From 203e1b1bb0b5c79345e300548cf2e9095e26f0b6 Mon Sep 17 00:00:00 2001 From: JCGuerrero Date: Sat, 18 Jan 2025 14:23:34 -0600 Subject: [PATCH] test --- .github/workflows/always.yml | 2 +- requirements.pipx.txt | 1 - requirements.upgrade.txt | 1 + scripts/{gil/setup.ba.sh => pip/upgrade.ba.sh} | 5 +---- scripts/prepare.ba.sh | 4 ++-- 5 files changed, 5 insertions(+), 8 deletions(-) rename scripts/{gil/setup.ba.sh => pip/upgrade.ba.sh} (50%) diff --git a/.github/workflows/always.yml b/.github/workflows/always.yml index d87585b..c51ab6d 100644 --- a/.github/workflows/always.yml +++ b/.github/workflows/always.yml @@ -112,7 +112,7 @@ jobs: verify_matrix: name: Verify needs: verify - if: github.ref == 'refs/heads/main' + # if: github.ref == 'refs/heads/main' # FIXME continue-on-error: true strategy: max-parallel: 10 diff --git a/requirements.pipx.txt b/requirements.pipx.txt index 356d219..31c0fca 100644 --- a/requirements.pipx.txt +++ b/requirements.pipx.txt @@ -1,4 +1,3 @@ -gil>=1.25.0.0,<2.0.0.0 poetry>=2.0.0,<3.0.0 pre_commit>=4.0.1,<5.0.0 pyclean>=3.0.0,<4.0.0 diff --git a/requirements.upgrade.txt b/requirements.upgrade.txt index e79531c..13f1418 100644 --- a/requirements.upgrade.txt +++ b/requirements.upgrade.txt @@ -1 +1,2 @@ +gil pipx diff --git a/scripts/gil/setup.ba.sh b/scripts/pip/upgrade.ba.sh similarity index 50% rename from scripts/gil/setup.ba.sh rename to scripts/pip/upgrade.ba.sh index 22ad4f9..2c2be0e 100644 --- a/scripts/gil/setup.ba.sh +++ b/scripts/pip/upgrade.ba.sh @@ -4,10 +4,7 @@ set -e set -x python -m pip install --upgrade pip -python -m pip install pipx -python -m pipx install gil -pipx run -- gil clone - +python -m pip install --upgrade --requirement requirements.upgrade.txt set +x set +e diff --git a/scripts/prepare.ba.sh b/scripts/prepare.ba.sh index 52fc503..31dbe9d 100644 --- a/scripts/prepare.ba.sh +++ b/scripts/prepare.ba.sh @@ -15,8 +15,8 @@ if [ "${environment}" == "pre-docker" ]; then fi # Upgrades top-level dependencies, like pipx -bash ${scripts_path}/gil/setup.ba.sh - +bash ${scripts_path}/pip/upgrade.ba.sh +gil clone bash ./repos/commons/scripts/prepare.ba.sh set +x