Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

103 - Use config python version and rh8 #104

Merged
merged 11 commits into from
Nov 15, 2024
8 changes: 5 additions & 3 deletions .github/workflows/test-examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:

test-examples:
name: Test Examples
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

env:
SHELL: /bin/bash
INSTALLED_EDM_VERSION: "3.4.0"
INSTALLED_EDM_VERSION: "3.7.0"
EdwinWiseOne marked this conversation as resolved.
Show resolved Hide resolved
EDM_API_TOKEN: ${{ secrets.HATCHER_TOKEN }}

strategy:
Expand Down Expand Up @@ -61,7 +61,9 @@ 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 available-runtimes
edm list-platforms
edm envs create edm --version 3.11 --platform rh8-x86_64 --force
npm install -g configurable-http-proxy

- name: Build example
Expand Down
2 changes: 1 addition & 1 deletion Minimal/app_config.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
9 changes: 7 additions & 2 deletions Minimal/ci/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
"generate",
"-i",
"--version",
"3.8",
python_version,
"--platform",
"rh7-x86_64",
platform,
"-m",
"2.0",
"-f",
Expand Down
1 change: 0 additions & 1 deletion Panel/app_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ env_deps:
- questionary
app_deps:
- enthought_edge>=2.16.0
- appdirs
- packaging
- pip
- pyparsing
Expand Down
9 changes: 7 additions & 2 deletions Panel/ci/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
"generate",
"-i",
"--version",
"3.8",
python_version,
"--platform",
"rh7-x86_64",
platform,
"-m",
"2.0",
"-f",
Expand Down
1 change: 0 additions & 1 deletion Plotly Dash/app_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ env_deps:
- questionary
app_deps:
- enthought_edge>=2.16.0
- appdirs
- packaging
- pip
- pyparsing
Expand Down
9 changes: 7 additions & 2 deletions Plotly Dash/ci/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
"generate",
"-i",
"--version",
"3.8",
python_version,
"--platform",
"rh7-x86_64",
platform,
"-m",
"2.0",
"-f",
Expand Down
3 changes: 1 addition & 2 deletions React/app_config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
app_id: edge-react-example
framework: react
app_version: 1.3.0
python_version: 3.8
python_version: 3.11
repository: quay.io
organisation: enthought
env_deps:
Expand All @@ -20,7 +20,6 @@ env_deps:
- questionary
app_deps:
- enthought_edge>=2.16.0
- appdirs
- packaging
- pip
- pyparsing
Expand Down
9 changes: 7 additions & 2 deletions React/ci/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -62,9 +67,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
"generate",
"-i",
"--version",
"3.8",
python_version,
"--platform",
"rh7-x86_64",
platform,
"-m",
"2.0",
"-f",
Expand Down
3 changes: 1 addition & 2 deletions Streamlit/app_config.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -19,7 +19,6 @@ env_deps:
- questionary
app_deps:
- enthought_edge>=2.16.0
- appdirs
- packaging
- pip
- pyparsing
Expand Down
9 changes: 7 additions & 2 deletions Streamlit/ci/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -57,9 +62,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose):
"generate",
"-i",
"--version",
"3.8",
python_version,
"--platform",
"rh7-x86_64",
platform,
"-m",
"2.0",
"-f",
Expand Down
Loading