diff --git a/.gitignore b/.gitignore index 7186cd5..0c817be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ *~ *.sw? *.pyc -.tox .coveralls.yml .coverage /build/ diff --git a/.travis.yml b/.travis.yml index 9aeea15..fdfd8c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,15 @@ matrix: - python: nightly include: - python: 3.8 - env: TOXENV=py38-coverage + script: + - 'pip install coverage' + - 'coverage run -m pytest' + - 'coverage report' + after_script: + - | + pip install --quiet coveralls + coveralls install: - - pip install --quiet tox-travis + - pip install .[testing] script: - - tox -after_script: - - | - if [ "${TOXENV%-coverage}" == "$TOXENV" ]; then - pip install --quiet coveralls; - coveralls; - fi + - pytest diff --git a/MANIFEST.in b/MANIFEST.in index fb90b35..e54f3ea 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,7 +5,6 @@ include AUTHORS.txt include .coveragerc include conftest.py include pytest.ini -include tox.ini include parso/python/grammar*.txt recursive-include test * recursive-include docs * diff --git a/deploy-master.sh b/deploy-master.sh index 876eb1d..79d25f8 100755 --- a/deploy-master.sh +++ b/deploy-master.sh @@ -23,7 +23,7 @@ cd $PROJECT_NAME git checkout $BRANCH # Test first. -tox +pytest # Create tag tag=v$(python3 -c "import $PROJECT_NAME; print($PROJECT_NAME.__version__)") diff --git a/docs/docs/development.rst b/docs/docs/development.rst index 1f6f47f..1332c66 100644 --- a/docs/docs/development.rst +++ b/docs/docs/development.rst @@ -21,18 +21,18 @@ The deprecation process is as follows: Testing ------- -The test suite depends on ``tox`` and ``pytest``:: +The test suite depends on ``pytest``:: - pip install tox pytest + pip install pytest -To run the tests for all supported Python versions:: +To run the tests use the following:: - tox + pytest If you want to test only a specific Python version (e.g. Python 3.9), it's as easy as:: - tox -e py39 + python3.9 -m pytest Tests are also run automatically on `Travis CI `_. diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 9c1e088..0000000 --- a/tox.ini +++ /dev/null @@ -1,14 +0,0 @@ -[tox] -envlist = {py36,py37,py38} -[testenv] -extras = testing -deps = - coverage: coverage -setenv = -# https://github.com/tomchristie/django-rest-framework/issues/1957 -# tox corrupts __pycache__, solution from here: - PYTHONDONTWRITEBYTECODE=1 - coverage: TOX_TESTENV_COMMAND=coverage run -m pytest -commands = - {env:TOX_TESTENV_COMMAND:pytest} {posargs} - coverage: coverage report