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.

Sign up for GitHub

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

Jump to bottom

2023 update #87

Merged
merged 46 commits into from
Aug 2, 2024
Merged

2023 update #87

merged 46 commits into from
Aug 2, 2024

Conversation

robbibt
Copy link
Member

@robbibt robbibt commented Jul 31, 2024 •
edited
Loading

This PR makes two main changes:

  1. Update DEA Coastlines repo for 2023 run (minor bugfixes etc, mainly .median(numeric_only=True))
  2. Major updates to the Docker integration test workflow to bring code in line with DEA Intertidal and remove old/poorly documented database setup

Specifically:

  • Replace custom database dump with direct access to DEA datacube
  • Combining docker build and testing into a single workflow
  • Remove Docker Compose over simply Docker
  • Simplify how integration test results are exported (code was way more complex than it needed to be!)
  • Upgraded to more recent base Docker image
  • Upgraded all requirement packages

@pep8speaks
Copy link

pep8speaks commented Jul 31, 2024 •
edited
Loading

Hello @robbibt! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 2707:89: E501 line too long (94 > 88 characters)

Comment last updated at 2024-08-02 00:58:53 UTC

@robbibt robbibt marked this pull request as draft July 31, 2024 08:03
robbibt and others added 23 commits August 1, 2024 10:08
@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 2, 2024

For full integration test results, refer to the Tests directory README.

@robbibt robbibt marked this pull request as ready for review August 2, 2024 01:02
@robbibt robbibt requested review from vnewey and erialC-P August 2, 2024 01:02
erialC-P
erialC-P approved these changes Aug 2, 2024
View reviewed changes
Copy link
Collaborator

@erialC-P erialC-P left a comment

Choose a reason for hiding this comment

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

I didn't undertake a comprehensive review but am happy that the tests look as expected. Nice sleuthing with the changes to pandas!

@robbibt robbibt merged commit 6d79445 into develop Aug 2, 2024
@robbibt robbibt deleted the 2023_update branch August 2, 2024 04:43
robbibt added a commit that referenced this pull request Aug 22, 2024
@robbibt @erialC-P
Merge 2023 updates to stable (#89)
b7d07c0 
* Test of directly syncing specific tide model subfolders (#86)

* Test of directly syncing specific tide model subfolders

* Automatically update integration test validation results

---------

Co-authored-by: robbibt <[email protected]>

* Automatically update integration test validation results

* 2023 update (#87)

* Update notebooks

* 2023 update

* Fix pep

* Clean notebook

* Update docker image base

* Update vector.py

* Automatically update integration test validation results

* Add experiment database access

* Update

* Update after permissions

* Update dockerfile and CI

* Update docker

* Remove AWS CLI

* Add test env

* Simplify by installing pytest in setup.py

* Add file copying to workflow

* Try new paths

* Check everything works up to copy step

* Try ls

* Fix

* Try combined approach

* Try smaller tests

* Fix paths

* Automatically update integration test validation results

* Try changing locations files are written to

* Fix

* Update .gitignore

* Automatically update integration test validation results

* Update stats_tests.csv

* Automatically update integration test validation results

* Clean repo

* Update gitignore

* Update test_coastline.py

* Update test_coastline.py

* Update test_coastline.py

* Debug

* Debug

* Finally fix validation bug

* Automatically update integration test validation results

* Fix formatting

* Fix pep8

* Add image build and artifacts

* Automatically update integration test validation results

* Update vector.py

* Automatically update integration test validation results

---------

Co-authored-by: robbibt <[email protected]>

* Fix branch reference

* Update badge

* Update Dockerfile

* Automatically update integration test validation results

* Update dea-coastlines-image.yaml

* Fix styling bug in 2023 uncertain shorelines (#93)

* Add fixed style

* Automatically update integration test validation results

* Update dea-coastlines-image.yaml

* Automatically update integration test validation results

---------

Co-authored-by: robbibt <[email protected]>

* Try old approach for image tagging

* Fix workflow name

* Update dea-coastlines-image.yaml

* Use simpler tagging method that doesn't require git history

* Add notebook for automatically generating `.sld` XML styles for GeoServer (#94)

* Add notebook for autogenerating coastlines styles

* Add notebook for generating XML styles for Geoserver

* Revert CLI notebook

---------

Co-authored-by: robbibt <[email protected]>
Co-authored-by: ClaireP <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erialC-P erialC-P erialC-P approved these changes

@vnewey vnewey Awaiting requested review from vnewey

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@robbibt @pep8speaks @erialC-P