From f3e4a1693589907f9620870aaeddd018022176b8 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Sun, 5 Jan 2025 15:58:25 +0000 Subject: [PATCH] Remove unnecessary quoting in conda package specification Fix the following error in: - test/unit/tool_util/test_conda_resolution.py::test_install_conda_build - test/integration/test_resolvers.py::TestCondaResolutionIntegration::test_dependency_install - test/integration/test_resolvers.py::TestCondaResolutionIntegration::test_uninstall_through_tools_api ``` InvalidMatchSpec: Invalid spec ''pyopenssl>=22.1.0'': Invalid version '22.1.0'': invalid character(s) ``` --- lib/galaxy/tool_util/deps/conda_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tool_util/deps/conda_util.py b/lib/galaxy/tool_util/deps/conda_util.py index d5190383a1f9..1c688cdd7c0f 100644 --- a/lib/galaxy/tool_util/deps/conda_util.py +++ b/lib/galaxy/tool_util/deps/conda_util.py @@ -48,7 +48,7 @@ VERSIONED_ENV_DIR_NAME = re.compile(r"__(.*)@(.*)") UNVERSIONED_ENV_DIR_NAME = re.compile(r"__(.*)@_uv_") USE_PATH_EXEC_DEFAULT = False -CONDA_PACKAGE_SPECS = ("conda>=23.7.0", "conda-libmamba-solver", "'pyopenssl>=22.1.0'") +CONDA_PACKAGE_SPECS = ("conda>=23.7.0", "conda-libmamba-solver", "pyopenssl>=22.1.0") CONDA_BUILD_SPECS = ("conda-build>=3.22.0",) USE_LOCAL_DEFAULT = False