Skip to content

Commit 112c159

Browse files
committed
Test things with pytest too
1 parent 4890cd7 commit 112c159

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ matrix:
1818
env: TOXENV=py36
1919
- python: 3.7-dev
2020
env: TOXENV=py37
21+
- python: 3.7
22+
env: TOXENV=pytest
2123
- os: linux
2224
dist: xenial
2325
python: pypy2.7-6.0

tox.ini

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1+
[pytest]
2+
python_files = *_test.py test*.py
3+
testpaths = tests
4+
norecursedirs = tests/django_example
5+
16
[tox]
2-
envlist = begin,py{27,py,py3,34,35,36,37},py27-django{lts,curr},end,quality
7+
envlist = begin,py{27,py,py3,35,36,37},pytest,py27-django{lts,curr},end,quality
38

49
[tox:travis]
510
2.7 = begin,py27,py27-django{lts,curr},end,quality
6-
3.4 = py34
711
3.5 = py35
812
3.6 = py36
9-
3.7 = py37
13+
3.7 = py37,pytest
1014

1115
[testenv]
1216
deps =
1317
coverage
1418
codecov>=1.4.0
1519
coveralls
16-
djangolts: django>=1.8.8,<1.9.0
20+
djangolts,pytest: django>=1.8.8,<1.9.0
1721
djangocurr: django>=1.9.1
22+
pytest: pytest
1823
lxml>=3.6.0
1924
mock
2025
commands =
@@ -24,6 +29,9 @@ commands =
2429
-coveralls
2530
passenv = CI TRAVIS_BUILD_ID TRAVIS TRAVIS_BRANCH TRAVIS_JOB_NUMBER TRAVIS_PULL_REQUEST TRAVIS_JOB_ID TRAVIS_REPO_SLUG TRAVIS_COMMIT
2631

32+
[testenv:pytest]
33+
commands = pytest
34+
2735
[testenv:begin]
2836
commands = coverage erase
2937

0 commit comments

Comments
 (0)