Unverified Commit 058d2377 authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_24.0' into release_24.1

parents 33cabba5 7fd1b6af

lib/galaxy/tool_util/deps/conda_util.py

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ IS_OS_X = sys.platform == "darwin" 
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