Merge pull request #242 from mplough-kobold/master

Add capability to run with Python 3.12
mdbartos · Feb 19, 2024 · 727c521 · 727c521
2 parents d9ad47d + 8df5b2b
commit 727c521
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/pysheds/pgrid.py b/pysheds/pgrid.py
@@ -6,7 +6,7 @@
 import pandas as pd
 import geojson
 from affine import Affine
-from distutils.version import LooseVersion
+from looseversion import LooseVersion
 try:
     import scipy.sparse
     import scipy.spatial

diff --git a/pysheds/pview.py b/pysheds/pview.py
@@ -3,7 +3,7 @@
 from scipy import interpolate
 import pyproj
 from affine import Affine
-from distutils.version import LooseVersion
+from looseversion import LooseVersion
 
 _OLD_PYPROJ = LooseVersion(pyproj.__version__) < LooseVersion('2.2')
 _pyproj_init = '+init=epsg:4326' if _OLD_PYPROJ else 'epsg:4326'

diff --git a/pysheds/sview.py b/pysheds/sview.py
@@ -2,7 +2,7 @@
 import numpy as np
 from . import projection
 from affine import Affine
-from distutils.version import LooseVersion
+from looseversion import LooseVersion
 try:
     import scipy.spatial
     _HAS_SCIPY = True

diff --git a/setup.py b/setup.py
@@ -26,13 +26,15 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Scientific/Engineering :: GIS",
         "Topic :: Scientific/Engineering :: Hydrology",
     ],
     include_package_data=True,
     install_requires=[
         "affine",
         "geojson",
+        "looseversion",
         "numba",
         "numpy",
         "pandas",