🤖 Update infrastructure file(s) (#370)

* 🤖 updated file(s) * Debug output of conda command * Explicitly add defaults to silence the FutureWarning breaking JSON output --------- Co-authored-by: Uwe L. Korn <uwe.korn@quantco.com>
conda · Oct 14, 2024 · 302f1d8 · 302f1d8
1 parent 7516244
commit 302f1d8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
@@ -23,7 +23,7 @@ jobs:
       GLOBAL: https://raw.githubusercontent.com/conda/infra/main/.github/global.yml
       LOCAL: .github/labels.yml
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - id: has_local
         uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -116,6 +116,8 @@ jobs:
     - name: Create the test environment and run the tests
       run: |
         source $CONDA_ROOT/etc/profile.d/conda.sh
+        # Explicitly add defaults to silence the FutureWarning breaking JSON output
+        conda config --add channels defaults
         conda info -a
         mv conda-bld $CONDA_ROOT/conda-bld
         conda create -n cptest local::conda-pack conda-forge::pytest conda-forge::pytest-cov defaults::python=${{ matrix.pyver }} zstandard>=0.23.0 ${{ matrix.conda_deps }}

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -44,7 +44,7 @@ jobs:
           echo REPOSITORY=$(curl --silent ${{ github.event.issue.pull_request.url }} | jq --raw-output '.head.repo.full_name') >> $GITHUB_ENV
           echo REF=$(curl --silent ${{ github.event.issue.pull_request.url }} | jq --raw-output '.head.ref') >> $GITHUB_ENV
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           repository: ${{ env.REPOSITORY || github.repository }}
           ref: ${{ env.REF || '' }}

diff --git a/conda_pack/tests/test_core.py b/conda_pack/tests/test_core.py
@@ -394,7 +394,7 @@ def test_pack_with_conda(tmpdir, fix_dest):
             commands = (
                 r"@set CONDA_PREFIX=",
                 r"@set CONDA_SHVL=",
-                rf"@call {extract_path}\Scripts\activate",
+                rf"@call {extract_path}\Scripts\activate.bat",
                 r"@conda info --json",
                 r"@deactivate",
             )

diff --git a/testing/env_yamls/has_conda.yml b/testing/env_yamls/has_conda.yml
@@ -1,5 +1,5 @@
 name: has_conda
 
 dependencies:
-    - conda
+    - conda<24.9
     - toolz