Skip to content

Commit 03be7fb

Browse files
committed
Merge branch 'develop'
2 parents c1d86a1 + c0de0c7 commit 03be7fb

File tree

8 files changed

+31
-5
lines changed

8 files changed

+31
-5
lines changed

.github/workflows/cd.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,12 @@ jobs:
2424
pypi:
2525
needs: [wheel-windows]
2626
uses: ecmwf/reusable-workflows/.github/workflows/cd-pypi.yml@v2
27+
with:
28+
env_vars: |
29+
{
30+
"DEPEND_ON_ECCODESLIB": "1"
31+
}
32+
buildargs: --no-isolation
2733
secrets: inherit
34+
2835

CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Changelog for eccodes-python
33
============================
44

5+
2.45.0 (2025-01-16)
6+
--------------------
7+
8+
- GitHub issue 372: Option "--no-binary" does not work
9+
See: `#372 <https://github.com/ecmwf/eccodes/issues/372>`_.
10+
- GitHub issue 145: test run fails
11+
See: `#145 <https://github.com/ecmwf/eccodes/issues/145>`_.
12+
513
2.44.0 (2025-10-03)
614
--------------------
715

MANIFEST.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include .dockerignore
22
include *.rst
3+
recursive-include eccodes *.md
34
include *.yml
45
include Dockerfile
56
include LICENSE
@@ -16,5 +17,8 @@ recursive-include docs *.rst
1617
recursive-include gribapi *.h
1718
recursive-include tests *.grib2
1819
recursive-include tests *.grib
20+
recursive-include tests *.bufr
21+
recursive-include tests *.items
22+
recursive-include tests *.attributes
1923
recursive-include tests *.ipynb
2024
recursive-include tests *.py

ci/requirements-docs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ sphinx==1.8.5
4444
# via -r requirements-docs.in
4545
sphinxcontrib-websupport==1.1.0
4646
# via sphinx
47-
urllib3==2.4.0
47+
urllib3==2.6.3
4848
# via requests

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
# the built documents.
4141
#
4242
# The full version, including alpha/beta/rc tags.
43-
release = pkg_resources.get_distribution("eccodes-python").version
43+
release = pkg_resources.get_distribution("eccodes").version
4444
# The short X.Y version.
4545
version = ".".join(release.split(".")[:2])
4646

gribapi/bindings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import cffi
2525

26-
__version__ = "2.44.0"
26+
__version__ = "2.45.0"
2727

2828
LOG = logging.getLogger(__name__)
2929

scripts/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ GIT_ECBUILD=https://github.com/ecmwf/ecbuild.git
1414
ECBUILD_VERSION=master
1515

1616
GIT_ECCODES=https://github.com/ecmwf/eccodes.git
17-
ECCODES_VERSION=2.44.0
17+
ECCODES_VERSION=2.45.0
1818
ECCODES_COMMON_CMAKE_OPTIONS="-DENABLE_PNG=1 -DENABLE_JPG=1 -DENABLE_NETCDF=0 -DENABLE_EXAMPLES=0"
1919

2020
GIT_AEC=https://github.com/MathisRosenhauer/libaec.git

setup.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import setuptools
1919

20+
binary = os.getenv("DEPEND_ON_ECCODESLIB", "") == "1"
21+
2022

2123
def read(path):
2224
file_path = os.path.join(os.path.dirname(__file__), *path.split("/"))
@@ -90,9 +92,14 @@ def shared(directory):
9092
"attrs",
9193
"cffi",
9294
"findlibs",
93-
"eccodeslib;platform_system!='Windows'",
9495
]
9596

97+
# only add eccodeslib as dependency if building a distribution that should depend on it
98+
if binary:
99+
install_requires += [
100+
"eccodeslib;platform_system!='Windows'",
101+
]
102+
96103
setuptools.setup(
97104
name="eccodes",
98105
version=parse_version_from("gribapi/bindings.py"),

0 commit comments

Comments
 (0)