Skip to content

Modify CF conventions attribute 1.5 -> 1.7 #3432

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.

Sign up for GitHub

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

Jump to bottom
Merged
bjlittle merged 1 commit into from
Oct 1, 2019
Merged

Modify CF conventions attribute 1.5 -> 1.7 #3432

bjlittle merged 1 commit into from
Oct 1, 2019

Conversation

@lbdreyer
Copy link
Member

@lbdreyer lbdreyer commented Oct 1, 2019

We are now committed to CF 1.7 so we should update the conventions attribute that Iris adds. This includes updating a bunch of cml results files.

Note that there is a fair amount of fall out from this PR due to how I approached the change:
I deleted all the results files, then reran the tests with the "create-missing" flag. This meant that quite a few of tests results files that are no longer being used have been deleted. I think this is okay

@lbdreyer lbdreyer added this to the v2.3.0 milestone Oct 1, 2019
@lbdreyer
Copy link
Member Author

lbdreyer commented Oct 1, 2019 •
edited
Loading

I checked the Python 2.7 default test run in travis.

The tests pass with 22 skipped tests (see here) (that are all skipped due to gdal not being available in the environment). None of the tests that are skipped appear to use the deleted test results files so I think it is safe to delete them:

test_inverted (iris.tests.experimental.test_raster.TestGeoTiffExport) ... SKIP: Test requires 'gdal'.
test_masked (iris.tests.experimental.test_raster.TestGeoTiffExport) ... SKIP: Test requires 'gdal'.
test_unmasked (iris.tests.experimental.test_raster.TestGeoTiffExport) ... SKIP: Test requires 'gdal'.
test_y_fastest (iris.tests.integration.test_grib_load.TestBasicLoad) ... SKIP: Test(s) are not currently usable with the new grib 2 loader.
test_float32 (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_float32_big_endian (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_float64 (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_float64_big_endian (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_int16 (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_int16_big_endian (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_int32 (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_int32_big_endian (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_invalid (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_uint16 (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_uint16_big_endian (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_uint32 (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_uint32_big_endian (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_uint8 (iris.tests.unit.experimental.raster.test_export_geotiff.TestDtypeAndValues) ... SKIP: Test requires 'gdal'.
test_ (iris.tests.unit.experimental.raster.test_export_geotiff.TestGeoTransform) ... SKIP: Test requires 'gdal'.
test_ellipsoid (iris.tests.unit.experimental.raster.test_export_geotiff.TestProjection) ... SKIP: Test requires 'gdal'.
test_no_ellipsoid (iris.tests.unit.experimental.raster.test_export_geotiff.TestProjection) ... SKIP: Test requires 'gdal'.
test_sphere (iris.tests.unit.experimental.raster.test_export_geotiff.TestProjection) ... SKIP: Test requires 'gdal'.

@bjlittle
Copy link
Member

bjlittle commented Oct 1, 2019

@lbdreyer Of the 22 skipped tests in Python2, one was for:

iris/tests/integration/format_interop/test_name_grib.py:86: UserWarning: NAMEII cube #2, "TRACER_WET_DEPOSITION" has empty data : SKIPPING test for this cube, as save/load will not currently work.

As you say, the rest due to gdal missing.

Okay, let go for it... if we need to reinstate the unused tests result data for some reason, then that's what git's for 😉

CF-1.7 a brave new world 🎉

@bjlittle bjlittle merged commit 652af7a into SciTools:master Oct 1, 2019
@pp-mo pp-mo mentioned this pull request Oct 22, 2019
Merged
@lbdreyer lbdreyer deleted the cf17 branch June 23, 2021 15:32
@lbdreyer lbdreyer restored the cf17 branch June 23, 2021 15:32
@lbdreyer lbdreyer deleted the cf17 branch June 23, 2021 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Feature: NetCDF + CF-conventions

Projects

None yet

Milestone

v2.3.0

Development

Successfully merging this pull request may close these issues.

2 participants

@lbdreyer @bjlittle