Merge pull request #295 from scottyhq/os_name

Add os_name environment marker for platform-dependent pypi dependencies

conda_lock/pypi_solver.py

@@ -71,12 +71,15 @@ def __init__(self, python_version: str, platform: str):
  if platform.startswith("osx-"):
  self._sys_platform = "darwin"
  self._platform_system = "Darwin"
+ self._os_name = "posix"
  elif platform.startswith("linux-"):
  self._sys_platform = "linux"
  self._platform_system = "Linux"
+ self._os_name = "posix"
  elif platform.startswith("win-"):
  self._sys_platform = "win32"
  self._platform_system = "Windows"
+ self._os_name = "nt"
  else:
  raise ValueError(f"Unsupported platform '{platform}'")
 
@@ -99,6 +102,7 @@ def get_marker_env(self) -> Dict[str, str]:
  "python_version": ".".join([str(c) for c in self._python_version[:2]]),
  "sys_platform": self._sys_platform,
  "platform_system": self._platform_system,
+ "os_name": self._os_name,
  }
 
 

tests/test-os-name-marker/environment.yml

@@ -0,0 +1,8 @@
+channels:
+ - conda-forge
+dependencies:
+ - pip
+ - pip:
+ - jupyter-server ==2.3.0
+platforms:
+ - linux-64

tests/test_conda_lock.py

@@ -960,6 +960,25 @@ def test_run_lock_with_pip(
  run_lock([pip_environment], conda_exe=conda_exe)
 
 
+@pytest.fixture
+def os_name_marker_environment(tmp_path: Path):
+ return clone_test_dir("test-os-name-marker", tmp_path).joinpath("environment.yml")
+
+
+def test_os_name_marker(
+ monkeypatch: pytest.MonkeyPatch, os_name_marker_environment: Path, conda_exe: str
+):
+ monkeypatch.chdir(os_name_marker_environment.parent)
+ if is_micromamba(conda_exe):
+ monkeypatch.setenv("CONDA_FLAGS", "-v")
+ run_lock([os_name_marker_environment], conda_exe=conda_exe)
+ lockfile = parse_conda_lock_file(
+ os_name_marker_environment.parent / DEFAULT_LOCKFILE_NAME
+ )
+ for package in lockfile.package:
+ assert package.name != "pywinpty"
+
+
 def test_run_lock_with_pip_environment_different_names_same_deps(
  monkeypatch: "pytest.MonkeyPatch",
  pip_environment_different_names_same_deps: Path,