Skip to content

Commit fcd8a88

Browse files
committed
Move test requirements to tox.ini
1 parent aa91b2e commit fcd8a88

File tree

6 files changed

+11
-19
lines changed

6 files changed

+11
-19
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ matrix:
4040
- env: TOXENV=py36-djangomaster
4141

4242
install:
43-
- pip install coveralls tox "virtualenv<14"
43+
- pip install coveralls tox
4444

4545
script:
4646
- tox

requirements/base.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

requirements/optional.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

requirements/project.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

requirements/testing.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

tox.ini

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,25 @@ deps =
1717
django110: Django==1.10.5
1818
django111: Django==1.11b1
1919
djangomaster: https://github.com/django/django/archive/master.tar.gz
20-
-rrequirements/testing.txt
20+
djangorestframework >= 3.5
21+
coverage
22+
mock
23+
pytest
24+
pytest-cov
25+
pytest-django
26+
pytest-xdist
27+
2128

2229
[testenv:docs]
2330
basepython = python
2431
changedir = docs
2532
whitelist_externals = make
26-
deps = sphinx
2733
commands = make html
34+
deps = sphinx
2835

2936
[testenv:flake8]
30-
deps = flake8
3137
commands = flake8 oauth2_provider
38+
deps = flake8
3239

3340
[flake8]
3441
max-line-length = 120

0 commit comments

Comments
 (0)