Skip to content

Commit 37ebf1e

Browse files
author
Jeff Whitaker
committed
fix for pkg_resources missing on 3.12
1 parent 657fd3a commit 37ebf1e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

test/tst_multifile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from numpy import ma
66
import tempfile, unittest, os, datetime
77
import cftime
8-
from pkg_resources import parse_version
8+
from packaging.version import Version
99

1010
nx=100; ydim=5; zdim=10
1111
nfiles = 10
@@ -138,7 +138,7 @@ def runTest(self):
138138
assert_equal(T.typecode(), t.typecode())
139139
# skip this until cftime pull request #55 is in a released
140140
# version (1.0.1?). Otherwise, fix for issue #808 breaks this
141-
if parse_version(cftime.__version__) >= parse_version('1.0.1'):
141+
if Version(cftime.__version__) >= Version('1.0.1'):
142142
assert_array_equal(cftime.num2date(T[:], T.units, T.calendar), dates)
143143
assert_equal(cftime.date2index(datetime.datetime(1980, 1, 2), T), 366)
144144
f.close()

test/tst_multifile2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from numpy import ma
66
import tempfile, unittest, os, datetime
77
import cftime
8-
from pkg_resources import parse_version
8+
from packaging.version import Version
99

1010
nx=100; ydim=5; zdim=10
1111
nfiles = 10
@@ -106,7 +106,7 @@ def runTest(self):
106106
# Get the real dates
107107
# skip this until cftime pull request #55 is in a released
108108
# version (1.0.1?). Otherwise, fix for issue #808 breaks this
109-
if parse_version(cftime.__version__) >= parse_version('1.0.1'):
109+
if Version(cftime.__version__) >= Version('1.0.1'):
110110
dates = []
111111
for file in self.files:
112112
f = Dataset(file)

0 commit comments

Comments
 (0)