diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml deleted file mode 100644 index d939432..0000000 --- a/.github/workflows/pre-commit.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: pre-commit - -on: - push: - branches: - - main - pull_request: - -jobs: - pre-commit: - runs-on: ubuntu-20.04 - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - - uses: pre-commit/action@v2.0.0 - with: - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a3d042..8cbbff3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,6 @@ jobs: - ubuntu - windows python-version: - - "3.6" - "3.7" - "3.8" - "3.9" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5de3ae5..1367879 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,20 +1,20 @@ repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.11.0 + rev: v2.32.1 hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.3.0 hooks: - id: black language_version: python3 - repo: https://github.com/pycqa/isort - rev: 5.8.0 + rev: 5.10.1 hooks: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 3.9.0 + rev: 4.0.1 hooks: - id: flake8 additional_dependencies: diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8463751..7e6a120 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,16 @@ +Unreleased +---------- + +* Dropped support for Python 3.6. + +* Updated dependencies to the latest versions. + + Previously a range of Twisted versions have been supported. Recent Twisted + releases (22.2, 22.4) have issued security fixes, so those are now the + minimum supported version. Given the stability of Twisted, supporting a + range of versions does not represent a good use of maintainer time. Going + forward the latest Twisted version will be required. + 3.0.2 (2021-04-07) ------------------ diff --git a/README.rst b/README.rst index 7525b27..70c4ba5 100644 --- a/README.rst +++ b/README.rst @@ -108,7 +108,7 @@ should start with a slash, but not end with one; for example:: Python Support -------------- -Daphne requires Python 3.6 or later. +Daphne requires Python 3.7 or later. Contributing diff --git a/setup.cfg b/setup.cfg index ddb3d5d..e7c19e5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,3 +8,4 @@ profile = black [tool:pytest] testpaths = tests +asyncio_mode = strict diff --git a/setup.py b/setup.py index 214df0d..274e8f8 100755 --- a/setup.py +++ b/setup.py @@ -22,8 +22,8 @@ setup( package_dir={"twisted": "daphne/twisted"}, packages=find_packages() + ["twisted.plugins"], include_package_data=True, - install_requires=["twisted[tls]>=19.7", "autobahn>=0.18", "asgiref>=3.2.10,<4"], - python_requires=">=3.6", + install_requires=["twisted[tls]>=22.4", "autobahn>=22.4.2", "asgiref>=3.5.2,<4"], + python_requires=">=3.7", setup_requires=["pytest-runner"], extras_require={"tests": ["hypothesis", "pytest", "pytest-asyncio"]}, entry_points={ @@ -37,7 +37,6 @@ setup( "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", diff --git a/tests/test_http_response.py b/tests/test_http_response.py index 0f42df2..1fc2439 100644 --- a/tests/test_http_response.py +++ b/tests/test_http_response.py @@ -13,11 +13,9 @@ class TestHTTPResponse(DaphneTestCase): Lowercases and sorts headers, and strips transfer-encoding ones. """ return sorted( - [ - (name.lower(), value.strip()) - for name, value in headers - if name.lower() != b"transfer-encoding" - ] + (name.lower(), value.strip()) + for name, value in headers + if name.lower() != b"transfer-encoding" ) def encode_headers(self, headers): diff --git a/tox.ini b/tox.ini index da7d4d9..876ff99 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,8 @@ [tox] envlist = - py{36,37,38,39,310}-twisted{197,latest} - + py{37,38,39,310} [testenv] usedevelop = true extras = tests commands = pytest -v {posargs} -deps = - twisted187: twisted==19.7.0 - twistedlatest: twisted>=20.3.0