setop/pyenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into miniconda3-24.3.0-0

Browse Source
This commit is contained in:
Ivan Pozdeev 2024-12-22 16:21:41 +03:00
commit f613daf7bc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/python-build/scripts/add_miniconda.py
View File

@ -213,7 +213,7 @@ class CondaVersion(NamedTuple):
return PyVersion.PY37 return PyVersion.PY37
else: else:
# since 4.8, Miniconda specifies versions explicitly in the file name # since 4.8, Miniconda specifies versions explicitly in the file name
return None raise ValueError("Miniconda 4.8+ is supposed to specify a Python version explicitly")
if self.flavor == "anaconda": if self.flavor == "anaconda":
# https://docs.anaconda.com/free/anaconda/reference/release-notes/ # https://docs.anaconda.com/free/anaconda/reference/release-notes/
if v >= (2024,6): if v >= (2024,6):
@ -270,6 +270,7 @@ class CondaSpec(NamedTuple):
SupportedArch(arch), SupportedArch(arch),
md5, md5,
repo, repo,
py_ver
) )
if py_version is None and py_ver is None and ver != "latest": if py_version is None and py_ver is None and ver != "latest":
spec = spec.with_py_version(spec.version.default_py_version()) spec = spec.with_py_version(spec.version.default_py_version())