Python 3.12 compatibility (#155)

* Replace obsolete dependencies

* Replace dev-requirements.txt with requirements.txt and
test-requirements.txt

* Bump version

* Fix tests

Author: mateumann

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - checkout
       - run: python -m venv ~/venv
-      - run: ~/venv/bin/pip install -r dev-requirements.txt
+      - run: ~/venv/bin/pip install -r requirements.txt -r test-requirements.txt
       - run: ~/venv/bin/pip install .
       - run: ~/venv/bin/pytest -sv
 

appveyor.yml

@@ -12,7 +12,7 @@ build: false
 
 install:
   - "%PYTHON%\\python.exe -m pip install --upgrade pip"
-  - "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt"
+  - "%PYTHON%\\python.exe -m pip install -r requirements.txt -r test-requirements.txt"
   - "%PYTHON%\\python.exe -m pip install -e ."
 
 test_script:

requirements.txt

@@ -0,0 +1,10 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --no-emit-index-url --output-file=requirements.txt --pre setup.py
+#
+pkginfo==1.10.0
+    # via wagon (setup.py)
+wheel==0.43.0
+    # via wagon (setup.py)

setup.py

@@ -27,7 +27,7 @@ def read(*parts):
 
 setup(
     name='wagon',
-    version='1.0.1',
+    version='1.0.2',
     url='https://github.com/cloudify-cosmo/wagon',
     author='Cloudify',
     author_email='cosmo-admin@cloudify.co',
@@ -59,6 +59,8 @@ def read(*parts):
         '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',
         'Natural Language :: English',
         'Environment :: Console',
         'Intended Audience :: Developers',

dev-requirements.txt test-requirements.txtdev-requirements.txt renamed to test-requirements.txt

@@ -264,13 +264,13 @@ def test_install_package_in_missing_venv(self):
         assert 'virtualenv {0} does not exist'.format(non_existing_venv) \
             in str(ex.value)
 
-    @mock.patch('wagon.find_executable', return_value=False)
+    @mock.patch('wagon.which', return_value=False)
     def test_assert_auditwheel_does_not_exist(self, _):
         with pytest.raises(wagon.WagonError) as ex:
             wagon._assert_auditwheel_exists()
         assert 'Could not find auditwheel.' in str(ex.value)
 
-    @mock.patch('wagon.find_executable', return_value=True)
+    @mock.patch('wagon.which', return_value=True)
     def test_assert_auditwheel_exists(self, _):
         wagon._assert_auditwheel_exists()
 

tests/test_wagon.py

@@ -27,13 +27,13 @@
 import argparse
 import tempfile
 import subprocess
-import pkg_resources
-import distutils.util
+import importlib.metadata
+import sysconfig
 import venv
 from io import StringIO
 from threading import Thread
 from contextlib import closing
-from distutils.spawn import find_executable
+from shutil import which
 from pkginfo import Wheel
 
 try:
@@ -412,7 +412,7 @@ def _get_python_version():
 
 
 def get_platform():
-    return distutils.util.get_platform().replace('.', '_').replace('-', '_')
+    return sysconfig.get_platform().replace('.', '_').replace('-', '_')
 
 
 def _get_os_properties():
@@ -478,7 +478,7 @@ def _get_package_info_from_pypi(source):
 
 
 def _get_wagon_version():
-    return pkg_resources.get_distribution('wagon').version
+    return importlib.metadata.distribution('wagon').version
 
 
 def _set_python_versions(python_versions=None):
@@ -1079,7 +1079,7 @@ def _assert_linux_distribution_exists():
 
 
 def _assert_auditwheel_exists():
-    if not find_executable('auditwheel'):
+    if not which('auditwheel'):
         raise WagonError(
             'Could not find auditwheel. '
             'Please make sure auditwheel is installed and is in the PATH.\n'