Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.x: Run tests for conda=24.1 #3191

Merged
merged 2 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mamba/environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- pytest >=7.3
- pyyaml
- boltons
- conda >=23.11.0
- conda >=24.1.0
- conda-content-trust
- cryptography<40.0 # Or breaks conda-content-trust
- pip:
Expand Down
2 changes: 1 addition & 1 deletion mamba/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"conda>=4.14.0",
"libmambapy",
],
extras_require={"test": ["pytest", "pytest-lazy-fixture"]},
extras_require={"test": ["pytest"]},
data_files=data_files,
include_package_data=True,
zip_safe=False,
Expand Down
1 change: 0 additions & 1 deletion micromamba/environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ dependencies:
- cli11 >=2.2
- pytest >=7.3.0
- pytest-asyncio
- pytest-lazy-fixture
- pytest-xprocess
- conda-package-handling
- pyyaml
Expand Down
11 changes: 7 additions & 4 deletions micromamba/tests/test_pkg_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,13 @@ def same_repodata_json_solv(cache: Path):


class TestMultiplePkgCaches:
@pytest.mark.parametrize(
"cache", (pytest.lazy_fixture(("tmp_cache", "tmp_cache_alt")))
)
def test_different_caches(self, tmp_home, tmp_root_prefix, cache):
@pytest.mark.parametrize("which_cache", ["tmp_cache", "tmp_cache_alt"])
def test_different_caches(
self, tmp_home, tmp_root_prefix, tmp_cache, tmp_cache_alt, which_cache
):
# Test parametrization
cache = {"tmp_cache": tmp_cache, "tmp_cache_alt": tmp_cache_alt}[which_cache]

os.environ["CONDA_PKGS_DIRS"] = f"{cache}"
env_name = "some_env"
res = helpers.create("-n", env_name, "xtensor", "-v", "--json", no_dry_run=True)
Expand Down
Loading