Merge branch 'main' into pre-commit-ci-update-config

conda · Jan 7, 2025 · 644a702 · 644a702
2 parents 87f10f5 + 1b3c801
commit 644a702
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
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

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/tests/test_uninstall.py b/tests/test_uninstall.py
@@ -297,11 +297,14 @@ def _shortcuts_found(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: