Merge pull request #842 from dcs4cop/forman-xxx-1.0.3

xcube 1.0.3

Author: forman

CHANGES.md

@@ -1,3 +1,7 @@
+## Changes in 1.0.3
+
+Same as 1.0.2, just fixed unit tests due to minor Python environment change.
+
 ## Changes in 1.0.2
 
 * Bundled latest 

test/core/gridmapping/test_cfconv.py

@@ -138,8 +138,7 @@ def test_rotated_pole_with_common_names(self):
         self.assertIn('rotated_pole', grid_mappings)
         grid_mapping = grid_mappings.get('rotated_pole')
         self.assertIsInstance(grid_mapping, GridMappingProxy)
-        self.assertEqual('Derived Geographic 2D CRS',
-                         grid_mapping.crs.type_name)
+        self.assertIn('Geographic', grid_mapping.crs.type_name)
         self.assertIsInstance(grid_mapping.coords, GridCoords)
         self.assertIsInstance(grid_mapping.coords.x, xr.DataArray)
         self.assertIsInstance(grid_mapping.coords.y, xr.DataArray)
@@ -164,8 +163,7 @@ def test_rotated_pole_with_standard_names(self):
         self.assertIn('rotated_pole', grid_mappings)
         grid_mapping = grid_mappings.get('rotated_pole')
         self.assertIsInstance(grid_mapping, GridMappingProxy)
-        self.assertEqual('Derived Geographic 2D CRS',
-                         grid_mapping.crs.type_name)
+        self.assertIn('Geographic', grid_mapping.crs.type_name)
         self.assertIsInstance(grid_mapping.coords, GridCoords)
         self.assertIsInstance(grid_mapping.coords.x, xr.DataArray)
         self.assertIsInstance(grid_mapping.coords.y, xr.DataArray)

test/core/gridmapping/test_dataset.py

@@ -108,28 +108,28 @@ def test_from_sentinel_2(self):
 
         gm = GridMapping.from_dataset(dataset)
         # Should pick the projected one which is regular
-        self.assertEqual("Derived Projected CRS", gm.crs.type_name)
+        self.assertIn("Projected", gm.crs.type_name)
         self.assertEqual(True, gm.is_regular)
 
         gm = GridMapping.from_dataset(dataset, prefer_is_regular=True)
         # Should pick the projected one which is regular
-        self.assertEqual("Derived Projected CRS", gm.crs.type_name)
+        self.assertIn("Projected", gm.crs.type_name)
         self.assertEqual(True, gm.is_regular)
 
         gm = GridMapping.from_dataset(dataset, prefer_is_regular=False)
         # Should pick the geographic one which is irregular
-        self.assertEqual('Geographic 2D CRS', gm.crs.type_name)
+        self.assertIn("Geographic", gm.crs.type_name)
         self.assertEqual(False, gm.is_regular)
 
         gm = GridMapping.from_dataset(dataset, prefer_crs=GEO_CRS)
         # Should pick the geographic one which is irregular
-        self.assertEqual('Geographic 2D CRS', gm.crs.type_name)
+        self.assertIn("Geographic", gm.crs.type_name)
         self.assertEqual(False, gm.is_regular)
 
         gm = GridMapping.from_dataset(dataset, prefer_crs=GEO_CRS,
                                       prefer_is_regular=True)
         # Should pick the geographic one which is irregular
-        self.assertEqual('Geographic 2D CRS', gm.crs.type_name)
+        self.assertIn("Geographic", gm.crs.type_name)
         self.assertEqual(False, gm.is_regular)
 
     def test_no_grid_mapping_found(self):

test/core/gridmapping/test_transform.py

@@ -50,7 +50,7 @@ def test_transform_s2(self):
 
         gm = GridMapping.from_dataset(dataset, prefer_is_regular=True)
         # Assert we've picked the projected one which is regular
-        self.assertEqual("Derived Projected CRS", gm.crs.type_name)
+        self.assertIn("Projected", gm.crs.type_name)
         self.assertEqual(True, gm.is_regular)
 
         gm_t = gm.transform(CRS_CRS84)
@@ -64,7 +64,7 @@ def test_transform_no_op(self):
 
         gm = GridMapping.from_dataset(dataset, prefer_is_regular=True)
         # Assert we've picked the projected one which is regular
-        self.assertEqual("Derived Projected CRS", gm.crs.type_name)
+        self.assertIn("Projected", gm.crs.type_name)
         self.assertEqual(True, gm.is_regular)
 
         gm_t = gm.transform(gm.crs)

xcube/version.py

@@ -19,4 +19,4 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-version = '1.0.2'
+version = '1.0.3'