Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunato committed Feb 19, 2024
2 parents 5554cf4 + bf7607a commit 5de6aac
Show file tree
Hide file tree
Showing 120 changed files with 10,430 additions and 5,125 deletions.
72 changes: 54 additions & 18 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,65 @@ jobs:
with:
files: artifacts/*/junit-report.xml

- name: Publish Coverage Report for Ubuntu
uses: 5monkeys/cobertura-action@master
if: ${{ github.event_name == 'pull_request' }}
- name: Produce the coverage report for Ubuntu
uses: insightsengineering/coverage-action@v2
with:
# Path to the Cobertura XML report.
path: artifacts/unit-test-results-python3.12-ubuntu-latest/coverage.xml
repo_token: ${{ secrets.GITHUB_TOKEN }}
pull_request_number: ${{ github.pull_request.number }}
minimum_coverage: 70
fail_below_threshold: false
only_changed_files: true
report_name: Code Coverage (Ubuntu)
# Minimum total coverage, if you want to the
# workflow to enforce it as a standard.
# This has no effect if the `fail` arg is set to `false`.
threshold: 70
# Fail the workflow if the minimum code coverage
# reuqirements are not satisfied.
fail: false
# Publish the rendered output as a PR comment
publish: true
# Create a coverage diff report.
diff: true
# Branch to diff against.
# Compare the current coverage to the coverage
# determined on this branch.
diff-branch: develop
# This is where the coverage reports for the
# `diff-branch` are stored.
# Branch is created if it doesn't already exist'.
diff-storage: _xml_coverage_reports
# A custom title that can be added to the code
# coverage summary in the PR comment.
coverage-summary-title: "Code Coverage (Ubuntu)"
# Make the code coverage report togglable
togglable-report: true

- name: Publish Coverage Report for Windows
uses: 5monkeys/cobertura-action@master
if: ${{ github.event_name == 'pull_request' }}
- name: Produce the coverage report for Windows
uses: insightsengineering/coverage-action@v2
with:
# Path to the Cobertura XML report.
path: artifacts/unit-test-results-python3.12-windows-latest/coverage.xml
repo_token: ${{ secrets.GITHUB_TOKEN }}
pull_request_number: ${{ github.pull_request.number }}
minimum_coverage: 70
fail_below_threshold: false
only_changed_files: true
report_name: Code Coverage (Windows)
# Minimum total coverage, if you want to the
# workflow to enforce it as a standard.
# This has no effect if the `fail` arg is set to `false`.
threshold: 70
# Fail the workflow if the minimum code coverage
# reuqirements are not satisfied.
fail: false
# Publish the rendered output as a PR comment
publish: true
# Create a coverage diff report.
diff: true
# Branch to diff against.
# Compare the current coverage to the coverage
# determined on this branch.
diff-branch: develop
# This is where the coverage reports for the
# `diff-branch` are stored.
# Branch is created if it doesn't already exist'.
diff-storage: _xml_coverage_reports_win
# A custom title that can be added to the code
# coverage summary in the PR comment.
coverage-summary-title: "Code Coverage (Windows)"
# Make the code coverage report togglable
togglable-report: true

build-docs:
name: Build the docs
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ celerybeat-schedule
.env

# virtualenv
.venv/
.venv*/
venv/
ENV/

Expand Down
45 changes: 40 additions & 5 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,26 +1,61 @@
Release history
---------------

2.12.0 (2024-02-19)
+++++++++++++++++++

* Individual product asset download methods (:pull:`932`)
* New environment variable `EODAG_CFG_DIR` available for custom configuration directory (:pull:`927`)
* New `list_queryables <https://eodag.readthedocs.io/en/latest/notebooks/api_user_guide/4_search.html#Queryables>`_
method, available through python API and server mode, and using product-types constraints if available (:pull:`911`)
(:pull:`917`)(:pull:`974`)(:pull:`977`)(:pull:`978`)(:pull:`981`)(:pull:`1005`)
* Removes limited RPC server (:pull:`1011`)
* Product types aliases (:pull:`905`)
* New provider `creodias_s3` (:pull:`986`)(:pull:`1002`)
* `earth_search` endpoint updated from v0 to v1 (:pull:`754`)
* `wekeo` endpoint updated to *wekeo2 wekeo-broker API* (:pull:`1010`)
* New product types added for `cop_ads` and `cop_cds` (:pull:`898`)
* Adds missing `tileIdentifier` and `quicklook` for `creodias`, `creodias_s3` and `cop_dataspace` (:pull:`957`)
(:pull:`1014`)
* HTTP download with :class:`~eodag.plugins.apis.cds.CdsApi` (:pull:`946`)
* Download streaming available for :class:`~eodag.plugins.download.aws.AwsDownload` plugin (:pull:`997`)
* Lists STAC alternate assets in server mode (:pull:`961`)
* `_dc_qs` used in server-mode to store :class:`~eodag.plugins.apis.cds.CdsApi` search criteria (:pull:`958`)(:pull:`1000`)
* New eodag exception :class:`~eodag.utils.exceptions.TimeOutError` (:pull:`982`)
* Cast loaded environment variables type using config type-hints (:pull:`987`)
* Type hints fixes (:pull:`880`)(:pull:`983`)
* Requirements updates (:pull:`1020`)(:pull:`1021`)
* Various server mode fixes (:pull:`891`)(:pull:`895`)(:pull:`947`)(:pull:`992`)(:pull:`1001`)
* Various minor fixes and improvements (:pull:`934`)(:pull:`935`)(:pull:`936`)(:pull:`962`)(:pull:`969`)(:pull:`976`)
(:pull:`980`)(:pull:`988`)(:pull:`991`)(:pull:`996`)(:pull:`1003`)(:pull:`1009`)(:pull:`1013`)(:pull:`1016`)
(:pull:`1019`)(:pull:`1022`)(:pull:`1024`)(:pull:`1025`)

2.11.0 (2023-11-20)
+++++++++++++++++++

* Fallback mechanism for search (:pull:`753`)(:pull:`807`)
* `creodias` and `cop_dataspace` configuration update (from `OData` to `OpenSearch`) (:pull:`866`)(:pull:`883`)(:pull:`894`)(:pull:`915`)(:pull:`929`)
* `creodias` and `cop_dataspace` configuration update (from `OData` to `OpenSearch`) (:pull:`866`)(:pull:`883`)
(:pull:`894`)(:pull:`915`)(:pull:`929`)
* Removes `mundi` provider (:pull:`890`)
* Copernicus DEM product types available through creodias (:pull:`882`)
* `wekeo` driver update and new product types (:pull:`798`)(:pull:`840`)(:pull:`856`)(:pull:`902`)
* Allows `provider` search parameter to directly search on it (:pull:`790`)
* Refresh token usage in `KeycloakOIDCPasswordAuth` (`creodias` and `cop_dataspace`) (:pull:`921`)
* Per-provider search timeout (:pull:`841`)
* New `EODAG_PROVIDERS_CFG_FILE` environment variable for custom provider configuration setting (:pull:`836`)
* Many server-mode updates and fixes: `queryables` endpoints (:pull:`795`), built-in Swagger doc update (:pull:`846`), exceptions handling (:pull:`794`)(:pull:`806`)(:pull:`812`)(:pull:`829`),
* Many server-mode updates and fixes: `queryables` endpoints (:pull:`795`), built-in Swagger doc update (:pull:`846`),
exceptions handling (:pull:`794`)(:pull:`806`)(:pull:`812`)(:pull:`829`),
provider setting (:pull:`808`) and returned information (:pull:`884`)(:pull:`879`), multithreaded requests (:pull:`843`),
opened time intervals fixes (:pull:`837`), search-by-ids fix (:pull:`822`), intersects parameter fixes (:pull:`796`)(:pull:`797`)
opened time intervals fixes (:pull:`837`), search-by-ids fix (:pull:`822`), intersects parameter fixes (:pull:`796`)
(:pull:`797`)
* Adds support for Python 3.12 (:pull:`892`) and removes support for Python 3.7 (:pull:`903`)
* Fixes plugin manager rebuild (solves preferred provider issues) (:pull:`919`)
* Reformatted logs (:pull:`842`)(:pull:`885`)
* Adds static type information (:pull:`863`)
* Various minor fixes and improvements (:pull:`759`)(:pull:`788`)(:pull:`791`)(:pull:`793`)(:pull:`802`)(:pull:`804`)(:pull:`805`)(:pull:`813`)(:pull:`818`)(:pull:`819`)(:pull:`821`)(:pull:`824`)(:pull:`825`)(:pull:`828`)(:pull:`830`)(:pull:`832`)(:pull:`835`)(:pull:`838`)(:pull:`844`)(:pull:`867`)(:pull:`868`)(:pull:`872`)(:pull:`877`)(:pull:`878`)(:pull:`881`)(:pull:`893`)(:pull:`899`)(:pull:`913`)(:pull:`920`)(:pull:`925`)(:pull:`926`)
* Various minor fixes and improvements (:pull:`759`)(:pull:`788`)(:pull:`791`)(:pull:`793`)(:pull:`802`)(:pull:`804`)
(:pull:`805`)(:pull:`813`)(:pull:`818`)(:pull:`819`)(:pull:`821`)(:pull:`824`)(:pull:`825`)(:pull:`828`)(:pull:`830`)
(:pull:`832`)(:pull:`835`)(:pull:`838`)(:pull:`844`)(:pull:`867`)(:pull:`868`)(:pull:`872`)(:pull:`877`)(:pull:`878`)
(:pull:`881`)(:pull:`893`)(:pull:`899`)(:pull:`913`)(:pull:`920`)(:pull:`925`)(:pull:`926`)

2.11.0b1 (2023-07-28)
+++++++++++++++++++++
Expand Down Expand Up @@ -66,7 +101,7 @@ Release history
(:pull:`659`)
* Fetch product types optimization (:pull:`683`)
* Fixes external product types update for unknown provider (:pull:`682`)
* Default dates and refactor for `CdsApi` and `EcmwfApi` (:pull:`672`)(:pull:`678`)(:pull:`679`)
* Default dates and refactor for `:class:`~eodag.plugins.apis.cds.CdsApi` and `:class:`~eodag.plugins.apis.cds.EcmwfApi` (:pull:`672`)(:pull:`678`)(:pull:`679`)
* `peps` `storageStatus` update (:pull:`677`)
* Customized and faster `deepcopy` (:pull:`664`)
* Various minor fixes and improvements (:pull:`665`)(:pull:`666`)(:pull:`667`)(:pull:`668`)(:pull:`669`)(:pull:`670`)
Expand Down
19 changes: 13 additions & 6 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ about the license of each project.
The Apache 2.0 License
================================================================

The following components are provided under the Apache 2.0 License (https://opensource.org/licenses/Apache-2.0).
The following components are provided under the Apache 2.0 License (https://opensource.org/licenses/Apache-2.0).
See project link for details.

https://github.com/requests/requests
https://github.com/dateutil/dateutil
https://github.com/boto/boto3
https://github.com/boto/botocore
https://github.com/h2non/jsonpath-ng
https://github.com/CS-SI/eodag-cube
https://github.com/ecmwf/ecmwf-api-client
Expand All @@ -30,7 +31,7 @@ https://github.com/stac-utils/pystac
The MIT License
================================================================

The following components are provided under the MIT License (http://www.opensource.org/licenses/mit-license.php).
The following components are provided under the MIT License (http://www.opensource.org/licenses/mit-license.php).
See project link for details.

https://pyyaml.org/wiki/PyYAML
Expand All @@ -42,13 +43,16 @@ https://github.com/GeospatialPython/pyshp
https://github.com/python-visualization/folium
https://github.com/Unidata/netcdf4-python
https://github.com/tiangolo/fastapi
https://github.com/urllib3/urllib3
https://github.com/annotated-types/annotated-types
https://github.com/pypa/setuptools


================================================================
The BSD-2-Clause Licence
================================================================

The following components are provided under the BSD-3-Clause License (https://opensource.org/licenses/BSD-2-Clause).
The following components are provided under the BSD-2-Clause License (https://opensource.org/licenses/BSD-2-Clause).
See project link for details.

https://github.com/mchaput/whoosh
Expand All @@ -59,7 +63,7 @@ https://github.com/imageio/imageio
The BSD-3-Clause Licence
================================================================

The following components are provided under the BSD-3-Clause License (https://opensource.org/licenses/BSD-3-Clause).
The following components are provided under the BSD-3-Clause License (https://opensource.org/licenses/BSD-3-Clause).
See project link for details.

https://github.com/pallets/click
Expand All @@ -72,17 +76,20 @@ https://github.com/lxml/lxml
https://github.com/jupyter-widgets/ipywidgets
https://github.com/jupyter/jupyter
https://github.com/encode/uvicorn
https://github.com/encode/starlette


The function slugify, located at eodag/utils/__init__.py is a modified version of the function with the same name from
the Django Project, licensed under the BSD-3-Clause Licence. Follow project link below for more information:
https://github.com/django/django


================================================================
The Python-2.0 License
The Python Software Foundation License
================================================================

The following components are provided under the Python-2.0 License (https://opensource.org/licenses/Python-2.0).
The following components are provided under the Python Software Foundation License (https://opensource.org/licenses/Python-2.0).
See project link for details.

https://github.com/matplotlib
https://github.com/python/typing_extensions
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
..
Checkout **EODAG Jupyterlab extension**: `eodag-labextension <https://github.com/CS-SI/eodag-labextension>`_!
This will bring a fiendly UI to your notebook and help you search and browse for EO products using ``eodag``.
This will bring a friendly UI to your notebook and help you search and browse for EO products using ``eodag``.

EODAG (Earth Observation Data Access Gateway) is a command line tool and a plugin-oriented Python framework for searching,
aggregating results and downloading remote sensed images while offering a unified API for data access regardless of the
Expand Down Expand Up @@ -152,12 +152,12 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm
# search for items
$ curl "http://127.0.0.1:5000/search?collections=S2_MSI_L1C&bbox=0,43,1,44&datetime=2018-01-20/2018-01-25" \
| jq ".context.matched"
| jq ".numberMatched"
6
# browse for items
$ curl "http://127.0.0.1:5000/catalogs/S2_MSI_L1C/country/FRA/year/2021/month/01/day/25/cloud_cover/10/items" \
| jq ".context.matched"
| jq ".numberMatched"
9
# get download link
Expand All @@ -173,7 +173,7 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm

.. code-block:: bash
docker run -p 5000:5000 --rm csspace/eodag-server:2.11.0
docker run -p 5000:5000 --rm csspace/eodag-server:2.12.0
You can also browse over your STAC API server using `STAC Browser <https://github.com/radiantearth/stac-browser>`_.
Simply run:
Expand Down Expand Up @@ -265,4 +265,4 @@ Credits

EODAG is built on top of amazingly useful open source projects. See NOTICE file for details about those projects and
their licenses.
Thank you to all the authors of these projects !
Thank you to all the authors of these projects!
4 changes: 2 additions & 2 deletions charts/eodag-server/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 2.11.0
appVersion: 2.12.0
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
Expand All @@ -15,4 +15,4 @@ name: eodag-server
sources:
- https://github.com/CS-SI/eodag
type: application
version: 2.11.0
version: 2.12.0
2 changes: 1 addition & 1 deletion docker/stac-server.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ COPY ./eodag /eodag/eodag
RUN python -m pip install .

# add python path
ENV PYTHONPATH="${PYTHONPATH}:/eodag/eodag"
ENV PYTHONPATH="${PYTHONPATH}:/eodag/eodag/resources"

# copy start-stac script
COPY ./docker/run-stac-server.sh /eodag/run-stac-server.sh
Expand Down
6 changes: 3 additions & 3 deletions docs/_static/params_mapping_extra.csv
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ latitudeBand,,,,,,:green:`queryable metadata`,,,,,,,,,
orderLink,,,,,,,,,,metadata only,,,,,
polarizationChannels,metadata only,,,:green:`queryable metadata`,,:green:`queryable metadata`,:green:`queryable metadata`,:green:`queryable metadata`,,metadata only,,:green:`queryable metadata`,,metadata only,:green:`queryable metadata`
polarizationMode,,,,,:green:`queryable metadata`,,metadata only,,,,:green:`queryable metadata`,,:green:`queryable metadata`,metadata only,
quicklook,metadata only,,,,metadata only,metadata only,metadata only,metadata only,,metadata only,metadata only,metadata only,metadata only,metadata only,metadata only
quicklook,metadata only,,,metadata only,metadata only,metadata only,metadata only,metadata only,,metadata only,metadata only,metadata only,metadata only,metadata only,metadata only
storageStatus,metadata only,,,metadata only,metadata only,metadata only,metadata only,metadata only,,metadata only,metadata only,metadata only,metadata only,metadata only,metadata only
thumbnail,metadata only,,,,metadata only,metadata only,metadata only,metadata only,,,metadata only,metadata only,metadata only,metadata only,metadata only
tileIdentifier,,,,metadata only,metadata only,:green:`queryable metadata`,,,,:green:`queryable metadata`,:green:`queryable metadata`,:green:`queryable metadata`,,:green:`queryable metadata`,
thumbnail,metadata only,,,metadata only,metadata only,metadata only,metadata only,metadata only,,,metadata only,metadata only,metadata only,metadata only,metadata only
tileIdentifier,,,,:green:`queryable metadata`,:green:`queryable metadata`,:green:`queryable metadata`,,,,:green:`queryable metadata`,:green:`queryable metadata`,:green:`queryable metadata`,,:green:`queryable metadata`,
uid,,,,metadata only,metadata only,,,,,metadata only,metadata only,,metadata only,metadata only,
utmZone,,,,,,:green:`queryable metadata`,,,,,,,,,
Loading

0 comments on commit 5de6aac

Please sign in to comment.