Merge pull request #93 from maxmind/greg/replace-distutils

Replace distutils

Author: horgh

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Install dependencies
         run: |

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
         # We don't test on Windows and macOS currently due to issues
         # build libmaxminddb there.
         platform: [ubuntu-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 -------
 
+2.3.0
+++++++++++++++++++
+
+* ``distutils`` is no longer used for building the C extension.
+
 2.2.0 (2021-09-24)
 ++++++++++++++++++
 

setup.cfg

@@ -16,7 +16,9 @@ python =
     3.6: py36
     3.7: py37
     3.8: py38
-    3.9: py39, mypy
+    3.9: py39
+   "3.10": py310, mypy
+
 
 [testenv]
 deps =

setup.py

@@ -2,13 +2,18 @@
 import re
 import sys
 
-# This import is apparently needed for Nose on Red Hat's Python
-import multiprocessing
-
-from distutils.command.build_ext import build_ext
-from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError
-
 from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
+
+# These were only added to setuptools in 59.0.1.
+try:
+    from setuptools.errors import CCompilerError
+    from setuptools.errors import DistutilsExecError
+    from setuptools.errors import DistutilsPlatformError
+except ImportError:
+    from distutils.errors import CCompilerError
+    from distutils.errors import DistutilsExecError
+    from distutils.errors import DistutilsPlatformError
 
 cmdclass = {}
 PYPY = hasattr(sys, "pypy_version_info")
@@ -33,7 +38,7 @@
 
 class BuildFailed(Exception):
     def __init__(self):
-        self.cause = sys.exc_info()[1]  # work around py 2/3 different syntax
+        self.cause = sys.exc_info()[1]
 
 
 class ve_build_ext(build_ext):
@@ -52,7 +57,7 @@ def build_extension(self, ext):
             raise BuildFailed()
         except ValueError:
             # this can happen on Windows 64 bit, see Python issue 7511
-            if "'path'" in str(sys.exc_info()[1]):  # works with both py 2/3
+            if "'path'" in str(sys.exc_info()[1]):
                 raise BuildFailed()
             raise
 
@@ -112,8 +117,6 @@ def run_setup(with_cext):
         python_requires=">=3.6",
         include_package_data=True,
         install_requires=requirements,
-        tests_require=["nose"],
-        test_suite="nose.collector",
         license=LICENSE,
         cmdclass=cmdclass,
         classifiers=[
@@ -127,6 +130,7 @@ def run_setup(with_cext):
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
             "Programming Language :: Python",
             "Topic :: Internet :: Proxy Servers",
             "Topic :: Internet",