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

Merge branch 'pr41'

Browse Source 
Closes #41
This commit is contained in:
Brian Warner 2016-06-03 16:16:05 -07:00
commit a03c1804f7
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -7,7 +7,7 @@ environment:
# that didn't work (it seems to work when I run it locally, but on appveyor # that didn't work (it seems to work when I run it locally, but on appveyor
# it fails to install the pypiwin32 package). So don't bother telling # it fails to install the pypiwin32 package). So don't bother telling
# Twisted to support windows: just install it ourselves. # Twisted to support windows: just install it ourselves.
EXTRA_DEPENDENCY: "pypiwin32" # EXTRA_DEPENDENCY: "pypiwin32"
matrix: matrix:
# For Python versions available on Appveyor, see # For Python versions available on Appveyor, see
# http://www.appveyor.com/docs/installed-software#python # http://www.appveyor.com/docs/installed-software#python

4
README.md
View File

@ -25,9 +25,7 @@ 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. On Windows you will need to use `pip install magic-wormhole[windows]` GCC. Note: on Windows, only python2 is currently supported.
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.

5
setup.py
View File

@ -29,9 +29,8 @@ 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={':sys_platform=="win32"': ["pypiwin32"],
"windows": ["pypiwin32"] "tor": ["txtorcon", "ipaddress"]},
},
test_suite="wormhole.test", test_suite="wormhole.test",
cmdclass=commands, cmdclass=commands,
) )

9
tox.ini
View File

@ -4,7 +4,7 @@
# and then run "tox" from this directory. # and then run "tox" from this directory.
[tox] [tox]
envlist = py27,py33,py34,py35 envlist = {py27,py33,py34,py35}
skip_missing_interpreters = True skip_missing_interpreters = True
# On windows we need "pypiwin32" installed. It's supposedly possible to make # On windows we need "pypiwin32" installed. It's supposedly possible to make
@ -20,11 +20,12 @@ skip_missing_interpreters = True
deps = deps =
pyflakes >= 1.2.3 pyflakes >= 1.2.3
mock mock
{env:EXTRA_DEPENDENCY:} install_command = pip install {packages}
commands = commands =
pyflakes setup.py src pyflakes setup.py src
wormhole --version wormhole --version
trial {posargs:wormhole.test} python -m wormhole.test.run_trial {posargs:wormhole}
# on windows, trial is installed as venv/bin/trial.py, not .exe, but (at # on windows, trial is installed as venv/bin/trial.py, not .exe, but (at
# least appveyor) adds .PY to $PATHEXT. So "trial wormhole" might work on # least appveyor) adds .PY to $PATHEXT. So "trial wormhole" might work on
@ -38,7 +39,7 @@ deps =
pyflakes >= 1.2.3 pyflakes >= 1.2.3
mock mock
coverage coverage
{env:EXTRA_DEPENDENCY:} install_command = pip install {packages}
commands = commands =
pyflakes setup.py src pyflakes setup.py src
wormhole --version wormhole --version