Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge develop into main for release 0.8.0 #67

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Merge develop into main for release 0.8.0 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions docs/components_overview.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 1 addition & 5 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ The interface of :ref:`earthkit components <components>` is designed to be high-
components_overview
earthkit-data <https://earthkit-data.readthedocs.io>
earthkit-geo <https://earthkit-geo.readthedocs.io>
earthkit-maps <https://earthkit-maps.readthedocs.io>
earthkit-meteo <https://earthkit-meteo.readthedocs.io>
earthkit-plots <https://pypi.org/project/earthkit-plots>
earthkit-plots <https://earthkit-plots.readthedocs.io>
earthkit-regrid <https://earthkit-regrid.readthedocs.io>
earthkit-transforms <https://earthkit-transforms.readthedocs.io>

Expand Down
5 changes: 2 additions & 3 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions src/earthkit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +26,6 @@
__all__ = [
"data",
"geo",
"maps",
"meteo",
"plots",
"regrid",
Expand Down
5 changes: 2 additions & 3 deletions tests/environment-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 0 additions & 12 deletions tests/test_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading