Skip to content

Commit

Permalink
Merge pull request #286 from maresb/patch-2
Browse files Browse the repository at this point in the history
List the conda-forge platforms in README example
  • Loading branch information
mariusvniekerk authored Nov 22, 2022
2 parents ec2c4bf + 5ba73d6 commit 7c935b9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,12 @@ dependencies:
- python=3.9
- pandas
platforms:
- osx-arm64
- linux-64
- osx-64
- win-64
- osx-arm64 # For Apple Silicon, e.g. M1/M2
- linux-aarch64 # aka arm64, use for Docker on Apple Silicon
- linux-ppc64le
```

If you specify target platforms on the command line with `-p`, these will
Expand Down
13 changes: 9 additions & 4 deletions tests/test_conda_lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,15 @@ def test_run_lock_with_update(
conda_exe: str,
_conda_exe_type: str,
):
if platform.system().lower() == "windows" and _conda_exe_type == "conda":
pytest.skip(
reason="this test just takes too long on windows, due to the slow conda solver"
)
if platform.system().lower() == "windows":
if _conda_exe_type == "conda":
pytest.skip(
reason="this test just takes too long on windows, due to the slow conda solver"
)
if _conda_exe_type == "micromamba":
pytest.skip(
reason="for some unknown reason this segfaults on windows when using xdist in ci"
)

monkeypatch.chdir(update_environment.parent)
if is_micromamba(conda_exe):
Expand Down

0 comments on commit 7c935b9

Please sign in to comment.