From 32a45a7413fb5e6b6814b400d7414c0f7bb106c1 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Fri, 21 Jan 2022 15:50:30 +1300 Subject: [PATCH] refactor(distutils): Version classes are deprecated, use internal class --- flopy/export/netcdf.py | 4 ++-- flopy/utils/gridintersect.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flopy/export/netcdf.py b/flopy/export/netcdf.py index 06eb8a29ee..f5b2e57af2 100644 --- a/flopy/export/netcdf.py +++ b/flopy/export/netcdf.py @@ -673,10 +673,10 @@ def initialize_geometry(self): needed for the netcdf file """ pyproj = import_optional_dependency("pyproj") - from distutils.version import LooseVersion + from ..utils.parse_version import Version # Check if using newer pyproj version conventions - pyproj220 = LooseVersion(pyproj.__version__) >= LooseVersion("2.2.0") + pyproj220 = Version(pyproj.__version__) >= Version("2.2.0") proj4_str = self.proj4_str print(f"initialize_geometry::proj4_str = {proj4_str}") diff --git a/flopy/utils/gridintersect.py b/flopy/utils/gridintersect.py index 79ad8243f5..e6605a41ce 100644 --- a/flopy/utils/gridintersect.py +++ b/flopy/utils/gridintersect.py @@ -1,19 +1,19 @@ import numpy as np import contextlib import warnings -from distutils.version import LooseVersion from .utl_import import import_optional_dependency from .geometry import transform from .geospatial_utils import GeoSpatialUtil +from .parse_version import Version -NUMPY_GE_121 = str(np.__version__) >= LooseVersion("1.21") +NUMPY_GE_121 = Version(np.__version__) >= Version("1.21") shapely = import_optional_dependency("shapely", errors="silent") if shapely is not None: - SHAPELY_GE_20 = str(shapely.__version__) >= LooseVersion("2.0") - SHAPELY_LT_18 = str(shapely.__version__) < LooseVersion("1.8") + SHAPELY_GE_20 = Version(shapely.__version__) >= Version("2.0") + SHAPELY_LT_18 = Version(shapely.__version__) < Version("1.8") else: SHAPELY_GE_20 = False SHAPELY_LT_18 = False