diff options
| -rw-r--r-- | CONTRIBUTING.rst | 11 | ||||
| -rw-r--r-- | MANIFEST.in | 9 | ||||
| -rw-r--r-- | plugin-test.sh | 20 | ||||
| -rw-r--r-- | requirements-docs.txt | 3 | ||||
| -rw-r--r-- | runtox.py | 8 | ||||
| -rw-r--r-- | tox.ini | 8 |
6 files changed, 13 insertions, 46 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 947d4e655..19b31c7f4 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -199,13 +199,10 @@ but here is a simple overview: You need to have Python 2.7 and 3.5 available in your system. Now running tests is as simple as issuing this command:: - $ python3 runtox.py -e linting,py27,py35 + $ tox -e linting,py27,py35 This command will run tests via the "tox" tool against Python 2.7 and 3.5 - and also perform "lint" coding-style checks. ``runtox.py`` is - a thin wrapper around ``tox`` which installs from a development package - index where newer (not yet released to PyPI) versions of dependencies - (especially ``py``) might be present. + and also perform "lint" coding-style checks. #. You can now edit your local working copy. @@ -214,11 +211,11 @@ but here is a simple overview: To run tests on Python 2.7 and pass options to pytest (e.g. enter pdb on failure) to pytest you can do:: - $ python3 runtox.py -e py27 -- --pdb + $ tox -e py27 -- --pdb Or to only run tests in a particular test module on Python 3.5:: - $ python3 runtox.py -e py35 -- testing/test_config.py + $ tox -e py35 -- testing/test_config.py #. Commit and push once your tests pass and you are happy with your change(s):: diff --git a/MANIFEST.in b/MANIFEST.in index 079b225ec..8e2cd6118 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,15 +11,12 @@ include setup.py include .coveragerc -include plugin-test.sh -include requirements-docs.txt -include runtox.py - recursive-include bench *.py recursive-include extra *.py graft testing graft doc +prune doc/en/_build exclude _pytest/impl @@ -27,6 +24,6 @@ graft _pytest/vendored_packages recursive-exclude * *.pyc *.pyo -exclude appveyor/install.ps1 exclude appveyor.yml -exclude appveyor +exclude .travis.yml +prune .github diff --git a/plugin-test.sh b/plugin-test.sh deleted file mode 100644 index 7830b7c7d..000000000 --- a/plugin-test.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# this assumes plugins are installed as sister directories - -set -e -cd ../pytest-pep8 -pytest -cd ../pytest-instafail -pytest -cd ../pytest-cache -pytest -cd ../pytest-xprocess -pytest -#cd ../pytest-cov -#pytest -cd ../pytest-capturelog -pytest -cd ../pytest-xdist -pytest - diff --git a/requirements-docs.txt b/requirements-docs.txt deleted file mode 100644 index be3a232e5..000000000 --- a/requirements-docs.txt +++ /dev/null @@ -1,3 +0,0 @@ -sphinx==1.2.3 -regendoc -pyyaml diff --git a/runtox.py b/runtox.py deleted file mode 100644 index 8c13c53e1..000000000 --- a/runtox.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python - -if __name__ == "__main__": - import subprocess - import sys - subprocess.call([sys.executable, "-m", "tox", - "-i", "ALL=https://devpi.net/hpk/dev/", - "--develop"] + sys.argv[1:]) @@ -47,9 +47,13 @@ commands= pytest --genscript=pytest1 [testenv:linting] basepython = python2.7 -deps = flake8 +deps = + flake8 restructuredtext_lint -commands = flake8 pytest.py _pytest testing + check-manifest +commands = + check-manifest + flake8 pytest.py _pytest testing rst-lint CHANGELOG.rst HOWTORELEASE.rst [testenv:py27-xdist] |