Skip to content

Commit 94c499a

Browse files
committed
Old tox couldn't rely on requirements reference
1 parent bded2b5 commit 94c499a

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ install:
1212
script: tox
1313
after_success:
1414
- coveralls
15+
before_deploy:
16+
- pip install -r CI_REQUIREMENTS.txt
1517
deploy:
1618
- provider: pypi
1719
distributions: sdist bdist_wheel

CI_REQUIREMENTS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
funcsigs>=1.0

tox.ini

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,16 @@ deps =
1818
pytest
1919
pytest-cov
2020
pytest-sugar
21+
py27: funcsigs>=1.0
22+
pypy: funcsigs>=1.0
2123
py27: mock
2224
pypy: mock
23-
{[base_deps]deps}
25+
py34: typing
2426

2527
commands =
2628
py.test -vv --junitxml=unit_result.xml --cov-config .coveragerc --cov-report html --cov=logwrap {posargs:test}
2729
coverage report --fail-under 90
2830

29-
[base_deps]
30-
deps =
31-
py27: funcsigs>=1.0
32-
pypy: funcsigs>=1.0
33-
py34: typing
34-
3531
[testenv:venv]
3632
commands = {posargs:}
3733

@@ -56,15 +52,17 @@ commands = pep257 logwrap
5652

5753
[testenv:install]
5854
deps =
59-
{[base_deps]deps}
55+
py34: typing
56+
-r{toxinidir}/CI_REQUIREMENTS.txt
6057
usedevelop = False
6158
commands = pip install ./ -vvv -U
6259

6360
[testenv:pylint]
6461
basepython = python3.5
6562
deps =
63+
py34: typing
6664
pylint
67-
funcsigs>=1.0
65+
-r{toxinidir}/CI_REQUIREMENTS.txt
6866
commands = pylint logwrap
6967

7068
[flake8]
@@ -87,15 +85,16 @@ count = True
8785

8886
[testenv:docs]
8987
deps =
88+
py34: typing
9089
sphinx
91-
{[base_deps]deps}
90+
-r{toxinidir}/CI_REQUIREMENTS.txt
9291
commands = python setup.py build_sphinx
9392

9493
[testenv:upload_docs]
9594
deps =
9695
sphinx
9796
sphinx-pypi-upload
98-
{[base_deps]deps}
97+
-r{toxinidir}/CI_REQUIREMENTS.txt
9998
commands = python setup.py build_sphinx upload_sphinx
10099

101100
[testenv:bandit]

0 commit comments

Comments
 (0)