open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr35'

Browse Source 
refs #25
This commit is contained in:
Brian Warner 2016-06-02 16:24:08 -07:00
commit 13cda9e615
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -25,7 +25,9 @@ and do not need to be memorized.
On Debian/Ubuntu systems, you may first need `apt-get python-dev On Debian/Ubuntu systems, you may first need `apt-get python-dev
libffi-dev`. On Fedora it's `libffi-devel` and `python-devel`. On OS-X, libffi-dev`. On Fedora it's `libffi-devel` and `python-devel`. On OS-X,
you may need to install `pip` and run `xcode-select --install` to get you may need to install `pip` and run `xcode-select --install` to get
GCC. GCC. On Windows you will need to use `pip install magic-wormhole[windows]`
to install the extra required libraries. (Note: only python2 is supported
on windows at this time).
Developers can clone the source tree and run `tox` to run the unit tests on Developers can clone the source tree and run `tox` to run the unit tests on
all supported (and installed) versions of python: 2.7, 3.3, 3.4, and 3.5. all supported (and installed) versions of python: 2.7, 3.3, 3.4, and 3.5.

4
setup.py
View File

@ -29,7 +29,9 @@ setup(name="magic-wormhole",
"autobahn[twisted] >= 0.14.1", "autobahn[twisted] >= 0.14.1",
"hkdf", "tqdm", "hkdf", "tqdm",
], ],
extras_require={"tor": ["txtorcon", "ipaddress"]}, extras_require={"tor": ["txtorcon", "ipaddress"],
"windows": ["pypiwin32"]
},
test_suite="wormhole.test", test_suite="wormhole.test",
cmdclass=commands, cmdclass=commands,
) )