From d48f96f6bc4b0843846750611447ec12841e3c95 Mon Sep 17 00:00:00 2001
From: Dale Roberts <dsroberts@unimelb.edu.au>
Date: Wed, 22 May 2024 12:16:29 +1000
Subject: [PATCH] Update analysis3 to 24.01, update analysis3-unstable to
 24.04. Add u8darts-all

---
 environments/analysis3/config.sh       | 4 ++--
 environments/analysis3/environment.yml | 5 +++--
 environments/analysis3/testconfig.yml  | 8 ++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/environments/analysis3/config.sh b/environments/analysis3/config.sh
index 1f94e42..5fbe056 100644
--- a/environments/analysis3/config.sh
+++ b/environments/analysis3/config.sh
@@ -9,8 +9,8 @@
 
 ### Optional config for custom deploy script
 export VERSION_TO_MODIFY=24.04
-export STABLE_VERSION=23.10
-export UNSTABLE_VERSION=24.01
+export STABLE_VERSION=24.01
+export UNSTABLE_VERSION=24.04
 
 ### Version settings
 export ENVIRONMENT=analysis3
diff --git a/environments/analysis3/environment.yml b/environments/analysis3/environment.yml
index 0110953..f5dc2f0 100644
--- a/environments/analysis3/environment.yml
+++ b/environments/analysis3/environment.yml
@@ -27,7 +27,7 @@ dependencies:
 - pygrib
 - pyhdf
 - pytest
-- scipy<1.13.0
+- scipy
 - seaborn
 - xarray>2023.9 ### py-cordex fixes xarray at != 2023.9.0 - set this to prevent downgrade
 - jupyter
@@ -95,7 +95,7 @@ dependencies:
 - h5py
 - line_profiler
 - bottleneck
-- jupyterlab
+- jupyterlab<4.2.0a0
 - dask-jobqueue
 - jupyterlab_server
 - docrep
@@ -288,5 +288,6 @@ dependencies:
 - accessnri::access-med-tools
 - crick ### Unlisted dependency for dask-expr
 - regional-mom6
+- u8darts-all
 - pip:
   - railroad-diagrams ### Unlisted dependency of pip and pyparsing
diff --git a/environments/analysis3/testconfig.yml b/environments/analysis3/testconfig.yml
index 28c8528..c22746b 100644
--- a/environments/analysis3/testconfig.yml
+++ b/environments/analysis3/testconfig.yml
@@ -50,6 +50,14 @@ skip:
 - numba.core.rvsdg_frontend ### Not supported in Python3.10
 - xgboost.testing ### Has an 'pytest.importorskip' call when imported, causing the whole thing to report skipped
 - scipy._lib.array_api_compat.torch ### Don't support pytorch
+- urllib3.contrib.emscripten ### Used for web browser integration and also experimental: https://urllib3.readthedocs.io/en/latest/reference/contrib/emscripten.html
+- fugue_duckdb ### Optional backend not used by any package in analysis3
+- fugue_ibis ### Optional backend not used by any package in analysis3
+- fugue_polars ### Optional backend not used by any package in analysis3
+- fugue_ray ### Optional backend not used by any package in analysis3
+- fugue_spark ### Optional backend not used by any package in analysis3
+- torch.onnx ### Prevent testing of _internal APIs
+- torch.testing ### Prevent testing of _internal APIs
 
 # Preload these modules before testing to avoid weird python issues
 preload: