Skip to content

Commit

Permalink
Remove pytest-cov, just use coverage.py
Browse files Browse the repository at this point in the history
  • Loading branch information
messense committed Nov 27, 2015
1 parent b49bda6 commit 0cc508b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 18 deletions.
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ install:
- redis-64\tools\redis-server.exe --service-start
- '@ECHO Redis Started'
- C:\Python27\python -m pip install tox
- C:\Python27\python -m pip install pytest pytest-cov

test_script:
- C:\Python27\python -m tox -e %TESTENV%
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ def run_tests(self):
include_package_data=True,
tests_require=[
'pytest',
'pytest-cov',
'pytest-tornado',
'pytest-asyncio',
'httmock',
Expand Down
40 changes: 24 additions & 16 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ basepython =
deps =
-rrequirements.txt
pytest
pytest-cov
pytest-tornado
pytest-asyncio
httmock
Expand All @@ -25,14 +24,15 @@ deps =
tornado
cryptography: cryptography>=0.8.2
pycrypto: pycrypto>=2.6.1
commands = py.test --cov=wechatpy
commands =
coverage run --source=wechatpy {envdir}/bin/py.test
coverage report -m

[testenv:py26-cryptography]
deps =
-rrequirements.txt
importlib
pytest
pytest-cov
pytest-tornado
httmock
coverage
Expand All @@ -42,14 +42,15 @@ deps =
tornado
ordereddict
cryptography: cryptography>=0.8.2
commands = py.test --cov=wechatpy
commands =
coverage run --source=wechatpy {envdir}/bin/py.test
coverage report -m

[testenv:py26-pycrypto]
deps =
-rrequirements.txt
importlib
pytest
pytest-cov
pytest-tornado
httmock
coverage
Expand All @@ -59,14 +60,15 @@ deps =
tornado
ordereddict
pycrypto: pycrypto>=2.6.1
commands = py.test --cov=wechatpy
commands =
coverage run --source=wechatpy {envdir}/bin/py.test
coverage report -m

[testenv:pypy-cryptography]
deps =
-rrequirements.txt
importlib
pytest
pytest-cov
pytest-tornado
httmock
coverage
Expand All @@ -75,13 +77,14 @@ deps =
shove
tornado
cryptography: cryptography>=0.8.2,<1.0.0
commands = py.test --cov=wechatpy
commands =
coverage run --source=wechatpy {envdir}/bin/py.test
coverage report -m

[testenv:py34-cryptography]
deps =
-rrequirements.txt
pytest
pytest-cov
pytest-tornado
pytest-asyncio
httmock
Expand All @@ -92,13 +95,14 @@ deps =
tornado
aiohttp
cryptography: cryptography>=0.8.2
commands = py.test --cov=wechatpy
commands =
coverage run --source=wechatpy {envdir}/bin/py.test
coverage report -m

[testenv:py34-pycrypto]
deps =
-rrequirements.txt
pytest
pytest-cov
pytest-tornado
pytest-asyncio
httmock
Expand All @@ -109,13 +113,14 @@ deps =
tornado
aiohttp
pycrypto: pycrypto>=2.6.1
commands = py.test --cov=wechatpy
commands =
coverage run --source=wechatpy {envdir}/bin/py.test
coverage report -m

[testenv:py35-cryptography]
deps =
-rrequirements.txt
pytest
pytest-cov
pytest-tornado
pytest-asyncio
httmock
Expand All @@ -126,13 +131,14 @@ deps =
tornado
aiohttp
cryptography: cryptography>=0.8.2
commands = py.test --cov=wechatpy
commands =
coverage run --source=wechatpy {envdir}/bin/py.test
coverage report -m

[testenv:py35-pycrypto]
deps =
-rrequirements.txt
pytest
pytest-cov
pytest-tornado
pytest-asyncio
httmock
Expand All @@ -143,4 +149,6 @@ deps =
tornado
aiohttp
pycrypto: pycrypto>=2.6.1
commands = py.test --cov=wechatpy
commands =
coverage run --source=wechatpy {envdir}/bin/py.test
coverage report -m

0 comments on commit 0cc508b

Please sign in to comment.