Update Python versions

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.10", "3.11"]
+        python-version: ["3.8", "3.10", "3.11", "3.12"]
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}

CHANGES.rst

@@ -12,6 +12,10 @@ release, and any new translations added.
 - Replace deprecated ``pkg_resources.iter_entry_points`` with
   ``importlib_metadata``.
 
+- Drop Python 3.7 support.
+
+- Add Python 3.12 support.
+
 
 7.5.1 (1 February 2023)
 =======================

django_countries/fields.py

@@ -1,4 +1,6 @@
+import importlib.metadata
 import re
+import sys
 from typing import Any, Iterable, Optional, Tuple, Type, Union, cast
 from urllib import parse as urlparse
 
@@ -15,16 +17,13 @@
 from django_countries.conf import settings
 
 _entry_points: Iterable[Any]
-try:
-    import importlib.metadata
 
-    _entry_points = importlib.metadata.entry_points().get(
-        "django_countries.Country", []
-    )
-except ImportError:  # Python <3.8
-    import pkg_resources
+_entry_points = importlib.metadata.entry_points()
+if sys.version_info >= (3, 10):
+    _entry_points = _entry_points.select(group="django_countries.Country")
+else:
+    _entry_points = _entry_points.get("django_countries.Country", [])
 
-    _entry_points = pkg_resources.iter_entry_points("django_countries.Country")
 
 EXTENSIONS = {ep.name: ep.load() for ep in _entry_points}  # type: ignore
 

setup.cfg

@@ -16,11 +16,11 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Framework :: Django
     Framework :: Django :: 3.2
     Framework :: Django :: 4.0

tox.ini

@@ -3,11 +3,11 @@ distribute = False
 envlist =
     coverage_setup
     # Latest
-    py311-latest{-pyuca,-noi18n}
+    py312-latest{-pyuca,-noi18n}
     # Historical Python, Django and DRF versions
-    py310-previous
+    py311-previous
     # Legacy
-    py37-legacy
+    py38-legacy
     # Package checks
     readme
     bandit
@@ -18,9 +18,10 @@ ignore_basepython_conflict = True
 
 [gh-actions]
 python =
-    3.7: py37
+    3.8: py38
     3.10: py310
-    3.11: py311, readme, bandit, mypy
+    3.11: py311
+    3.12: py312, readme, bandit, mypy
 
 [testenv]
 basepython = python3
@@ -50,7 +51,7 @@ commands =
     rst2html.py --report=info --halt=warning README.rst /dev/null
     rst2html.py --report=info --halt=warning CHANGES.rst /dev/null
 
-[py311-latest-noi18n]
+[py312-latest-noi18n]
 setenv = 
     DJANGO_SETTINGS_MODULE = django_countries.tests.settings_noi18n
 
@@ -73,11 +74,11 @@ commands = coverage erase
 skip_install = True
 parallel_show_output = True
 depends =
-    py310-latest{-pyuca}
+    py312-latest{-pyuca}
     noi18n
-    py36-django32-drf312
+    py38-django32-drf312
     py39-django{32,40}-drf313
-    py36-legacy
+    py38-legacy
 commands =
   coverage combine
   coverage html