Merge pull request natcap#1554 from phargogh/task/1425-add-support-fo…

…r-py312

Add explicit support for python 3.12

.github/workflows/build-and-test.yml

@@ -21,7 +21,7 @@ env:
   # nomkl: make sure numpy w/out mkl
   # setuptools_scm: needed for versioning to work
   CONDA_DEFAULT_DEPENDENCIES: python-build nomkl setuptools_scm
-  LATEST_SUPPORTED_PYTHON_VERSION: "3.11"
+  LATEST_SUPPORTED_PYTHON_VERSION: "3.12"
 
 jobs:
   check-syntax-errors:
@@ -72,7 +72,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
         os: [windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v3
@@ -159,7 +159,7 @@ jobs:
     needs: check-syntax-errors
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
         os: [windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v3

pyproject.toml

@@ -2,7 +2,7 @@
 name = "natcap.invest"
 description = "InVEST Ecosystem Service models"
 readme = "README_PYTHON.rst"
-requires-python = ">=3.8,<3.12"
+requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}
 maintainers = [
     {name = "Natural Capital Project Software Team"}
@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Cython",
     "License :: OSI Approved :: BSD License",
     "Topic :: Scientific/Engineering :: GIS"

requirements-dev.txt

@@ -16,7 +16,9 @@ pytest
 pytest-subtests
 wheel>=0.27.0
 pypiwin32; sys_platform == 'win32'  # pip-only
-setuptools>=8.0,<60.7.0 # https://github.com/pyinstaller/pyinstaller/issues/6564
+
+# 60.7.0 exception because of https://github.com/pyinstaller/pyinstaller/issues/6564
+setuptools>=8.0,!=60.7.0
 PyInstaller>=4.10
 setuptools_scm>=6.4.0
 requests

tests/test_utils.py

@@ -1199,7 +1199,7 @@ def test_os_path_normalization_linux(self):
         relative_to = os.path.join(self.workspace_dir, 'test.csv')
         expected_path = os.path.join(self.workspace_dir, "foo/bar.shp")
         path = utils.expand_path(rel_path, relative_to)
-        self.assertEquals(path, expected_path)
+        self.assertEqual(path, expected_path)
 
     @unittest.skipIf(platform.system() != 'Windows',
                      "Function behavior differs across systems.")
@@ -1213,7 +1213,7 @@ def test_os_path_normalization_windows(self):
         relative_to = os.path.join(self.workspace_dir, 'test.csv')
         expected_path = os.path.join(self.workspace_dir, "foo\\bar.shp")
         path = utils.expand_path(rel_path, relative_to)
-        self.assertEquals(path, expected_path)
+        self.assertEqual(path, expected_path)
 
     def test_falsey(self):
         """Utils: test return None when falsey."""