Skip to content

Commit 3548176

Browse files
sandorkerteszsandorkertesz
authored
Merge pull request #370 from ecmwf/develop
Merge develop into main for release 0.7.0
2 parents e0effd7 + 99eace2 commit 3548176

File tree

182 files changed

+11683
-3352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+11683
-3352
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ docs/examples/_*
214214
docs/examples/earthkit_use_cases/*.grib
215215
docs/examples/_fdb
216216
docs/examples/*.db
217+
docs/examples/*.json
218+
docs/examples/*.geojson
217219

218220
# PyBuilder
219221
.pybuilder/

‎Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ qa:
1212
pre-commit run --all-files
1313

1414
unit-tests:
15-
python -m pytest -vv -m 'not notebook and not no_cache_init and not plugin' --cov=. --cov-report=$(COV_REPORT)
15+
python -m pytest -vv -m 'not notebook and not no_cache_init' --cov=. --cov-report=$(COV_REPORT)
1616
python -m pytest -v -m "notebook"
1717
python -m pytest --forked -vv -m 'no_cache_init'
18-
python -m pytest -v -m "plugin"
1918

2019
# type-check:
2120
# python -m mypy .

‎docs/conf.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@
9292

9393
xref_links = {
9494
"cfgrib": ("cfgirb", "https://github.com/ecmwf/cfgrib"),
95+
"earthkit": ("earthkit", "https://earthkit.readthedocs.io/en/latest/"),
96+
"earthkit-geo": (
97+
"earthkit-geo",
98+
"https://earthkit-geo.readthedocs.io/en/latest/",
99+
),
95100
"earthkit-regrid": (
96101
"earthkit-regrid",
97102
"https://earthkit-regrid.readthedocs.io/en/latest/",

‎docs/development.rst

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,19 @@ To run the test suite, you can use the following command:
3636

3737
.. code-block:: shell
3838
39-
pytest
39+
make unit-tests
40+
41+
Please note this will not run any of the tests based on remote services e.g. :ref:`data-sources-mars`. These are disabled by default because they can take a very long time to complete or just hang. To enable all these tests you need to run:
42+
43+
.. code-block:: shell
44+
45+
pytest -E long -v
46+
47+
If just want to run e.g. the :ref:`data-sources-cds` tests you can use:
48+
49+
.. code-block:: shell
50+
51+
pytest -E long -v -k cds
4052
4153
4254
Build documentation

‎docs/examples.rst

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎docs/examples/ads.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tags": []
1212
},
1313
"source": [
14-
"## Retrieving CAMS data from the ADS"
14+
"## Retrieving data from the ADS"
1515
]
1616
},
1717
{

‎docs/examples/bufr_synop.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tags": []
1212
},
1313
"source": [
14-
"## Using BUFR SYNOP data"
14+
"## BUFR: using SYNOP data"
1515
]
1616
},
1717
{

‎docs/examples/bufr_temp.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tags": []
1212
},
1313
"source": [
14-
"## Using BUFR TEMP data"
14+
"## BUFR: using TEMP data"
1515
]
1616
},
1717
{

‎docs/examples/cds.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tags": []
1212
},
1313
"source": [
14-
"## Retrieving ERA5 data from the CDS"
14+
"## Retrieving data from the CDS"
1515
]
1616
},
1717
{

‎docs/examples/grib_from_stream.ipynb renamed to ‎docs/examples/data_from_stream.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tags": []
1212
},
1313
"source": [
14-
"## Reading GRIB from a stream"
14+
"## Reading data from a stream"
1515
]
1616
},
1717
{

‎docs/examples/ecmwf_open_data.ipynb

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
"ds = earthkit.data.from_source(\"ecmwf-open-data\", \n",
5656
" param=[\"t\", \"gh\"],\n",
5757
" levelist=\"500\",\n",
58-
" step=[0,6,12])"
58+
" step=[0, 24, 48]\n",
59+
" )"
5960
]
6061
},
6162
{
@@ -104,8 +105,8 @@
104105
" <td>t</td>\n",
105106
" <td>isobaricInhPa</td>\n",
106107
" <td>500</td>\n",
107-
" <td>20230630</td>\n",
108-
" <td>600</td>\n",
108+
" <td>20240306</td>\n",
109+
" <td>0</td>\n",
109110
" <td>0</td>\n",
110111
" <td>fc</td>\n",
111112
" <td>None</td>\n",
@@ -117,8 +118,8 @@
117118
" <td>gh</td>\n",
118119
" <td>isobaricInhPa</td>\n",
119120
" <td>500</td>\n",
120-
" <td>20230630</td>\n",
121-
" <td>600</td>\n",
121+
" <td>20240306</td>\n",
122+
" <td>0</td>\n",
122123
" <td>0</td>\n",
123124
" <td>fc</td>\n",
124125
" <td>None</td>\n",
@@ -130,9 +131,9 @@
130131
" <td>t</td>\n",
131132
" <td>isobaricInhPa</td>\n",
132133
" <td>500</td>\n",
133-
" <td>20230630</td>\n",
134-
" <td>600</td>\n",
135-
" <td>6</td>\n",
134+
" <td>20240306</td>\n",
135+
" <td>0</td>\n",
136+
" <td>24</td>\n",
136137
" <td>fc</td>\n",
137138
" <td>None</td>\n",
138139
" <td>regular_ll</td>\n",
@@ -143,9 +144,9 @@
143144
" <td>gh</td>\n",
144145
" <td>isobaricInhPa</td>\n",
145146
" <td>500</td>\n",
146-
" <td>20230630</td>\n",
147-
" <td>600</td>\n",
148-
" <td>6</td>\n",
147+
" <td>20240306</td>\n",
148+
" <td>0</td>\n",
149+
" <td>24</td>\n",
149150
" <td>fc</td>\n",
150151
" <td>None</td>\n",
151152
" <td>regular_ll</td>\n",
@@ -156,9 +157,9 @@
156157
" <td>t</td>\n",
157158
" <td>isobaricInhPa</td>\n",
158159
" <td>500</td>\n",
159-
" <td>20230630</td>\n",
160-
" <td>600</td>\n",
161-
" <td>12</td>\n",
160+
" <td>20240306</td>\n",
161+
" <td>0</td>\n",
162+
" <td>48</td>\n",
162163
" <td>fc</td>\n",
163164
" <td>None</td>\n",
164165
" <td>regular_ll</td>\n",
@@ -169,9 +170,9 @@
169170
" <td>gh</td>\n",
170171
" <td>isobaricInhPa</td>\n",
171172
" <td>500</td>\n",
172-
" <td>20230630</td>\n",
173-
" <td>600</td>\n",
174-
" <td>12</td>\n",
173+
" <td>20240306</td>\n",
174+
" <td>0</td>\n",
175+
" <td>48</td>\n",
175176
" <td>fc</td>\n",
176177
" <td>None</td>\n",
177178
" <td>regular_ll</td>\n",
@@ -182,12 +183,12 @@
182183
],
183184
"text/plain": [
184185
" centre shortName typeOfLevel level dataDate dataTime stepRange \\\n",
185-
"0 ecmf t isobaricInhPa 500 20230630 600 0 \n",
186-
"1 ecmf gh isobaricInhPa 500 20230630 600 0 \n",
187-
"2 ecmf t isobaricInhPa 500 20230630 600 6 \n",
188-
"3 ecmf gh isobaricInhPa 500 20230630 600 6 \n",
189-
"4 ecmf t isobaricInhPa 500 20230630 600 12 \n",
190-
"5 ecmf gh isobaricInhPa 500 20230630 600 12 \n",
186+
"0 ecmf t isobaricInhPa 500 20240306 0 0 \n",
187+
"1 ecmf gh isobaricInhPa 500 20240306 0 0 \n",
188+
"2 ecmf t isobaricInhPa 500 20240306 0 24 \n",
189+
"3 ecmf gh isobaricInhPa 500 20240306 0 24 \n",
190+
"4 ecmf t isobaricInhPa 500 20240306 0 48 \n",
191+
"5 ecmf gh isobaricInhPa 500 20240306 0 48 \n",
191192
"\n",
192193
" dataType number gridType \n",
193194
"0 fc None regular_ll \n",
@@ -210,17 +211,17 @@
210211
{
211212
"cell_type": "code",
212213
"execution_count": null,
213-
"id": "1d489e50-8076-4fad-a090-0faffe64b7eb",
214+
"id": "e59c45e5-fa81-42ee-9ec8-8d3908f5111e",
214215
"metadata": {},
215216
"outputs": [],
216217
"source": []
217218
}
218219
],
219220
"metadata": {
220221
"kernelspec": {
221-
"display_name": "dev",
222+
"display_name": "dev_ecc",
222223
"language": "python",
223-
"name": "dev"
224+
"name": "dev_ecc"
224225
},
225226
"language_info": {
226227
"codemirror_mode": {

0 commit comments

Comments
 (0)