Release 0.9.6

ecmwf · Mar 5, 2020 · 9ad8150 · 9ad8150
2 parents 0a4a0d4 + 970ff1f
commit 9ad8150
Show file tree

Hide file tree

Showing 18 changed files with 301 additions and 177 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,8 +2,17 @@
 Changelog for eccodes-python
 ============================
 
+0.9.6 (2020-03-10)
+-------------------
+
+- Update Copyright notices
+- Function-argument type checks: Improve error message
+- Fix C function calls for codes_gribex_mode_on/codes_gribex_mode_off
+
+
 0.9.5 (2020-01-15)
 -------------------
+
 - ECC-1029: Function-argument type-checking should be disabled by default.
             To enable these checks, export ECCODES_PYTHON_ENABLE_TYPE_CHECKS=1
 - ECC-1032: Added codes_samples_path() and codes_definition_path()

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -8,7 +8,7 @@ Contributing
 Contributions are welcome, and they are greatly appreciated! Every
 little bit helps, and credit will always be given.
 
-Please note, that we have hooked a CLA assiatant to this GitHub Repo. Please accept the contributors license agreement to allow us to keep a legal track of contributions and keep this package open source for the future.
+Please note, that we have hooked a CLA assistant to this GitHub Repo. Please accept the contributors license agreement to allow us to keep a legal track of contributions and keep this package open source for the future.
 
 You can contribute in many ways:
 
@@ -71,7 +71,7 @@ you already have `virtualenv` and `Git` installed and ready to go.
 
    Now you can make your changes locally.
 
-6. The next step would be to run the test cases. `eccodes-python` uses py.test, you can run PyTest. Before you run pytest you should ensure all dependancies are installed::
+6. The next step would be to run the test cases. `eccodes-python` uses py.test, you can run PyTest. Before you run pytest you should ensure all dependencies are installed::
 
     $ pip install -r ci/requirements-dev.txt
     $ pytest -v --flakes

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2017- ECMWF
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.rst b/README.rst
@@ -1,5 +1,5 @@
 
-Python 3 interface to encode and decode GRIB and BUFR files via the
+Python 3 interface to decode and encode GRIB and BUFR files via the
 `ECMWF ecCodes library <https://software.ecmwf.int/wiki/display/ECC/>`_.
 
 Features:
@@ -11,7 +11,7 @@ Features:
 - PyPI package can be installed without compiling,
   at the cost of being twice as slow as the original *ecCodes* module,
 - an optional compile step makes the code as fast as the original module
-  but it needs a recent version of *ecCodes* `>= 2.16.0`.
+  but it needs a recent version of *ecCodes* `>= 2.17.0`.
 
 Limitations:
 
@@ -47,7 +47,7 @@ https://software.ecmwf.int/wiki/display/ECC/ecCodes+installation
 You may run a simple selfcheck command to ensure that your system is set up correctly::
 
     $ python -m eccodes selfcheck
-    Found: ecCodes v2.16.0.
+    Found: ecCodes v2.17.0.
     Your system is ready.
 
 
@@ -119,13 +119,12 @@ who participated in this project.
 License
 =======
 
-Copyright 2017-2019 European Centre for Medium-Range Weather Forecasts (ECMWF).
+ (C) Copyright 2017- ECMWF.
+
+ This software is licensed under the terms of the Apache Licence Version 2.0
+ which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+
+ In applying this licence, ECMWF does not waive the privileges and immunities
+ granted to it by virtue of its status as an intergovernmental organisation nor
+ does it submit to any jurisdiction.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0.
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/docs/conf.py b/docs/conf.py
@@ -33,7 +33,7 @@
 
 # General information about the project.
 project = u"eccodes-python"
-copyright = u"2017-2019, European Centre for Medium-Range Weather Forecasts (ECMWF)."
+copyright = u"2017-, European Centre for Medium-Range Weather Forecasts (ECMWF)."
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout

diff --git a/docs/index.rst b/docs/index.rst
@@ -20,7 +20,7 @@ Features:
 - PyPI package can be installed without compiling,
   at the cost of being twice as slow as the original *ecCodes* module,
 - an optional compile step makes the code as fast as the original module
-  but it needs a recent version of *ecCodes* `>= 2.16.0`.
+  but it needs a recent version of *ecCodes* `>= 2.17.0`.
 
 Limitations:
 

diff --git a/eccodes/__init__.py b/eccodes/__init__.py
@@ -1,3 +1,14 @@
+#
+# (C) Copyright 2017- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
+#
+#
 from __future__ import absolute_import
 import sys
 

diff --git a/eccodes/__main__.py b/eccodes/__main__.py
@@ -1,20 +1,12 @@
 #
-# Copyright 2017-2019 European Centre for Medium-Range Weather Forecasts (ECMWF).
+# (C) Copyright 2017- ECMWF.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Authors:
-#   Alessandro Amici - B-Open - https://bopen.eu
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
 #
 
 import argparse

diff --git a/eccodes/eccodes.py b/eccodes/eccodes.py
@@ -1,10 +1,22 @@
+#
+# (C) Copyright 2017- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
+#
+#
 from gribapi import __version__
 from gribapi import bindings_version
 
 from gribapi import GRIB_CHECK as CODES_CHECK
 
 from gribapi import CODES_PRODUCT_GRIB
 from gribapi import CODES_PRODUCT_BUFR
+from gribapi import CODES_PRODUCT_GTS
 from gribapi import CODES_PRODUCT_ANY
 from gribapi import GRIB_MISSING_DOUBLE as CODES_MISSING_DOUBLE
 from gribapi import GRIB_MISSING_LONG as CODES_MISSING_LONG

diff --git a/eccodes/messages.py b/eccodes/messages.py
@@ -1,17 +1,13 @@
 #
-# Copyright 2017-2019 European Centre for Medium-Range Weather Forecasts (ECMWF).
+# (C) Copyright 2017- ECMWF.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 #
 # Authors:
 #   Alessandro Amici - B-Open - https://bopen.eu

diff --git a/gribapi/__init__.py b/gribapi/__init__.py
@@ -1,10 +1,22 @@
+#
+# (C) Copyright 2017- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
+#
+#
+
 from .gribapi import *  # noqa
 from .gribapi import __version__
 from .gribapi import bindings_version
 
 # The minimum required version for the ecCodes package
-min_reqd_version_str = "2.16.0"
-min_reqd_version_int = 21600
+min_reqd_version_str = "2.17.0"
+min_reqd_version_int = 21700
 
 if lib.grib_get_api_version() < min_reqd_version_int:
     print(

diff --git a/gribapi/bindings.py b/gribapi/bindings.py
@@ -1,18 +1,14 @@
 #
-# Copyright 2017-2019 European Centre for Medium-Range Weather Forecasts (ECMWF).
+# (C) Copyright 2017- ECMWF.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
 #
+
 # Authors:
 #   Alessandro Amici - B-Open - https://bopen.eu
 #
@@ -25,7 +21,7 @@
 
 import cffi
 
-__version__ = "0.9.5"
+__version__ = "0.9.6"
 
 LOG = logging.getLogger(__name__)
 

diff --git a/gribapi/eccodes.h b/gribapi/eccodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2019 ECMWF.
+ * (C) Copyright 2017- ECMWF.
  *
  * This software is licensed under the terms of the Apache Licence Version 2.0
  * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.

diff --git a/gribapi/errors.py b/gribapi/errors.py
@@ -1,3 +1,14 @@
+#
+# (C) Copyright 2017- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
+#
+
 """
 Exception class hierarchy
 """

diff --git a/gribapi/grib_api.h b/gribapi/grib_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2019 ECMWF.
+ * (C) Copyright 2017- ECMWF.
  *
  * This software is licensed under the terms of the Apache Licence Version 2.0
  * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.