111 - Install from pip requirements and disable python 3.8 (#112)

* pip requirements and disable python 3.8
* EDM 4.0.  
* setup-edm-action v4

.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:
@@ -51,7 +51,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up EDM
-        uses: enthought/setup-edm-action@v2
+        uses: enthought/setup-edm-action@v4
         with:
           edm-version:  ${{ env.INSTALLED_EDM_VERSION }}
 

Kubernetes/devspace.yaml

@@ -49,7 +49,7 @@ hooks:
     command: |-
       $!(
         if ! [ -f ./src/app_environment.zbundle ] || [ $(get_flag "rebuild-zbundle") == "true" ]; then
-          echo 'edm bundle generate -i --version 3.8 --platform rh7-x86_64 -m 2.0 -f ./src/app_environment.zbundle ${EDM_APP_DEPENDENCIES}'
+          echo 'edm bundle generate -i --version 3.11 --platform rh8-x86_64 -m 2.0 -f ./src/app_environment.zbundle ${EDM_APP_DEPENDENCIES}'
         else
           echo ''
         fi
@@ -77,7 +77,7 @@ commands:
     cd deploy/terraform/deployments/devspace
     terraform init
   create-edm-devenv: |-
-    edm env create ${DEVSPACE_NAME} --version 3.8
+    edm env create ${DEVSPACE_NAME} --version 3.11 --platform rh8-x86_64
     edm install -e ${DEVSPACE_NAME} -y ${EDM_APP_DEPENDENCIES}
 
 functions:

Minimal/Dockerfile

@@ -20,7 +20,7 @@
 
 ARG BASE_IMAGE=quay.io/enthought/edm-rockylinux-8:latest
 
-FROM $BASE_IMAGE as stage_one
+FROM $BASE_IMAGE AS stage_one
 
 ARG EDGE_BUNDLE=app_environment.zbundle
 COPY $EDGE_BUNDLE /tmp/app_environment.zbundle
@@ -32,10 +32,13 @@ WORKDIR /home/app
 # Create a default EDM environment using the enthought_edge bundle
 RUN edm env import -f /tmp/app_environment.zbundle edm && edm cache purge --yes
 
+# Add any 'pip' packages to the application environment
+COPY requirements.txt /tmp/requirements.txt
+RUN edm run -- python -m pip install -r /tmp/requirements.txt --no-cache-dir
 
 # Second stage
 
-FROM $BASE_IMAGE as stage_two
+FROM $BASE_IMAGE AS stage_two
 
 LABEL source="https://github.com/enthought/edge-examples/blob/main/Minimal/Dockerfile"
 

Minimal/app_config.yaml

@@ -18,10 +18,13 @@ env_deps:
   pip:
   - questionary
 app_deps:
-- flask
-- setuptools
-- gunicorn
-- enthought_edge
+  edm:
+  - flask
+  - pip
+  - setuptools
+  - gunicorn
+  - enthought_edge
+  pip: []
 cmd_deps:
 - docker
 exclude:

Minimal/bootstrap.py

@@ -27,7 +27,8 @@ def bootstrap(ci_mode):
 
     if ENV_NAME not in _list_edm_envs():
         print(f"Creating development environment '{ENV_NAME}'...")
-        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
+        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.11",
+               "--platform", "rh8-x86_64", "--force"]
         subprocess.run(cmd, check=True)
 
         cmd = ["edm", "install", "-e", ENV_NAME, "-y"] + EDM_DEPS

Minimal/ci/__main__.py

@@ -45,12 +45,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     # Configuration details
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
-    app_deps = config["app_deps"]
+    app_deps = config["app_deps"]["edm"]
     python_version = str(config["python_version"])
     if python_version == "3.8":
-        platform = "rh7-x86_64"
-    else:
-        platform = "rh8-x86_64"
+        raise RuntimeError("Python 3.8 is not supported")
+    platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.

Minimal/requirements.txt

@@ -0,0 +1 @@
+# No pip requirements

Panel/Dockerfile

@@ -32,6 +32,9 @@ WORKDIR /home/app
 # Create a default EDM environment using the enthought_edge bundle
 RUN edm env import -f /tmp/app_environment.zbundle edm && edm cache purge --yes
 
+# Add any 'pip' packages to the application environment
+COPY requirements.txt /tmp/requirements.txt
+RUN edm run -- python -m pip install -r /tmp/requirements.txt --no-cache-dir
 
 # Second stage
 

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:
@@ -18,16 +18,18 @@ env_deps:
   pip:
   - questionary
 app_deps:
-- enthought_edge>=2.16.0
-- packaging
-- pip
-- pyparsing
-- setuptools
-- six
-- panel
-- numpy
-- pandas
-- matplotlib
+  edm:
+  - enthought_edge>=2.16.0
+  - packaging
+  - pip
+  - pyparsing
+  - setuptools
+  - six
+  - numpy
+  - pandas
+  - matplotlib
+  pip:
+  - panel
 cmd_deps:
 - docker
 exclude:

Panel/bootstrap.py

@@ -27,7 +27,8 @@ def bootstrap(ci_mode):
 
     if ENV_NAME not in _list_edm_envs():
         print(f"Creating development environment '{ENV_NAME}'...")
-        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
+        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.11",
+               "--platform", "rh8-x86_64", "--force"]
         subprocess.run(cmd, check=True)
 
         cmd = ["edm", "install", "-e", ENV_NAME, "-y"] + EDM_DEPS

Panel/ci/__main__.py

@@ -45,12 +45,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     # Configuration details
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
-    app_deps = config["app_deps"]
+    app_deps = config["app_deps"]["edm"]
     python_version = str(config["python_version"])
     if python_version == "3.8":
-        platform = "rh7-x86_64"
-    else:
-        platform = "rh8-x86_64"
+        raise RuntimeError("Python 3.8 is not supported")
+    platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.

Panel/requirements.txt

@@ -0,0 +1 @@
+panel

Plotly Dash/Dockerfile

@@ -32,9 +32,9 @@ WORKDIR /home/app
 # Create a default EDM environment using the enthought_edge bundle
 RUN edm env import -f /tmp/app_environment.zbundle edm && edm cache purge --yes
 
-# Install any 'pip' dependencies
-RUN edm run -- pip install --no-cache-dir Flask-Session
-
+# Add any 'pip' packages to the application environment
+COPY requirements.txt /tmp/requirements.txt
+RUN edm run -- python -m pip install -r /tmp/requirements.txt --no-cache-dir
 
 # Second stage
 

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:
@@ -18,17 +18,20 @@ env_deps:
   pip:
   - questionary
 app_deps:
-- enthought_edge>=2.16.0
-- packaging
-- pip
-- pyparsing
-- setuptools
-- six
-- requests
-- gunicorn
-- pandas
-- flask>2
-- dash
+  edm:
+  - enthought_edge>=2.16.0
+  - packaging
+  - pip
+  - pyparsing
+  - setuptools
+  - six
+  - requests
+  - gunicorn
+  - pandas
+  - flask>2
+  pip:
+  - dash
+  - Flask-Session
 cmd_deps:
 - docker
 exclude:

Plotly Dash/bootstrap.py

@@ -27,7 +27,8 @@ def bootstrap(ci_mode):
 
     if ENV_NAME not in _list_edm_envs():
         print(f"Creating development environment '{ENV_NAME}'...")
-        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
+        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.11",
+               "--platform", "rh8-x86_64", "--force"]
         subprocess.run(cmd, check=True)
 
         cmd = ["edm", "install", "-e", ENV_NAME, "-y"] + EDM_DEPS

Plotly Dash/ci/__main__.py

@@ -45,12 +45,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     # Configuration details
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
-    app_deps = config["app_deps"]
+    app_deps = config["app_deps"]["edm"]
     python_version = str(config["python_version"])
     if python_version == "3.8":
-        platform = "rh7-x86_64"
-    else:
-        platform = "rh8-x86_64"
+        raise RuntimeError("Python 3.8 is not supported")
+    platform = "rh8-x86_64"
 
     # First, we build a "zbundle" which contains all the eggs needed to
     # build the environment within the Docker image.

Plotly Dash/requirements.txt

@@ -0,0 +1,2 @@
+dash
+Flask-Session

React/Dockerfile

@@ -32,9 +32,9 @@ WORKDIR /home/app
 # Create a default EDM environment using the enthought_edge bundle
 RUN edm env import -f /tmp/app_environment.zbundle edm && edm cache purge --yes
 
-# Install any 'pip' dependencies
-RUN edm run -- pip install --no-cache-dir Flask-Session
-
+# Add any 'pip' packages to the application environment
+COPY requirements.txt /tmp/requirements.txt
+RUN edm run -- python -m pip install -r /tmp/requirements.txt --no-cache-dir
 
 # Second stage
 

React/app_config.yaml

@@ -19,16 +19,19 @@ env_deps:
   pip:
   - questionary
 app_deps:
-- enthought_edge>=2.16.0
-- packaging
-- pip
-- pyparsing
-- setuptools
-- six
-- click
-- flask>2
-- gunicorn
-- opencv_python
+  edm:
+  - enthought_edge>=2.16.0
+  - packaging
+  - pip
+  - pyparsing
+  - setuptools
+  - six
+  - click
+  - flask>2
+  - gunicorn
+  - opencv_python
+  pip:
+  - Flask-Session
 cmd_deps:
 - docker
 exclude:

React/bootstrap.py

@@ -27,7 +27,8 @@ def bootstrap(ci_mode):
 
     if ENV_NAME not in _list_edm_envs():
         print(f"Creating development environment '{ENV_NAME}'...")
-        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
+        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.11",
+               "--platform", "rh8-x86_64", "--force"]
         subprocess.run(cmd, check=True)
 
         cmd = ["edm", "install", "-e", ENV_NAME, "-y"] + EDM_DEPS

React/ci/__main__.py

@@ -45,12 +45,11 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
     # Configuration details
     bundle_image = bundle_image or _bundle_image(config)
     version = config["app_version"]
-    app_deps = config["app_deps"]
+    app_deps = config["app_deps"]["edm"]
     python_version = str(config["python_version"])
     if python_version == "3.8":
-        platform = "rh7-x86_64"
-    else:
-        platform = "rh8-x86_64"
+        raise RuntimeError("Python 3.8 is not supported")
+    platform = "rh8-x86_64"
 
     # First, build the React application
     jsdir = op.join(SRC_ROOT, "src", "application", "frontend")

React/requirements.txt

@@ -0,0 +1 @@
+Flask-Session

Streamlit/Dockerfile

@@ -32,9 +32,9 @@ WORKDIR /home/app
 # Create a default EDM environment using the enthought_edge bundle
 RUN edm env import -f /tmp/app_environment.zbundle edm && edm cache purge --yes
 
-# Add a few 'pip' packages to the application environment
-RUN edm run -- python -m pip install --no-cache-dir \
-    streamlit streamlit-javascript streamlit-extras
+# Add any 'pip' packages to the application environment
+COPY requirements.txt /tmp/requirements.txt
+RUN edm run -- python -m pip install -r /tmp/requirements.txt --no-cache-dir
 
 # Second stage
 

Streamlit/app_config.yaml

@@ -18,13 +18,18 @@ env_deps:
   pip:
   - questionary
 app_deps:
-- enthought_edge>=2.16.0
-- packaging
-- pip
-- pyparsing
-- setuptools
-- six
-- requests
+  edm:
+  - enthought_edge>=2.16.0
+  - packaging
+  - pip
+  - pyparsing
+  - setuptools
+  - six
+  - requests
+  pip:
+  - streamlit
+  - streamlit-javascript
+  - streamlit-extras
 cmd_deps:
 - docker
 exclude:

Streamlit/bootstrap.py

@@ -27,7 +27,8 @@ def bootstrap(ci_mode):
 
     if ENV_NAME not in _list_edm_envs():
         print(f"Creating development environment '{ENV_NAME}'...")
-        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
+        cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.11",
+               "--platform", "rh8-x86_64", "--force"]
         subprocess.run(cmd, check=True)
 
         cmd = ["edm", "install", "-e", ENV_NAME, "-y"] + EDM_DEPS