Skip to content

Commit ccbe443

Browse files
committed
Update test requirements
1 parent f197052 commit ccbe443

File tree

8 files changed

+16
-48
lines changed

8 files changed

+16
-48
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ https://semver.org/spec/v2.0.0.html
3131
- Upgrade lower limit for `pyproj` to 3.0.
3232
- Upgrade upper limit for `pyproj` to 3.8.
3333
- Upgrade lower limit for `pyshp` to 2.0.
34+
- Update test dependencies:
35+
- Remove dependency on `unittest2`.
36+
- Upgrade lower limit for `pytest` to 7.0.
37+
- Upgrade upper limit for `pytest` to 8.4.
38+
- Upgrade lower limit for `pytest-cov` to 3.0.
39+
- Upgrade upper limit for `pytest-cov` to 6.1.
40+
- Downgrade lower limit for `coverage` to 5.0.
41+
- Upgrade upper limit for `coverage` to 7.7.
3442

3543
### Fixed
3644
- Fix Cython extension to use `noexcept` (PR [#615] by @cvanelteren).
Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
1-
unittest2; python_version <= "3.9"
1+
pytest >= 7.0, < 8.4
22

3-
pytest >= 3.2.0, < 3.3; python_version == "2.6"
4-
pytest >= 4.6.9, < 5.0; python_version == "2.7"
5-
pytest >= 2.9.0, < 3.0; python_version == "3.2"
6-
pytest >= 3.2.0, < 3.3; python_version == "3.3"
7-
pytest >= 4.6.9, < 5.0; python_version == "3.4"
8-
pytest >= 6.1.2, < 6.2; python_version == "3.5"
9-
pytest >= 6.2.5, < 7.5; python_version >= "3.6"
10-
11-
coverage >= 4.5, < 5.0; python_version == "2.6"
12-
coverage >= 5.5, < 6.0; python_version == "2.7"
13-
coverage >= 3.7, < 4.0; python_version == "3.2"
14-
coverage >= 4.5, < 5.0; python_version == "3.3"
15-
coverage >= 4.5, < 5.0; python_version == "3.4"
16-
coverage >= 5.5, < 6.0; python_version == "3.5"
17-
coverage >= 5.5, < 7.4; python_version >= "3.6"
18-
pytest-cov >= 2.5, < 2.6; python_version == "2.6"
19-
pytest-cov >= 2.9, < 3.0; python_version == "2.7"
20-
pytest-cov >= 2.5, < 2.6; python_version == "3.2"
21-
pytest-cov >= 2.5, < 2.6; python_version == "3.3"
22-
pytest-cov >= 2.5, < 2.9; python_version == "3.4"
23-
pytest-cov >= 2.9, < 4.2; python_version >= "3.5"
3+
pytest-cov >= 3.0, < 6.1
4+
coverage >= 5.0, < 7.7

packages/basemap/setup.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ ignore =
2222
[tool:pytest]
2323
filterwarnings =
2424
error
25-
# To be removed when replacing `unittest2`.
26-
ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated:DeprecationWarning:unittest2.compatibility:143
2725
# To be removed with `dateutil` release after 2.8.2.
2826
# See: https://github.com/dateutil/dateutil/issues/1314
2927
ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:dateutil.tz.tz:37

packages/basemap/test/mpl_toolkits/basemap/test_Basemap.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import shutil
55
import tempfile
66
import datetime as dt
7-
try:
8-
import unittest2 as unittest
9-
except ImportError:
10-
import unittest
7+
import unittest
118

129
import numpy as np
1310
import matplotlib as mpl

packages/basemap/test/mpl_toolkits/basemap/test_cm.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
"""Import test for :mod:`mpl_toolkits.basemap.cm`."""
22

3-
try:
4-
import unittest2 as unittest
5-
except ImportError:
6-
import unittest
7-
3+
import unittest
84
from mpl_toolkits.basemap import cm
95

106

packages/basemap/test/mpl_toolkits/basemap/test_diagnostic.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
"""Import test for :mod:`mpl_toolkits.basemap.diagnostic`."""
22

3+
import unittest
34
from collections import namedtuple
4-
try:
5-
import unittest2 as unittest
6-
except ImportError:
7-
import unittest
8-
95
from mpl_toolkits.basemap import diagnostic
106

117

packages/basemap/test/mpl_toolkits/basemap/test_proj.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
"""Import test for :mod:`mpl_toolkits.basemap.proj`."""
22

3-
try:
4-
import unittest2 as unittest
5-
except ImportError:
6-
import unittest
7-
3+
import unittest
84
from mpl_toolkits.basemap.proj import Proj
95

106

packages/basemap/test/mpl_toolkits/test_basemap.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
"""Import test for the :mod:`mpl_toolkits.basemap` package."""
22

3-
try:
4-
import unittest2 as unittest
5-
except ImportError:
6-
import unittest
7-
3+
import unittest
84
from mpl_toolkits import basemap
95

106

0 commit comments

Comments
 (0)