From 718160680ebe7a74e061759f83c91fd695e1f437 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2024 06:45:58 -0500 Subject: [PATCH 1/6] feat: move entirely to pinnings package in env --- conda_forge_tick/migrators/arch.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/conda_forge_tick/migrators/arch.py b/conda_forge_tick/migrators/arch.py index 274ed3ad2..1dfe551db 100644 --- a/conda_forge_tick/migrators/arch.py +++ b/conda_forge_tick/migrators/arch.py @@ -116,7 +116,13 @@ def __init__( if target_packages is None: # We are constraining the scope of this migrator with open( - "../conda-forge-pinning-feedstock/recipe/migrations/arch_rebuild.txt", + os.path.join( + os.environ["CONDA_PREFIX"], + "share", + "conda-forge", + "migrations", + "arch_rebuild.txt", + ) ) as f: target_packages = set(f.read().split()) @@ -265,7 +271,13 @@ def __init__( if target_packages is None: # We are constraining the scope of this migrator with open( - "../conda-forge-pinning-feedstock/recipe/migrations/osx_arm64.txt", + os.path.join( + os.environ["CONDA_PREFIX"], + "share", + "conda-forge", + "migrations", + "osx_arm64.txt", + ) ) as f: target_packages = set(f.read().split()) From 07430ee137165fa4a9ea678556411be99e897fe6 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2024 06:48:14 -0500 Subject: [PATCH 2/6] fix: update install scripts --- autotick-bot/install_bot_code.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/autotick-bot/install_bot_code.sh b/autotick-bot/install_bot_code.sh index 1812218c0..3f0f73c96 100644 --- a/autotick-bot/install_bot_code.sh +++ b/autotick-bot/install_bot_code.sh @@ -36,9 +36,8 @@ cd .. if [[ "$1" != "--no-clone-graph-and-pinning" ]]; then git clone --depth=5 https://github.com/regro/cf-graph-countyfair.git cf-graph - git clone --depth=1 https://github.com/conda-forge/conda-forge-pinning-feedstock.git else - echo "Skipping cloning of cf-graph and pinning feedstock" + echo "Skipping cloning of cf-graph" fi bot_tag=$(python -c "import conda_forge_tick; print(conda_forge_tick.__version__)") From 29d013c38c1f8191fd0be4935474a6aaa17161fb Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2024 06:50:31 -0500 Subject: [PATCH 3/6] Update bot-cache.yml --- .github/workflows/bot-cache.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bot-cache.yml b/.github/workflows/bot-cache.yml index 03957b839..08d088a04 100644 --- a/.github/workflows/bot-cache.yml +++ b/.github/workflows/bot-cache.yml @@ -57,7 +57,7 @@ jobs: - name: install bot code if: success() && ! env.CI_SKIP run: | - source cf-scripts/autotick-bot/install_bot_code.sh --no-clone-graph-and-pinning + source cf-scripts/autotick-bot/install_bot_code.sh --no-clone-graph - name: run sync if: success() && ! env.CI_SKIP @@ -110,7 +110,7 @@ jobs: - name: install bot code if: success() && ! env.CI_SKIP run: | - source cf-scripts/autotick-bot/install_bot_code.sh --no-clone-graph-and-pinning + source cf-scripts/autotick-bot/install_bot_code.sh --no-clone-graph - name: trigger next job uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1.2.3 From d6173bcf4547c8add1b52b325e91dc6971c11217 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2024 06:50:56 -0500 Subject: [PATCH 4/6] Update install_bot_code.sh --- autotick-bot/install_bot_code.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autotick-bot/install_bot_code.sh b/autotick-bot/install_bot_code.sh index 3f0f73c96..7b7114571 100644 --- a/autotick-bot/install_bot_code.sh +++ b/autotick-bot/install_bot_code.sh @@ -34,7 +34,7 @@ pip install --no-deps --no-build-isolation -e . cd .. -if [[ "$1" != "--no-clone-graph-and-pinning" ]]; then +if [[ "$1" != "--no-clone-graph" ]]; then git clone --depth=5 https://github.com/regro/cf-graph-countyfair.git cf-graph else echo "Skipping cloning of cf-graph" From fe2fff9003cef047ab82e6159f4644d8e1b67827 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:51:23 +0000 Subject: [PATCH 5/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- conda_forge_tick/migrators/arch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda_forge_tick/migrators/arch.py b/conda_forge_tick/migrators/arch.py index 1dfe551db..9a4d37c04 100644 --- a/conda_forge_tick/migrators/arch.py +++ b/conda_forge_tick/migrators/arch.py @@ -122,7 +122,7 @@ def __init__( "conda-forge", "migrations", "arch_rebuild.txt", - ) + ) ) as f: target_packages = set(f.read().split()) @@ -277,7 +277,7 @@ def __init__( "conda-forge", "migrations", "osx_arm64.txt", - ) + ) ) as f: target_packages = set(f.read().split()) From 8ebf542f599cabac1fe78b1d1ed014da5043cc0d Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2024 06:52:16 -0500 Subject: [PATCH 6/6] Update arch.py --- conda_forge_tick/migrators/arch.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conda_forge_tick/migrators/arch.py b/conda_forge_tick/migrators/arch.py index 9a4d37c04..d811af004 100644 --- a/conda_forge_tick/migrators/arch.py +++ b/conda_forge_tick/migrators/arch.py @@ -1,3 +1,4 @@ +import os import typing from textwrap import dedent from typing import Any, Optional, Sequence