Merge pull request #465 from mariusvniekerk/osx-arm64-as-a-default

add osx-arm64 as a default platform
conda · Aug 30, 2023 · eb1cd9f · eb1cd9f
2 parents de32227 + 755be59
commit eb1cd9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/conda_lock/src_parser/__init__.py b/conda_lock/src_parser/__init__.py
@@ -19,7 +19,7 @@
 from conda_lock.virtual_package import FakeRepoData
 
 
-DEFAULT_PLATFORMS = ["osx-64", "linux-64", "win-64"]
+DEFAULT_PLATFORMS = ["linux-64", "osx-arm64", "osx-64", "win-64"]
 
 
 logger = logging.getLogger(__name__)

diff --git a/tests/test_conda_lock.py b/tests/test_conda_lock.py
@@ -1074,7 +1074,11 @@ def test_run_lock_blas_mkl(
     monkeypatch: "pytest.MonkeyPatch", blas_mkl_environment: Path, conda_exe: str
 ):
     monkeypatch.chdir(blas_mkl_environment.parent)
-    run_lock([blas_mkl_environment], conda_exe=conda_exe)
+    run_lock(
+        [blas_mkl_environment],
+        conda_exe=conda_exe,
+        platforms=["linux-64", "win-64", "osx-64"],
+    )
 
 
 @pytest.fixture