Merge pull request #204 from mraspaud/bump-python-versions

pytroll · Nov 22, 2023 · 6f3b523 · 6f3b523
2 parents eb88f0a + a546b34
commit 6f3b523
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,10 +10,10 @@ jobs:
       fail-fast: true
       matrix:
         os: ["windows-latest", "ubuntu-latest", "macos-latest"]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.10", "3.11", "3.12"]
         experimental: [false]
         include:
-          - python-version: "3.10"
+          - python-version: "3.12"
             os: "ubuntu-latest"
             experimental: true
 

diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml
@@ -17,8 +17,6 @@ dependencies:
   - behave
   - netcdf4
   - h5py
-  - h5netcdf
-  - pyhdf
   - mock
   - pytest
   - pytest-cov

diff --git a/pyspectral/tests/test_rayleigh.py b/pyspectral/tests/test_rayleigh.py
@@ -219,7 +219,7 @@ def test_get_reflectance_wvl_outside_range(self, fake_lut_hdf5):
             refl_corr = rayl.get_reflectance(sun_zenith, sat_zenith, azidiff, 1.2, redband_refl)
             np.testing.assert_allclose(refl_corr, 0)
             assert isinstance(refl_corr, da.Array)
-            assert rsr_obj.not_called()
+            rsr_obj.assert_not_called()
 
 
 class TestRayleigh:
@@ -385,7 +385,7 @@ def test_get_reflectance_float_wavelength(self, fake_lut_hdf5):
             refl_corr = rayl.get_reflectance(sun_zenith, sat_zenith, azidiff, 0.634, redband_refl)
             np.testing.assert_allclose(refl_corr, TEST_RAYLEIGH_RESULT3)
             assert isinstance(refl_corr, np.ndarray)
-            assert rsr_obj.not_called()
+            rsr_obj.assert_not_called()
 
     @patch('pyspectral.rayleigh.da', None)
     def test_get_reflectance_wvl_outside_range(self, fake_lut_hdf5):
@@ -402,7 +402,7 @@ def test_get_reflectance_wvl_outside_range(self, fake_lut_hdf5):
             refl_corr = rayl.get_reflectance(sun_zenith, sat_zenith, azidiff, 1.2, redband_refl)
             np.testing.assert_allclose(refl_corr, 0)
             assert isinstance(refl_corr, np.ndarray)
-            assert rsr_obj.not_called()
+            rsr_obj.assert_not_called()
 
     def test_get_reflectance_no_lut(self, fake_lut_hdf5):
         """Test that missing a LUT causes an exception.."""

diff --git a/setup.py b/setup.py
@@ -82,6 +82,6 @@
                              'pyspectral/data/MSG_SEVIRI_Spectral_Response_Characterisation.XLS'])],
       test_suite='pyspectral.tests.suite',
       tests_require=test_requires,
-      python_requires='>=3.7',
+      python_requires='>=3.10',
       zip_safe=False,
       )
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,8 +17,6 @@ dependencies: @@
       - behave
       - netcdf4
       - h5py
-      - h5netcdf
-      - pyhdf
       - mock
       - pytest
       - pytest-cov
@@ Expand Down @@