Wed Apr 24 13:16:59 2019 UTC ()
Default to python 3.7.

We don't want to end up defaulting to an EOL python by the end of this year,
and would like to switch early in the branch. Waiting longer isn't wise.


(maya)
diff -r1.127 -r1.128 pkgsrc/lang/python/pyversion.mk
cvs diff -r1.127 -r1.128 pkgsrc/lang/python/pyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/pyversion.mk 2018/11/13 11:57:26 1.127
+++ pkgsrc/lang/python/pyversion.mk 2019/04/24 13:16:59 1.128
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: pyversion.mk,v 1.127 2018/11/13 11:57:26 markd Exp $ 1# $NetBSD: pyversion.mk,v 1.128 2019/04/24 13:16:59 maya Exp $
2 2
3# This file determines which Python version is used as a dependency for 3# This file determines which Python version is used as a dependency for
4# a package. 4# a package.
5# 5#
6# === User-settable variables === 6# === User-settable variables ===
7# 7#
8# PYTHON_VERSION_DEFAULT 8# PYTHON_VERSION_DEFAULT
9# The preferred Python version to use. 9# The preferred Python version to use.
10# 10#
11# Possible values: 27 34 35 36 37 11# Possible values: 27 34 35 36 37
12# Default: 27 12# Default: 37
13# 13#
14# === Infrastructure variables === 14# === Infrastructure variables ===
15# 15#
16# PYTHON_VERSION_REQD 16# PYTHON_VERSION_REQD
17# Python version to use. This variable should not be set in 17# Python version to use. This variable should not be set in
18# packages. Normally it is used by bulk build tools. 18# packages. Normally it is used by bulk build tools.
19# 19#
20# Possible: ${PYTHON_VERSIONS_ACCEPTED} 20# Possible: ${PYTHON_VERSIONS_ACCEPTED}
21# Default: ${PYTHON_VERSION_DEFAULT} 21# Default: ${PYTHON_VERSION_DEFAULT}
22# 22#
23# === Package-settable variables === 23# === Package-settable variables ===
24# 24#
25# PYTHON_VERSIONS_ACCEPTED 25# PYTHON_VERSIONS_ACCEPTED
@@ -74,27 +74,27 @@ PYTHON_PYVERSION_MK= defined @@ -74,27 +74,27 @@ PYTHON_PYVERSION_MK= defined
74.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \ 74.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \
75 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*) 75 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
76PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 76PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
77.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \ 77.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
78 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*) 78 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
79PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 79PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
80.endif 80.endif
81 81
82.include "../../mk/bsd.prefs.mk" 82.include "../../mk/bsd.prefs.mk"
83 83
84BUILD_DEFS+= PYTHON_VERSION_DEFAULT 84BUILD_DEFS+= PYTHON_VERSION_DEFAULT
85BUILD_DEFS_EFFECTS+= PYPACKAGE 85BUILD_DEFS_EFFECTS+= PYPACKAGE
86 86
87PYTHON_VERSION_DEFAULT?= 27 87PYTHON_VERSION_DEFAULT?= 37
88PYTHON_VERSIONS_ACCEPTED?= 37 36 35 34 27 88PYTHON_VERSIONS_ACCEPTED?= 37 36 35 34 27
89PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default 89PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
90 90
91# transform the list into individual variables 91# transform the list into individual variables
92.for pv in ${PYTHON_VERSIONS_ACCEPTED} 92.for pv in ${PYTHON_VERSIONS_ACCEPTED}
93. if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv}) 93. if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
94_PYTHON_VERSION_${pv}_OK= yes 94_PYTHON_VERSION_${pv}_OK= yes
95_PYTHON_VERSIONS_ACCEPTED+= ${pv} 95_PYTHON_VERSIONS_ACCEPTED+= ${pv}
96. endif 96. endif
97.endfor 97.endfor
98 98
99# 99#
100# choose a python version where to add, 100# choose a python version where to add,