Skip to content

Commit

Permalink
Merge pull request #65 from ecmwf/develop
Browse files Browse the repository at this point in the history
Merge develop into main fro release 0.7.0
  • Loading branch information
sandorkertesz authored Sep 3, 2024
2 parents 00e25c9 + 12ca9f1 commit d4a2ee4
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 13 deletions.
3 changes: 3 additions & 0 deletions docs/components_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ This is the summary of the available ``earthkit`` components.
* - :xref:`earthkit-regrid`
- Regridding of geospatial data.
-
* - :xref:`earthkit-transforms`
- Aggregation and transformation of geospatial data.
-
4 changes: 4 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@
"earthkit-regrid",
"https://earthkit-regrid.readthedocs.io",
),
"earthkit-transforms": (
"earthkit-transforms",
"https://earthkit-transforms.readthedocs.io",
),
"eccodes": (
"ecCodes",
"https://confluence.ecmwf.int/display/ECC/ecCodes+Home",
Expand Down
1 change: 1 addition & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ The interface of :ref:`earthkit components <components>` is designed to be high-
earthkit-meteo <https://earthkit-meteo.readthedocs.io>
earthkit-plots <https://pypi.org/project/earthkit-plots>
earthkit-regrid <https://earthkit-regrid.readthedocs.io>
earthkit-transforms <https://earthkit-transforms.readthedocs.io>

.. toctree::
:maxdepth: 1
Expand Down
8 changes: 4 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ channels:
- conda-forge
- nodefaults
dependencies:
- numpy<2.0.0
- earthkit-data>=0.9.4
- earthkit-data>=0.10.0
- geos
- pip:
- earthkit-maps>=0.0.19
- earthkit-geo>=0.2.0
- earthkit-meteo>=0.1.0
- earthkit-plots>=0.1.2
- earthkit-meteo>=0.1.1
- earthkit-plots>=0.2.0
- earthkit-regrid>=0.3.2
- earthkit-transforms>=0.3.3
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ classifiers = [
"Operating System :: OS Independent"
]
dependencies = [
"numpy<2.0.0",
"earthkit-data[all]>=0.9.4",
"earthkit-data[all]>=0.10.0",
"earthkit-geo>=0.2.0",
"earthkit-maps>=0.0.19",
"earthkit-meteo>=0.1.0",
"earthkit-plots>=0.1.2",
"earthkit-regrid>=0.3.2"
"earthkit-meteo>=0.1.1",
"earthkit-plots>=0.2.0",
"earthkit-regrid>=0.3.2",
"earthkit-transforms>=0.3.3"
]
description = "A format-agnostic Python interface for geospatial data"
dynamic = ["version"]
Expand Down
2 changes: 2 additions & 0 deletions src/earthkit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import earthkit.meteo as meteo
import earthkit.plots as plots
import earthkit.regrid as regrid
import earthkit.transforms as transforms

__all__ = [
"data",
Expand All @@ -30,5 +31,6 @@
"meteo",
"plots",
"regrid",
"transforms",
"__version__",
]
8 changes: 4 additions & 4 deletions tests/environment-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ dependencies:
- pip
- pytest
- pytest-cov
- numpy<2.0.0
- geos
- pip:
- earthkit-data[all]>=0.9.4
- earthkit-data[all]>=0.10.0
- earthkit-geo>=0.2.0
- earthkit-maps>=0.0.19
- earthkit-meteo>=0.1.0
- earthkit-plots>=0.1.2
- earthkit-meteo>=0.1.1
- earthkit-plots>=0.2.0
- earthkit-regrid>=0.3.2
- earthkit-transforms>=0.3.3
12 changes: 12 additions & 0 deletions tests/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,15 @@ def test_earthkit_regrid_version_2():
from earthkit import regrid # noqa

assert VERSION_RX.match(regrid.__version__) is not None


def test_earthkit_transforms_version_1():
import earthkit.transforms # noqa

assert VERSION_RX.match(earthkit.transforms.__version__) is not None


def test_earthkit_transforms_version_2():
from earthkit import transforms # noqa

assert VERSION_RX.match(transforms.__version__) is not None

0 comments on commit d4a2ee4

Please sign in to comment.