From 60379a1c98d2d903f27c6b68d52499948c90e01d Mon Sep 17 00:00:00 2001
From: Damien Ayers <damien@omad.net>
Date: Fri, 25 Aug 2023 09:44:44 +1000
Subject: [PATCH] Upgrade versions, python->3.10

---
 docker/Dockerfile       |  4 ++--
 docker/env.yaml         | 37 ++++++++++++++++++-------------------
 docker/requirements.txt | 32 ++++++++++++++++----------------
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3ad707bd..ba2bf2a6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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
 
diff --git a/docker/env.yaml b/docker/env.yaml
index 0b1efefc..13895fbe 100644
--- a/docker/env.yaml
+++ b/docker/env.yaml
@@ -6,29 +6,36 @@ dependencies:
   - 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
@@ -40,7 +47,6 @@ dependencies:
   - charset-normalizer
   - checksumdir
   - ciso8601
-  - click
   - click-plugins
   - cligj
   - cloudpickle
@@ -48,7 +54,6 @@ dependencies:
   - colour
   - cycler
   - cython
-  - dask
   - dask-image
   - datadog
   - deepdiff
@@ -56,7 +61,6 @@ dependencies:
   - distributed
   - docutils
   - ephem
-  - fiona
   - Flask
   - Flask-Babel
   - fonttools
@@ -74,11 +78,8 @@ dependencies:
   - ipyleaflet
   - iso8601
   - itsdangerous
-  - Jinja2
   - jmespath
-  - jsonschema
   - kiwisolver
-  - lark
   - python-lmdb
   - locket
   - lxml
@@ -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
@@ -154,6 +150,7 @@ dependencies:
   - zict
   - zipp
   - zstandard
+
 # misc
   - alabaster
   - dill
@@ -163,8 +160,10 @@ dependencies:
   - s3fs
   - voluptuous
   - bottleneck
+
 # Scientific Stack
   - gsl
+  - cgal
   - cgal-cpp
   - boost
   - openmp
diff --git a/docker/requirements.txt b/docker/requirements.txt
index e676cb94..36a9043c 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -1,5 +1,5 @@
+# Packages not available from conda-forge
 cognitojwt
-cgal
 line-profiler
 jupyterlab-logout
 jupyter-contrib-core
@@ -8,33 +8,33 @@ jupyter-nbextensions-configurator
 
 # ODC/DEA: these are installed in builder stage
 otps
-eodatasets3
 
 # Damien - August 2023
 # These are causing trouble, and are hopefully no longer required.
 #
 # 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
-
 
 # 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
+# Should be installed from conda-forge now
+#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