diff --git a/docs/components_overview.rst b/docs/components_overview.rst index 2774803..4b53093 100644 --- a/docs/components_overview.rst +++ b/docs/components_overview.rst @@ -24,5 +24,8 @@ This is the summary of the available ``earthkit`` components. - Meteorological computations. - * - :xref:`earthkit-plots` - - Graph chart visualisation + - Graph chart visualisation. + - + * - :xref:`earthkit-regrid` + - Regridding of geospatial data. - diff --git a/docs/conf.py b/docs/conf.py index ef76b7c..f9b95fd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -77,6 +77,10 @@ "earthkit-plots", "https://pypi.org/project/earthkit-plots", ), + "earthkit-regrid": ( + "earthkit-regrid", + "https://earthkit-regrid.readthedocs.io", + ), "eccodes": ( "ecCodes", "https://confluence.ecmwf.int/display/ECC/ecCodes+Home", diff --git a/docs/index.rst b/docs/index.rst index a6e456f..00454b5 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 4 components, :xref:`earthkit-data`, :xref:`earthkit-maps` , :xref:`earthkit-meteo` and :xref:`earthkit-plots` are now available in beta through PyPI and their GitHub repositories. +**earthkit** is still under development but some components are already available in beta through PyPI and their GitHub repositories. .. .. toctree:: .. :maxdepth: 1 @@ -30,6 +30,7 @@ The interface of :ref:`earthkit components ` is designed to be high- earthkit-maps earthkit-meteo earthkit-plots + earthkit-regrid .. toctree:: :maxdepth: 1 diff --git a/earthkit/__init__.py b/earthkit/__init__.py index d39b324..1c61efa 100644 --- a/earthkit/__init__.py +++ b/earthkit/__init__.py @@ -19,11 +19,14 @@ import earthkit.data as data import earthkit.maps as maps import earthkit.meteo as meteo +import earthkit.plots as plots +import earthkit.regrid as regrid __all__ = [ "data", "maps", "meteo", - # "regrid", + "plots", + "regrid", "__version__", ] diff --git a/environment.yml b/environment.yml index c48664d..03173cd 100644 --- a/environment.yml +++ b/environment.yml @@ -3,9 +3,10 @@ channels: - conda-forge - nodefaults dependencies: -- earthkit-data>=0.5.4 +- earthkit-data>=0.5.5 - geos - pip: - earthkit-maps>=0.0.17 - earthkit-meteo>=0.0.1 - earthkit-plots>=0.0.6 + - earthkit-regrid>=0.2.1 diff --git a/setup.cfg b/setup.cfg index 19e6bea..54de110 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,10 +24,11 @@ test_suite = tests python-requires = >=3.8 packages = find_namespace: install_requires = - earthkit-data>=0.5.4 + earthkit-data>=0.5.5 earthkit-maps>=0.0.17 earthkit-meteo>=0.0.1 earthkit-plots>=0.0.6 + earthkit-regrid>=0.2.1 [options.packages.find] include = earthkit, earthkit.* diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 32fa103..e351239 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -8,7 +8,8 @@ dependencies: - pytest-cov - geos - pip: - - earthkit-data>=0.5.4 + - earthkit-data>=0.5.5 - earthkit-maps>=0.0.17 - earthkit-meteo>=0.0.1 - earthkit-plots>=0.0.6 + - earthkit-regrid>=0.2.1 diff --git a/tests/test_version.py b/tests/test_version.py index 39baef6..bc210ec 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -67,3 +67,15 @@ def test_earthkit_plots_version_2(): from earthkit import plots # noqa assert VERSION_RX.match(plots.__version__) is not None + + +def test_earthkit_regrid_version_1(): + import earthkit.regrid # noqa + + assert VERSION_RX.match(earthkit.regrid.__version__) is not None + + +def test_earthkit_regrid_version_2(): + from earthkit import regrid # noqa + + assert VERSION_RX.match(regrid.__version__) is not None