scipy required

davidhassell · davidhassell · commit 31c05bedcbf2 · 2023-11-14T11:36:40.000Z
diff --git a/cf/__init__.py b/cf/__init__.py
@@ -199,7 +199,7 @@
     )
 
 # Check the version of cfdm
-_minimum_vn = "1.11.0.0"
+_minimum_vn = "1.11.0.0b2"
 _maximum_vn = "1.11.1.0"
 _cfdm_version = Version(cfdm.__version__)
 if not Version(_minimum_vn) <= _cfdm_version < Version(_maximum_vn):
diff --git a/cf/test/test_Field.py b/cf/test/test_Field.py
@@ -9,7 +9,6 @@
 
 import numpy
 import numpy as np
-
 from scipy.ndimage import convolve1d
 
 faulthandler.enable()  # to debug seg faults and timeouts
@@ -2318,9 +2317,6 @@ def test_Field_percentile(self):
         # TODO: add loop to check get same shape and close enough data
         # for every possible axis combo (see also test_Data_percentile).
 
-    @unittest.skipIf(
-        not SCIPY_AVAILABLE, "scipy must be installed for this test."
-    )
     def test_Field_grad_xy(self):
         f = cf.example_field(0)
 
@@ -2406,9 +2402,6 @@ def test_Field_grad_xy(self):
             y.dimension_coordinate("X").standard_name, "longitude"
         )
 
-    @unittest.skipIf(
-        not SCIPY_AVAILABLE, "scipy must be installed for this test."
-    )
     def test_Field_laplacian_xy(self):
         f = cf.example_field(0)
 
diff --git a/cf/test/test_Maths.py b/cf/test/test_Maths.py
@@ -2,30 +2,12 @@
 import faulthandler
 import unittest
 
-
-SCIPY_AVAILABLE = False
-try:
-    # We don't need SciPy directly in this test, it is only required by code
-    # here which uses 'convolve1d' under-the-hood. Without it installed, get:
-    #
-    # NameError: name 'convolve1d' is not defined. Did you
-    # mean: 'cf_convolve1d'?
-    import scipy
-
-    SCIPY_AVAILABLE = True
-# not 'except ImportError' as that can hide nested errors, catch anything:
-except Exception:
-    pass  # test with this dependency will then be skipped by unittest
-
 faulthandler.enable()  # to debug seg faults and timeouts
 
 import cf
 
 
 class MathTest(unittest.TestCase):
-    @unittest.skipIf(
-        not SCIPY_AVAILABLE, "scipy must be installed for this test."
-    )
     def test_curl_xy(self):
         f = cf.example_field(0)
 
@@ -115,9 +97,6 @@ def test_curl_xy(self):
             c.dimension_coordinate("X").standard_name, "longitude"
         )
 
-    @unittest.skipIf(
-        not SCIPY_AVAILABLE, "scipy must be installed for this test."
-    )
     def test_div_xy(self):
         f = cf.example_field(0)
 
@@ -206,9 +185,6 @@ def test_div_xy(self):
             d.dimension_coordinate("X").standard_name, "longitude"
         )
 
-    @unittest.skipIf(
-        not SCIPY_AVAILABLE, "scipy must be installed for this test."
-    )
     def test_differential_operators(self):
         f = cf.example_field(0)
 

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@`
`199`	`199`	`)`
`200`	`200`
`201`	`201`	`# Check the version of cfdm`
`202`		`-_minimum_vn = "1.11.0.0"`
	`202`	`+_minimum_vn = "1.11.0.0b2"`
`203`	`203`	`_maximum_vn = "1.11.1.0"`
`204`	`204`	`_cfdm_version = Version(cfdm.__version__)`
`205`	`205`	`if not Version(_minimum_vn) <= _cfdm_version < Version(_maximum_vn):`