From ad5dc23062d6ebd19f93f4a597902333c645c70a Mon Sep 17 00:00:00 2001 From: EdwinWiseOne Date: Fri, 20 Dec 2024 09:49:34 -0600 Subject: [PATCH 1/2] Re-enable python 3.8 in CI --- Minimal/ci/__main__.py | 5 +++-- Panel/ci/__main__.py | 5 +++-- Panel/requirements.txt | 2 +- Plotly Dash/ci/__main__.py | 5 +++-- Plotly Dash/requirements.txt | 1 - React/ci/__main__.py | 5 +++-- Streamlit/ci/__main__.py | 5 +++-- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Minimal/ci/__main__.py b/Minimal/ci/__main__.py index 2605ca5..fc90eca 100644 --- a/Minimal/ci/__main__.py +++ b/Minimal/ci/__main__.py @@ -48,8 +48,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose): app_deps = config["app_deps"]["edm"] python_version = str(config["python_version"]) if python_version == "3.8": - raise RuntimeError("Python 3.8 is not supported") - platform = "rh8-x86_64" + 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. diff --git a/Panel/ci/__main__.py b/Panel/ci/__main__.py index f73bd4f..8be30d2 100644 --- a/Panel/ci/__main__.py +++ b/Panel/ci/__main__.py @@ -48,8 +48,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose): app_deps = config["app_deps"]["edm"] python_version = str(config["python_version"]) if python_version == "3.8": - raise RuntimeError("Python 3.8 is not supported") - platform = "rh8-x86_64" + 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. diff --git a/Panel/requirements.txt b/Panel/requirements.txt index f9ec12d..4aa7e84 100644 --- a/Panel/requirements.txt +++ b/Panel/requirements.txt @@ -1 +1 @@ -panel +# No pip requirements diff --git a/Plotly Dash/ci/__main__.py b/Plotly Dash/ci/__main__.py index ef97997..8f51af8 100644 --- a/Plotly Dash/ci/__main__.py +++ b/Plotly Dash/ci/__main__.py @@ -48,8 +48,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose): app_deps = config["app_deps"]["edm"] python_version = str(config["python_version"]) if python_version == "3.8": - raise RuntimeError("Python 3.8 is not supported") - platform = "rh8-x86_64" + 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. diff --git a/Plotly Dash/requirements.txt b/Plotly Dash/requirements.txt index 633b4b7..1adea34 100644 --- a/Plotly Dash/requirements.txt +++ b/Plotly Dash/requirements.txt @@ -1,2 +1 @@ -dash Flask-Session diff --git a/React/ci/__main__.py b/React/ci/__main__.py index 9bd7491..2dc9d4e 100644 --- a/React/ci/__main__.py +++ b/React/ci/__main__.py @@ -48,8 +48,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose): app_deps = config["app_deps"]["edm"] python_version = str(config["python_version"]) if python_version == "3.8": - raise RuntimeError("Python 3.8 is not supported") - platform = "rh8-x86_64" + platform = "rh7-x86_64" + else: + platform = "rh8-x86_64" # First, build the React application jsdir = op.join(SRC_ROOT, "src", "application", "frontend") diff --git a/Streamlit/ci/__main__.py b/Streamlit/ci/__main__.py index 442cdb3..d058430 100644 --- a/Streamlit/ci/__main__.py +++ b/Streamlit/ci/__main__.py @@ -48,8 +48,9 @@ def build(config, bundle_image, rebuild_zbundle, verbose): app_deps = config["app_deps"]["edm"] python_version = str(config["python_version"]) if python_version == "3.8": - raise RuntimeError("Python 3.8 is not supported") - platform = "rh8-x86_64" + 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. From f93c91e20d7cd36f2b10598ef2efabddeb78867d Mon Sep 17 00:00:00 2001 From: EdwinWiseOne Date: Fri, 20 Dec 2024 09:52:20 -0600 Subject: [PATCH 2/2] Verbosity --- Minimal/ci/__main__.py | 2 +- Panel/ci/__main__.py | 2 +- Plotly Dash/ci/__main__.py | 2 +- React/ci/__main__.py | 2 +- Streamlit/ci/__main__.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Minimal/ci/__main__.py b/Minimal/ci/__main__.py index fc90eca..e55832d 100644 --- a/Minimal/ci/__main__.py +++ b/Minimal/ci/__main__.py @@ -37,7 +37,7 @@ def cli(ctx): @cli.command() @click.option("--bundle-image", default=None) @click.option("--rebuild-zbundle", default=False, is_flag=True) -@click.option("--verbose", default=False, is_flag=True) +@click.option("--verbose/--no-verbose", default=True, is_flag=True) @click.pass_obj def build(config, bundle_image, rebuild_zbundle, verbose): """Build the Docker image""" diff --git a/Panel/ci/__main__.py b/Panel/ci/__main__.py index 8be30d2..14fdfea 100644 --- a/Panel/ci/__main__.py +++ b/Panel/ci/__main__.py @@ -37,7 +37,7 @@ def cli(ctx): @cli.command() @click.option("--bundle-image", default=None) @click.option("--rebuild-zbundle", default=False, is_flag=True) -@click.option("--verbose", default=False, is_flag=True) +@click.option("--verbose/--no-verbose", default=True, is_flag=True) @click.pass_obj def build(config, bundle_image, rebuild_zbundle, verbose): """Build the Docker image""" diff --git a/Plotly Dash/ci/__main__.py b/Plotly Dash/ci/__main__.py index 8f51af8..93e5b78 100644 --- a/Plotly Dash/ci/__main__.py +++ b/Plotly Dash/ci/__main__.py @@ -37,7 +37,7 @@ def cli(ctx): @cli.command() @click.option("--bundle-image", default=None) @click.option("--rebuild-zbundle", default=False, is_flag=True) -@click.option("--verbose", default=False, is_flag=True) +@click.option("--verbose/--no-verbose", default=True, is_flag=True) @click.pass_obj def build(config, bundle_image, rebuild_zbundle, verbose): """Build the Docker image""" diff --git a/React/ci/__main__.py b/React/ci/__main__.py index 2dc9d4e..c4f207d 100644 --- a/React/ci/__main__.py +++ b/React/ci/__main__.py @@ -37,7 +37,7 @@ def cli(ctx): @cli.command() @click.option("--bundle-image", default=None) @click.option("--rebuild-zbundle", default=False, is_flag=True) -@click.option("--verbose", default=False, is_flag=True) +@click.option("--verbose/--no-verbose", default=True, is_flag=True) @click.pass_obj def build(config, bundle_image, rebuild_zbundle, verbose): """Build the Docker image""" diff --git a/Streamlit/ci/__main__.py b/Streamlit/ci/__main__.py index d058430..f93af0a 100644 --- a/Streamlit/ci/__main__.py +++ b/Streamlit/ci/__main__.py @@ -37,7 +37,7 @@ def cli(ctx): @cli.command() @click.option("--bundle-image", default=None) @click.option("--rebuild-zbundle", default=False, is_flag=True) -@click.option("--verbose", default=False, is_flag=True) +@click.option("--verbose/--no-verbose", default=True, is_flag=True) @click.pass_obj def build(config, bundle_image, rebuild_zbundle, verbose): """Build the Docker image"""