Merge pull request #2950 from regro/beckermr-patch-2

feat: move entirely to pinnings package in env
regro · Aug 26, 2024 · bc34a9e · bc34a9e
2 parents e781bb1 + 8ebf542
commit bc34a9e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git 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

diff --git a/autotick-bot/install_bot_code.sh b/autotick-bot/install_bot_code.sh
@@ -34,11 +34,10 @@ 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
-    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__)")

diff --git 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
@@ -116,7 +117,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 +272,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())