Merge branch 'develop'

CHANGELOG.rst

@@ -2,6 +2,12 @@
 Changelog for eccodes-python
 ============================
 
+2.40.0 (2025-02-12)
+--------------------
+
+- Update version to be the same as the ecCodes library
+
+
 2.39.2 (2025-01-27)
 --------------------
 

README.rst

@@ -24,9 +24,11 @@ Limitations:
 Installation
 ============
 
-**From version 2.37.0, the ecCodes Python bindings additionally provide the ecCodes binary library, and will
+**From version 2.37.0, the ecCodes Python bindings on PyPi additionally provide the ecCodes binary library, and will
 follow the version numbering of the ecCodes binary library. See below for details.**
 
+Installation from PyPI
+----------------------
 
 The package can be installed from PyPI with::
 
@@ -40,30 +42,37 @@ set the following environment variable before you import eccodes::
 
 If this is set, the ecCodes' Python bindings will use the `findlibs <https://github.com/ecmwf/findlibs>`_ package
 to locate the binary library (findlibs was the only mechanism used before version 2.37.0).
-
-In order to gain insights into the search for the binary library, set the following environment variable before
-importing eccodes::
-
-    $ export ECCODES_PYTHON_TRACE_LIB_SEARCH=1
 
 You may also install a version of ecCodes' Python interface that does not include a binary library at all,
 in which case the findlibs mechanism will be used as before::
 
     $ pip install eccodes --no-binary eccodes
 
+See also 'Debugging the library search', below.
+
+
+Installation from conda
+-----------------------
+
+ecCodes' Python bindings can be installed from the `conda-forge <https://conda-forge.org/>`_ channel with::
+
+    $ conda install -c conda-forge python-eccodes
+
+This will install the Python bindings (`python-eccodes`) and also the ecCodes binary library (`eccodes`) on which they depend.
+
 
 System dependencies
 -------------------
 
-The Python module depends on the ECMWF *ecCodes* library. From version 2.37.0, this is supplied with
-the Python module. If you wish to install and use a separate binary library (see above), it
-must be installed on the system and accessible as a shared library.
+The Python module depends on the ECMWF *ecCodes* binary library. From version 2.37.0, this library is supplied with
+the Python module on both PyPi and conda, as described above. If you wish to install and use a separate binary library
+(see above), it must be installed on the system and accessible as a shared library.
 
 On a MacOS with HomeBrew use::
 
     $ brew install eccodes
 
-Or if you manage binary packages with *Conda* use::
+Or if you manage binary packages with *Conda* but use Python bindings from elsewhere, use::
 
     $ conda install -c conda-forge eccodes
 
@@ -78,6 +87,15 @@ You may run a simple selfcheck command to ensure that your system is set up corr
     Your system is ready.
 
 
+Debugging the library search
+----------------------------
+
+In order to gain insights into the search for the binary library, set the following environment variable before
+importing eccodes::
+
+    $ export ECCODES_PYTHON_TRACE_LIB_SEARCH=1
+
+
 Usage
 -----
 

gribapi/bindings.py

@@ -23,7 +23,7 @@
 
 import cffi
 
-__version__ = "2.39.2"
+__version__ = "2.40.0"
 
 LOG = logging.getLogger(__name__)
 

scripts/common.sh

@@ -14,7 +14,7 @@ GIT_ECBUILD=https://github.com/ecmwf/ecbuild.git
 ECBUILD_VERSION=master
 
 GIT_ECCODES=https://github.com/ecmwf/eccodes.git
-ECCODES_VERSION=2.39.2
+ECCODES_VERSION=2.40.0
 ECCODES_COMMON_CMAKE_OPTIONS="-DENABLE_PNG=1 -DENABLE_JPG=1 -DENABLE_NETCDF=0 -DENABLE_EXAMPLES=0"
 
 GIT_AEC=https://github.com/MathisRosenhauer/libaec.git