Skip to content

Commit 7f865b0

Browse files
authored
Merge pull request #103 from hugovk/rm-2.6
Drop support for EOL Python 2.6 & 3.3
2 parents 0fbcb25 + 1732d75 commit 7f865b0

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@ matrix:
77
env: TOXENV=check
88
- python: '3.6'
99
env: TOXENV=docs
10-
- python: '2.6'
11-
env: TOXENV=py26-pytestrelease
1210
- python: '2.7'
1311
env: TOXENV=py27-pytestrelease
14-
- python: '3.3'
15-
env: TOXENV=py33-pytestrelease
1612
- python: '3.4'
1713
env: TOXENV=py34-pytestrelease
1814
- python: '3.5'

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
0.6.0
2+
-----
3+
4+
- Drop support for EOL Python 2.6 and 3.3 in PR `#103`_.
5+
6+
.. _#103: https://github.com/pytest-dev/pluggy/pull/103
7+
18
0.5.2
29
-----
310
- fix bug where ``firstresult`` wrappers were being sent an incorrectly configured

appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ environment:
33
# note: please use "tox --listenvs" to populate the build matrix below
44
- TOXENV: "check"
55
- TOXENV: "docs"
6-
- TOXENV: "py26-pytestrelease"
76
- TOXENV: "py27-pytestrelease"
87
- TOXENV: "py34-pytestrelease"
98
- TOXENV: "py35-pytestrelease"

pluggy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ def __call__(self, *args, **kwargs):
609609
kwargs.keys())
610610
if notincall:
611611
warnings.warn(
612-
"Argument(s) {0} which are declared in the hookspec "
612+
"Argument(s) {} which are declared in the hookspec "
613613
"can not be found in this hook call"
614614
.format(tuple(notincall)),
615615
stacklevel=2,

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
'Programming Language :: Python :: Implementation :: CPython',
1515
'Programming Language :: Python :: Implementation :: PyPy'] + [
1616
('Programming Language :: Python :: %s' % x) for x in
17-
'2 2.6 2.7 3 3.3 3.4 3.5 3.6'.split()]
17+
'2 2.7 3 3.4 3.5 3.6'.split()]
1818

1919
with open('README.rst') as fd:
2020
long_description = fd.read()

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist=check,docs,py{26,27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features}
2+
envlist=check,docs,py{27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features}
33

44
[testenv]
55
commands=py.test {posargs:testing/}

0 commit comments

Comments
 (0)