From owner-svn-ports-all@freebsd.org Thu Feb 4 14:35:23 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7229F5452BC; Thu, 4 Feb 2021 14:35:23 +0000 (UTC) (envelope-from mat@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 4DWh0q2nzFz4R2r; Thu, 4 Feb 2021 14:35:23 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52E5E572C; Thu, 4 Feb 2021 14:35:23 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 114EZNZf002557; Thu, 4 Feb 2021 14:35:23 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 114EZNUn002556; Thu, 4 Feb 2021 14:35:23 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202102041435.114EZNUn002556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 4 Feb 2021 14:35:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564032 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 564032 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 14:35:23 -0000 Author: mat Date: Thu Feb 4 14:35:22 2021 New Revision: 564032 URL: https://svnweb.freebsd.org/changeset/ports/564032 Log: Make USES=python without argument mean 3.6+. This is getting us one step further to deorbitting Python 2.7. Reviewed by: rene, antoine, swills Differential Revision: https://reviews.freebsd.org/D28459 Modified: head/Mk/Uses/python.mk Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Thu Feb 4 14:35:00 2021 (r564031) +++ head/Mk/Uses/python.mk Thu Feb 4 14:35:22 2021 (r564032) @@ -22,12 +22,12 @@ # 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.8 # Supports Python up to 3.8 -# USES=python # Supports any/all Python versions +# USES=python # Supports 3.6+ # # NOTE: should be as specific as possible, matching the versions # upstream declares support for, without being incorrect. In particular, -# USES=python *without* a means any and all past or future -# versions, including unreleased versions, which is probably incorrect. +# USES=python *without* a means 3.6+, +# 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 @@ -333,6 +333,10 @@ DEV_ERROR+= "USES=python:3 is no longer supported, us .endif # ${_PYTHON_ARGS} == 2.7 _PYTHON_VERSION:= ${PYTHON_DEFAULT} + +.if empty(_PYTHON_ARGS) +_PYTHON_ARGS= 3.6+ +.endif # Validate Python version whether it meets the version restriction. _PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}