diff --git a/cfgrib/dataset.py b/cfgrib/dataset.py index 4cbf930b..b6946557 100644 --- a/cfgrib/dataset.py +++ b/cfgrib/dataset.py @@ -35,7 +35,7 @@ # Edition-independent keys in ecCodes namespaces. Documented in: # https://software.ecmwf.int/wiki/display/ECC/GRIB%3A+Namespaces # -GLOBAL_ATTRIBUTES_KEYS = ["edition", "centre", "centreDescription", "subCentre"] +GLOBAL_ATTRIBUTES_KEYS = ["centre", "centreDescription", "subCentre"] DATA_ATTRIBUTES_KEYS = [ "paramId", diff --git a/tests/test_20_messages.py b/tests/test_20_messages.py index 889a2a2d..e02bfe7f 100644 --- a/tests/test_20_messages.py +++ b/tests/test_20_messages.py @@ -61,8 +61,6 @@ def test_Message_write(tmpdir): # warn on errors res["centreDescription"] = "DUMMY" assert res["centreDescription"] != "DUMMY" - res["edition"] = -1 - assert res["edition"] != -1 # ignore errors res.errors = "ignore" diff --git a/tests/test_30_dataset.py b/tests/test_30_dataset.py index 36b9f9b7..a3bb4da6 100644 --- a/tests/test_30_dataset.py +++ b/tests/test_30_dataset.py @@ -126,7 +126,6 @@ def test_Dataset(): assert "Conventions" in res.attributes assert "institution" in res.attributes assert "history" in res.attributes - assert res.attributes["GRIB_edition"] == 1 assert tuple(res.dimensions.keys()) == ( "number", "time", @@ -146,7 +145,6 @@ def test_Dataset_no_encode(): assert "Conventions" in res.attributes assert "institution" in res.attributes assert "history" in res.attributes - assert res.attributes["GRIB_edition"] == 1 assert tuple(res.dimensions.keys()) == ("number", "dataDate", "dataTime", "level", "values") assert len(res.variables) == 9 @@ -154,7 +152,6 @@ def test_Dataset_no_encode(): def test_Dataset_encode_cf_time(): res = dataset.open_file(TEST_DATA, encode_cf=("time",)) assert "history" in res.attributes - assert res.attributes["GRIB_edition"] == 1 assert tuple(res.dimensions.keys()) == ("number", "time", "level", "values") assert len(res.variables) == 9 @@ -165,7 +162,6 @@ def test_Dataset_encode_cf_time(): def test_Dataset_encode_cf_geography(): res = dataset.open_file(TEST_DATA, encode_cf=("geography",)) assert "history" in res.attributes - assert res.attributes["GRIB_edition"] == 1 assert tuple(res.dimensions.keys()) == ( "number", "dataDate", @@ -183,7 +179,6 @@ def test_Dataset_encode_cf_geography(): def test_Dataset_encode_cf_vertical(): res = dataset.open_file(TEST_DATA, encode_cf=("vertical",)) assert "history" in res.attributes - assert res.attributes["GRIB_edition"] == 1 expected_dimensions = ("number", "dataDate", "dataTime", "isobaricInhPa", "values") assert tuple(res.dimensions.keys()) == expected_dimensions assert len(res.variables) == 9 diff --git a/tests/test_40_xarray_store.py b/tests/test_40_xarray_store.py index 11c879ea..f113d55f 100644 --- a/tests/test_40_xarray_store.py +++ b/tests/test_40_xarray_store.py @@ -16,7 +16,8 @@ def test_open_dataset(): res = xarray_store.open_dataset(TEST_DATA) - assert res.attrs["GRIB_edition"] == 1 + print(res.attrs) + assert res.attrs["GRIB_centre"] == "ecmf" var = res["t"] assert var.attrs["GRIB_gridType"] == "regular_ll" @@ -41,7 +42,7 @@ def test_open_dataset(): def test_open_dataset_corrupted(): res = xarray_store.open_dataset(TEST_CORRUPTED) - assert res.attrs["GRIB_edition"] == 1 + assert res.attrs["GRIB_centre"] == "ecmf" assert len(res.data_vars) == 1 with pytest.raises(Exception): @@ -52,7 +53,7 @@ def test_open_dataset_encode_cf_time(): backend_kwargs = {"encode_cf": ("time",)} res = xarray_store.open_dataset(TEST_DATA, backend_kwargs=backend_kwargs) - assert res.attrs["GRIB_edition"] == 1 + assert res.attrs["GRIB_centre"] == "ecmf" assert res["t"].attrs["GRIB_gridType"] == "regular_ll" assert res["t"].attrs["GRIB_units"] == "K" assert res["t"].dims == ("number", "time", "level", "values") @@ -74,7 +75,7 @@ def test_open_dataset_encode_cf_geography(): backend_kwargs = {"encode_cf": ("geography",)} res = xarray_store.open_dataset(TEST_DATA, backend_kwargs=backend_kwargs) - assert res.attrs["GRIB_edition"] == 1 + assert res.attrs["GRIB_centre"] == "ecmf" var = res["t"] assert var.attrs["GRIB_gridType"] == "regular_ll" @@ -87,7 +88,7 @@ def test_open_dataset_encode_cf_geography(): def test_open_dataset_eccodes(): res = xarray_store.open_dataset(TEST_DATA) - assert res.attrs["GRIB_edition"] == 1 + assert res.attrs["GRIB_centre"] == "ecmf" var = res["t"] assert var.attrs["GRIB_gridType"] == "regular_ll"