From 0c79441ba61bd90913f161727d6b1187df54cae1 Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 26 Apr 2024 14:33:24 +0100 Subject: [PATCH] Add earthkit-geo --- docs/components_overview.rst | 3 +++ docs/conf.py | 4 ++++ docs/index.rst | 1 + environment.yml | 3 ++- setup.cfg | 3 ++- tests/environment-unit-tests.yml | 3 ++- tests/test_version.py | 12 ++++++++++++ 7 files changed, 26 insertions(+), 3 deletions(-) diff --git a/docs/components_overview.rst b/docs/components_overview.rst index 4b53093..662e528 100644 --- a/docs/components_overview.rst +++ b/docs/components_overview.rst @@ -16,6 +16,9 @@ This is the summary of the available ``earthkit`` components. - Format-agnostic Python interface for geospatial data with a focus on meteorology and climate science. - .. image:: https://raw.githubusercontent.com/ecmwf/earthkit-data/main/docs/_static/earthkit-data.png :width: 120px + * - :xref:`earthkit-geo` + - Geospatial computations + - * - :xref:`earthkit-maps` - Geospatial visualisation tools and templates. - .. image:: https://raw.githubusercontent.com/ecmwf/earthkit-maps/develop/docs/_static/earthkit-maps.png diff --git a/docs/conf.py b/docs/conf.py index f9b95fd..b496764 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -65,6 +65,10 @@ "earthkit-data", "https://earthkit-data.readthedocs.io", ), + "earthkit-geo": ( + "earthkit-geo", + "https://earthkit-geo.readthedocs.io", + ), "earthkit-maps": ( "earthkit-maps", "https://earthkit-maps.readthedocs.io", diff --git a/docs/index.rst b/docs/index.rst index 00454b5..15a889c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -27,6 +27,7 @@ The interface of :ref:`earthkit components ` is designed to be high- components_overview earthkit-data + earthkit-geo earthkit-maps earthkit-meteo earthkit-plots diff --git a/environment.yml b/environment.yml index f93c209..24417eb 100644 --- a/environment.yml +++ b/environment.yml @@ -7,6 +7,7 @@ dependencies: - geos - pip: - earthkit-maps>=0.0.18 - - earthkit-meteo>=0.0.1 + - earthkit-geo>=0.1.0 + - earthkit-meteo>=0.1.0 - earthkit-plots>=0.0.6 - earthkit-regrid>=0.3.0 diff --git a/setup.cfg b/setup.cfg index 251b698..3a9cbe8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,8 +25,9 @@ python-requires = >=3.8 packages = find_namespace: install_requires = earthkit-data[all]>=0.7.0 + earthkit-geo>=0.1.0 earthkit-maps>=0.0.18 - earthkit-meteo>=0.0.1 + earthkit-meteo>=0.1.0 earthkit-plots>=0.0.6 earthkit-regrid>=0.3.0 diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 2ac7176..7e28eda 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -9,7 +9,8 @@ dependencies: - geos - pip: - earthkit-data[all]>=0.7.0 + - earthkit-geo>=0.1.0 - earthkit-maps>=0.0.18 - - earthkit-meteo>=0.0.1 + - earthkit-meteo>=0.1.0 - earthkit-plots>=0.0.6 - earthkit-regrid>=0.3.0 diff --git a/tests/test_version.py b/tests/test_version.py index bc210ec..674ce9a 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -33,6 +33,18 @@ def test_earthkit_data_version_2(): assert VERSION_RX.match(data.__version__) is not None +def test_earthkit_geo_version_1(): + import earthkit.geo # noqa + + assert VERSION_RX.match(earthkit.geo.__version__) is not None + + +def test_earthkit_geo_version_2(): + from earthkit import geo # noqa + + assert VERSION_RX.match(geo.__version__) is not None + + def test_earthkit_maps_version_1(): import earthkit.maps # noqa