From a54774a1475c5b8f0b41550d4bf61e29be44d4aa Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Fri, 28 May 2021 21:07:31 -0400 Subject: [PATCH] Instead of reimplementing platform detection here use the function from ensureconda --- conda_lock/conda_lock.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conda_lock/conda_lock.py b/conda_lock/conda_lock.py index d07720018..1b16b90cd 100644 --- a/conda_lock/conda_lock.py +++ b/conda_lock/conda_lock.py @@ -63,8 +63,6 @@ CONDA_PKGS_DIRS = None DEFAULT_PLATFORMS = ["osx-64", "linux-64", "win-64"] -_PLATFORM_MAP = {"osx-64": "darwin", "linux-64": "linux", "win-64": "win"} - def _extract_platform(line: str) -> Optional[str]: search = PLATFORM_PATTERN.search(line) @@ -82,7 +80,10 @@ def extract_platform(lockfile: str) -> str: def _do_validate_platform(platform: str) -> Tuple[bool, str]: - return sys.platform.startswith(_PLATFORM_MAP[platform]), sys.platform + from ensureconda.resolve import platform_subdir + + determined_subdir = platform_subdir() + return platform == determined_subdir, platform def do_validate_platform(lockfile: str):