From f8474541d519adb6aba5e2d8aef7fd5d155e7944 Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 26 Jan 2024 09:46:31 +0000 Subject: [PATCH 1/6] Add earthkit-plots --- docs/components_overview.rst | 3 +++ docs/conf.py | 4 ++++ docs/index.rst | 3 ++- setup.cfg | 3 ++- tests/environment-unit-tests.yml | 3 ++- tests/test_version.py | 20 +++++++++++++++++++- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/docs/components_overview.rst b/docs/components_overview.rst index 84468aa..2774803 100644 --- a/docs/components_overview.rst +++ b/docs/components_overview.rst @@ -23,3 +23,6 @@ This is the summary of the available ``earthkit`` components. * - :xref:`earthkit-meteo` - Meteorological computations. - + * - :xref:`earthkit-plots` + - Graph chart visualisation + - diff --git a/docs/conf.py b/docs/conf.py index 661beee..ef76b7c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,6 +73,10 @@ "earthkit-meteo", "https://earthkit-meteo.readthedocs.io", ), + "earthkit-plots": ( + "earthkit-plots", + "https://pypi.org/project/earthkit-plots", + ), "eccodes": ( "ecCodes", "https://confluence.ecmwf.int/display/ECC/ecCodes+Home", diff --git a/docs/index.rst b/docs/index.rst index c0f1577..ea21e9f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -11,7 +11,7 @@ Welcome to earthkit's documentation The interface of :ref:`earthkit components ` is designed to be high-level in order to provide common tools to support activities across ECMWF and beyond. The design of the components also takes **scalability** into account, so researchers can enjoy efficiency whilst providing easier transfer to operations. -**earthkit** is still under development, but three components, :xref:`earthkit-data`, :xref:`earthkit-maps` and :xref:`earthkit-meteo` are now available in beta through PyPI and their GitHub repositories. +**earthkit** is still under development, but 4 components, :xref:`earthkit-data`, :xref:`earthkit-maps` , :xref:`earthkit-meteo` and :xref:`earthkit-plots` and are now available in beta through PyPI and their GitHub repositories. .. .. toctree:: .. :maxdepth: 1 @@ -29,6 +29,7 @@ The interface of :ref:`earthkit components ` is designed to be high- earthkit-data earthkit-maps earthkit-meteo + earthkit-plots .. toctree:: :maxdepth: 1 diff --git a/setup.cfg b/setup.cfg index f311334..0fb4106 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,8 +25,9 @@ python-requires = >=3.8 packages = find_namespace: install_requires = earthkit-data - earthkit-maps + earthkit-maps>=0.0.13 earthkit-meteo>=0.0.1 + earthkit-plots>=0.0.3 [options.packages.find] include = earthkit, earthkit.* diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 688aebc..66436a2 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -9,5 +9,6 @@ dependencies: - pytest-cov - geos - pip: - - earthkit-maps + - earthkit-maps>=0.0.13 - earthkit-meteo>=0.0.1 + - earthkit-plots>=0.0.3 diff --git a/tests/test_version.py b/tests/test_version.py index 3ee75af..39baef6 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -33,12 +33,18 @@ def test_earthkit_data_version_2(): assert VERSION_RX.match(data.__version__) is not None -def test_earthkit_maps_version(): +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 @@ -49,3 +55,15 @@ def test_earthkit_meteo_version_2(): from earthkit import meteo # noqa assert VERSION_RX.match(meteo.__version__) is not None + + +def test_earthkit_plots_version_1(): + import earthkit.plots # noqa + + assert VERSION_RX.match(earthkit.plots.__version__) is not None + + +def test_earthkit_plots_version_2(): + from earthkit import plots # noqa + + assert VERSION_RX.match(plots.__version__) is not None From 0a5bddb67a853c7c02c2fef2f6b5616969218e1a Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 26 Jan 2024 10:08:46 +0000 Subject: [PATCH 2/6] Add earthkit-plots --- setup.cfg | 2 +- tests/environment-unit-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 0fb4106..1e711dd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ install_requires = earthkit-data earthkit-maps>=0.0.13 earthkit-meteo>=0.0.1 - earthkit-plots>=0.0.3 + earthkit-plots>=0.0.4 [options.packages.find] include = earthkit, earthkit.* diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 66436a2..9fb2856 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -11,4 +11,4 @@ dependencies: - pip: - earthkit-maps>=0.0.13 - earthkit-meteo>=0.0.1 - - earthkit-plots>=0.0.3 + - earthkit-plots>=0.0.4 From 163e10d337e48de8a4b20e905c9e827127027128 Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 26 Jan 2024 11:13:05 +0000 Subject: [PATCH 3/6] Add earthkit-plots --- setup.cfg | 2 +- tests/environment-unit-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1e711dd..ccd846f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ install_requires = earthkit-data earthkit-maps>=0.0.13 earthkit-meteo>=0.0.1 - earthkit-plots>=0.0.4 + earthkit-plots>=0.0.5 [options.packages.find] include = earthkit, earthkit.* diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 9fb2856..7caec88 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -11,4 +11,4 @@ dependencies: - pip: - earthkit-maps>=0.0.13 - earthkit-meteo>=0.0.1 - - earthkit-plots>=0.0.4 + - earthkit-plots>=0.0.5 From d8aea55c2bce52912afd751530b11d00e6f4efd6 Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 26 Jan 2024 12:21:08 +0000 Subject: [PATCH 4/6] Add earthkit-plots --- setup.cfg | 4 ++-- tests/environment-unit-tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index ccd846f..5219f59 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,10 +24,10 @@ test_suite = tests python-requires = >=3.8 packages = find_namespace: install_requires = - earthkit-data + earthkit-data>=0.5.0 earthkit-maps>=0.0.13 earthkit-meteo>=0.0.1 - earthkit-plots>=0.0.5 + earthkit-plots>=0.0.6 [options.packages.find] include = earthkit, earthkit.* diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 7caec88..dd2c612 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -3,12 +3,12 @@ channels: - conda-forge - nodefaults dependencies: -- earthkit-data - pip - pytest - pytest-cov - geos - pip: + - earthkit-data>=0.5.0 - earthkit-maps>=0.0.13 - earthkit-meteo>=0.0.1 - - earthkit-plots>=0.0.5 + - earthkit-plots>=0.0.6 From 942b0fca6bcb384e3aed9aafcbfbcc26b8f5a5c9 Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 26 Jan 2024 14:22:25 +0000 Subject: [PATCH 5/6] Add earthkit-plots --- setup.cfg | 2 +- tests/environment-unit-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5219f59..eef8fb1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ test_suite = tests python-requires = >=3.8 packages = find_namespace: install_requires = - earthkit-data>=0.5.0 + earthkit-data>=0.5.1 earthkit-maps>=0.0.13 earthkit-meteo>=0.0.1 earthkit-plots>=0.0.6 diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index dd2c612..fc983de 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -3,12 +3,12 @@ channels: - conda-forge - nodefaults dependencies: +- earthkit-data>=0.5.1 - pip - pytest - pytest-cov - geos - pip: - - earthkit-data>=0.5.0 - earthkit-maps>=0.0.13 - earthkit-meteo>=0.0.1 - earthkit-plots>=0.0.6 From 506107d4922d3ac343825158dcbbf62e81498dc5 Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 26 Jan 2024 14:29:17 +0000 Subject: [PATCH 6/6] Add earthkit-plots --- environment.yml | 5 +++-- tests/environment-unit-tests.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index 7f1fabe..08c9b77 100644 --- a/environment.yml +++ b/environment.yml @@ -3,8 +3,9 @@ channels: - conda-forge - nodefaults dependencies: -- earthkit-data +- earthkit-data>=0.5.1 - geos - pip: - - earthkit-maps + - earthkit-maps>=0.0.13 - earthkit-meteo>=0.0.1 + - earthkit-plots>=0.0.6 diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index fc983de..77560fa 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -3,12 +3,12 @@ channels: - conda-forge - nodefaults dependencies: -- earthkit-data>=0.5.1 - pip - pytest - pytest-cov - geos - pip: + - earthkit-data>=0.5.1 - earthkit-maps>=0.0.13 - earthkit-meteo>=0.0.1 - earthkit-plots>=0.0.6