Skip to content

Commit f071a12

Browse files
authored
Merge pull request #181 from pytest-dev/altendky-patch-11
Python 2.7 and 3.6-3.12
2 parents 7958546 + 690309d commit f071a12

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
python_platform: linux
6161
container:
6262
"2.7": docker://python:2.7-buster
63-
"3.5": docker://python:3.5-buster
6463
"3.6": docker://python:3.6-bullseye
6564
"3.7": docker://python:3.7-bookworm
6665
"3.8": docker://python:3.8-bookworm
@@ -86,12 +85,6 @@ jobs:
8685
docker: 2.7
8786
implementation: cpython
8887
major: 2
89-
- name: CPython 3.5
90-
tox: py35
91-
action: 3.5
92-
docker: 3.5
93-
implementation: cpython
94-
major: 3
9588
- name: CPython 3.6
9689
tox: py36
9790
action: 3.6

setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
author_email="sda@fstab.net",
1414
url="https://github.com/pytest-dev/pytest-twisted",
1515
py_modules=["pytest_twisted"],
16-
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
16+
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*',
1717
install_requires=["greenlet", "pytest>=2.3", "decorator"],
1818
extras_require={
1919
"dev": ["pre-commit", "black"],
@@ -33,10 +33,13 @@
3333
"Programming Language :: Python :: 2",
3434
"Programming Language :: Python :: 2.7",
3535
"Programming Language :: Python :: 3",
36-
"Programming Language :: Python :: 3.5",
3736
"Programming Language :: Python :: 3.6",
3837
"Programming Language :: Python :: 3.7",
3938
"Programming Language :: Python :: 3.8",
39+
"Programming Language :: Python :: 3.9",
40+
"Programming Language :: Python :: 3.10",
41+
"Programming Language :: Python :: 3.11",
42+
"Programming Language :: Python :: 3.12",
4043
"Programming Language :: Python :: Implementation :: CPython",
4144
"Programming Language :: Python :: Implementation :: PyPy",
4245
],

0 commit comments

Comments
 (0)