Skip to content

refactor(distutils): Version classes are deprecated, use internal class #1331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdhughes-dev merged 1 commit into from
Jan 21, 2022
Merged

refactor(distutils): Version classes are deprecated, use internal class #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flopy/export/netcdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
8 changes: 4 additions & 4 deletions flopy/utils/gridintersect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down