Skip to content

Commit c6732c6

Browse files
committed
Fix tox.
1 parent 8571331 commit c6732c6

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# This file was autogenerated and will overwrite each time you run travis_pypi_setup.py
22
deploy:
33
distributions: sdist bdist_wheel
4-
provider: pypi
54
user: sophilabs
65
password:
76
secure: !!binary |
@@ -17,6 +16,7 @@ deploy:
1716
cGIvTDJYRXZ5NmVMaVBVMU41dlBLanVNZ1Y3RHlPMzc2VzVFMXJ0V1RmeTh2MFpETmlISnF4cmFQ
1817
MDZUamlvMm1zU1VIbmpTWXFjU0VSdzJqOElMakpsa2RPNFZGYTY1SlRVNzJobWJFbXZHZDdGZUtC
1918
UEhYZnR4SUVFTHlkR205eFo3VE1pS2w5c0duQzM1MzVmZEFyNVk4VVZSOFFRUndGN05MdTFFMDA9
19+
provider: pypi
2020
true:
2121
condition: $TOXENV == py33
2222
repo: sophilabs/learnregex

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ include README.rst
88

99
recursive-include tests *
1010
recursive-include learnregex *.py *.rst *.mo *.po *.pot
11+
1112
recursive-exclude * __pycache__
1213
recursive-exclude * *.py[co]

requirements_dev.pip

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
pip==8.1.2
1+
pip==9.0.1
22
bumpversion==0.5.3
33
wheel==0.29.0
44
watchdog==0.8.3
55
flake8==2.6.0
66
tox==2.3.1
77
coverage==4.1
8-
Sphinx==1.4.8
8+
cryptography==1.7
9+
PyYAML==3.11
10+
pytest==2.9.2

tox.ini

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py26, py27, py33, py34, py35, flake8
2+
envlist = py33, py34, py35, flake8
33

44
[testenv:flake8]
55
basepython=python
@@ -9,8 +9,11 @@ commands=flake8 learnregex
99
[testenv]
1010
setenv =
1111
PYTHONPATH = {toxinidir}:{toxinidir}/learnregex
12-
13-
commands = python setup.py test
12+
deps =
13+
-r{toxinidir}/requirements_dev.pip
14+
commands =
15+
pip install -U pip
16+
py.test --basetemp={envtmpdir}
1417

1518
; If you want to make tox run the tests with the same versions, create a
1619
; requirements.txt with the pinned versions and uncomment the following lines:

0 commit comments

Comments
 (0)