From 52885d80080b0f26ecb142bce67080901e38b945 Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Thu, 12 Sep 2024 14:06:10 +0100 Subject: [PATCH] Remove earthkit-maps (#66) --- docs/components_overview.rst | 6 +----- docs/conf.py | 6 +----- docs/index.rst | 3 +-- environment.yml | 5 ++--- pyproject.toml | 5 ++--- src/earthkit/__init__.py | 2 -- tests/environment-unit-tests.yml | 5 ++--- tests/test_version.py | 12 ------------ 8 files changed, 9 insertions(+), 35 deletions(-) diff --git a/docs/components_overview.rst b/docs/components_overview.rst index f1a9532..fbdfedd 100644 --- a/docs/components_overview.rst +++ b/docs/components_overview.rst @@ -19,15 +19,11 @@ This is the summary of the available ``earthkit`` components. * - :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 - :width: 120px * - :xref:`earthkit-meteo` - Meteorological computations. - * - :xref:`earthkit-plots` - - Graph chart visualisation. + - Visualisation tools and templates - * - :xref:`earthkit-regrid` - Regridding of geospatial data. diff --git a/docs/conf.py b/docs/conf.py index 275c1b6..8590b1a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -69,17 +69,13 @@ "earthkit-geo", "https://earthkit-geo.readthedocs.io", ), - "earthkit-maps": ( - "earthkit-maps", - "https://earthkit-maps.readthedocs.io", - ), "earthkit-meteo": ( "earthkit-meteo", "https://earthkit-meteo.readthedocs.io", ), "earthkit-plots": ( "earthkit-plots", - "https://pypi.org/project/earthkit-plots", + "https://earthkit-plots.readthedocs.io", ), "earthkit-regrid": ( "earthkit-regrid", diff --git a/docs/index.rst b/docs/index.rst index e699f1a..3c255a2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -28,9 +28,8 @@ The interface of :ref:`earthkit components ` is designed to be high- components_overview earthkit-data earthkit-geo - earthkit-maps earthkit-meteo - earthkit-plots + earthkit-plots earthkit-regrid earthkit-transforms diff --git a/environment.yml b/environment.yml index 9857e29..3b839ab 100644 --- a/environment.yml +++ b/environment.yml @@ -3,12 +3,11 @@ channels: - conda-forge - nodefaults dependencies: -- earthkit-data>=0.10.0 +- earthkit-data>=0.10.2 - geos - pip: - - earthkit-maps>=0.0.19 - earthkit-geo>=0.2.0 - earthkit-meteo>=0.1.1 - earthkit-plots>=0.2.0 - - earthkit-regrid>=0.3.2 + - earthkit-regrid>=0.3.4 - earthkit-transforms>=0.3.3 diff --git a/pyproject.toml b/pyproject.toml index 2775b1c..5a81bd2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,12 +19,11 @@ classifiers = [ "Operating System :: OS Independent" ] dependencies = [ - "earthkit-data[all]>=0.10.0", + "earthkit-data[all]>=0.10.2", "earthkit-geo>=0.2.0", - "earthkit-maps>=0.0.19", "earthkit-meteo>=0.1.1", "earthkit-plots>=0.2.0", - "earthkit-regrid>=0.3.2", + "earthkit-regrid>=0.3.4", "earthkit-transforms>=0.3.3" ] description = "A format-agnostic Python interface for geospatial data" diff --git a/src/earthkit/__init__.py b/src/earthkit/__init__.py index 394b27e..84aa07e 100644 --- a/src/earthkit/__init__.py +++ b/src/earthkit/__init__.py @@ -18,7 +18,6 @@ import earthkit.data as data import earthkit.geo as geo -import earthkit.maps as maps import earthkit.meteo as meteo import earthkit.plots as plots import earthkit.regrid as regrid @@ -27,7 +26,6 @@ __all__ = [ "data", "geo", - "maps", "meteo", "plots", "regrid", diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 377bb69..1d23f71 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -8,10 +8,9 @@ dependencies: - pytest-cov - geos - pip: - - earthkit-data[all]>=0.10.0 + - earthkit-data[all]>=0.10.2 - earthkit-geo>=0.2.0 - - earthkit-maps>=0.0.19 - earthkit-meteo>=0.1.1 - earthkit-plots>=0.2.0 - - earthkit-regrid>=0.3.2 + - earthkit-regrid>=0.3.4 - earthkit-transforms>=0.3.3 diff --git a/tests/test_version.py b/tests/test_version.py index 463c097..006bf3d 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -45,18 +45,6 @@ def test_earthkit_geo_version_2(): assert VERSION_RX.match(geo.__version__) is not None -def test_earthkit_maps_version_1(): - import earthkit.maps # noqa - - assert VERSION_RX.match(earthkit.maps.__version__) is not None - - -def test_earthkit_maps_version_2(): - from earthkit import maps # noqa - - assert VERSION_RX.match(maps.__version__) is not None - - def test_earthkit_meteo_version_1(): import earthkit.meteo # noqa