diff options
| author | Jonathan Huot <JonathanHuot@users.noreply.github.com> | 2018-12-20 13:46:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 13:46:35 +0100 |
| commit | 347e4aaf41d1688d47912e44364d2e51adf30280 (patch) | |
| tree | 54fc1e51df14fe0922ccf6ef0945f5be81947711 | |
| parent | c5de837837d3b69edb6bb8bcfe1741047b992760 (diff) | |
| parent | 5d76d02f32b1cdb9af6b9806df907f3802ebb22b (diff) | |
| download | oauthlib-347e4aaf41d1688d47912e44364d2e51adf30280.tar.gz | |
Merge branch 'master' into dry-up-code
| -rw-r--r-- | docs/contributing.rst | 4 | ||||
| -rw-r--r-- | requirements-test.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/contributing.rst b/docs/contributing.rst index 771262d..e101f70 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -144,7 +144,7 @@ the project root via: .. sourcecode:: bash - $ python -m unittest discover + $ py.test The first thing the core committers will do is run this command. Any pull request that fails this test suite will be **rejected**. @@ -301,7 +301,7 @@ First we pull the code into a local branch:: Then we run the tests:: - python -m unittest discover + py.test We finish with a non-fastforward merge (to preserve the branch history) and push to GitHub:: diff --git a/requirements-test.txt b/requirements-test.txt index c3e0a7b..64485a6 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,3 +1,4 @@ -r requirements.txt -coverage>=3.7.1 mock>=2.0 +pytest>=4.0 +pytest-cov>=2.6 @@ -5,8 +5,7 @@ envlist = py27,py34,py35,py36,py37,pypy,pypy3,docs,readme,bandit deps= -rrequirements-test.txt commands= - coverage run --source oauthlib -m unittest discover - coverage report + py.test --cov=oauthlib tests/ # tox -e docs to mimick readthedocs build. |