From 6fdb034a61d27848d2b4c7298fcb8cc815eeaca2 Mon Sep 17 00:00:00 2001 From: hugovk Date: Mon, 20 Nov 2017 22:21:52 +0200 Subject: [PATCH 1/3] Drop support for EOL Python 2.6 --- .travis.yml | 2 -- appveyor.yml | 1 - pluggy/__init__.py | 2 +- setup.py | 2 +- tox.ini | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 184d3d4d..f43fe56a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ matrix: env: TOXENV=check - python: '3.6' env: TOXENV=docs - - python: '2.6' - env: TOXENV=py26-pytestrelease - python: '2.7' env: TOXENV=py27-pytestrelease - python: '3.3' diff --git a/appveyor.yml b/appveyor.yml index c1b2fee2..c3903f8b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,6 @@ environment: # note: please use "tox --listenvs" to populate the build matrix below - TOXENV: "check" - TOXENV: "docs" - - TOXENV: "py26-pytestrelease" - TOXENV: "py27-pytestrelease" - TOXENV: "py34-pytestrelease" - TOXENV: "py35-pytestrelease" diff --git a/pluggy/__init__.py b/pluggy/__init__.py index 870b6c9c..dd7ff41a 100644 --- a/pluggy/__init__.py +++ b/pluggy/__init__.py @@ -609,7 +609,7 @@ def __call__(self, *args, **kwargs): kwargs.keys()) if notincall: warnings.warn( - "Argument(s) {0} which are declared in the hookspec " + "Argument(s) {} which are declared in the hookspec " "can not be found in this hook call" .format(tuple(notincall)), stacklevel=2, diff --git a/setup.py b/setup.py index c8a72607..c82b90f0 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy'] + [ ('Programming Language :: Python :: %s' % x) for x in - '2 2.6 2.7 3 3.3 3.4 3.5 3.6'.split()] + '2 2.7 3 3.3 3.4 3.5 3.6'.split()] with open('README.rst') as fd: long_description = fd.read() diff --git a/tox.ini b/tox.ini index 2acf6835..7b2bb4d4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=check,docs,py{26,27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features} +envlist=check,docs,py{27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features} [testenv] commands=py.test {posargs:testing/} From 3a8bb9929d9abf6d56ab9914b52344d22b50d3b8 Mon Sep 17 00:00:00 2001 From: hugovk Date: Mon, 20 Nov 2017 23:20:43 +0200 Subject: [PATCH 2/3] Drop support for EOL Python 2.6 in pluggy 0.6 --- CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a777b211..5f3276be 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,10 @@ +0.6.0 +----- + +- Drop support for EOL Python 2.6 in PR `#103`_. + +.. _#103: https://github.com/pytest-dev/pluggy/pull/103 + 0.5.2 ----- - fix bug where ``firstresult`` wrappers were being sent an incorrectly configured From 1732d7579005806db3a09899115092d5fddec926 Mon Sep 17 00:00:00 2001 From: hugovk Date: Tue, 21 Nov 2017 08:43:15 +0200 Subject: [PATCH 3/3] Drop support for EOL Python 3.3 in pluggy 0.6 --- .travis.yml | 2 -- CHANGELOG.rst | 2 +- setup.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f43fe56a..42e174e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,6 @@ matrix: env: TOXENV=docs - python: '2.7' env: TOXENV=py27-pytestrelease - - python: '3.3' - env: TOXENV=py33-pytestrelease - python: '3.4' env: TOXENV=py34-pytestrelease - python: '3.5' diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5f3276be..daa0f547 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ 0.6.0 ----- -- Drop support for EOL Python 2.6 in PR `#103`_. +- Drop support for EOL Python 2.6 and 3.3 in PR `#103`_. .. _#103: https://github.com/pytest-dev/pluggy/pull/103 diff --git a/setup.py b/setup.py index c82b90f0..4774b2e1 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy'] + [ ('Programming Language :: Python :: %s' % x) for x in - '2 2.7 3 3.3 3.4 3.5 3.6'.split()] + '2 2.7 3 3.4 3.5 3.6'.split()] with open('README.rst') as fd: long_description = fd.read()