git: c6cba04860de - main - Mk: Revert "Mk: unregister expired lang/python38 and update some comments"
Date: Thu, 31 Oct 2024 22:11:52 UTC
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6cba04860de992d4c6a6419922c508116dc85fa commit c6cba04860de992d4c6a6419922c508116dc85fa Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2024-10-31 22:10:09 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2024-10-31 22:11:34 +0000 Mk: Revert "Mk: unregister expired lang/python38 and update some comments" This reverts commit ee12243bdd7f5fda05a716c29f90671307a5c059. At least devel/include-what-you-use and emulators/libretro-mame still require Python 3.8 --- Mk/Uses/python.mk | 24 ++++++++++++------------ Mk/bsd.default-versions.mk | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index c044058c9438..bc7bfef2771c 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -17,19 +17,19 @@ # Examples: # # USES=python:2.7 # Supports Python 2.7 Only -# USES=python:3.9+ # Supports Python 3.9 or later -# USES=python:3.9-3.10 # Supports Python 3.9 to 3.10 -# USES=python:-3.9 # Supports Python up to 3.9 -# USES=python # Supports 3.9+ +# USES=python:3.8+ # Supports Python 3.8 or later +# USES=python:3.8-3.10 # Supports Python 3.8 to 3.10 +# USES=python:-3.8 # Supports Python up to 3.8 +# USES=python # Supports 3.8+ # # NOTE: <version-spec> should be as specific as possible, matching the versions # upstream declares support for, without being incorrect. In particular, -# USES=python *without* a <version-spec> means 3.9+, +# USES=python *without* a <version-spec> means 3.8+, # including unreleased versions, which is probably incorrect. # # Not specifying a <version-spec> should only be used when a more specific # <version-spec> cannot be specified due to syntax limitations, for -# example: 2.7,3.9-3.10, but even in this case, X.Y+ (2.7+), or -X.Y (-3.9) +# example: 2.7,3.8-3.9, but even in this case, X.Y+ (2.7+), or -X.Y (-3.8) # is preferred and likely more correct. # # patch Python is needed at patch time. Adds dependency to PATCH_DEPENDS. @@ -50,7 +50,7 @@ # Exported variables: # # PYTHON_VERSION - The chosen Python interpreter including the version, -# e.g. python2.7, python3.9, etc. +# e.g. python2.7, python3.8, etc. # # Variables, which can be set by the port: # @@ -233,7 +233,7 @@ # interpreter, e.g. 2, 3, ... # # PYTHON_VER - The major-minor release version of the chosen Python -# interpreter, e.g. 2.7, 3.9, ... +# interpreter, e.g. 2.7, 3.8, ... # # PYTHON_ABIVER - Additional ABI flags set by the chosen Python # interpreter, e.g. md @@ -316,7 +316,7 @@ _INCLUDE_USES_PYTHON_MK= yes # What Python version and what Python interpreters are currently supported? # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -_PYTHON_VERSIONS= 3.11 3.10 3.9 2.7 # preferred first +_PYTHON_VERSIONS= 3.11 3.10 3.9 3.8 2.7 # preferred first _PYTHON_PORTBRANCH= 3.11 # ${_PYTHON_VERSIONS:[1]} _PYTHON_BASECMD= ${LOCALBASE}/bin/python _PYTHON_RELPORTDIR= lang/python @@ -420,13 +420,13 @@ DEV_WARNING+= "lang/python27 reached End of Life and will be removed somewhere . elif ${_PYTHON_ARGS} == 2 DEV_ERROR+= "USES=python:2 is no longer supported, use USES=python:2.7" . elif ${_PYTHON_ARGS} == 3 -DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.9+ or an appropriate version range" +DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.8+ or an appropriate version range" . endif # ${_PYTHON_ARGS} == 2.7 _PYTHON_VERSION:= ${PYTHON_DEFAULT} . if empty(_PYTHON_ARGS) -_PYTHON_ARGS= 3.9+ +_PYTHON_ARGS= 3.8+ . endif # Validate Python version whether it meets the version restriction. @@ -528,7 +528,7 @@ PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} # To avoid having dependencies with @ and empty flavor: # _PYTHON_VERSION is either set by (first that matches): # - If using Python flavors, from the current Python flavor -# - If using a version restriction (USES=python:3.9+), from the first +# - If using a version restriction (USES=python:3.8+), from the first # acceptable default Python version. # - From PYTHON_DEFAULT PY_FLAVOR= py${_PYTHON_VERSION:S/.//} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 91a654c3bc04..dddd773f65ea 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -136,7 +136,7 @@ PYCRYPTOGRAPHY_DEFAULT?= rust . else PYCRYPTOGRAPHY_DEFAULT?= legacy . endif -# Possible values: 3.9, 3.10, 3.11 +# Possible values: 3.8, 3.9, 3.10, 3.11 PYTHON_DEFAULT?= 3.11 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7