Merge pull request #155 from maxmind/greg/python-3.12

List 3.12 as supported and test on it
maxmind · Nov 21, 2023 · 6eba688 · 6eba688
2 parents 114b07e + bc57539
commit 6eba688
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
         # We don't test on Windows currently as it appears mocket may not
         # work there.
         platform: [ubuntu-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11]
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
@@ -33,7 +33,7 @@ jobs:
       - name: Install dependencies
         run: |
               python -m pip install --upgrade pip
-              pip install tox tox-gh-actions
+              pip install setuptools tox tox-gh-actions
 
       - name: Test with tox
         run: tox
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -4,6 +4,12 @@
 History
 -------
 
+4.8.0
+++++++++++++++++++
+
+* IMPORTANT: Python 3.8 or greater is required. If you are using an older
+  version, please use an earlier release.
+
 4.7.0 (2023-05-09)
 ++++++++++++++++++
 

diff --git a/README.rst b/README.rst
@@ -495,7 +495,7 @@ correction, please `contact MaxMind support
 Requirements
 ------------
 
-Python 3.7 or greater is required. Older versions are not supported.
+Python 3.8 or greater is required. Older versions are not supported.
 
 The Requests HTTP library is also required. See
 <https://pypi.org/project/requests/> for details.

diff --git a/pyproject.toml b/pyproject.toml
@@ -10,13 +10,12 @@ authors = [
     {name = "Gregory Oschwald", email = "goschwald@maxmind.com"},
 ]
 dependencies = [
-    "maxminddb",
     "aiohttp>=3.6.2,<4.0.0",
-    "maxminddb>=2.3.0,<3.0.0",
+    "maxminddb>=2.5.1,<3.0.0",
     "requests>=2.24.0,<3.0.0",
     "setuptools>=60.0.0",
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 readme = "README.rst"
 license = {text = "Apache License, Version 2.0"}
 classifiers = [
@@ -27,7 +26,6 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
     "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/setup.cfg b/setup.cfg
@@ -12,14 +12,15 @@ universal = 1
 disable = duplicate-code
 
 [tox:tox]
-envlist = {py37,py38,py39,py310}-test,py310-{black,lint,flake8,mypy}
+envlist = {py37,py38,py39,py310,py311,py312}-test,py312-{black,lint,flake8,mypy}
 
 [gh-actions]
 python =
-    3.7: py37
     3.8: py38
     3.9: py39
-    3.10: py310,black,lint,flake8,mypy
+    3.10: py310
+    3.11: py311
+    3.12: py312,black,lint,flake8,mypy
 
 [testenv:{py37,py38,py39,py310}-test]
 deps =
@@ -31,19 +32,19 @@ deps =
     charset-normalizer==2.1.1
 commands = pytest tests
 
-[testenv:py310-black]
+[testenv:py312-black]
 deps = black
 commands = black --check --diff .
 
-[testenv:py310-lint]
+[testenv:py312-lint]
 deps = pylint
 commands = pylint geoip2
 
-[testenv:py310-flake8]
+[testenv:py312-flake8]
 deps = flake8
 commands = flake8 geoip2
 
-[testenv:py310-mypy]
+[testenv:py312-mypy]
 deps =
     mypy
     types-requests