Merge branch 'main' into update_platform_tags

conda_lock/conda_lock.py

@@ -1239,7 +1239,10 @@ def lock(
 ) -> None:
  """Generate fully reproducible lock files for conda environments.
 
- By default, the lock files are written to conda-{platform}.lock. These filenames can be customized using the
+ By default, a multi-platform lock file is written to conda-lock.yml.
+
+ When choosing the "explicit" or "env" kind, lock files are written to
+ conda-{platform}.lock. These filenames can be customized using the
  --filename-template argument. The following tokens are available:
 
  \b

tests/test_conda_lock.py

@@ -316,6 +316,7 @@ def include_dev_dependencies(request: Any) -> bool:
 )
 def _conda_exe_type(request: Any) -> str:
  "Internal fixture to iterate over"
+
  return request.param
 
 
@@ -328,6 +329,10 @@ def conda_exe(_conda_exe_type: str) -> PathLike:
  conda=False,
  conda_exe=False,
  )
+ if platform.system().lower() == "windows":
+ if _conda_exe_type == "micromamba":
+ pytest.skip(reason="micromamba tests are failing on windows")
+
  kwargs[_conda_exe_type] = True
  _conda_exe = _ensureconda(**kwargs)