Skip to content

Commit 12f0b3a

Browse files
committed
Enable codecov in AppVeyor CI
Closes #168 Also: * Added pytest config
1 parent 35570be commit 12f0b3a

5 files changed

Lines changed: 15 additions & 5 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ install:
1414
- pip install -r requirements/ci.txt
1515

1616
script:
17-
- pytest --cov=multidict tests
17+
- pytest
1818

1919
after_success:
2020
- codecov

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ build_script:
2121
- "tools/build.cmd %PYTHON%\\python.exe setup.py bdist_wheel"
2222

2323
test_script:
24-
- "tools/build.cmd %PYTHON%\\python.exe -m pytest --junitxml=junit-test-results.xml tests"
24+
- "tools/build.cmd %PYTHON%\\python.exe -m pytest"
2525

2626
after_test:
27+
- tools/build.cmd %PYTHON%\\python.exe -c "import codecov, os, sys; os.environ['APPVEYOR'] = os.getenv('APPVEYOR', '').replace('true', 'True'); sys.argv += ['-f', 'coverage.xml', '-X', 'gcov']; codecov.main()"
2728
- ps: |
2829
$wc = New-Object 'System.Net.WebClient'
2930
$wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\junit-test-results.xml))

pytest.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[pytest]
2+
norecursedirs=dist build .tox docs requirements tools
3+
addopts=-v -rxs --doctest-modules --junitxml=junit-test-results.xml --cov=multidict --cov-report term-missing:skip-covered --cov-report xml tests
4+
doctest_optionflags=ALLOW_UNICODE ELLIPSIS

requirements/ci.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ mypy==0.530; (python_version>="3.5" or platform_system != "Windows") and platfor
1111
git+git://github.com/python/mypy.git@b6bcdc0; python_version<"3.5" and platform_system == "Windows"
1212
-e .
1313

14-
codecov==2.0.9; platform_system!="Windows" # We only use it in Travis CI
14+
codecov==2.0.9

tests/gen_pickles.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import pickle
22

3-
from multidict._multidict import (MultiDict, CIMultiDict) # noqa
3+
from multidict._compat import USE_CYTHON
4+
5+
if USE_CYTHON:
6+
from multidict._multidict import MultiDict, CIMultiDict # noqa
7+
48
from multidict._multidict_py import (MultiDict as PyMultiDict, # noqa
59
CIMultiDict as PyCIMultiDict)
610

@@ -14,4 +18,5 @@ def write(name, proto):
1418

1519
for proto in range(pickle.HIGHEST_PROTOCOL):
1620
for name in ('MultiDict', 'CIMultiDict', 'PyMultiDict', 'PyCIMultiDict'):
17-
write(name, proto)
21+
if USE_CYTHON or name.startswith('Py'):
22+
write(name, proto)

0 commit comments

Comments
 (0)