Merge branch 'master' into issue653-add-py313

Author: soxofaan

setup.py

@@ -22,17 +22,13 @@
     "mock",
     "requests-mock>=1.8.0",
     "httpretty>=1.1.4",
-    # TODO #578 Conditional netCDF4 constraint: no more py3.7 wheels since 1.6.5 (#489)
-    "netCDF4<1.6.5 ; python_version <= '3.7'",
-    "netCDF4 ; python_version > '3.7'",
-    "matplotlib",
+    "netCDF4>=1.7.0",
+    "matplotlib",  # TODO: eliminate matplotlib as test dependency
     "geopandas",
     "flake8>=5.0.0",
     "time_machine",
     "pyproj>=3.2.0",  # Pyproj is an optional, best-effort runtime dependency
-    "dirty_equals>=0.6.0",
-    # TODO #578 On Python 3.7: avoid dirty_equals 0.7.1 which wrongly claims to be Python 3.7 compatible
-    "dirty_equals<0.7.1 ; python_version <= '3.7'",
+    "dirty_equals>=0.8.0",
     "pyarrow>=10.0.1",  # For Parquet read/write support in pandas
 ]
 

tests/extra/test_job_management.py

@@ -678,11 +678,6 @@ def test_automatic_cancel_of_too_long_running_jobs(
         cancel_after_seconds,
         expected_status,
     ):
-        if not hasattr(time_machine, "shift"):
-            # TODO #578 remove this hack to skip this test on Python 3.7
-            #       `time_machine.shift` is only available since timemachine>=2.13.0, which only support Python 3.8 and up
-            pytest.skip("time_machine.shift not available")
-
         fake_backend = FakeBackend(requests_mock=requests_mock)
 
         # For simplicity, set up pre-existing job with status "running" (instead of job manager creating+starting it)

tests/rest/datacube/test_datacube100.py

@@ -198,14 +198,9 @@ def _get_normalizable_crs_inputs():
     """
     yield "EPSG:32631"
     yield 32631
-    if pyproj.__version__ >= ComparableVersion("3.3.1"):
-        # TODO #578 drop this skip once support for python 3.7 is dropped (pyproj 3.3.0 requires at least python 3.8)
-        # pyproj below 3.3.1 does not support int-like strings
-        yield "32631"
+    yield "32631"
     yield "+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs"  # is also EPSG:32631, in proj format
-    if pyproj.__version__ >= ComparableVersion("3.1.0"):
-        # WKT2 format support requires pyproj 3.1.0 or higher
-        yield WKT2_FOR_EPSG23631
+    yield WKT2_FOR_EPSG23631
 
 
 def _get_leaf_node(cube: DataCube) -> dict:

tests/rest/test_connection.py

@@ -2719,7 +2719,7 @@ def test_list_service_types_error(requests_mock):
 def test_list_udf_runtimes(requests_mock):
     requests_mock.get(API_URL, json={"api_version": "1.0.0"})
     conn = Connection(API_URL)
-    runtimes = {"Python": {"type": "language", "versions": {"3.7": {}}, "default": "3.7"}}  # TODO #578
+    runtimes = {"Python": {"type": "language", "versions": {"3.12": {}}, "default": "3.12"}}
     m = requests_mock.get(API_URL + "udf_runtimes", json=runtimes)
     assert conn.list_udf_runtimes() == runtimes
     assert m.call_count == 1

tests/test_util.py

@@ -689,11 +689,6 @@ def test_init(self):
             "crs": 4326,
         }
 
-    @pytest.mark.skipif(
-        # TODO #460 #578 this skip is only necessary for python 3.6 and lower
-        pyproj.__version__ < ComparableVersion("3.3.1"),
-        reason="pyproj below 3.3.1 does not support int-like strings",
-    )
     def test_init_python_for_pyprojv331(self):
         """Extra test case that does not work with old pyproj versions that we get on python version 3.7 and below."""
         assert BBoxDict(west=1, south=2, east=3, north=4, crs="4326") == {
@@ -730,11 +725,6 @@ def test_to_bbox_dict_from_sequence(self):
             "crs": 4326,
         }
 
-    @pytest.mark.skipif(
-        # TODO #460 #578 this skip is only necessary for python 3.6 and lower
-        pyproj.__version__ < ComparableVersion("3.3.1"),
-        reason="pyproj below 3.3.1 does not support int-like strings",
-    )
     def test_to_bbox_dict_from_sequence_pyprojv331(self):
         """Extra test cases that do not work with old pyproj versions that we get on python version 3.7 and below."""
         assert to_bbox_dict([1, 2, 3, 4], crs="4326") == {
@@ -788,11 +778,6 @@ def test_to_bbox_dict_from_dict(self):
             }
         ) == {"west": 1, "south": 2, "east": 3, "north": 4, "crs": 4326}
 
-    @pytest.mark.skipif(
-        # TODO #460 #578 this skip is only necessary for python 3.6 and lower
-        pyproj.__version__ < ComparableVersion("3.3.1"),
-        reason="pyproj below 3.3.1 does not support int-like strings",
-    )
     def test_to_bbox_dict_from_dict_for_pyprojv331(self):
         """Extra test cases that do not work with old pyproj versions that we get on python version 3.7 and below."""
         assert to_bbox_dict({"west": 1, "south": 2, "east": 3, "north": 4, "crs": "4326"}) == {
@@ -932,10 +917,6 @@ class TestNormalizeCrs:
     )
     def test_normalize_crs_succeeds_with_correct_crses(self, epsg_input, expected):
         """Happy path, values that are allowed"""
-        if isinstance(epsg_input, str) and epsg_input.isnumeric() and pyproj.__version__ < ComparableVersion("3.3.1"):
-            # TODO #578 drop this skip once support for python 3.7 is dropped (pyproj 3.3.0 requires at least python 3.8)
-            pytest.skip("pyproj below 3.3.1 does not support int-like strings")
-
         assert normalize_crs(epsg_input) == expected
 
     @pytest.mark.parametrize(
@@ -1051,11 +1032,6 @@ def test_normalize_crs_without_pyproj_succeeds_with_wkt2_input(self):
         "id": {"authority": "EPSG", "code": 32631},
     }
 
-    @pytest.mark.skipif(
-        # TODO #578 drop this skip once support for python 3.7 is dropped (pyproj 3.3.0 requires at least python 3.8)
-        pyproj.__version__ < ComparableVersion("3.3.0"),
-        reason="PROJJSON format support requires pyproj 3.3.0 or higher",
-    )
     def test_normalize_crs_succeeds_with_correct_projjson(
         self,
     ):

tests/udf/test_xarraydatacube.py

@@ -147,17 +147,11 @@ class _SaveLoadRoundTrip(NamedTuple):
 
 
 def _get_netcdf_engines() -> List[str]:
-    if hasattr(xarray.backends, "list_engines"):
-        # xarray 0.17 or higher provides xarray.backends.list_engines
-        netcdf_engines = [
+    netcdf_engines = [
             name
             for name, engine in xarray.backends.list_engines().items()
             if engine.guess_can_open("dummy.nc")
-        ]
-    else:
-        # Poor man's hardcoded fallback
-        # TODO #578: drop this once we can require "xarray>=0.17" (which requires "python>=3.7")
-        netcdf_engines = ["netcdf4"]
+    ]
     return netcdf_engines