Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a4bad51
remove dead code and unused imports
jennan May 22, 2025
daaf681
remove a level of folder nesting, make ERA5 valid variables a list
jennan May 22, 2025
aa6c854
replace global object with loading function
jennan May 23, 2025
e7d952f
remove unused function
jennan May 23, 2025
a7be88d
precompute reverse name mapping and create variable list from them
jennan May 23, 2025
38ba4fa
drop unused variables instead of filtering after loading everything
jennan May 23, 2025
7d1083d
reformat with ruff
jennan May 23, 2025
da92f92
use set to lower complexity of repeatedly searching in an list
jennan May 25, 2025
87727ec
move all ARCOERA5 code in one module
jennan May 25, 2025
e72d137
small reformating
jennan May 25, 2025
e12023a
load all variables by default, expose variables and levels in public API
jennan May 26, 2025
33fac3f
Merge branch 'ACCESS-Community-Hub:develop' into refactor_arco
jennan May 26, 2025
e938eba
fix formatting error making pre-commit fail
jennan May 26, 2025
43337a3
add tests for ARCOERA5 class, mark heavy ones as slow
jennan May 27, 2025
aa4d87c
add test to check variable renaming
jennan May 27, 2025
f15a031
fix formatting
jennan May 27, 2025
dbb1f05
exclude slow tests from CI workflow
jennan May 27, 2025
d6058a9
add ARCOERA5 class to the documentation
jennan May 27, 2025
95635ff
add arcoera5 constants to the API documentation
jennan May 27, 2025
b5e3a19
remove space in flag to skip slow tests
jennan May 27, 2025
d1eeba9
Merge branch 'ACCESS-Community-Hub:develop' into refactor_arco
jennan May 29, 2025
3f6f334
replace "slow" pytest mark with more explicit "noci" mark
jennan Jun 3, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
pip install -e packages/nci_site_archive
pip install -e .[test,docs]

pytest --cov=packages/data --cov=packages/utils --cov=packages/pipeline --cov=packages/training --cov=packages/zoo --cov=packages/bundled_models/fourcastnext --cov=packages/nci_site_archive
pytest -m="not noci" --cov=packages/data --cov=packages/utils --cov=packages/pipeline --cov=packages/training --cov=packages/zoo --cov=packages/bundled_models/fourcastnext --cov=packages/nci_site_archive
- name: Coveralls GitHub Action
uses: coverallsapp/github-action@v2.3.0
with:
Expand Down
12 changes: 12 additions & 0 deletions docs/api/data/data_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@

```

## `data.download`

```{eval-rst}
.. autoclass:: pyearthtools.data.download.arcoera5.ARCOERA5
:members:
.. autodata:: pyearthtools.data.download.arcoera5.LEVELS
.. autodata:: pyearthtools.data.download.arcoera5.LONG_NAMES
:no-value:
.. autodata:: pyearthtools.data.download.arcoera5.SHORT_NAMES
:no-value:
```

## `data.indexes`

```{eval-rst}
Expand Down
1 change: 1 addition & 0 deletions docs/api/data/data_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ The rest of this page contains reference information for the components of the D
| | | - [TimeDerivedValue](data_api.md#pyearthtools.data.derived.TimeDerivedValue) |
| | | - [AdvancedTimeDerivedValue](data_api.md#pyearthtools.data.derived.AdvancedTimeDerivedValue) |
| | | - [Insolation](data_api.md#pyearthtools.data.derived.Insolation) |
| `data.download` | Publicly available datasets | - [ARCOERA5](data_api.md#pyearthtools.data.download.arcoera5.ARCOERA5) |
| `data.indexes` | | - [Index](data_api.md#pyearthtools.data.indexes.Index) |
| | | - [DataIndex](data_api.md#pyearthtools.data.indexes.DataIndex) |
| | | - [FileSystemIndex](data_api.md#pyearthtools.data.indexes.FileSystemIndex) |
Expand Down
4 changes: 2 additions & 2 deletions packages/data/src/pyearthtools/data/archive/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ def auto_import() -> None:
def post_import():
"""Run post importing of archives"""
if not hasattr(archive, "ERA5_ARCO"):
from pyearthtools.data.download import arco
from pyearthtools.data.download import arcoera5

setattr(archive, "ERA5_ARCO", arco.ERA5)
setattr(archive, "ERA5_ARCO", arcoera5.ARCOERA5)


__all__ = ["auto_import"]
4 changes: 2 additions & 2 deletions packages/data/src/pyearthtools/data/download/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
| `DownloadIndex` | Base download index. `download` must be implemented. |
| `cds` | Copernicus Data Store Access |
| `opendata` | ECMWF Opendata |
| `arco` | Analysis-Ready, Cloud Optimized by Google |
| `arcoera5` | Analysis-Ready, Cloud Optimized ERA5 by Google |

"""

from pyearthtools.data.download.templates import DownloadIndex
from pyearthtools.data.download import cds, arco
from pyearthtools.data.download import cds, arcoera5
from pyearthtools.data.download import ecmwf_opendata as opendata
184 changes: 0 additions & 184 deletions packages/data/src/pyearthtools/data/download/arco/ERA5.py

This file was deleted.

18 changes: 0 additions & 18 deletions packages/data/src/pyearthtools/data/download/arco/__init__.py

This file was deleted.

Loading
Loading