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

Move Docker image to the standard gdal base #324

Merged
merged 7 commits into from
Oct 10, 2021

Conversation

jeremyh
Copy link
Collaborator

@jeremyh jeremyh commented Oct 5, 2021

It's less maintenance than the geo-base one, and brings us in-line with datacube-alchemist and eodatasets.

It also fixes the current security-scan failure.

@jeremyh jeremyh changed the title Move Docker image to the standard gdal image Move Docker image to the standard gdal base Oct 5, 2021
@jeremyh jeremyh force-pushed the normal-gdal-docker branch from 6c30555 to 2827f87 Compare October 5, 2021 06:12
Comment on lines -2 to -4
sqlalchemy==1.3.20
click<8.0.0
eodatasets3>=0.17.0
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There's appropriate minimum versions in the dependencies now, I believe. So I removed these.

It's less maintenance than the geo-base one
(fixing the current scan issue), and brings us
in-line with datacube-alchemist and eodatasets.
... and can't require an ODC config on build.
The test is broken on newer docker container -- built-in WKT strings
are slightly different.

Strangely, it was sorting ascending and picking the first. ... so the least
good match? But this worked because the test data used a completely different capitalisation to the real CRS, so they didn't match at all.

Changed them to:

1. Compare without case sensitivity.
2. Compare total matches, rather than ratio. WKTs are very diff.
   lengths, and we want to match their strings of names/numbers,
   not penalize for missing sections (which is common).
3. Pick the best match, not the least
@jeremyh jeremyh force-pushed the normal-gdal-docker branch from 16e7d52 to b86cd9b Compare October 8, 2021 00:25
Their dict return type changes too often. Suddenly
our error messages are incorrect as we aren't looking
for the right key names.
@codecov
Copy link

codecov bot commented Oct 8, 2021

Codecov Report

Merging #324 (a2da63f) into develop (77a352f) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #324   +/-   ##
========================================
  Coverage    86.18%   86.19%           
========================================
  Files           25       25           
  Lines         3048     3049    +1     
========================================
+ Hits          2627     2628    +1     
  Misses         421      421           
Impacted Files Coverage Δ
cubedash/_utils.py 85.47% <100.00%> (+0.04%) ⬆️
cubedash/summary/_summarise.py 96.25% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 77a352f...a2da63f. Read the comment docs.

@jeremyh jeremyh marked this pull request as ready for review October 8, 2021 04:04
@jeremyh jeremyh merged commit bbba14c into opendatacube:develop Oct 10, 2021
@jeremyh jeremyh deleted the normal-gdal-docker branch October 10, 2021 22:31
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.

1 participant