Merge pull request #443 from martinfleis/version

MAINT: replace LooseVersion with packaging
pysal · Jan 7, 2022 · 0f03a31 · 0f03a31
2 parents 7f66997 + 2503749
commit 0f03a31
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/ci/37.yaml b/ci/37.yaml
@@ -17,3 +17,4 @@ dependencies:
   - geopandas>=0.7.0
   - numba
   - zstd
+  - packaging
diff --git a/ci/38.yaml b/ci/38.yaml
@@ -19,10 +19,10 @@ dependencies:
   - xarray
   - joblib
   - zstd
+  - packaging
   # for docs build action (this env only)
   - nbsphinx
   - numpydoc
   - sphinx>=1.4.3
   - sphinxcontrib-bibtex<2.0.0
   - sphinx_bootstrap_theme
-
diff --git a/ci/39.yaml b/ci/39.yaml
@@ -19,10 +19,10 @@ dependencies:
   - xarray
   - joblib
   - zstd
+  - packaging
   # for docs build action (this env only)
   - nbsphinx
   - numpydoc
   - sphinx>=1.4.3
   - sphinxcontrib-bibtex<2.0.0
   - sphinx_bootstrap_theme
-
diff --git a/environment.yml b/environment.yml
@@ -32,3 +32,4 @@ dependencies:
   - pytest-cov
   - descartes
   - mapclassify
+  - packaging
diff --git a/libpysal/weights/util.py b/libpysal/weights/util.py
@@ -14,12 +14,12 @@
 from collections import defaultdict
 from itertools import tee
 from ..common import requires
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 try:
     import geopandas as gpd
 
-    GPD_08 = str(gpd.__version__) >= LooseVersion("0.8.0")
+    GPD_08 = Version(gpd.__version__) >= Version("0.8.0")
 except ImportError:
     warn("geopandas not available. Some functionality will be disabled.")
 

diff --git a/requirements.txt b/requirements.txt
@@ -4,3 +4,4 @@ numpy>=1.3
 pandas
 requests
 scipy>=0.11
+packaging
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,3 +17,4 @@ dependencies: @@
       - geopandas>=0.7.0
       - numba
       - zstd
+      - packaging