From 05a6c61dd45aec1e740e2afa7114d728c3205c9e Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Thu, 19 Dec 2024 14:41:33 +0100 Subject: [PATCH 1/2] Rename split-tox-gh-actions --- .github/workflows/ci.yml | 4 ++-- .github/workflows/test-integrations-ai.yml | 6 ++++-- .github/workflows/test-integrations-aws.yml | 6 ++++-- .github/workflows/test-integrations-cloud.yml | 6 ++++-- .github/workflows/test-integrations-common.yml | 6 ++++-- .github/workflows/test-integrations-dbs.yml | 6 ++++-- .github/workflows/test-integrations-graphql.yml | 6 ++++-- .github/workflows/test-integrations-misc.yml | 6 ++++-- .github/workflows/test-integrations-network.yml | 6 ++++-- .github/workflows/test-integrations-tasks.yml | 6 ++++-- .github/workflows/test-integrations-web-1.yml | 6 ++++-- .github/workflows/test-integrations-web-2.yml | 6 ++++-- scripts/split_tox_gh_actions/__init__.py | 0 scripts/split_tox_gh_actions/requirements.txt | 1 + .../split_tox_gh_actions.py} | 8 ++++---- .../templates/base.jinja | 6 ++++-- .../templates/check_permissions.jinja | 0 .../templates/check_required.jinja | 0 .../templates/test_group.jinja | 0 19 files changed, 55 insertions(+), 30 deletions(-) create mode 100644 scripts/split_tox_gh_actions/__init__.py create mode 100644 scripts/split_tox_gh_actions/requirements.txt rename scripts/{split-tox-gh-actions/split-tox-gh-actions.py => split_tox_gh_actions/split_tox_gh_actions.py} (96%) rename scripts/{split-tox-gh-actions => split_tox_gh_actions}/templates/base.jinja (87%) rename scripts/{split-tox-gh-actions => split_tox_gh_actions}/templates/check_permissions.jinja (100%) rename scripts/{split-tox-gh-actions => split_tox_gh_actions}/templates/check_required.jinja (100%) rename scripts/{split-tox-gh-actions => split_tox_gh_actions}/templates/test_group.jinja (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed035b4ab0..7ef6604e39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,8 +45,8 @@ jobs: python-version: 3.12 - run: | - pip install jinja2 - python scripts/split-tox-gh-actions/split-tox-gh-actions.py --fail-on-changes + pip install -r scripts/split_tox_gh_actions/requirements.txt + python scripts/split_tox_gh_actions/split_tox_gh_actions.py --fail-on-changes build_lambda_layer: name: Build Package diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml index 5d1b05add8..3025bab3b4 100644 --- a/.github/workflows/test-integrations-ai.yml +++ b/.github/workflows/test-integrations-ai.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test AI on: push: diff --git a/.github/workflows/test-integrations-aws.yml b/.github/workflows/test-integrations-aws.yml index d2ce22f326..6cd9c8339f 100644 --- a/.github/workflows/test-integrations-aws.yml +++ b/.github/workflows/test-integrations-aws.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test AWS on: push: diff --git a/.github/workflows/test-integrations-cloud.yml b/.github/workflows/test-integrations-cloud.yml index 8fdd4a0649..fc86e12898 100644 --- a/.github/workflows/test-integrations-cloud.yml +++ b/.github/workflows/test-integrations-cloud.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test Cloud on: push: diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml index 8294b9480e..9aa32c37d8 100644 --- a/.github/workflows/test-integrations-common.yml +++ b/.github/workflows/test-integrations-common.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test Common on: push: diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index 0d9a7bbd7d..ecbbf84846 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test DBs on: push: diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml index 30480efe2e..f008d9f4d3 100644 --- a/.github/workflows/test-integrations-graphql.yml +++ b/.github/workflows/test-integrations-graphql.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test GraphQL on: push: diff --git a/.github/workflows/test-integrations-misc.yml b/.github/workflows/test-integrations-misc.yml index b88b256384..7d6366074f 100644 --- a/.github/workflows/test-integrations-misc.yml +++ b/.github/workflows/test-integrations-misc.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test Misc on: push: diff --git a/.github/workflows/test-integrations-network.yml b/.github/workflows/test-integrations-network.yml index 0a51866164..2885049889 100644 --- a/.github/workflows/test-integrations-network.yml +++ b/.github/workflows/test-integrations-network.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test Network on: push: diff --git a/.github/workflows/test-integrations-tasks.yml b/.github/workflows/test-integrations-tasks.yml index 695c338721..9eeecd4eb5 100644 --- a/.github/workflows/test-integrations-tasks.yml +++ b/.github/workflows/test-integrations-tasks.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test Tasks on: push: diff --git a/.github/workflows/test-integrations-web-1.yml b/.github/workflows/test-integrations-web-1.yml index 6e172182b3..08b8cb6d6d 100644 --- a/.github/workflows/test-integrations-web-1.yml +++ b/.github/workflows/test-integrations-web-1.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test Web 1 on: push: diff --git a/.github/workflows/test-integrations-web-2.yml b/.github/workflows/test-integrations-web-2.yml index f9f2651cb8..c72ac4fed5 100644 --- a/.github/workflows/test-integrations-web-2.yml +++ b/.github/workflows/test-integrations-web-2.yml @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja name: Test Web 2 on: push: diff --git a/scripts/split_tox_gh_actions/__init__.py b/scripts/split_tox_gh_actions/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scripts/split_tox_gh_actions/requirements.txt b/scripts/split_tox_gh_actions/requirements.txt new file mode 100644 index 0000000000..7f7afbf3bf --- /dev/null +++ b/scripts/split_tox_gh_actions/requirements.txt @@ -0,0 +1 @@ +jinja2 diff --git a/scripts/split-tox-gh-actions/split-tox-gh-actions.py b/scripts/split_tox_gh_actions/split_tox_gh_actions.py similarity index 96% rename from scripts/split-tox-gh-actions/split-tox-gh-actions.py rename to scripts/split_tox_gh_actions/split_tox_gh_actions.py index 26d13390c2..1b53093c5e 100755 --- a/scripts/split-tox-gh-actions/split-tox-gh-actions.py +++ b/scripts/split_tox_gh_actions/split_tox_gh_actions.py @@ -8,7 +8,7 @@ Whenever tox.ini is changed, this script needs to be run. Usage: - python split-tox-gh-actions.py [--fail-on-changes] + python split_tox_gh_actions.py [--fail-on-changes] If the parameter `--fail-on-changes` is set, the script will raise a RuntimeError in case the yaml files have been changed by the scripts execution. This is used in CI to check if the yaml files @@ -158,7 +158,7 @@ def main(fail_on_changes): if missing_frameworks: raise RuntimeError( "Please add the following frameworks to the corresponding group " - "in `GROUPS` in `scripts/split-tox-gh-actions/split-tox-gh-actions.py: " + "in `GROUPS` in `scripts/split_tox_gh_actions/split_tox_gh_actions.py: " + ", ".join(missing_frameworks) ) @@ -176,9 +176,9 @@ def main(fail_on_changes): if old_hash != new_hash: raise RuntimeError( "The yaml configuration files have changed. This means that either `tox.ini` " - "or one of the constants in `split-tox-gh-actions.py` has changed " + "or one of the constants in `split_tox_gh_actions.py` has changed " "but the changes have not been propagated to the GitHub actions config files. " - "Please run `python scripts/split-tox-gh-actions/split-tox-gh-actions.py` " + "Please run `python scripts/split_tox_gh_actions/split_tox_gh_actions.py` " "locally and commit the changes of the yaml configuration files to continue. " ) diff --git a/scripts/split-tox-gh-actions/templates/base.jinja b/scripts/split_tox_gh_actions/templates/base.jinja similarity index 87% rename from scripts/split-tox-gh-actions/templates/base.jinja rename to scripts/split_tox_gh_actions/templates/base.jinja index 23f051de42..16dbc04a76 100644 --- a/scripts/split-tox-gh-actions/templates/base.jinja +++ b/scripts/split_tox_gh_actions/templates/base.jinja @@ -1,5 +1,7 @@ -# Do not edit this file. This file is generated automatically by executing -# python scripts/split-tox-gh-actions/split-tox-gh-actions.py +# Do not edit this YAML file. This file is generated automatically by executing +# python scripts/split_tox_gh_actions/split_tox_gh_actions.py +# The template responsible for it is in +# scripts/split_tox_gh_actions/templates/base.jinja {% with lowercase_group=group | replace(" ", "_") | lower %} name: Test {{ group }} diff --git a/scripts/split-tox-gh-actions/templates/check_permissions.jinja b/scripts/split_tox_gh_actions/templates/check_permissions.jinja similarity index 100% rename from scripts/split-tox-gh-actions/templates/check_permissions.jinja rename to scripts/split_tox_gh_actions/templates/check_permissions.jinja diff --git a/scripts/split-tox-gh-actions/templates/check_required.jinja b/scripts/split_tox_gh_actions/templates/check_required.jinja similarity index 100% rename from scripts/split-tox-gh-actions/templates/check_required.jinja rename to scripts/split_tox_gh_actions/templates/check_required.jinja diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja similarity index 100% rename from scripts/split-tox-gh-actions/templates/test_group.jinja rename to scripts/split_tox_gh_actions/templates/test_group.jinja From 653fcde1a39a12b574ffaadeb7960b44424796ae Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Thu, 19 Dec 2024 14:45:05 +0100 Subject: [PATCH 2/2] fix name --- ...amba-layer-versions.sh => aws-delete-lambda-layer-versions.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{aws-delete-lamba-layer-versions.sh => aws-delete-lambda-layer-versions.sh} (100%) diff --git a/scripts/aws-delete-lamba-layer-versions.sh b/scripts/aws-delete-lambda-layer-versions.sh similarity index 100% rename from scripts/aws-delete-lamba-layer-versions.sh rename to scripts/aws-delete-lambda-layer-versions.sh