Skip to content

Commit

Permalink
Add guards for None-type versions for skips
Browse files Browse the repository at this point in the history
  • Loading branch information
marcoesters committed Sep 20, 2024
1 parent c6c585c commit f6337c4
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,11 @@ def test_example_extra_files(tmp_path, request):


@pytest.mark.xfail(
CONDA_EXE == StandaloneExe.CONDA and CONDA_EXE_VERSION < Version("23.11.0a0"),
(
CONDA_EXE == StandaloneExe.CONDA
and CONDA_EXE_VERSION is not None
and CONDA_EXE_VERSION < Version("23.11.0a0")
),
reason="Known issue with conda-standalone<=23.10: shortcuts are created but not removed.",
)
def test_example_miniforge(tmp_path, request):
Expand Down Expand Up @@ -568,7 +572,11 @@ def test_example_scripts(tmp_path, request):


@pytest.mark.skipif(
CONDA_EXE == StandaloneExe.MAMBA or CONDA_EXE_VERSION < Version("23.11.0a0"),
(
CONDA_EXE == StandaloneExe.MAMBA
or CONDA_EXE_VERSION is None
or CONDA_EXE_VERSION < Version("23.11.0a0")
),
reason="menuinst v2 requires conda-standalone>=23.11.0; micromamba is not supported yet",
)
def test_example_shortcuts(tmp_path, request):
Expand Down

0 comments on commit f6337c4

Please sign in to comment.