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.

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

Release : 2.15.3 #3355

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open

Release : 2.15.3 #3355

wants to merge 18 commits into from

Conversation

jacquesfize
Copy link
Contributor

@jacquesfize jacquesfize commented Feb 3, 2025

Checklist :

  • Update VERSION
  • Change install_all.ini
  • Update setup.py if necessary
  • Build requirements-dev and requirements
  • Check documentation

Copy link

codecov bot commented Feb 3, 2025

Codecov Report

Attention: Patch coverage is 40.00000% with 9 lines in your changes missing coverage. Please review.

Project coverage is 83.95%. Comparing base (1b74c23) to head (31c6126).

Files with missing lines Patch % Lines
...nature/core/gn_synthese/utils/query_select_sqla.py 36.36% 7 Missing ⚠️
backend/geonature/core/errors.py 0.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3355      +/-   ##
===========================================
- Coverage    84.00%   83.95%   -0.06%     
===========================================
  Files          122      122              
  Lines         9736     9748      +12     
===========================================
+ Hits          8179     8184       +5     
- Misses        1557     1564       +7     
Flag Coverage Δ
pytest 83.95% <40.00%> (-0.06%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

jacquesfize and others added 9 commits February 10, 2025 16:34
For Synthese queries involving blurring:
- Add first order_by on descending date_min > this allows to retrieve up-to-50000 more-recently-dated observations from the up-to-100000 observations of the 2 unioned queries
- Set (now) second order_by on id_synthese from ascending to descending > this allows, for several observations with same date_min, to prioritize more-recently-added-in-database observations

Notes:
- We want to preserve the final order_by on `allowed_geom_cte.c.priority` and the distinct clause on id_synthese, to keep only precise geom for obs retrieved in both precise and blurred subqueries: this requires to:
  - Keep the order_by on id_synthese
- The wish to retrieve "more recent" observations may be understood in two ways:
  - Meant as "more-recently-dated": operated by the first order_by > it is thus assumed this is the preferred meaning given to "more recent"
  - Meant as "more-recently-added-in-database": operated by the second order_by > it is thus assumed that for two observations with the same date_min we qualify as "more recent" the one with the greater id_synthese

Solves #3249

Co-authored-by: VincentCauchois <vincent.cauchois@mnhn.fr>
Co-authored-by: Christophe Ramet <christophe.ramet@mnhn.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants