diff --git a/.travis.yml b/.travis.yml index 184d3d4d..42e174e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,8 @@ 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' - env: TOXENV=py33-pytestrelease - python: '3.4' env: TOXENV=py34-pytestrelease - python: '3.5' diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a777b211..daa0f547 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,10 @@ +0.6.0 +----- + +- Drop support for EOL Python 2.6 and 3.3 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 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..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.6 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() 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/}