From 8728cae63b092979e378b5ad5c863fc6971d936b Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Tue, 25 Apr 2017 13:07:46 +1000 Subject: [PATCH 1/3] Update test matrix - drop 3.3 compatibility testing - CPython dev branch is now 3.7 - add 3.6 maintenance branch - PyPy3 exception chaining bug has been fixed --- .travis.yml | 8 +++++--- NEWS.rst | 11 +++++++++++ README.rst | 17 +++++------------ VERSION.txt | 2 +- tox.ini | 6 +----- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ccc2a5..fb11944 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,16 +5,18 @@ matrix: env: TOXENV=py26 - python: 2.7 env: TOXENV=py27 - - python: 3.3 - env: TOXENV=py33 - python: 3.4 env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - - python: nightly + - python: 3.6 env: TOXENV=py36 + - python: nightly + env: TOXENV=py37 - python: pypy env: TOXENV=pypy + - python: pypy3 + env: TOXENV=pypy3 install: pip install tox coveralls && tox --notest script: tox after_success: coveralls diff --git a/NEWS.rst b/NEWS.rst index d3f68b1..20a7217 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -1,6 +1,17 @@ Release History --------------- +0.5.5 (2017-04-25) +^^^^^^^^^^^^^^^^^^ + +* Issue `#13 `__: + ``setup.py`` now falls back to plain ``distutils`` if ``setuptools`` is not + available (patch by Allan Harwood) + +* Updates to the default compatibility testing matrix: + * Added: PyPy3, CPython 3.6 (maintenance), CPython 3.7 (development) + * Dropped: CPython 3.3 + 0.5.4 (2016-07-31) ^^^^^^^^^^^^^^^^^^ diff --git a/README.rst b/README.rst index 64c4087..fd217f6 100644 --- a/README.rst +++ b/README.rst @@ -26,7 +26,8 @@ Development ----------- contextlib2 has no runtime dependencies, but requires ``unittest2`` for testing -on Python 2.x. +on Python 2.x, as well as ``setuptools`` and ``wheel`` to generate universal +wheel archives. Local testing is just a matter of running ``python test_contextlib2.py``. @@ -42,15 +43,7 @@ Versions currently tested in both tox and Travis CI are: * CPython 2.7 * CPython 3.4 * CPython 3.5 -* CPython 3.6 (CPython development branch) +* CPython 3.6 +* CPython 3.7 (CPython development branch) * PyPy - -tox also has a PyPy3 configuration, but it is not configured in Travis -due to a -`known incompatibility `_. - -To install several of the relevant runtimes on Fedora 23:: - - sudo dnf install python python3 pypy pypy3 - sudo dnf copr enable -y mstuchli/Python3.5 - sudo dnf install python35-python3 +* PyPy3 diff --git a/VERSION.txt b/VERSION.txt index 7d85683..d1d899f 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.5.4 +0.5.5 diff --git a/tox.ini b/tox.ini index 0b1bf07..3ef47b9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{26,27,33,34,35,36,py,py3} +envlist = py{26,27,34,35,36,37,py,py3} skip_missing_interpreters = True [testenv] @@ -12,7 +12,3 @@ deps = py26: unittest2 py27: unittest2 pypy: unittest2 - -[testenv:pypy3] -# Known incompatibility: https://bitbucket.org/pypy/pypy/issues/1903 -ignore_outcome = True From 57eb33db7b98f7809e3aa77730049301bf9025d7 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Tue, 25 Apr 2017 13:19:37 +1000 Subject: [PATCH 2/3] Don't test PyPy3 in Travis CI for now --- .travis.yml | 6 ++++-- README.rst | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb11944..9608012 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,10 @@ matrix: env: TOXENV=py37 - python: pypy env: TOXENV=pypy - - python: pypy3 - env: TOXENV=pypy3 +# Travis CI hasn't updated to PyPy3 2.5 yet, so still has the exception +# chaining compatibility bug that breaks the contextlib2 tests +# - python: pypy3 +# env: TOXENV=pypy3 install: pip install tox coveralls && tox --notest script: tox after_success: coveralls diff --git a/README.rst b/README.rst index fd217f6..a90264c 100644 --- a/README.rst +++ b/README.rst @@ -46,4 +46,11 @@ Versions currently tested in both tox and Travis CI are: * CPython 3.6 * CPython 3.7 (CPython development branch) * PyPy + +Versions currently tested only in tox are: + * PyPy3 + +This is due to an exception chaining compatibility bug that was fixed in +the PyPy3 5.5 alpha release, while the version on Travis CI (as of April 2017) +is still the older PyPy3 2.4.0 release. From 3d2e7ab60e4a456215bda6e1737cfb4bed9abb95 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Tue, 25 Apr 2017 13:28:55 +1000 Subject: [PATCH 3/3] Fix version ref in comment --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9608012..400f4ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: env: TOXENV=py37 - python: pypy env: TOXENV=pypy -# Travis CI hasn't updated to PyPy3 2.5 yet, so still has the exception +# Travis CI hasn't updated to PyPy3 5.5+ yet, so still has the exception # chaining compatibility bug that breaks the contextlib2 tests # - python: pypy3 # env: TOXENV=pypy3