Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove some @tests.skip_biggus that are now unnecessary #2450

Merged
merged 7 commits into from
Mar 22, 2017
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def test_nearest_sinusoidal(self):
self.assertArrayShapeStats(res[:, 0], (1, 73, 96),
299.99993826, 3.9223839688e-5)

@tests.skip_biggus
def test_nearest_gnomonic_uk_domain(self):
crs = ccrs.Gnomonic(central_latitude=60.0)
uk_grid = self.global_grid.intersection(longitude=(-20, 20),
Expand Down Expand Up @@ -110,7 +109,6 @@ def test_nearest_aux_factories(self):
299.99993826, 3.9226378869e-5)
self.assertEqual(res.coord('altitude').shape, (6, 73, 96))

@tests.skip_biggus
def test_linear_sinusoidal(self):
res = self.src.regrid(self.global_grid, ProjectedUnstructuredLinear())
self.assertArrayShapeStats(res, (1, 6, 73, 96),
Expand Down
1 change: 0 additions & 1 deletion lib/iris/tests/integration/test_aggregated_cube.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from iris._lazy_data import is_lazy_data


@tests.skip_biggus
class Test_aggregated_by(tests.IrisTest):
@tests.skip_data
def test_agg_by_aux_coord(self):
Expand Down
1 change: 0 additions & 1 deletion lib/iris/tests/integration/test_regridding.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
from iris.analysis import UnstructuredNearest


@tests.skip_biggus
@tests.skip_data
class TestOSGBToLatLon(tests.IrisTest):
def setUp(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="u curl of wind" units="0.277777777777778 hertz">
<cube core-dtype="float64" dtype="float64" long_name="u curl of wind" units="0.277777777777778 hertz">
<coords>
<coord datadims="[2]">
<dimCoord id="a2e1fbc2" points="[3.105, 5.315, 7.525, 9.735, 11.945, 14.155,
Expand Down Expand Up @@ -31,7 +31,7 @@
<cellMethods/>
<data dtype="float64" shape="(10, 25, 49)" state="loaded"/>
</cube>
<cube long_name="v curl of wind" units="0.277777777777778 hertz">
<cube core-dtype="float64" dtype="float64" long_name="v curl of wind" units="0.277777777777778 hertz">
<coords>
<coord datadims="[2]">
<dimCoord id="a2e1fbc2" points="[3.105, 5.315, 7.525, 9.735, 11.945, 14.155,
Expand Down Expand Up @@ -62,7 +62,7 @@
<cellMethods/>
<data dtype="float64" shape="(10, 25, 49)" state="loaded"/>
</cube>
<cube long_name="w curl of wind" units="0.277777777777778 hertz">
<cube core-dtype="float64" dtype="float64" long_name="w curl of wind" units="0.277777777777778 hertz">
<coords>
<coord datadims="[2]">
<dimCoord id="a2e1fbc2" points="[3.105, 5.315, 7.525, 9.735, 11.945, 14.155,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="change_in_x_wind_wrt_x" units="km/h">
<cube core-dtype="float32" dtype="float32" long_name="change_in_x_wind_wrt_x" units="km/h">
<coords>
<coord datadims="[0]">
<dimCoord id="61a1c174" long_name="x" points="[0.5, 1.5, 2.5, 3.5]" shape="(4,)" units="Unit('count')" value_type="float32"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="change_in_x_wind_wrt_latitude" units="km/h">
<cube core-dtype="float32" dtype="float32" long_name="change_in_x_wind_wrt_latitude" units="km/h">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-67.5, -22.5, 22.5, 67.5]" shape="(4,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="change_in_x_wind_wrt_longitude" units="km/h">
<cube core-dtype="float32" dtype="float32" long_name="change_in_x_wind_wrt_longitude" units="km/h">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-90.0, -45.0, 0.0, 45.0, 90.0]" shape="(5,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="change_in_x_wind_wrt_x" units="km/h">
<cube core-dtype="float32" dtype="float32" long_name="change_in_x_wind_wrt_x" units="km/h">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-90.0, -45.0, 0.0, 45.0, 90.0]" shape="(5,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="change_in_x_wind_wrt_y" units="km/h">
<cube core-dtype="float32" dtype="float32" long_name="change_in_x_wind_wrt_y" units="km/h">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-67.5, -22.5, 22.5, 67.5]" shape="(4,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="w curl of wind" units="0.277777777777778 second^-1-radian^-1">
<cube core-dtype="float64" dtype="float64" long_name="w curl of wind" units="0.277777777777778 second^-1-radian^-1">
<coords>
<coord datadims="[0]">
<dimCoord id="620d7656" points="[-87.0, -81.0, -75.0, -69.0, -63.0, -57.0, -51.0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="w curl of wind" units="0.277777777777778 second^-1-radian^-1">
<cube core-dtype="float64" dtype="float64" long_name="w curl of wind" units="0.277777777777778 second^-1-radian^-1">
<coords>
<coord datadims="[0]">
<dimCoord id="620d7656" points="[-88.7143, -86.1429, -83.5714, -81.0, -78.4286,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="w curl of wind" units="0.277777777777778 hertz">
<cube core-dtype="float64" dtype="float64" long_name="w curl of wind" units="0.277777777777778 hertz">
<coords>
<coord datadims="[1]">
<dimCoord id="a2e1fbc2" points="[3.105, 5.315, 7.525, 9.735, 11.945, 14.155,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="derivative_of_x_wind_wrt_latitude" units="15.9154943091895 meter-second^-1-radian^-1">
<cube core-dtype="float32" dtype="float32" long_name="derivative_of_x_wind_wrt_latitude" units="15.9154943091895 meter-second^-1-radian^-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-87.75, -83.25, -78.75, -74.25, -69.75, -65.25,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="derivative_of_x_wind_wrt_longitude" units="15.9154943091895 meter-second^-1-radian^-1">
<cube core-dtype="float32" dtype="float32" long_name="derivative_of_x_wind_wrt_longitude" units="15.9154943091895 meter-second^-1-radian^-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-90.0, -85.5, -81.0, -76.5, -72.0, -67.5, -63.0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="derivative_of_x_wind_wrt_x" units="0.277777777777778 meter-second^-1">
<cube core-dtype="float32" dtype="float32" long_name="derivative_of_x_wind_wrt_x" units="0.277777777777778 meter-second^-1">
<coords>
<coord datadims="[0]">
<dimCoord id="61a1c174" long_name="x" points="[0.5, 1.5, 2.5, 3.5]" shape="(4,)" units="Unit('count')" value_type="float32"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="derivative_of_x_wind_wrt_latitude" units="15.9154943091895 meter-second^-1-radian^-1">
<cube core-dtype="float32" dtype="float32" long_name="derivative_of_x_wind_wrt_latitude" units="15.9154943091895 meter-second^-1-radian^-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-67.5, -22.5, 22.5, 67.5]" shape="(4,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="derivative_of_x_wind_wrt_longitude" units="15.9154943091895 meter-second^-1-radian^-1">
<cube core-dtype="float32" dtype="float32" long_name="derivative_of_x_wind_wrt_longitude" units="15.9154943091895 meter-second^-1-radian^-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-90.0, -45.0, 0.0, 45.0, 90.0]" shape="(5,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="derivative_of_x_wind_wrt_x" units="0.277777777777778 meter-second^-1">
<cube core-dtype="float32" dtype="float32" long_name="derivative_of_x_wind_wrt_x" units="0.277777777777778 meter-second^-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-90.0, -45.0, 0.0, 45.0, 90.0]" shape="(5,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="derivative_of_x_wind_wrt_y" units="0.277777777777778 meter-second^-1">
<cube core-dtype="float32" dtype="float32" long_name="derivative_of_x_wind_wrt_y" units="0.277777777777778 meter-second^-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-67.5, -22.5, 22.5, 67.5]" shape="(4,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
4 changes: 2 additions & 2 deletions lib/iris/tests/results/cdm/masked_cube.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="unknown">
<cube core-dtype="float32" dtype="float32" fill_value="1e-09" units="unknown">
<attributes>
<attribute name="STASH" value="m01s00i???"/>
<attribute name="source" value="Data from Met Office Unified Model"/>
Expand Down Expand Up @@ -36,6 +36,6 @@
</coord>
</coords>
<cellMethods/>
<data checksum="0xf4816e76" dtype="float32" fill_value="1e-09" mask_checksum="0x54a64fdc" shape="(8, 20, 20)"/>
<data checksum="0xf4816e76" dtype="float32" mask_checksum="0x54a64fdc" shape="(8, 20, 20)"/>
</cube>
</cubes>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="kelvin^2">
<cube core-dtype="float32" dtype="float32" units="kelvin^2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="kelvin^2">
<cube core-dtype="float32" dtype="float32" units="kelvin^2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="kelvin^2">
<cube core-dtype="float32" dtype="float32" units="kelvin^2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="kelvin^2">
<cube core-dtype="float32" dtype="float32" units="kelvin^2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="kelvin^2">
<cube core-dtype="float32" dtype="float32" units="kelvin^2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="kelvin^2">
<cube core-dtype="float32" dtype="float32" units="kelvin^2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="K">
<cube core-dtype="float32" dtype="float32" units="K">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
5 changes: 0 additions & 5 deletions lib/iris/tests/test_analysis_calculus.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ def test_cos(self):
self.assertXMLElement(cos_of_coord_radians, ('analysis', 'calculus', 'cos_simple_radians.xml'))


@tests.skip_biggus
class TestCalculusSimple3(tests.IrisTest):

def setUp(self):
Expand All @@ -223,7 +222,6 @@ def test_diff_wrt_lat(self):
self.assertCMLApproxData(t, ('analysis', 'calculus', 'handmade2_wrt_lat.cml'))


@tests.skip_biggus
class TestCalculusSimple2(tests.IrisTest):

def setUp(self):
Expand Down Expand Up @@ -275,7 +273,6 @@ def test_delta_wrt_lat(self):
self.assertCMLApproxData(t, ('analysis', 'calculus', 'delta_handmade_wrt_lat.cml'))


@tests.skip_biggus
class TestCalculusSimple1(tests.IrisTest):

def setUp(self):
Expand Down Expand Up @@ -337,7 +334,6 @@ def build_cube(data, spherical=False):
return cube


@tests.skip_biggus
class TestCalculusWKnownSolutions(tests.IrisTest):

def get_coord_pts(self, cube):
Expand Down Expand Up @@ -623,7 +619,6 @@ def test_standard_name(self):
v.rename('northward_foobar2')
self.assertRaises(ValueError, iris.analysis.calculus.spatial_vectors_with_phenom_name, u, v)

@tests.skip_biggus
def test_rotated_pole(self):
u = build_cube(np.empty((30, 20)), spherical='rotated')
v = u.copy()
Expand Down
Loading