diff options
| author | Seth M. Larson <sethmichaellarson@gmail.com> | 2019-01-11 15:39:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 15:39:42 -0600 |
| commit | 36355af7a8e416804c74b65abf63b7f8a76f0d3a (patch) | |
| tree | 7769912c78b5ae9f5d667ecd3b93a2ab6c61f90e | |
| parent | adb358f8e06865406d1f05e581a16cbea2136fbc (diff) | |
| download | urllib3-36355af7a8e416804c74b65abf63b7f8a76f0d3a.tar.gz | |
Upgrade coverage to 4.5.2 (#1495)
| -rw-r--r-- | .coveragerc | 7 | ||||
| -rw-r--r-- | dev-requirements.txt | 7 | ||||
| -rw-r--r-- | tox.ini | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/.coveragerc b/.coveragerc index ff7b9253..3052ac25 100644 --- a/.coveragerc +++ b/.coveragerc @@ -12,9 +12,10 @@ omit = [paths] source = - src/urllib3 - .tox/*/lib/python*/site-packages/urllib3 - .tox/pypy*/site-packages/urllib3 + src/urllib3 + .tox/*/lib/python*/site-packages/urllib3 + .tox\*\Lib\site-packages\urllib3 + .tox/pypy*/site-packages/urllib3 [report] exclude_lines = diff --git a/dev-requirements.txt b/dev-requirements.txt index df3ed610..264e844f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,14 +1,13 @@ mock==2.0.0 -coverage==4.5.1 +coverage~=4.5 tox==2.9.1 -twine==1.11.0 wheel==0.30.0 tornado==5.0.2 PySocks==1.6.8 pkginfo==1.4.2 pytest-timeout==1.3.1 pytest==3.8.2 +pluggy==0.8.0 # https://github.com/GoogleCloudPlatform/python-repo-tools/issues/23 pylint<2.0;python_version<="2.7" -gcp-devrel-py-tools==0.0.15 -pluggy==0.8.0 +gcp-devrel-py-tools @@ -26,10 +26,13 @@ basepython = python2.7 deps= {[testenv]deps} commands= - py.test -r sx test/appengine {posargs} + coverage run --parallel-mode -m pytest -r sx test/appengine {posargs} + coverage combine + coverage report -m setenv = GAE_SDK_PATH={env:GAE_SDK_PATH:} {[testenv]setenv} +passenv = TRAVIS TRAVIS_INFRA [testenv:flake8-py3] basepython = python3.4 |