From 8e36a8f0468155e6b0990af04318e5f89fd35df2 Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 07:27:50 -0600
Subject: [PATCH 01/11] Use config python version and rh8

---
 Minimal/ci/__main__.py     | 4 ++--
 Panel/ci/__main__.py       | 4 ++--
 Plotly Dash/ci/__main__.py | 4 ++--
 React/ci/__main__.py       | 4 ++--
 Streamlit/ci/__main__.py   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Minimal/ci/__main__.py b/Minimal/ci/__main__.py
index 6c9e9b2..80f9196 100644
--- a/Minimal/ci/__main__.py
+++ b/Minimal/ci/__main__.py
@@ -57,9 +57,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            config["python_version"],
             "--platform",
-            "rh7-x86_64",
+            "rh8-x86_64",
             "-m",
             "2.0",
             "-f",
diff --git a/Panel/ci/__main__.py b/Panel/ci/__main__.py
index 2dfd655..0a2def9 100644
--- a/Panel/ci/__main__.py
+++ b/Panel/ci/__main__.py
@@ -57,9 +57,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            config["python_version"],
             "--platform",
-            "rh7-x86_64",
+            "rh8-x86_64",
             "-m",
             "2.0",
             "-f",
diff --git a/Plotly Dash/ci/__main__.py b/Plotly Dash/ci/__main__.py
index d6888d6..b1d01ac 100644
--- a/Plotly Dash/ci/__main__.py	
+++ b/Plotly Dash/ci/__main__.py	
@@ -57,9 +57,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            config["python_version"],
             "--platform",
-            "rh7-x86_64",
+            "rh8-x86_64",
             "-m",
             "2.0",
             "-f",
diff --git a/React/ci/__main__.py b/React/ci/__main__.py
index f1f7cfa..79a1df9 100644
--- a/React/ci/__main__.py
+++ b/React/ci/__main__.py
@@ -62,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            config["python_version"],
             "--platform",
-            "rh7-x86_64",
+            "rh8-x86_64",
             "-m",
             "2.0",
             "-f",
diff --git a/Streamlit/ci/__main__.py b/Streamlit/ci/__main__.py
index 4c46533..f981330 100644
--- a/Streamlit/ci/__main__.py
+++ b/Streamlit/ci/__main__.py
@@ -57,9 +57,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            "3.8",
+            config["python_version"],
             "--platform",
-            "rh7-x86_64",
+            "rh8-x86_64",
             "-m",
             "2.0",
             "-f",

From 3904e1042ab81bcdb9d8dd91f035af44f7b4696a Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 07:53:26 -0600
Subject: [PATCH 02/11] Fix python and platform, default to 3.11

---
 Minimal/app_config.yaml     | 2 +-
 Minimal/ci/__main__.py      | 9 +++++++--
 Panel/app_config.yaml       | 2 +-
 Panel/ci/__main__.py        | 9 +++++++--
 Plotly Dash/app_config.yaml | 2 +-
 Plotly Dash/ci/__main__.py  | 9 +++++++--
 React/app_config.yaml       | 2 +-
 React/ci/__main__.py        | 9 +++++++--
 Streamlit/app_config.yaml   | 2 +-
 Streamlit/ci/__main__.py    | 9 +++++++--
 10 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/Minimal/app_config.yaml b/Minimal/app_config.yaml
index a3d6bb4..2641faa 100644
--- a/Minimal/app_config.yaml
+++ b/Minimal/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-minimal-example
 framework: generic
 app_version: 1.2.0
-python_version: 3.8
+python_version: 3.11
 repository: quay.io
 organisation: enthought
 env_deps:
diff --git a/Minimal/ci/__main__.py b/Minimal/ci/__main__.py
index 80f9196..1be01d7 100644
--- a/Minimal/ci/__main__.py
+++ b/Minimal/ci/__main__.py
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.
@@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            config["python_version"],
+            python_version,
             "--platform",
-            "rh8-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",
diff --git a/Panel/app_config.yaml b/Panel/app_config.yaml
index ddda871..b75f879 100644
--- a/Panel/app_config.yaml
+++ b/Panel/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-panel-example
 framework: panel
 app_version: 1.3.0
-python_version: 3.8
+python_version: 3.11
 repository: quay.io
 organisation: enthought
 env_deps:
diff --git a/Panel/ci/__main__.py b/Panel/ci/__main__.py
index 0a2def9..86a3117 100644
--- a/Panel/ci/__main__.py
+++ b/Panel/ci/__main__.py
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.
@@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            config["python_version"],
+            python_version,
             "--platform",
-            "rh8-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",
diff --git a/Plotly Dash/app_config.yaml b/Plotly Dash/app_config.yaml
index fed985a..c3ab352 100644
--- a/Plotly Dash/app_config.yaml	
+++ b/Plotly Dash/app_config.yaml	
@@ -1,7 +1,7 @@
 app_id: edge-plotly-dash-example
 framework: plotly-dash
 app_version: 1.3.0
-python_version: 3.8
+python_version: 3.11
 repository: quay.io
 organisation: enthought
 env_deps:
diff --git a/Plotly Dash/ci/__main__.py b/Plotly Dash/ci/__main__.py
index b1d01ac..942917f 100644
--- a/Plotly Dash/ci/__main__.py	
+++ b/Plotly Dash/ci/__main__.py	
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.
@@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            config["python_version"],
+            python_version,
             "--platform",
-            "rh8-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",
diff --git a/React/app_config.yaml b/React/app_config.yaml
index bac2ce2..e090449 100644
--- a/React/app_config.yaml
+++ b/React/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-react-example
 framework: react
 app_version: 1.3.0
-python_version: 3.8
+python_version: 3.1
 repository: quay.io
 organisation: enthought
 env_deps:
diff --git a/React/ci/__main__.py b/React/ci/__main__.py
index 79a1df9..3dec34a 100644
--- a/React/ci/__main__.py
+++ b/React/ci/__main__.py
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, build the React application
     jsdir = op.join(SRC_ROOT, "src", "application", "frontend")
@@ -62,9 +67,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            config["python_version"],
+            python_version,
             "--platform",
-            "rh8-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",
diff --git a/Streamlit/app_config.yaml b/Streamlit/app_config.yaml
index 463e246..c779324 100644
--- a/Streamlit/app_config.yaml
+++ b/Streamlit/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-streamlit-example
 framework: streamlit
 app_version: 1.3.0
-python_version: 3.8
+python_version: 3.11
 repository: quay.io
 organisation: enthought
 env_deps:
diff --git a/Streamlit/ci/__main__.py b/Streamlit/ci/__main__.py
index f981330..4418802 100644
--- a/Streamlit/ci/__main__.py
+++ b/Streamlit/ci/__main__.py
@@ -46,6 +46,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
     app_deps = config["app_deps"]
+    python_version = str(config["python_version"])
+    if python_version == "3.8":
+        platform = "rh7-x86_64"
+    else:
+        platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.
@@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
             "generate",
             "-i",
             "--version",
-            config["python_version"],
+            python_version,
             "--platform",
-            "rh8-x86_64",
+            platform,
             "-m",
             "2.0",
             "-f",

From e0208a4c8971b4f5848cf3ff9190a0917ce4fe69 Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 07:58:20 -0600
Subject: [PATCH 03/11] Adjust workflow

---
 .github/workflows/test-examples.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml
index 6c7ea1d..7f18fa4 100644
--- a/.github/workflows/test-examples.yaml
+++ b/.github/workflows/test-examples.yaml
@@ -61,7 +61,7 @@ jobs:
           export PATH="$HOME/edm/bin:$PATH"
           set -e
           cp "${{ github.workspace }}/.github/data/edm.yml" $HOME/.edm.yaml
-          edm envs create edm --version 3.8 --force
+          edm envs create edm --version 3.11 --force
           npm install -g configurable-http-proxy
 
       - name: Build example 

From adb3d2256f66ae05bf27d46601200e3dae056997 Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 07:59:38 -0600
Subject: [PATCH 04/11] Adjust workflow again, edm 3.7

---
 .github/workflows/test-examples.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml
index 7f18fa4..5ec337d 100644
--- a/.github/workflows/test-examples.yaml
+++ b/.github/workflows/test-examples.yaml
@@ -11,7 +11,7 @@ jobs:
 
     env:
       SHELL: /bin/bash
-      INSTALLED_EDM_VERSION: "3.4.0"
+      INSTALLED_EDM_VERSION: "3.7.0"
       EDM_API_TOKEN: ${{ secrets.HATCHER_TOKEN }}
 
     strategy:

From bd62a11244c7315c558a71f3104d4a1cf3d4c4fa Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 08:02:42 -0600
Subject: [PATCH 05/11] Workflow log, wth?

---
 .github/workflows/test-examples.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml
index 5ec337d..f4cf919 100644
--- a/.github/workflows/test-examples.yaml
+++ b/.github/workflows/test-examples.yaml
@@ -61,6 +61,7 @@ jobs:
           export PATH="$HOME/edm/bin:$PATH"
           set -e
           cp "${{ github.workspace }}/.github/data/edm.yml" $HOME/.edm.yaml
+          edm available-runtimes
           edm envs create edm --version 3.11 --force
           npm install -g configurable-http-proxy
 

From 1d064b2280ccc13f5e21368a29d69e556d4b78a0 Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 08:04:47 -0600
Subject: [PATCH 06/11] Workflow, a different ubuntu?

---
 .github/workflows/test-examples.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml
index f4cf919..190b74e 100644
--- a/.github/workflows/test-examples.yaml
+++ b/.github/workflows/test-examples.yaml
@@ -7,7 +7,7 @@ jobs:
 
   test-examples:
     name: Test Examples
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     env:
       SHELL: /bin/bash
@@ -62,6 +62,7 @@ jobs:
           set -e
           cp "${{ github.workspace }}/.github/data/edm.yml" $HOME/.edm.yaml
           edm available-runtimes
+          edm list-platforms
           edm envs create edm --version 3.11 --force
           npm install -g configurable-http-proxy
 

From e31771cdf709d06c2c777bdcd2bab46b9c22b7a0 Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 08:09:34 -0600
Subject: [PATCH 07/11] Force platform

---
 .github/workflows/test-examples.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml
index 190b74e..7e81f00 100644
--- a/.github/workflows/test-examples.yaml
+++ b/.github/workflows/test-examples.yaml
@@ -63,7 +63,7 @@ jobs:
           cp "${{ github.workspace }}/.github/data/edm.yml" $HOME/.edm.yaml
           edm available-runtimes
           edm list-platforms
-          edm envs create edm --version 3.11 --force
+          edm envs create edm --version 3.11 --platform rh8-x86_64 --force
           npm install -g configurable-http-proxy
 
       - name: Build example 

From 48e1ef6da35081e2d4614429aa25c77550d08fcd Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 08:16:49 -0600
Subject: [PATCH 08/11] Remove appdirs, but things still won't work in 3.11

---
 Panel/app_config.yaml       | 3 +--
 Plotly Dash/app_config.yaml | 1 -
 React/app_config.yaml       | 3 +--
 Streamlit/app_config.yaml   | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Panel/app_config.yaml b/Panel/app_config.yaml
index b75f879..873e06d 100644
--- a/Panel/app_config.yaml
+++ b/Panel/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-panel-example
 framework: panel
 app_version: 1.3.0
-python_version: 3.11
+python_version: 3.8
 repository: quay.io
 organisation: enthought
 env_deps:
@@ -19,7 +19,6 @@ env_deps:
   - questionary
 app_deps:
 - enthought_edge>=2.16.0
-- appdirs
 - packaging
 - pip
 - pyparsing
diff --git a/Plotly Dash/app_config.yaml b/Plotly Dash/app_config.yaml
index c3ab352..fa4d4a8 100644
--- a/Plotly Dash/app_config.yaml	
+++ b/Plotly Dash/app_config.yaml	
@@ -19,7 +19,6 @@ env_deps:
   - questionary
 app_deps:
 - enthought_edge>=2.16.0
-- appdirs
 - packaging
 - pip
 - pyparsing
diff --git a/React/app_config.yaml b/React/app_config.yaml
index e090449..d1db476 100644
--- a/React/app_config.yaml
+++ b/React/app_config.yaml
@@ -1,7 +1,7 @@
 app_id: edge-react-example
 framework: react
 app_version: 1.3.0
-python_version: 3.1
+python_version: 3.11
 repository: quay.io
 organisation: enthought
 env_deps:
@@ -20,7 +20,6 @@ env_deps:
   - questionary
 app_deps:
 - enthought_edge>=2.16.0
-- appdirs
 - packaging
 - pip
 - pyparsing
diff --git a/Streamlit/app_config.yaml b/Streamlit/app_config.yaml
index c779324..328d3a6 100644
--- a/Streamlit/app_config.yaml
+++ b/Streamlit/app_config.yaml
@@ -19,7 +19,6 @@ env_deps:
   - questionary
 app_deps:
 - enthought_edge>=2.16.0
-- appdirs
 - packaging
 - pip
 - pyparsing

From 48ef53cc781c3c941e050b64e6ee0ed99a8cc50d Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Thu, 14 Nov 2024 08:23:38 -0600
Subject: [PATCH 09/11] Plotly default to 3.8

---
 Plotly Dash/app_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plotly Dash/app_config.yaml b/Plotly Dash/app_config.yaml
index fa4d4a8..72ab5a6 100644
--- a/Plotly Dash/app_config.yaml	
+++ b/Plotly Dash/app_config.yaml	
@@ -1,7 +1,7 @@
 app_id: edge-plotly-dash-example
 framework: plotly-dash
 app_version: 1.3.0
-python_version: 3.11
+python_version: 3.8
 repository: quay.io
 organisation: enthought
 env_deps:

From f6f6701f79519abd2467f84ce10c1f0cc2445c86 Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Fri, 15 Nov 2024 12:34:04 -0600
Subject: [PATCH 10/11] Step all the way up to EDM 4.0

---
 .github/workflows/test-examples.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml
index 7e81f00..da61e9f 100644
--- a/.github/workflows/test-examples.yaml
+++ b/.github/workflows/test-examples.yaml
@@ -11,7 +11,7 @@ jobs:
 
     env:
       SHELL: /bin/bash
-      INSTALLED_EDM_VERSION: "3.7.0"
+      INSTALLED_EDM_VERSION: "4.0.0"
       EDM_API_TOKEN: ${{ secrets.HATCHER_TOKEN }}
 
     strategy:

From 305e3e1812acbbc60c350aba5dcd0e5355e8d70e Mon Sep 17 00:00:00 2001
From: EdwinWiseOne <edwin@simreal.com>
Date: Fri, 15 Nov 2024 12:41:37 -0600
Subject: [PATCH 11/11] EDM 4.0 doesn't work in this CI

---
 .github/workflows/test-examples.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml
index da61e9f..7e81f00 100644
--- a/.github/workflows/test-examples.yaml
+++ b/.github/workflows/test-examples.yaml
@@ -11,7 +11,7 @@ jobs:
 
     env:
       SHELL: /bin/bash
-      INSTALLED_EDM_VERSION: "4.0.0"
+      INSTALLED_EDM_VERSION: "3.7.0"
       EDM_API_TOKEN: ${{ secrets.HATCHER_TOKEN }}
 
     strategy: