Commit Graph

76 Commits

Author SHA1 Message Date
meejah
42a4959ada metadata/readme updates about dropped versions 2022-08-30 17:12:34 -06:00
sneakypete81
aa555a82ed
Replace deprecated attrs cmp=False parameter with eq=False (#384)
See https://attrs.readthedocs.io/en/stable/api.html#core
2020-04-12 14:50:03 -07:00
Brian Warner
52ee3ce105 setup.py: include wormhole._dilation, wormhole.test.dilate 2020-04-04 16:38:01 -07:00
Brian Warner
2420150794 README/setup.py: update to reflect py3.8 compatibility 2020-04-04 14:25:47 -07:00
Brian Warner
baf5ce4ead setup.py: hush deprecation warning
open(mode=U) is deprecated in py3, remove it
2019-02-10 11:18:48 -08:00
Brian Warner
29c269ac8d get tests to work on py2.7
only install 'noiseprotocol' (which is necessary for dilation to work) if the
"dilate" feature is requested (e.g. `pip install magic-wormhole[dilate]`)
2018-12-24 00:07:06 -05:00
Brian Warner
34686a346a add dilation code
(this compresses several months of false starts and rearchitecting)
2018-12-23 15:21:08 -05:00
Brian Warner
54a369c95a setup.py: bump dep on transit-relay to latest 0.1.2 2018-10-16 16:12:51 -07:00
Brian Warner
3f099cc51f setup.py: bump to txtorcon-18.0.2 to fix py3.4 2018-07-02 23:57:11 -07:00
Brian Warner
5dd41cead3 setup.py: update to latest mailbox-server 0.3.1 2018-06-23 19:31:29 -07:00
Brian Warner
b06eda5f11 setup.py: update to newly-released mailbox-server 0.2.0 2018-06-16 17:26:53 -07:00
Brian Warner
1011197dce Merge PR304: fix long description on PyPI 2018-06-16 11:10:40 -07:00
Marius Gedminas
21dbf00a7f
Add long_description_content_type to setup.py
The new PyPI code discards long_description when it's not valid ReStructuredText.  Luckily it also supports Markdown, but you have to [specify the content type](https://packaging.python.org/tutorials/packaging-projects/#creating-setup-py) explicitly in that case.

(IIRC for this to work correctly you also have to use sufficiently recent versions of setuptools and twine to upload releases.)

Should fix #303.
2018-06-12 14:08:34 +03:00
Ofek Lev
16c48a54f1
update Windows dependency 2018-06-02 17:36:15 -04:00
Brian Warner
7b39e42df7 setup.py: add classifiers and long_description 2018-03-22 00:32:06 -07:00
Brian Warner
77201966b4 remove server-related source files, munin plugins
setup.py: pin to magic-wormhole-mailbox-server 0.1.0, the current version
2018-02-20 23:46:29 -08:00
Brian Warner
e4e8216d2c tests: pin transit-relay to 0.1.1, that's the new version 2018-02-19 17:24:27 -08:00
Brian Warner
13b1539409 setup.py: remove the dependency on ipaddress
Do we still need this? Nothing in wormhole uses it.

refs #274
2018-02-15 17:02:19 -08:00
Brian Warner
83d0d15a39 update to spake2-0.8, which loads much faster 2018-02-14 18:58:25 -08:00
Brian Warner
73764830ac setup.py: pin transit-relay to 0.1.0 since tests look inside it 2017-11-13 12:14:08 -08:00
Brian Warner
a804365536 remove most of Transit server, use external package instead 2017-11-13 11:34:17 -08:00
Brian Warner
68ce54ad3a setup.py: add dep on attrs, >=16.3.0 to get __attrs_post_init__
I should have added this when I switched to the new state machines, since
they definitely depend on attrs. The only reason this worked at all was that
some subdependency was also depending upon attrs.

We need at least 16.3.0, since we use __attrs_post_init__, and that feature
wasn't included in attrs-16.2.0 or earlier.

Closess #248
2017-09-03 14:04:00 -07:00
Brian Warner
2575dbfad3 setup.py: require txtorcon all the time, remove 'tor' extra 2017-06-14 23:41:49 +01:00
Brian Warner
b66aacd968 bump Twisted dep to get ClientService.whenConnected(failAfterFailures=) 2017-06-14 10:41:55 +01:00
Brian Warner
117747306d setup.py: bump tqdm dep to 4.13.0
That's the first version that works on netbsd.
2017-06-01 21:58:27 +01:00
Brian Warner
b0224cc08c require txtorcon-0.19.3, for socks-port bugfix
We needed the fix for https://github.com/meejah/txtorcon/issues/237 so that
connect-to-running-tor works.
2017-05-25 01:19:34 -07:00
Brian Warner
805e07cd97 setup.py: extras=dev requires txtorcon on both py2 and py3
We used to avoid this on py3, but now that txtorcon (0.19.2) is compatible
with it, we can use it on both. This also means tests can rely on having
txtorcon available.
2017-05-24 16:48:00 -07:00
Brian Warner
73f3d86107 state machine should be complete, I think 2017-04-06 12:21:00 -07:00
Brian Warner
47007273ec rewrite Tor support (py2 only)
The new TorManager adds --launch-tor and --tor-control-port= arguments
(requiring the user to explicitly request a new Tor process, if that's what
they want). The default (when --tor is enabled) looks for a control port in
the usual places (/var/run/tor/control, localhost:9051, localhost:9151), then
falls back to hoping there's a SOCKS port in the usual
place (localhost:9050). (closes #64)

The ssh utilities should now accept the same tor arguments as ordinary
send/receive commands. There are now full tests for TorManager, and basic
tests for how send/receive use it. (closes #97)

Note that Tor is only supported on python2.7 for now, since txsocksx (and
therefore txtorcon) doesn't work on py3. You need to do "pip install
magic-wormhole[tor]" to get Tor support, and that will get you an inscrutable
error on py3 (referencing vcversioner, "install_requires must be a string or
list of strings", and "int object not iterable").

To run tests, you must install with the [dev] extra (to get "mock" and other
libraries). Our setup.py only includes "txtorcon" in the [dev] extra when on
py2, not on py3. Unit tests tolerate the lack of txtorcon (they mock out
everything txtorcon would provide), so they should provide the same coverage
on both py2 and py3.
2017-01-15 22:39:03 -05:00
Brian Warner
2d949f23c6 setup.py: refactor slightly 2017-01-15 16:26:23 -05:00
Brian Warner
64307d3531 setup.py: require twisted[tls] to hush service-identity warning
Thanks to @grempe for the catch. Closes #89.
2016-12-07 22:13:40 -08:00
Antoine Beaupré
342bebbd0e use humanize library instead of custom implementation 2016-11-11 22:01:21 -05:00
meejah
2a332471d3 add pyflakes to 'dev' extra 2016-08-14 16:49:34 -06:00
meejah
e11c7496a9 add 'dev' extra, with mock + tox, and a pypy environment 2016-06-22 02:14:34 -06:00
meejah
f32cd46e2c remove argparse, whitespace-ify requirements 2016-06-22 01:30:15 -06:00
meejah
e16b53817e Refactor to use Click 2016-06-22 01:11:07 -06:00
laharah
74b4a10ac1 Windows build and CI patch
a compressed patch to apply new settings for the windows build
and allows appveyor to execute tox tests correctly
2016-06-03 16:12:55 -07:00
laharah
e98a6c501b added windows extra to setup 2016-06-02 16:23:48 -07:00
meejah
5b23669cf3 use ipaddress not ipaddr 2016-06-02 16:20:12 -07:00
Brian Warner
2cf11e85d3 un-pin Twisted, require autobahn >=0.14.1
The new autobahn release removes the Twisted pin, so we no longer need
one. Depend on the new autobahn to flush out any environments that are
still using the old one (and thus can't use the current Twisted).

Thanks https://github.com/crossbario/autobahn-python/issues/680 !
2016-05-26 13:01:43 -07:00
Brian Warner
0414051df2 remove wormhole/twisted/ 2016-05-24 16:26:17 -07:00
Brian Warner
b72f0ce934 INCOMPATIBLE CHANGE: switch to spake2-0.7
This changes the way keys are derived, and thus is incompatible with
previous versions. We pin "spake2==0.7" to avoid future surprises.
2016-05-24 13:14:34 -07:00
Brian Warner
bc908ef07e setup.py: pin twisted==16.1.1, remove pytrie
* To avoid an incompatible patch that landed in Twisted trunk after the
  16.1.1 release, autobahn pinned their requirement on Twisted to
  be <=16.1.1 . However Twisted reverted the patch before making a
  release. The new 16.2.0 is fine. Since autobahn has this pin, and
  since pip doesn't do full dependency resolution, I must add the pin
  too, so that 'pip install magic-wormhole' can work. I plan to remove
  this pin as soon as autobahn does the same upstream.
  https://github.com/crossbario/autobahn-python/issues/680
* A previous version of autobahn had a bug where it tried to import
  something that wasn't actually depended upon, exposed by having pynacl
  installed. Installing 'pytrie' manually fixed it. This doesn't seem to
  be a problem anymore, so I'm removing the manual dependency.
2016-05-24 00:10:16 -07:00
Brian Warner
49785008bb remove blocking implementation: it will return
It will return as a crochet-based wrapper around the Twisted
implementation.
2016-05-12 16:45:54 -07:00
Brian Warner
86edf96412 switch to tqdm for nicer CLI progress bars 2016-04-24 12:04:05 -07:00
Brian Warner
7b9c48fbc4 unsplit: last fixups 2016-04-20 19:18:41 -07:00
Brian Warner
b2c3f49038 unsplit txwormhole step 2: edit files 2016-04-20 19:18:41 -07:00
Brian Warner
7c45f3d472 unsplit wormhole_server step 2: edit files 2016-04-20 19:15:33 -07:00
Brian Warner
85b6264826 unsplit cli step 2: edit files 2016-04-20 19:15:33 -07:00
Brian Warner
7a5a99a1a8 unsplit tests step 3: modify files 2016-04-20 18:54:10 -07:00