summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStevie Gayet <87695919+stegayet@users.noreply.github.com>2023-05-15 05:23:25 +0200
committerGitHub <noreply@github.com>2023-05-15 09:23:25 +0600
commit5e30a6941fc2c958517f68f55daabe05b0916b97 (patch)
tree4ed87c7d82443111955c5d92a083613e3cfdf18b
parent221f34c6e057fd0dca7b1ea33106c7c910fdd2f7 (diff)
downloadkombu-5e30a6941fc2c958517f68f55daabe05b0916b97.tar.gz
chore(python): remove Python 3.7 support (#1708)
* chore(python): remove Python 3.7 support * Update setup.py --------- Co-authored-by: Stevie Gayet <stegayet@users.noreply.github.com> Co-authored-by: Asif Saif Uddin <auvipy@gmail.com>
-rw-r--r--.github/workflows/ci.yaml2
-rw-r--r--kombu/utils/compat.py8
-rw-r--r--requirements/default.txt2
-rw-r--r--setup.py3
-rw-r--r--tox.ini20
5 files changed, 12 insertions, 23 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c85e8c9b..4174ade9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- python-version: [3.7,3.8,3.9,"3.10"]
+ python-version: [3.8,3.9,"3.10"]
steps:
- name: Install system packages
run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev
diff --git a/kombu/utils/compat.py b/kombu/utils/compat.py
index e1b22f66..472e8758 100644
--- a/kombu/utils/compat.py
+++ b/kombu/utils/compat.py
@@ -6,13 +6,7 @@ import numbers
import sys
from contextlib import contextmanager
from functools import wraps
-
-try:
- from importlib import metadata as importlib_metadata
-except ImportError:
- # TODO: Remove this when we drop support for Python 3.7
- import importlib_metadata
-
+from importlib import metadata as importlib_metadata
from io import UnsupportedOperation
from kombu.exceptions import reraise
diff --git a/requirements/default.txt b/requirements/default.txt
index 221a92b1..d1041ac5 100644
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -1,5 +1,3 @@
-importlib-metadata>=3.6; python_version<"3.8"
-cached_property; python_version<"3.8"
typing_extensions; python_version<"3.10"
amqp>=5.1.1,<6.0.0
vine
diff --git a/setup.py b/setup.py
index 50de0cc5..5031fcd5 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,7 @@ setup(
},
platforms=['any'],
license='BSD-3-Clause',
- python_requires=">=3.7",
+ python_requires=">=3.8",
install_requires=reqs('default.txt'),
tests_require=reqs('test.txt'),
extras_require={
@@ -125,7 +125,6 @@ setup(
'Programming Language :: Python',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
diff --git a/tox.ini b/tox.ini
index 85288018..1329dad4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
[tox]
envlist =
- {pypy3.9,3.7,3.8,3.9,3.10,3.11}-unit
- {pypy3.9,3.7,3.8,3.9,3.10,3.11}-linux-integration-py-amqp
- {pypy3.9,3.7,3.8,3.9,3.10,3.11}-linux-integration-redis
- {pypy3.9,3.7,3.8,3.9,3.10,3.11}-linux-integration-mongodb
- {3.7,3.8,3.9,3.10,3.11}-linux-integration-kafka
+ {pypy3.9,3.8,3.9,3.10,3.11}-unit
+ {pypy3.9,3.8,3.9,3.10,3.11}-linux-integration-py-amqp
+ {pypy3.9,3.8,3.9,3.10,3.11}-linux-integration-redis
+ {pypy3.9,3.8,3.9,3.10,3.11}-linux-integration-mongodb
+ {3.8,3.9,3.10,3.11}-linux-integration-kafka
flake8
apicheck
pydocstyle
@@ -13,7 +13,6 @@ requires = tox-docker>=3.0
[gh-actions]
python =
- 3.7: py37
3.8: py38
3.9: py39
3.10: py310, mypy
@@ -26,10 +25,10 @@ passenv =
DISTUTILS_USE_SDK
deps=
-r{toxinidir}/requirements/dev.txt
- apicheck,pypy3.9,3.7,3.8,3.9,3.10,3.11: -r{toxinidir}/requirements/default.txt
- apicheck,pypy3.9,3.7,3.8,3.9,3.10,3.11: -r{toxinidir}/requirements/test.txt
- apicheck,pypy3.9,3.7-linux,3.8-linux,3.9-linux,3.10-linux,3.11-linux: -r{toxinidir}/requirements/test-ci.txt
- apicheck,3.7-linux,3.8-linux,3.9-linux,3.10-linux,3.11-linux: -r{toxinidir}/requirements/extras/confluentkafka.txt
+ apicheck,pypy3.9,3.8,3.9,3.10,3.11: -r{toxinidir}/requirements/default.txt
+ apicheck,pypy3.9,3.8,3.9,3.10,3.11: -r{toxinidir}/requirements/test.txt
+ apicheck,pypy3.9,linux,3.8-linux,3.9-linux,3.10-linux,3.11-linux: -r{toxinidir}/requirements/test-ci.txt
+ apicheck,3.8-linux,3.9-linux,3.10-linux,3.11-linux: -r{toxinidir}/requirements/extras/confluentkafka.txt
3.8-windows,3.9-windows,3.10-windows,3.11-windows: -r{toxinidir}/requirements/test-ci-windows.txt
apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
flake8,pydocstyle,mypy: -r{toxinidir}/requirements/pkgutils.txt
@@ -44,7 +43,6 @@ commands =
basepython =
pypy3.9: pypy3.9
pypy3.8: pypy3.8
- 3.7: python3.7
3.8: python3.8
3.9: python3.9
3.10,apicheck,pydocstyle,flake8,linkcheck,cov,mypy: python3.10