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

Cherrypicks from 1.8 #1637

Merged
merged 11 commits into from
Sep 20, 2024
Merged

Cherrypicks from 1.8 #1637

merged 11 commits into from
Sep 20, 2024

Conversation

SpacemanPaul
Copy link
Contributor

Reason for this pull request

Cherry picks of #1624, #1625, #1626, #1629, #1630, #1631

This fixes the warning:

FromAsCasing: 'as' and 'FROM' keywords' casing do not match

emitted by recent Docker releases.
This fixes the warning:

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format

emitted by recent Docker releases.

And while changing this, bring all the ENV
lines into a single layer, which saves
some space in the resulting image.
This will cause Dependabot to make
pull requests for the Dockerfile
when there are new releases of GDAL.
The documentation at

https://github.com/readthedocs/actions/tree/v1/preview

uses this. According to

https://stackoverflow.com/questions/74957218/what-is-the-difference-between-pull-request-and-pull-request-target-event-in-git

there is something with permissions of tokens
that differ between pull_request and pull_request_target,
so switch to what the action documentation
suggests.
@SpacemanPaul SpacemanPaul marked this pull request as ready for review September 20, 2024 06:53
@@ -1525,19 +1525,19 @@ def temporal_extent_by_prod(self, product_id: int) -> tuple[datetime.datetime, d
query = self.temporal_extent_full().where(Dataset.product_ref == product_id)
res = self._connection.execute(query)
for tmin, tmax in res:
return (self.time_min.normalise_value(tmin), self.time_max.normalise_value(tmax))
return (time_min.normalise_value(tmin), time_max.normalise_value(tmax))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't this change the other way around?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, totally muffed that merge. Sorry, my mind was elsewhere. This should fix it.

datacube/index/postgis/_datasets.py Show resolved Hide resolved
caitlinadams and others added 6 commits September 20, 2024 19:17
#1629)

Bumps [osgeo/gdal](https://github.com/OSGeo/gdal) from ubuntu-full-3.9.0 to ubuntu-full-3.9.2.
- [Release notes](https://github.com/OSGeo/gdal/releases)
- [Changelog](https://github.com/OSGeo/gdal/blob/master/NEWS.md)
- [Commits](OSGeo/gdal@v3.9.0...v3.9.2)

---
updated-dependencies:
- dependency-name: osgeo/gdal
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* don't assume product.id exists when adding a dataset

* don't assume assume product.id exists  when adding dataset

* update whats_new

---------

Co-authored-by: Ariana Barzinpour <ariana.barzinpour@ga.gov.au>
Copy link

codecov bot commented Sep 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.25%. Comparing base (d4f84dc) to head (f8154ef).
Report is 16 commits behind head on develop-1.9.

Additional details and impacted files
@@               Coverage Diff               @@
##           develop-1.9    #1637      +/-   ##
===============================================
- Coverage        85.26%   85.25%   -0.02%     
===============================================
  Files              142      144       +2     
  Lines            15605    15692      +87     
===============================================
+ Hits             13306    13378      +72     
- Misses            2299     2314      +15     

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

@Ariana-B Ariana-B merged commit 7a61f06 into develop-1.9 Sep 20, 2024
30 checks passed
@Ariana-B Ariana-B deleted the cherrypicks_from_1.8 branch September 20, 2024 11:10
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.

4 participants