Merge pull request #370 from ecmwf/develop

Merge develop into main for release 0.7.0

.gitignore

@@ -214,6 +214,8 @@ docs/examples/_*
 docs/examples/earthkit_use_cases/*.grib
 docs/examples/_fdb
 docs/examples/*.db
+docs/examples/*.json
+docs/examples/*.geojson
 
 # PyBuilder
 .pybuilder/

Makefile

@@ -12,10 +12,9 @@ qa:
 	pre-commit run --all-files
 
 unit-tests:
-	python -m pytest -vv -m 'not notebook and not no_cache_init and not plugin' --cov=. --cov-report=$(COV_REPORT)
+	python -m pytest -vv -m 'not notebook and not no_cache_init' --cov=. --cov-report=$(COV_REPORT)
 	python -m pytest -v -m "notebook"
 	python -m pytest --forked -vv -m 'no_cache_init'
-	python -m pytest -v -m "plugin"
 
 # type-check:
 # 	python -m mypy .

docs/conf.py

@@ -92,6 +92,11 @@
 
 xref_links = {
     "cfgrib": ("cfgirb", "https://github.com/ecmwf/cfgrib"),
+    "earthkit": ("earthkit", "https://earthkit.readthedocs.io/en/latest/"),
+    "earthkit-geo": (
+        "earthkit-geo",
+        "https://earthkit-geo.readthedocs.io/en/latest/",
+    ),
     "earthkit-regrid": (
         "earthkit-regrid",
         "https://earthkit-regrid.readthedocs.io/en/latest/",

docs/development.rst

@@ -36,7 +36,19 @@ To run the test suite, you can use the following command:
 
 .. code-block:: shell
 
-    pytest
+    make unit-tests
+
+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:
+
+.. code-block:: shell
+
+    pytest -E long -v
+
+If just want to run e.g. the :ref:`data-sources-cds` tests you can use:
+
+.. code-block:: shell
+
+    pytest -E long -v -k cds
 
 
 Build documentation

docs/examples/ads.ipynb

@@ -11,7 +11,7 @@
     "tags": []
    },
    "source": [
-    "## Retrieving CAMS data from the ADS"
+    "## Retrieving data from the ADS"
    ]
   },
   {

docs/examples/bufr_synop.ipynb

@@ -11,7 +11,7 @@
     "tags": []
    },
    "source": [
-    "## Using BUFR SYNOP data"
+    "## BUFR: using SYNOP data"
    ]
   },
   {

docs/examples/bufr_temp.ipynb

@@ -11,7 +11,7 @@
     "tags": []
    },
    "source": [
-    "## Using BUFR TEMP data"
+    "## BUFR: using TEMP data"
    ]
   },
   {

docs/examples/cds.ipynb

@@ -11,7 +11,7 @@
     "tags": []
    },
    "source": [
-    "## Retrieving ERA5 data from the CDS"
+    "## Retrieving data from the CDS"
    ]
   },
   {

docs/examples/grib_from_stream.ipynb → docs/examples/data_from_stream.ipynb

@@ -11,7 +11,7 @@
     "tags": []
    },
    "source": [
-    "## Reading GRIB from a stream"
+    "## Reading data from a stream"
    ]
   },
   {

docs/examples/ecmwf_open_data.ipynb

@@ -55,7 +55,8 @@
     "ds = earthkit.data.from_source(\"ecmwf-open-data\",  \n",
     "        param=[\"t\", \"gh\"],\n",
     "        levelist=\"500\",\n",
-    "        step=[0,6,12])"
+    "        step=[0, 24, 48]\n",
+    "       )"
    ]
   },
   {
@@ -104,8 +105,8 @@
        "      <td>t</td>\n",
        "      <td>isobaricInhPa</td>\n",
        "      <td>500</td>\n",
-       "      <td>20230630</td>\n",
-       "      <td>600</td>\n",
+       "      <td>20240306</td>\n",
+       "      <td>0</td>\n",
        "      <td>0</td>\n",
        "      <td>fc</td>\n",
        "      <td>None</td>\n",
@@ -117,8 +118,8 @@
        "      <td>gh</td>\n",
        "      <td>isobaricInhPa</td>\n",
        "      <td>500</td>\n",
-       "      <td>20230630</td>\n",
-       "      <td>600</td>\n",
+       "      <td>20240306</td>\n",
+       "      <td>0</td>\n",
        "      <td>0</td>\n",
        "      <td>fc</td>\n",
        "      <td>None</td>\n",
@@ -130,9 +131,9 @@
        "      <td>t</td>\n",
        "      <td>isobaricInhPa</td>\n",
        "      <td>500</td>\n",
-       "      <td>20230630</td>\n",
-       "      <td>600</td>\n",
-       "      <td>6</td>\n",
+       "      <td>20240306</td>\n",
+       "      <td>0</td>\n",
+       "      <td>24</td>\n",
        "      <td>fc</td>\n",
        "      <td>None</td>\n",
        "      <td>regular_ll</td>\n",
@@ -143,9 +144,9 @@
        "      <td>gh</td>\n",
        "      <td>isobaricInhPa</td>\n",
        "      <td>500</td>\n",
-       "      <td>20230630</td>\n",
-       "      <td>600</td>\n",
-       "      <td>6</td>\n",
+       "      <td>20240306</td>\n",
+       "      <td>0</td>\n",
+       "      <td>24</td>\n",
        "      <td>fc</td>\n",
        "      <td>None</td>\n",
        "      <td>regular_ll</td>\n",
@@ -156,9 +157,9 @@
        "      <td>t</td>\n",
        "      <td>isobaricInhPa</td>\n",
        "      <td>500</td>\n",
-       "      <td>20230630</td>\n",
-       "      <td>600</td>\n",
-       "      <td>12</td>\n",
+       "      <td>20240306</td>\n",
+       "      <td>0</td>\n",
+       "      <td>48</td>\n",
        "      <td>fc</td>\n",
        "      <td>None</td>\n",
        "      <td>regular_ll</td>\n",
@@ -169,9 +170,9 @@
        "      <td>gh</td>\n",
        "      <td>isobaricInhPa</td>\n",
        "      <td>500</td>\n",
-       "      <td>20230630</td>\n",
-       "      <td>600</td>\n",
-       "      <td>12</td>\n",
+       "      <td>20240306</td>\n",
+       "      <td>0</td>\n",
+       "      <td>48</td>\n",
        "      <td>fc</td>\n",
        "      <td>None</td>\n",
        "      <td>regular_ll</td>\n",
@@ -182,12 +183,12 @@
       ],
       "text/plain": [
        "  centre shortName    typeOfLevel  level  dataDate  dataTime stepRange  \\\n",
-       "0   ecmf         t  isobaricInhPa    500  20230630       600         0   \n",
-       "1   ecmf        gh  isobaricInhPa    500  20230630       600         0   \n",
-       "2   ecmf         t  isobaricInhPa    500  20230630       600         6   \n",
-       "3   ecmf        gh  isobaricInhPa    500  20230630       600         6   \n",
-       "4   ecmf         t  isobaricInhPa    500  20230630       600        12   \n",
-       "5   ecmf        gh  isobaricInhPa    500  20230630       600        12   \n",
+       "0   ecmf         t  isobaricInhPa    500  20240306         0         0   \n",
+       "1   ecmf        gh  isobaricInhPa    500  20240306         0         0   \n",
+       "2   ecmf         t  isobaricInhPa    500  20240306         0        24   \n",
+       "3   ecmf        gh  isobaricInhPa    500  20240306         0        24   \n",
+       "4   ecmf         t  isobaricInhPa    500  20240306         0        48   \n",
+       "5   ecmf        gh  isobaricInhPa    500  20240306         0        48   \n",
        "\n",
        "  dataType number    gridType  \n",
        "0       fc   None  regular_ll  \n",
@@ -210,17 +211,17 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "1d489e50-8076-4fad-a090-0faffe64b7eb",
+   "id": "e59c45e5-fa81-42ee-9ec8-8d3908f5111e",
    "metadata": {},
    "outputs": [],
    "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "dev",
+   "display_name": "dev_ecc",
    "language": "python",
-   "name": "dev"
+   "name": "dev_ecc"
   },
   "language_info": {
    "codemirror_mode": {