From 38c8e1ecf05aa27ee1a73281afb41d959babdb05 Mon Sep 17 00:00:00 2001 From: Marcin Sulikowski Date: Wed, 19 Oct 2022 23:18:33 +0200 Subject: [PATCH] Drop Python 3.6 support We cannot run tests with Python 3.10 using Pytest 6.x due to [1]. This is fixed in Pytest 7.x but Pytest 7.x no longer supports Python 3.6 which aioresponses tries to support. However because Python 3.6 is already past the EOL date, the simplest solution is to no longer test with Python 3.6 and to stop declaring support for that version. [1] https://github.com/pytest-dev/pytest/issues/8546 --- .github/workflows/ci.yml | 19 ------------------- CONTRIBUTING.rst | 2 +- README.rst | 2 +- setup.cfg | 1 - tox.ini | 1 - 5 files changed, 2 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 282aba6..cf27a17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,25 +19,6 @@ jobs: fail-fast: false matrix: include: - - python-version: 3.6 - aiohttp-version: aiohttp30 - - python-version: 3.6 - aiohttp-version: aiohttp31 - - python-version: 3.6 - aiohttp-version: aiohttp32 - - python-version: 3.6 - aiohttp-version: aiohttp33 - - python-version: 3.6 - aiohttp-version: aiohttp34 - - python-version: 3.6 - aiohttp-version: aiohttp35 - - python-version: 3.6 - aiohttp-version: aiohttp36 - - python-version: 3.6 - aiohttp-version: aiohttp37 - - python-version: 3.6 - aiohttp-version: aiohttp38 - - python-version: 3.7 aiohttp-version: aiohttp33 - python-version: 3.7 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 85df330..3a4a4e8 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -101,7 +101,7 @@ Before you submit a pull request, check that it meets these guidelines: 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -3. The pull request should work for Python 3.6+ and for PyPy. Check +3. The pull request should work for Python 3.7+ and for PyPy. Check https://travis-ci.org/pnuckowski/aioresponses/pull_requests and make sure that the tests pass for all supported Python versions. diff --git a/README.rst b/README.rst index d7e032f..fd2dad8 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,7 @@ Installing Supported versions ------------------ -- Python 3.6+ +- Python 3.7+ - aiohttp>=3.0.0,<4.0.0 Usage diff --git a/setup.cfg b/setup.cfg index 76cf4a8..6658b74 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,7 +15,6 @@ classifier = License :: OSI Approved :: MIT License Natural Language :: English 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/tox.ini b/tox.ini index 9d7435b..e5b9268 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,6 @@ envlist = flake8, coverage, - py3.6-aiohttp{30,31,32,33,34,35,36,37,38} py3.7-aiohttp{33,34,35,36,37,38} py3.8-aiohttp{33,34,35,36,37,38} py3.9-aiohttp{37,38}