Skip to content

Commit

Permalink
[chore] missing osx-arm64 (#168)
Browse files Browse the repository at this point in the history
* missing osx-arm64

* ensure default platforms

* changelog
  • Loading branch information
AlbertDeFusco authored Jun 3, 2024
1 parent 004f88e commit f0bec15
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [0.4.2] - 2024-06-03

- Fix default_platforms by @AlbertDeFusco in [#168](https://github.com/conda-incubator/conda-project/pull/168)

## [0.4.1] - 2024-05-04

- Fixing pypi trigger by @AlbertDeFusco in [#165](https://github.com/conda-incubator/conda-project/pull/165)
Expand Down
4 changes: 3 additions & 1 deletion src/conda_project/conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,9 @@ def current_platform() -> str:
return info.get("platform")


DEFAULT_PLATFORMS = set(["osx-64", "win-64", "linux-64", current_platform()])
DEFAULT_PLATFORMS = set(
["osx-64", "win-64", "linux-64", "osx-arm64", current_platform()]
)


def conda_run(
Expand Down
4 changes: 4 additions & 0 deletions tests/test_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
from conda_project.exceptions import CondaProjectError


def test_default_platforms():
assert DEFAULT_PLATFORMS >= set(["linux-64", "win-64", "osx-64", "osx-arm64"])


def test_local_condarc(tmp_path):
condarc = "channels: [__conda-project-test]\n"
condarc_file = tmp_path / ".condarc"
Expand Down

0 comments on commit f0bec15

Please sign in to comment.