Preparation for version 4.0.0 release

cedadev · Oct 8, 2019 · 819ee20 · 819ee20
1 parent 2ea02fc
commit 819ee20
Show file tree

Hide file tree

Showing 38 changed files with 82 additions and 73 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,15 @@
 See https://github.com/cedadev/cf-checker/milestones?state=closed for full details of each release.
 
 -----------------------------------------------------------------
+## October 2019
+
+CF Checker release 4.0.0
+
+First official Python 3 release.
+
+* Support for Python 3 only.
+* CEDA cf-checker wrapper script removed.  Caching of standard_name, area_type and region tables has been incorporated into the checker at a previous version
+
 ## August 2019
 
 CF Checker release 3.2.0rc1

diff --git a/src/cfchecker/__init__.py b/src/cfchecker/__init__.py
@@ -1 +1 @@
-__version__ = '3.2.0rc1'
+__version__ = '4.0.0'
diff --git a/test_files/CF_1_0_OK.check b/test_files/CF_1_0_OK.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CF_1_0_OK.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/CF_1_7.check b/test_files/CF_1_7.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CF_1_7.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.7
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Area Type Table Version 9 (07 August 2018)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 

diff --git a/test_files/CRM018_test1.check b/test_files/CRM018_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM018_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (2.6.1): No 'Conventions' attribute present

diff --git a/test_files/CRM021_test1.check b/test_files/CRM021_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM021_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/CRM024_test1.check b/test_files/CRM024_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM024_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 ERROR: (2.6.1): This netCDF file does not appear to contain CF Convention data.

diff --git a/test_files/CRM026_test2.check b/test_files/CRM026_test2.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM026_test2.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/CRM027_test1.check b/test_files/CRM027_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM027_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (7.1): Data for variable time lies outside cell boundaries

diff --git a/test_files/CRM027_test2.check b/test_files/CRM027_test2.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM027_test2.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (7.1): Data for variable time lies outside cell boundaries

diff --git a/test_files/CRM028_test1.check b/test_files/CRM028_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM028_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (2.6.1): No 'Conventions' attribute present

diff --git a/test_files/CRM032_test1.check b/test_files/CRM032_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM032_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 ERROR: (2.6.1): This netCDF file does not appear to contain CF Convention data.

diff --git a/test_files/CRM033_test1.check b/test_files/CRM033_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM033_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (2.6.1): No 'Conventions' attribute present

diff --git a/test_files/CRM035.check b/test_files/CRM035.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM035.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (2.6.1): No 'Conventions' attribute present

diff --git a/test_files/CRM037.check b/test_files/CRM037.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM037.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/CRM038.check b/test_files/CRM038.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM038.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/CRM041.check b/test_files/CRM041.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: CRM041.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/GregRappa.check b/test_files/GregRappa.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: GregRappa.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/Trac020_test1.check b/test_files/Trac020_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: Trac020_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/Trac020_test2.check b/test_files/Trac020_test2.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: Trac020_test2.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/Trac022.check b/test_files/Trac022.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: Trac022.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (2.6.1): No 'Conventions' attribute present

diff --git a/test_files/Trac049_test1.check b/test_files/Trac049_test1.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: Trac049_test1.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.4
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Area Type Table Version 9 (07 August 2018)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 

diff --git a/test_files/Trac049_test2.check b/test_files/Trac049_test2.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: Trac049_test2.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.4
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Area Type Table Version 9 (07 August 2018)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 

diff --git a/test_files/UpgradeVn.pl b/test_files/UpgradeVn.pl
@@ -13,13 +13,13 @@
 #           Before running simply alter the variables $checkerVN and
 #           $standardNameVN as appropriate.
 #-------------------------------------------------------------------------- 
-$checkerVN="3.2.0rc1";
-$standardNameVN="67 (2019-06-18T13:25:38Z)";
+$checkerVN="4.0.0";
+$standardNameVN="68 (2019-09-18T13:48:23Z)";
 $areaTypeVN="9 (07 August 2018)";
 $regionNameVN="4 (18 December 2018)";
 
 
-$TEST_FILES_DIR="/home/ros/git-projects/cf-checker-python3/test_files";
+$TEST_FILES_DIR="/home/ros/git-projects/cf-checker/test_files";
 
 chdir $TEST_FILES_DIR or die "Failed to cd to $TEST_FILES_DIR: $!\n";
 

diff --git a/test_files/badc_units.check b/test_files/badc_units.check
@@ -1,8 +1,8 @@
 
 CHECKING NetCDF FILE: badc_units.nc
 =====================
-Using CF Checker Version 3.2.0rc1
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using CF Checker Version 4.0.0
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 
 WARNING (7.1): Data for variable time lies outside cell boundaries
 

diff --git a/test_files/cell_measures.check b/test_files/cell_measures.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: cell_measures.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 ERROR: (7.1): Incorrect dimensions for boundary variable: lon_vertices

diff --git a/test_files/cell_methods.check b/test_files/cell_methods.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: cell_methods.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 ERROR: (7.1): Incorrect dimensions for boundary variable: lon_vertices

diff --git a/test_files/complex.check b/test_files/complex.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: complex.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (2.6.1): No 'Conventions' attribute present

diff --git a/test_files/compress.check b/test_files/compress.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: compress.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.7
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Area Type Table Version 9 (07 August 2018)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 

diff --git a/test_files/example_5.10.check b/test_files/example_5.10.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: example_5.10.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.7
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Area Type Table Version 9 (07 August 2018)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 

diff --git a/test_files/example_6.2.check b/test_files/example_6.2.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: example_6.2.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.7
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Area Type Table Version 9 (07 August 2018)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 

diff --git a/test_files/flag_tests.check b/test_files/flag_tests.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: flag_tests.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.3
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/formula_terms.check b/test_files/formula_terms.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: formula_terms.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 WARN: (7.1): Data for variable lat lies outside cell boundaries

diff --git a/test_files/hfogo_O1_labelVariable_KT.check b/test_files/hfogo_O1_labelVariable_KT.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: hfogo_O1_labelVariable_KT.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 
 

diff --git a/test_files/issue27.check b/test_files/issue27.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: issue27.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.6
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Area Type Table Version 9 (07 August 2018)
 Using Standardized Region Name Table Version 4 (18 December 2018)
 

diff --git a/test_files/issue58.check b/test_files/issue58.check
@@ -1,8 +1,8 @@
 CHECKING NetCDF FILE: issue58.nc
 =====================
-Using CF Checker Version 3.2.0rc1
+Using CF Checker Version 4.0.0
 Checking against CF Version CF-1.6
-Using Standard Name Table Version 67 (2019-06-18T13:25:38Z)
+Using Standard Name Table Version 68 (2019-09-18T13:48:23Z)
 Using Area Type Table Version 9 (07 August 2018)
 Using Standardized Region Name Table Version 4 (18 December 2018)