Skip to content

Commit

Permalink
Upgrade versions, python->3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
omad committed Aug 24, 2023
1 parent 9a43a08 commit 576fe27
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 37 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM mambaorg/micromamba:git-7545124-jammy as sandbox-conda
FROM mambaorg/micromamba:jammy as sandbox-conda

USER root
COPY env.yaml /conf/
RUN micromamba create -y -p /env -f /conf/env.yaml && \
RUN micromamba create --yes --path /env --file /conf/env.yaml && \
micromamba clean --all --yes && \
micromamba env export -p /env --explicit

Expand Down
39 changes: 19 additions & 20 deletions docker/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,40 @@ name: env
channels:
- conda-forge
dependencies:
- python=3.8.10
- python=3.10
- libgdal
- gdal
- proj
- rasterio>=1.3.2
- gcc_linux-64
- gxx_linux-64
- binutils_linux-64
# odc packages from conda-forge
- datacube
- odc-stats
- odc-geo
- odc-algo
- odc-apps-dc-tools
- eodatasets3

# - rasterio>=1.3.2
# - gcc_linux-64
# - gxx_linux-64
# - binutils_linux-64
- libpq
# Useful CLI tools
- git
- wget
- unzip
- htop
- tmux
- vim
- awscli

- rio-cogeo
- access
- aiobotocore
- awscli
- boto3
- affine
- aiohttp
- aioitertools
- aiosignal
- astropy
- async-timeout
- attrs
- Babel
- blinker
- boltons
Expand All @@ -40,23 +47,20 @@ dependencies:
- charset-normalizer
- checksumdir
- ciso8601
- click
- click-plugins
- cligj
- cloudpickle
- colorama
- colour
- cycler
- cython
- dask
- dask-image
- datadog
- deepdiff
- defusedxml
- distributed
- docutils
- ephem
- fiona
- Flask
- Flask-Babel
- fonttools
Expand All @@ -74,11 +78,8 @@ dependencies:
- ipyleaflet
- iso8601
- itsdangerous
- Jinja2
- jmespath
- jsonschema
- kiwisolver
- lark
- python-lmdb
- locket
- lxml
Expand All @@ -88,19 +89,14 @@ dependencies:
- mpi4py
- multidict
- munch
- netCDF4
- networkx
- nodejs
- numexpr
- numpy
- ordered-set
- packaging
- pandas
- partd
- Pillow
- PIMS
- psutil
- psycopg2
- pyasn1
- pydantic
- pyerfa
Expand Down Expand Up @@ -154,6 +150,7 @@ dependencies:
- zict
- zipp
- zstandard

# misc
- alabaster
- dill
Expand All @@ -163,8 +160,10 @@ dependencies:
- s3fs
- voluptuous
- bottleneck

# Scientific Stack
- gsl
- cgal
- cgal-cpp
- boost
- openmp
Expand Down
34 changes: 19 additions & 15 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Packages not available from conda-forge
cognitojwt
cgal
line-profiler
jupyterlab-logout
jupyter-contrib-core
Expand All @@ -8,27 +8,31 @@ jupyter-nbextensions-configurator

# ODC/DEA: these are installed in builder stage
otps
eodatasets3

# rsgislib was manually packaged as a binary wheel
# rios required by rsgislib no PIPy publish
https://github.com/ubarsc/rios/releases/download/rios-1.4.13/rios-1.4.13.tar.gz
rsgislib==4.1.95
#https://github.com/ubarsc/rios/releases/download/rios-1.4.13/rios-1.4.13.tar.gz
#rsgislib==4.1.95

# Dale's s2cloudmask
# https://github.com/daleroberts/s2cloudmask
s2cloudmask


# need to be installed after to override libs with non-gl ones
opencv-python-headless
opencv-contrib-python-headless
#opencv-python-headless
#opencv-contrib-python-headless

datacube[performance,s3]
odc-algo
odc-cloud[ASYNC]
odc-dscache
odc-io
odc-stac
odc-stats[ows]
odc-ui
odc-geo
#datacube[performance,s3]
#odc-algo
#odc-cloud[ASYNC]
#odc-dscache
#odc-io
#odc-stac
#odc-stats[ows]
#odc-ui
#odc-geo
#eodatasets3

thredds-crawler
hdstats==0.1.8.post1
Expand Down

0 comments on commit 576fe27

Please sign in to comment.