Skip to content

Commit

Permalink
Merge pull request #365 from twisted/363-drop-3.6
Browse files Browse the repository at this point in the history
Drop Python 3.6 support
  • Loading branch information
glyph authored Apr 30, 2023
2 parents 0cf1920 + e3b8cdd commit 08bb4d3
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 14 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
${{ runner.os }}-pip-lint-
${{ runner.os }}-pip-
- run: python -m pip install tox
- run: python -m pip install 'tox<4'

- run: tox -q -p all -e flake8,towncrier,twine,check-manifest

Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7", "pypy-3.8"]
python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.8", "pypy-3.9"]
twisted-version: ["lowest", "latest"]
experimental: [false]

Expand Down Expand Up @@ -97,13 +97,12 @@ jobs:
shell: python
run: |
table = {
"3.6": "py36",
"3.7": "py37",
"3.8": "py38",
"3.9": "py39",
"3.10": "py310",
"pypy-3.7": "pypy3",
"pypy-3.8": "pypy3",
"pypy-3.9": "pypy3",
}
factor = table["${{ matrix.python-version }}"]
print("::set-output name=value::" + factor)
Expand Down
6 changes: 5 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ formats:
- pdf
- epub

build:
os: ubuntu-22.04
tools:
python: "3.11"

python:
version: 3.8
install:
- method: pip
path: .
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Developing
==========

This project uses `Tox <https://tox.readthedocs.io/en/latest/config.html>`_ to manage virtual environments.
This project uses `Tox 3 <https://tox.readthedocs.io/en/latest/config.html>`_ to manage virtual environments.

To run the tests::

Expand Down
1 change: 1 addition & 0 deletions changelog.d/363.removal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support for Python 3.6, which has reached end of support, has been dropped.
1 change: 1 addition & 0 deletions changelog.d/365.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PyPy 3.9 is now supported.
1 change: 1 addition & 0 deletions changelog.d/365.removal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support for PyPy 3.7, which has reached end of support, has been removed.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"werkzeug==2.0.3",
],
"docs": [
"sphinx>=1.4.8",
"sphinx<7.0.0", # Removal of 'style' key breaks RTD.
],
},
package_data={"treq": ["_version"]},
Expand Down
4 changes: 2 additions & 2 deletions src/treq/_agentspy.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Copyright (c) The treq Authors.
# See LICENSE for details.
from typing import Callable, List, Optional, Tuple
from typing import Callable, List, Optional, Tuple # noqa

import attr
from twisted.internet.defer import Deferred
from twisted.web.http_headers import Headers
from twisted.web.iweb import IAgent, IBodyProducer, IResponse
from twisted.web.iweb import IAgent, IBodyProducer, IResponse # noqa
from zope.interface import implementer


Expand Down
2 changes: 1 addition & 1 deletion src/treq/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from __future__ import absolute_import, division, print_function

import binascii
from typing import Union
from typing import Union # noqa

from twisted.web.http_headers import Headers
from twisted.web.iweb import IAgent
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
envlist =
{py36,py37}-twisted_lowest,
{pypy3,py36,py37,py38,py39,py310}-twisted_latest,
{pypy3,py36,py37,py38,py39,py310}-twisted_trunk,
py37-twisted_lowest,
{pypy3,py37,py38,py39,py310}-twisted_latest,
{pypy3,py37,py38,py39,py310}-twisted_trunk,
twine, check-manifest, flake8, docs, coverage-report
isolated_build = true

Expand Down Expand Up @@ -53,11 +53,12 @@ commands =
[testenv:docs]
extras = docs
changedir = docs
basepython = python3.8
commands =
sphinx-build -b html . html

[testenv:coverage-report]
depends = pypy3,py36,py37,py38,py39
depends = pypy3,py37,py38,py39
commands =
coverage combine
coverage report
Expand Down

0 comments on commit 08bb4d3

Please sign in to comment.