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

Add minimum package versions for ESRI/GDAL nodata fix #288

Merged
merged 7 commits into from
Jul 19, 2024
Merged

Add minimum package versions for ESRI/GDAL nodata fix #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
736b363
Add minimum package versions for ESRI/GDAL nodata fix
robbibt Jul 16, 2024
3919844
Use latest versions of odc-geo and eodatasets
robbibt Jul 17, 2024
0affe90
Download only subset of tide models
robbibt Jul 17, 2024
c71dd27
install awscliv2 from conda
Jul 18, 2024
f802bf7
fix indentation of workflow yaml
Jul 18, 2024
95a632c
output python package version
Jul 18, 2024
d707b22
Remove pyTMD restriction
robbibt Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ jobs:
aws-region: ap-southeast-2

- name: Copy tide modelling files with the AWS CLI
run: aws s3 sync s3://dea-non-public-data/tide_models/tide_models tide_models
run: |
aws s3 sync s3://dea-non-public-data/tide_models/tide_models/fes2014 tide_models/fes2014
aws s3 sync s3://dea-non-public-data/tide_models/tide_models/hamtide tide_models/hamtide

- name: Start docker-compose
run: |
Expand Down
11 changes: 2 additions & 9 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,11 @@ RUN echo "Enable server extensions" \
&& jupyter server extension list \
&& echo "...done"

RUN echo "Install AWS CLI v2" \
&& curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip" \
&& unzip /tmp/awscliv2.zip -d /tmp \
&& /tmp/aws/install -i /env/bin/aws-cli -b /env/bin \
&& aws --version \
&& rm -f /tmp/awscliv2.zip \
&& rm -fr /tmp/aws \
&& echo "...done"

COPY assets/sync_repo assets/jupyterhub-singleuser /usr/local/bin/
COPY assets/overrides.json /env/share/jupyter/lab/settings/

RUN pip list --format=freeze

WORKDIR "/home/$nb_user"
ENTRYPOINT ["/env/bin/tini", "--"]
CMD ["jupyter", "lab", \
Expand Down
3 changes: 2 additions & 1 deletion docker/env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies:
- rio-cogeo
- access
- aiobotocore
- awscliv2
- boto3
- s5cmd
- affine
Expand Down Expand Up @@ -204,7 +205,7 @@ dependencies:
- spyndex
- urbanaccess
- contextily
- pyTMD<=2.1.0
- pyTMD
- xarray-spatial
# jupyter things
- autopep8
Expand Down
6 changes: 3 additions & 3 deletions docker/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jupyterlab-logout==0.5.0

# ODC/DEA: these are installed in builder stage
otps
eodatasets3
eodatasets3 >= 0.30.6 # min version required for ESRI/GDAL nodata fix

# Dale's s2cloudmask
# https://github.com/daleroberts/s2cloudmask
Expand All @@ -21,15 +21,15 @@ s2cloudmask
opencv-python-headless
opencv-contrib-python-headless

datacube[performance,s3] >= 1.8.19
datacube[performance,s3] >= 1.8.19 # min version required for ESRI/GDAL nodata fix
odc-algo @ git+https://github.com/opendatacube/odc-algo@b8dcfce
odc-cloud[ASYNC]
odc-dscache
odc-io
odc-stac
odc-stats[ows]
odc-ui
odc-geo
odc-geo >= 0.4.8 # min version required for ESRI/GDAL nodata fix
dea-tools

thredds-crawler
Expand Down
Loading