Merge pull request #208 from blueyed/xenial

Travis: use Ubuntu Xenial, pypy3, coverage

.travis.yml

@@ -1,44 +1,59 @@
-sudo: false
+dist: xenial
 language: python
+
 python:
-- '2.7'
-- '3.4'
-- '3.5'
-- '3.6'
-- 'pypy-5.4'
+  - '2.7'
+  - '3.4'
+  - '3.5'
+  - '3.6'
+  # - 'pypy2.7-6.0'
+  - 'pypy3.5-6.0'
+
 env:
-- DEPS="pytest~=2.9.0"
-- DEPS="pytest~=3.0.0"
-#- DEPS="pytest~=3.1.0"
+  - DEPS="pytest~=2.9.0"
+  - DEPS="pytest~=3.0.0"
+  #- DEPS="pytest~=3.1.0"
 
-matrix:
+stages:
+  - name: deploy
+    if: tag IS present
 
+matrix:
   include:
-  - python: '2.7'
-    # using a different option due to pytest-addopts pytester issues
-    env: PYTEST_XADDOPTS="-n 3 --runslowtests" DEPS="pytest~=3.0.0 pytest-xdist"
-    
-  - stage: deploy
-    python: '3.6'
-    env:
-    install: pip install -U setuptools setuptools_scm
-    script: skip
-    deploy:
-      provider: pypi
-      user: nicoddemus
-      distributions: sdist bdist_wheel
-      skip_upload_docs: true
-      password:
-        secure: VNYW/sZoD+9DzKCe6vANNXXJR7jP7rwySafQ33N1jAnCrdylQjEN/p6tSfUe8jDi3wDpLPL9h8pwfxuUT7CRxglHov3Qe7zSeywixvHan5aFahQiQ8+gucYIM7wITHH3oQs7jN35pnhdnF+QlW2+eDCL6qOLU5XwuRhsDKXjQ/hUWR5hlX5EniD1gzyKEf6j1YCpST87tKpeLwVEYEmsucdkUZuXhxDtyaWQHWiPsLWwh/slQtUJEHeLF26r8UxFy0RiGne9jR+CzRfH5ktcA9/pArvp4VuwOii+1TDxVSYP7+I8Z+eUKN9JBg12QLaHwoIN/8J+MvHCkuf+OGSLM3sEyNRJGDev372xg3K7ylIkeeK4WXirKEp2ojgN8tniloDjnwdu/gPWBnrXuooA60tNoByHFa8KbMZAr2B2sQeMxD4VZGr1N8l0rX4gRTrwvdk3i3ulLKVSwkXaGn+GrfZTTboa7dEnpuma8tv1niNCSpStYIy7atS8129+5ijV3OC8DzOMh/rVbO9WsDb/RPG3yjFiDvEJPIPeE0l/m5u42QBqtdZSS2ia7UWTJBiEY09uFMTRmH5hhE/1aiYBbvAztf5CReUbeKdSQz3L8TTSZqewtFZmXTkX97/xQnrEpsnGezIM2DNuMEuQG3MxGkNCxwbQKpx/bkHdrD75yMk=
-      on:
-        tags: true
-        repo: pytest-dev/py
-        
+    - python: '2.7'
+      # using a different option due to pytest-addopts pytester issues
+      env: PYTEST_XADDOPTS="-n auto --runslowtests" DEPS="pytest~=3.0.0 pytest-xdist<1.25 pytest-forked<0.3"
+
+    - stage: deploy
+      python: '3.6'
+      env:
+      install: pip install -U setuptools setuptools_scm
+      script: skip
+      deploy:
+        provider: pypi
+        user: nicoddemus
+        distributions: sdist bdist_wheel
+        skip_upload_docs: true
+        password:
+          secure: VNYW/sZoD+9DzKCe6vANNXXJR7jP7rwySafQ33N1jAnCrdylQjEN/p6tSfUe8jDi3wDpLPL9h8pwfxuUT7CRxglHov3Qe7zSeywixvHan5aFahQiQ8+gucYIM7wITHH3oQs7jN35pnhdnF+QlW2+eDCL6qOLU5XwuRhsDKXjQ/hUWR5hlX5EniD1gzyKEf6j1YCpST87tKpeLwVEYEmsucdkUZuXhxDtyaWQHWiPsLWwh/slQtUJEHeLF26r8UxFy0RiGne9jR+CzRfH5ktcA9/pArvp4VuwOii+1TDxVSYP7+I8Z+eUKN9JBg12QLaHwoIN/8J+MvHCkuf+OGSLM3sEyNRJGDev372xg3K7ylIkeeK4WXirKEp2ojgN8tniloDjnwdu/gPWBnrXuooA60tNoByHFa8KbMZAr2B2sQeMxD4VZGr1N8l0rX4gRTrwvdk3i3ulLKVSwkXaGn+GrfZTTboa7dEnpuma8tv1niNCSpStYIy7atS8129+5ijV3OC8DzOMh/rVbO9WsDb/RPG3yjFiDvEJPIPeE0l/m5u42QBqtdZSS2ia7UWTJBiEY09uFMTRmH5hhE/1aiYBbvAztf5CReUbeKdSQz3L8TTSZqewtFZmXTkX97/xQnrEpsnGezIM2DNuMEuQG3MxGkNCxwbQKpx/bkHdrD75yMk=
+        on:
+          tags: true
+          repo: pytest-dev/py
+
   allow_failures:
-  - python: 'pypy-5.4'
+  - python: 'pypy2.7-6.0'
+  - python: 'pypy3.5-6.0'
+
 install:
-- pip install -U setuptools setuptools_scm
-- pip install $DEPS
-- pip install -U . --force-reinstall
+  - pip install -U coverage coverage-enable-subprocess pip setuptools setuptools_scm
+  - pip install $DEPS
+  - pip install -U . --force-reinstall
+
 script:
-- py.test --lsof $PYTEST_XADDOPTS
+  - coverage run -m pytest --lsof $PYTEST_XADDOPTS
+
+after_success:
+  - coverage combine
+  - coverage report -m
+  - coverage xml
+  - bash <(curl -s https://codecov.io/bash) -Z -X gcov -X coveragepy -X search -X xcode -X gcovout -X fix -f coverage.xml -e TRAVIS_PYTHON_VERSION

tox.ini

@@ -6,7 +6,7 @@ envlist=py{27,34,35,36}-pytest{29,30,31},py37-pytest{30,31}
 changedir=testing
 commands=
   pip install -U .. # hande the install order fallout since pytest depends on pip
-  py.test --confcutdir=.. -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
+  py.test --confcutdir=.. --junitxml={envlogdir}/junit-{envname}.xml []
 deps=
   attrs
   pytest29: pytest~=2.9.0
@@ -20,15 +20,22 @@ deps=
     pytest-xdist<=1.16.0
 commands=
   pip install -U .. # hande the install order fallout since pytest depends on pip
-  py.test -n3 -rfsxX --confcutdir=.. --runslowtests \
+  py.test -n3 --confcutdir=.. --runslowtests \
         --junitxml={envlogdir}/junit-{envname}.xml []
 
 [testenv:jython]
 changedir=testing
 commands=
     {envpython} -m pip install -U .. # hande the install order fallout since pytest depends on pip
-    {envpython} -m pytest --confcutdir=.. -rfsxX --junitxml={envlogdir}/junit-{envname}0.xml {posargs:io_ code}
+    {envpython} -m pytest --confcutdir=.. --junitxml={envlogdir}/junit-{envname}0.xml {posargs:io_ code}
 
 [pytest]
 rsyncdirs = conftest.py py doc testing
 addopts = -ra
+
+[coverage:run]
+branch = 1
+source = .
+parallel = 1
+[coverage:report]
+include = py/*,testing/*