From nobody Fri Dec 31 12:58:43 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EBD6C1914CD2; Fri, 31 Dec 2021 12:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JQQDz4Mkkz4XLq; Fri, 31 Dec 2021 12:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D9473C72; Fri, 31 Dec 2021 12:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BVCwhbF020197; Fri, 31 Dec 2021 12:58:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BVCwhaB020196; Fri, 31 Dec 2021 12:58:43 GMT (envelope-from git) Date: Fri, 31 Dec 2021 12:58:43 GMT Message-Id: <202112311258.1BVCwhaB020196@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: d85222d9669d - main - Mk: unregister expired lang/python36 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d85222d9669d10c9fd198334bfe7adab61ec6e1a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640955523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cSlj8hP0MDL+WHQZrl4D34a/md1GjNk77PCeDiqGiA=; b=eJKYroAq9f0P7kpV87ZcEnBvgiBGEWsEBfLb3f02v6mDfJ9A9Mq/S6DqGW79VMI58maQ/K /2nkqYWKajJN/nLI2UQ/a7W+M2ORMgjUdYd4OBRqUU8hGYazDfAJLn5XXq0JLFe8xBmTTd 4sse8QDsZRszV9mnkZbh849wzvYJxdodsW9kv9m3rhi7nQq552p6g9pMbP186AsZ3veRsx AErDyg6pzbv+GWJcB+WyarvWQTQEP5tfgwdZydIEQv2cPQZDcX32u+Lm5usT17SzS5pnY7 5k/QIcLn8b+H9nTKImoQszK4L0v+MEQnZhaWlDrWMW0FAkubZ2PXmb3tMq6Pow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640955523; a=rsa-sha256; cv=none; b=aydmm3aeVOlB4pDeYM20q8TrrXP2ng10z63z0hWferByfn7xCtED5CKVJTbLcWw5wubkH1 eYvL1wsEraSN93eIlirDNT4fgFH6QAix3JpiboF5lvplVh57Vy6mQqZpaczSwckTUosxDT 2dYkI5/8CnVOrHKyRdTNhvVXqAc3L8O47Pyp81pqH2YEQPC08oMs4VQly8+yRizfCYZcLn ViNcop3c6HfmH/yOumGPTgoIlR8KtkKv/wc5XvgbVm5CPLLbkUotelb4nWtvPWghFm5nLe K4Zn/yZ0SvbKslYnxuJpE1K8g/hc86Zo2LWF8hnUIrjTqEYoe9WtcmMR+IEiBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=d85222d9669d10c9fd198334bfe7adab61ec6e1a commit d85222d9669d10c9fd198334bfe7adab61ec6e1a Author: Rene Ladan AuthorDate: 2021-12-31 12:57:46 +0000 Commit: Rene Ladan CommitDate: 2021-12-31 12:57:46 +0000 Mk: unregister expired lang/python36 While here update some examples. --- Mk/Uses/python.mk | 22 +++++++++++----------- Mk/bsd.default-versions.mk | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 19b5fea01b3c..6c5d11dc9d08 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.6+ # Supports Python 3.6 or later -# USES=python:3.6-3.9 # Supports Python 3.6 to 3.9 +# USES=python:3.7+ # Supports Python 3.7 or later +# USES=python:3.7-3.9 # Supports Python 3.7 to 3.9 # USES=python:-3.8 # Supports Python up to 3.8 -# USES=python # Supports 3.6+ +# USES=python # Supports 3.7+ # # NOTE: should be as specific as possible, matching the versions # upstream declares support for, without being incorrect. In particular, -# USES=python *without* a means 3.6+, +# USES=python *without* a means 3.7+, # including unreleased versions, which is probably incorrect. # # Not specifying a should only be used when a more specific # cannot be specified due to syntax limitations, for -# example: 2.7,3.4-3.6, but even in this case, X.Y+ (2.7+), or -X.Y (-3.6) +# example: 2.7,3.7-3.8, but even in this case, X.Y+ (2.7+), or -X.Y (-3.7) # is preferred and likely more correct. # # patch Python is needed at patch time. Adds dependency to PATCH_DEPENDS. @@ -184,7 +184,7 @@ # interpreter, e.g. 2, 3, ... # # PYTHON_VER - The major-minor release version of the chosen Python -# interpreter, e.g. 2.7, 3.6, ... +# interpreter, e.g. 2.7, 3.7, ... # # PYTHON_ABIVER - Additional ABI flags set by the chosen Python # interpreter, e.g. md @@ -248,7 +248,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.8 3.9 3.7 3.6 3.10 3.11 2.7 # preferred first +_PYTHON_VERSIONS= 3.8 3.9 3.7 3.10 3.11 2.7 # preferred first _PYTHON_PORTBRANCH= 3.8 # ${_PYTHON_VERSIONS:[1]} _PYTHON_BASECMD= ${LOCALBASE}/bin/python _PYTHON_RELPORTDIR= lang/python @@ -327,13 +327,13 @@ DEV_WARNING+= "lang/python27 reached End of Life and will be removed on 2020-12 .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.6+ or an appropriate version range" +DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.7+ or an appropriate version range" .endif # ${_PYTHON_ARGS} == 2.7 _PYTHON_VERSION:= ${PYTHON_DEFAULT} .if empty(_PYTHON_ARGS) -_PYTHON_ARGS= 3.6+ +_PYTHON_ARGS= 3.7+ .endif # Validate Python version whether it meets the version restriction. @@ -435,7 +435,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.6+), from the first +# - If using a version restriction (USES=python:3.7+), from the first # acceptable default Python version. # - From PYTHON_DEFAULT PY_FLAVOR= py${_PYTHON_VERSION:S/.//} @@ -466,7 +466,7 @@ PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION} .if exists(${PYTHON_CMD}-config) PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags .elif ${PYTHON_REL} < 30800 -# Default ABI flags for lang/python3[67] ports +# Default ABI flags for lang/python37 port PYTHON_ABIVER= m .endif .endif diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 53519b606af4..461bc25cfcaa 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -109,11 +109,11 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} PGSQL_DEFAULT?= 13 # Possible values: 7.3, 7.4, 8.0 PHP_DEFAULT?= 7.4 -# Possible values: 2.7, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11 +# Possible values: 2.7, 3.7, 3.8, 3.9, 3.10, 3.11 PYTHON_DEFAULT?= 3.8 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7 -# Possible values: 3.6, 3.7, 3.8, 3.9, 3.10 +# Possible values: 3.7, 3.8, 3.9, 3.10 PYTHON3_DEFAULT?= 3.8 # Possible values: 2.6, 2.7, 3.0, 3.1 RUBY_DEFAULT?= 2.7