Skip to content

Commit

Permalink
Merge pull request #103 from hugovk/rm-2.6
Browse files Browse the repository at this point in the history
Drop support for EOL Python 2.6 & 3.3
  • Loading branch information
nicoddemus authored Nov 22, 2017
2 parents 0fbcb25 + 1732d75 commit 7f865b0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pluggy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -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/}
Expand Down

0 comments on commit 7f865b0

Please sign in to comment.