Skip to content

Commit d922442

Browse files
authored
Merge pull request #300 from twisted/py35-not-so-much
RFC: Drop CI support for Python 3.5
2 parents 32e001e + 38095ce commit d922442

5 files changed

Lines changed: 5 additions & 14 deletions

File tree

.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ matrix:
2828
- python: 3.8
2929
env: TOXENV=mypy
3030

31-
- python: 3.5
32-
env: TOXENV=coverage-py35-tw184,codecov
33-
- python: 3.5
34-
env: TOXENV=coverage-py35-tw192,codecov
35-
- python: 3.5
36-
env: TOXENV=coverage-py35-twcurrent,codecov
37-
3831
- python: 3.6
3932
env: TOXENV=coverage-py36-tw184,codecov
4033
- python: 3.6

CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Code
4545
Klein uses `Twisted Trial <http://twistedmatrix.com/documents/current/api/twisted.trial.html>`_ and `tox <https://tox.readthedocs.io/en/latest/>`_ for its tests.
4646
The command to run the full test suite is ``tox`` with no arguments.
4747
This will run tests against several versions of Python and Twisted, which can be time-consuming.
48-
To run tests against only one or a few versions, pass a ``-e`` argument with an environment from the envlist in ``tox.ini``: for example, ``tox -e py35-twcurrent`` will run tests with Python 3.5 and the current released version of Twisted.
48+
To run tests against only one or a few versions, pass a ``-e`` argument with an environment from the envlist in ``tox.ini``: for example, ``tox -e py38-twcurrent`` will run tests with Python 3.8 and the current released version of Twisted.
4949
To run only one or a few specific tests in the suite, add a filename or fully-qualified Python path to the end of the test invocation: for example, ``tox klein.test.test_app.KleinTestCase.test_foo`` will run only the ``test_foo()`` method of the ``KleinTestCase`` class in ``klein/test/test_app.py``.
5050
These two test shortcuts can be combined to give you a quick feedback cycle, but make sure to check on the full test suite from time to time to make sure changes haven't had unexpected side effects.
5151
- Show us your code changes through pull requests sent to `Klein's GitHub repo <https://github.com/twisted/klein>`_.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ build-backend = "setuptools.build_meta"
77
[tool.black]
88

99
line-length = 80
10-
target-version = ["py35"]
10+
target-version = ["py36"]

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"License :: OSI Approved :: MIT License",
1313
"Operating System :: OS Independent",
1414
"Programming Language :: Python",
15-
"Programming Language :: Python :: 3.5",
1615
"Programming Language :: Python :: 3.6",
1716
"Programming Language :: Python :: 3.7",
1817
"Programming Language :: Python :: 3.8",

tox.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
envlist =
44
flake8, black, mypy
5-
coverage-py{35,36,37,38,39,py3}-tw{184,192,current,trunk}
5+
coverage-py{36,37,38,39,py3}-tw{184,192,current,trunk}
66
coverage_report
77
docs, docs-linkcheck
88
packaging
@@ -64,7 +64,6 @@ setenv =
6464
description = run tests
6565

6666
basepython =
67-
py35: python3.5
6867
py36: python3.6
6968
py37: python3.7
7069
py38: python3.8
@@ -378,8 +377,8 @@ ignore_missing_imports = True
378377
description = generate coverage report
379378

380379
depends =
381-
coverage-py{35,36,37,38,39,py3}-tw{1,2}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
382-
coverage-py{35,36,37,38,39,py3}-tw{current,trunk}
380+
coverage-py{36,37,38,39,py3}-tw{1,2}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
381+
coverage-py{36,37,38,39,py3}-tw{current,trunk}
383382

384383
basepython = {[default]basepython}
385384

0 commit comments

Comments
 (0)