From 3fa2a487b977b6b8fb49d5c79c64d423cd1a9706 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 5 May 2018 09:51:16 -0400 Subject: Upgrade most dependencies --- doc/requirements.pip | 6 +++--- requirements/dev.pip | 2 +- requirements/pytest.pip | 5 ++--- requirements/wheel.pip | 5 ++--- tests/test_oddball.py | 9 --------- tox.ini | 4 ++-- 6 files changed, 10 insertions(+), 21 deletions(-) diff --git a/doc/requirements.pip b/doc/requirements.pip index 73467c9..299ca0e 100644 --- a/doc/requirements.pip +++ b/doc/requirements.pip @@ -3,9 +3,9 @@ # https://requires.io/github/nedbat/coveragepy/requirements/ pyenchant==2.0.0 -sphinx==1.6.6 -sphinxcontrib-spelling==4.0.1 -sphinx_rtd_theme==0.2.4 +sphinx==1.7.4 +sphinxcontrib-spelling==4.1.0 +sphinx_rtd_theme==0.3.1 # A version of doc8 with a -q flag. git+https://github.com/nedbat/doc8.git#egg=doc8==0.0 diff --git a/requirements/dev.pip b/requirements/dev.pip index 36e962d..cf6c40e 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -18,4 +18,4 @@ unittest-mixins==1.4 # for kitting. requests==2.18.4 -twine==1.9.1 +twine==1.11.0 diff --git a/requirements/pytest.pip b/requirements/pytest.pip index 17ccc0d..dfa447f 100644 --- a/requirements/pytest.pip +++ b/requirements/pytest.pip @@ -3,7 +3,6 @@ # The pytest specifics used by coverage.py -# Keep pytest at 3.2.x until we are done with Python 2.6 and 3.3 -pytest==3.2.5 -pytest-xdist==1.20.1 +pytest==3.5.1 +pytest-xdist==1.22.2 flaky==3.4.0 diff --git a/requirements/wheel.pip b/requirements/wheel.pip index 6dfe70b..9574164 100644 --- a/requirements/wheel.pip +++ b/requirements/wheel.pip @@ -1,4 +1,3 @@ # 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 +setuptools==39.1.0 +wheel==0.31.0 diff --git a/tests/test_oddball.py b/tests/test_oddball.py index 2a0b03c..5bd204d 100644 --- a/tests/test_oddball.py +++ b/tests/test_oddball.py @@ -398,15 +398,6 @@ class ExceptionTest(CoverageTest): class DoctestTest(CoverageTest): """Tests invoked with doctest should measure properly.""" - def setUp(self): - super(DoctestTest, self).setUp() - - # This test case exists because Python 2.4's doctest module didn't play - # well with coverage. Nose fixes the problem by monkeypatching doctest. - # I want to be sure there's no monkeypatch and that I'm getting the - # doctest module that users of coverage will get. - assert 'doctest' not in sys.modules - def test_doctest(self): self.check_coverage('''\ def return_arg_or_void(arg): diff --git a/tox.ini b/tox.ini index deab539..4cec188 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ usedevelop = True deps = # https://requires.io/github/nedbat/coveragepy/requirements/ -rrequirements/pytest.pip - pip==9.0.3 + pip==10.0.1 # setuptools>=36 vendors packages which pollute the coverage output in tests setuptools==35.0.2 mock==2.0.0 @@ -20,7 +20,7 @@ deps = unittest-mixins==1.4 #-e/Users/ned/unittest_mixins py{27,34,35,36}: gevent==1.2.2 - py{27,34,35,36,37}: eventlet==0.22.0 + py{27,34,35,36,37}: eventlet==0.22.1 py{27,34,35,36,37}: greenlet==0.4.13 # Windows can't update the pip version with pip running, so use Python -- cgit v1.2.1