summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml32
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--README.rst7
-rw-r--r--doc/requirements.pip2
-rw-r--r--requirements/ci.pip1
-rw-r--r--requirements/dev.pip4
-rw-r--r--requirements/pytest.pip4
-rw-r--r--requirements/tox.pip4
-rw-r--r--requirements/wheel.pip1
-rw-r--r--tox.ini10
10 files changed, 33 insertions, 33 deletions
diff --git a/.travis.yml b/.travis.yml
index 986deb67..5e28d48b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,31 +4,19 @@
language: python
sudo: false
-
python:
- - 2.7
-
-addons:
- apt:
- sources:
- - deadsnakes
- packages:
- - python3.5
- - python3.5-dev
+ - '2.6'
+ - '2.7'
+ - '3.3'
+ - '3.4'
+ - '3.5'
+ - '3.6'
+ - 'pypy'
env:
- - TOXENV=py26
- - TOXENV=py27
- - TOXENV=py33
- - TOXENV=py34
- - TOXENV=py35
- - TOXENV=pypy
- - TOXENV=py26 COVERAGE_COVERAGE=yes
- - TOXENV=py27 COVERAGE_COVERAGE=yes
- - TOXENV=py33 COVERAGE_COVERAGE=yes
- - TOXENV=py34 COVERAGE_COVERAGE=yes
- - TOXENV=py35 COVERAGE_COVERAGE=yes
- - TOXENV=pypy COVERAGE_COVERAGE=yes
+ matrix:
+ - COVERAGE_COVERAGE=no
+ - COVERAGE_COVERAGE=yes
sudo: false
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 877f6b84..15bd808a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -24,6 +24,7 @@ Catherine Proulx
Chris Adams
Chris Jerdonek
Chris Rose
+Chris Warrick
Christian Heimes
Christine Lytwynec
Christoph Zwerschke
diff --git a/README.rst b/README.rst
index fd25f1b3..ae5f2eb5 100644
--- a/README.rst
+++ b/README.rst
@@ -12,6 +12,8 @@ Code coverage testing for Python.
| |kit| |format| |commits-since|
| |saythanks|
+| |codesponsor|
+
.. downloads badge seems to be broken... |downloads|
Coverage.py measures code coverage, typically during test execution. It uses
@@ -102,3 +104,8 @@ Licensed under the `Apache 2.0 License`_. For details, see `NOTICE.txt`_.
.. |saythanks| image:: https://img.shields.io/badge/saythanks.io-%E2%98%BC-1EAEDB.svg
:target: https://saythanks.io/to/nedbat
:alt: Say thanks :)
+.. |codesponsor| image:: https://app.codesponsor.io/embed/8cXmdZx1a9Mu45zuTzC5du75/nedbat/coveragepy.svg
+ :target: https://app.codesponsor.io/link/8cXmdZx1a9Mu45zuTzC5du75/nedbat/coveragepy
+ :height: 68px
+ :width: 888px
+ :alt: codesponsor.io
diff --git a/doc/requirements.pip b/doc/requirements.pip
index 10448015..e0a67a07 100644
--- a/doc/requirements.pip
+++ b/doc/requirements.pip
@@ -2,7 +2,7 @@
# https://requires.io/github/nedbat/coveragepy/requirements/
-pyenchant==1.6.8
+pyenchant==1.6.11
sphinx==1.6.3
sphinxcontrib-spelling==2.3.0
sphinx_rtd_theme==0.2.4
diff --git a/requirements/ci.pip b/requirements/ci.pip
index 0c560d4a..d22e46f8 100644
--- a/requirements/ci.pip
+++ b/requirements/ci.pip
@@ -5,3 +5,4 @@
-r tox.pip
-r pytest.pip
-r wheel.pip
+tox-travis==0.8
diff --git a/requirements/dev.pip b/requirements/dev.pip
index e9b15f9c..eb5a89fc 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -12,10 +12,10 @@
greenlet==0.4.12
mock==2.0.0
PyContracts==1.7.15
-pyenchant==1.6.8
+pyenchant==1.6.11
pylint==1.7.2
unittest-mixins==1.3
# for kitting.
-requests==2.18.1
+requests==2.18.4
twine==1.9.1
diff --git a/requirements/pytest.pip b/requirements/pytest.pip
index 9ad471d4..c97401ca 100644
--- a/requirements/pytest.pip
+++ b/requirements/pytest.pip
@@ -2,6 +2,6 @@
# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt
# The pytest specifics used by coverage.py
-pytest==3.1.3
-pytest-xdist==1.18.1
+pytest==3.2.2
+pytest-xdist==1.20.0
flaky==3.4.0
diff --git a/requirements/tox.pip b/requirements/tox.pip
index d09412d0..a74bbc9b 100644
--- a/requirements/tox.pip
+++ b/requirements/tox.pip
@@ -1,4 +1,4 @@
# The version of tox used by coverage.py
-tox==2.7.0
+tox==2.8.2
# Adds env recreation on requirements file changes.
-tox-battery==0.4
+tox-battery==0.5
diff --git a/requirements/wheel.pip b/requirements/wheel.pip
index dd2e6ec0..6dfe70b2 100644
--- a/requirements/wheel.pip
+++ b/requirements/wheel.pip
@@ -1,3 +1,4 @@
# Things needed to make wheels for coverage.py
setuptools==35.0.2
+# We need to stick with 0.29.0 until we drop 2.6 and 3.3
wheel==0.29.0
diff --git a/tox.ini b/tox.ini
index 554e3326..14cce8d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,8 @@
# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt
[tox]
-envlist = py{26,27,33,34,35,36}, pypy{2,3}, jython, doc, lint
-skip_missing_interpreters = True
+envlist = py{26,27,33,34,35,36,37}, pypy{2,3}, jython, doc, lint
+skip_missing_interpreters = {env:COVERAGE_SKIP_MISSING_INTERPRETERS:True}
[testenv]
usedevelop = True
@@ -12,15 +12,17 @@ deps =
# https://requires.io/github/nedbat/coveragepy/requirements/
-rrequirements/pytest.pip
pip==9.0.1
+ # setuptools>=36 vendors packages which pollute the coverage output in tests
setuptools==35.0.2
mock==2.0.0
PyContracts==1.7.15
unittest-mixins==1.3
#-e/Users/ned/unittest_mixins
py26: unittest2==1.1.0
+ # gevent won't install on py37: https://github.com/gevent/gevent/issues/1019
py{27,33,34,35,36}: gevent==1.2.2
- py{26,27,33,34,35,36}: eventlet==0.21.0
- py{26,27,33,34,35,36}: greenlet==0.4.12
+ py{26,27,33,34,35,36,37}: eventlet==0.21.0
+ py{26,27,33,34,35,36,37}: greenlet==0.4.12
# Windows can't update the pip version with pip running, so use Python
# to install things.