Merge branch 'main' of github.com:conda/conda-standalone into remove-…

…macos-apps-test
conda · Jan 8, 2025 · 5a3ee82 · 5a3ee82
2 parents 5dcdff4 + 801176e
commit 5a3ee82
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -44,7 +44,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
         with:
           auto-activate-base: true
-          activate-environment: ""
+          activate-environment: "test"
           run-post: false
 
       - name: Install dependencies
@@ -57,7 +57,7 @@ jobs:
           CONDA_BLD_PATH: ${{ runner.temp }}/bld
         run: conda build recipe --override-channels -c conda-forge
 
-      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: github.event_name == 'pull_request'
         with:
           name: conda-standalone-${{ matrix.subdir }}

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -80,7 +80,7 @@ jobs:
       - if: github.event.comment.body != '@conda-bot render'
         id: create
         # no-op if no commits were made
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
         with:
           push-to-fork: ${{ env.FORK }}
           token: ${{ secrets.SYNC_TOKEN }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
       # catch git merge/rebase problems
       - id: check-merge-conflict
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: ["--py37-plus"]

diff --git a/news/118-skip-uninstallation-caches-test b/news/118-skip-uninstallation-caches-test
@@ -0,0 +1,19 @@
+### Enhancements
+
+* <news item>
+
+### Bug fixes
+
+* Skip `test_uninstallation_remove_caches` if not on CI or if `CONDA_PKGS_DIRS` is set. (#118)
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* <news item>
diff --git a/news/125-build-environment b/news/125-build-environment
@@ -0,0 +1,19 @@
+### Enhancements
+
+* <news item>
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* Run CI builds in a separate conda environment. (#125)
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -14,7 +14,7 @@ source:
   - path: ../
 
   - url: https://github.com/conda/conda/archive/{{ conda_version }}.tar.gz
-    sha256: 781cfe0d1bcc8d6f0249ea58a7f9655a5089a8a6eeab1511ab556e6a8e742e23
+    sha256: 9ae1433949ca80eddfd81f0d5bd9eb8c291c7e101cbb440f8bdba324c9ea470c
     folder: conda_src
     patches:
       - ../src/conda_patches/0001-Rename-and-replace-entrypoint-stub-exe.patch

diff --git a/tests/test_uninstall.py b/tests/test_uninstall.py
@@ -298,11 +298,14 @@ def _shortcuts_found(base_env: Path, shortcut_env: Path) -> list:
     (True, False),
     ids=("shared pkgs", "remove pkgs"),
 )
+@pytest.mark.skipif(not ON_CI, reason="CI only - may remove shared caches")
 def test_uninstallation_remove_caches(
     mock_system_paths: dict[str, Path],
     tmp_env: TmpEnvFixture,
     shared_pkgs: bool,
 ):
+    if "CONDA_PKGS_DIRS" in os.environ:
+        pytest.skip("Test will fail with CONDA_PKGS_DIRS set.")
     # Set up notices
     if ON_WIN:
         try: