From 0216d55409f6894bed8663bd15b908fe1e161c52 Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Mon, 16 Sep 2024 00:57:32 +0200 Subject: [PATCH] Always convert Poetry versions to Conda versions This shouldn't be lossy, and it gets rid of nasty caret and tilde operators which may be incompatible with tools like pip/pixi. --- conda_lock/src_parser/pyproject_toml.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conda_lock/src_parser/pyproject_toml.py b/conda_lock/src_parser/pyproject_toml.py index 2c548b9a..256b57df 100644 --- a/conda_lock/src_parser/pyproject_toml.py +++ b/conda_lock/src_parser/pyproject_toml.py @@ -276,12 +276,12 @@ def parse_poetry_pyproject_toml( f"Unsupported type for dependency: {depname}: {depattrs}" ) - if manager == "conda": - name = pypi_name_to_conda_name(depname, mapping_url=mapping_url) - version = poetry_version_to_conda_version(poetry_version_spec) - else: - name = depname - version = poetry_version_spec + name = ( + pypi_name_to_conda_name(depname, mapping_url=mapping_url) + if manager == "conda" + else depname + ) + version = poetry_version_to_conda_version(poetry_version_spec) if "git" in depattrs and url is not None: url, rev = unpack_git_url(url)