8000 plpython: Reject Python 2 during build configuration. · postgres/postgres@19252e8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 19252e8

Browse files
anarazelanarazel
committed
plpython: Reject Python 2 during build configuration.
Python 2.7 went EOL 2020-01-01 and the support for Python 2 requires a fair bit of infrastructure. Therefore we are removing Python 2 support in plpython. This patch just rejects Python 2 during configure / mkvcbuild.pl. Future commits will remove the code and infrastructure for Python 2 support and adjust more of the documentation. This way we can see the buildfarm state after the removal sooner and we can be sure that failures are due to desupporting Python 2, rather than caused by infrastructure cleanup. Reviewed-By: Peter Eisentraut <peter@eisentraut.org> Discussion: https://postgr.es/m/20211031184548.g4sxfe47n2kyi55r@alap3.anarazel.de
1 parent 8f388f6 commit 19252e8

File tree

5 files changed

+19
-20
lines changed

5 files changed

+19
-20
lines changed

‎config/python.m4‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
# Look for Python and set the output variable 'PYTHON' if found,
1010
# fail otherwise.
1111
#
12+
# Since we are supporting only Python 3.x, prefer python3 to plain python. If
13+
# the latter exists at all, it very possibly points to python2.
14+
1215
# As the Python 3 transition happens and PEP 394 isn't updated, we
1316
# need to cater to systems that don't have unversioned "python" by
1417
# default. Some systems ship with "python3" by default and perhaps
1518
# have "python" in an optional package. Some systems only have
1619
# "python2" and "python3", in which case it's reasonable to prefer the
1720
# newer version.
1821
AC_DEFUN([PGAC_PATH_PYTHON],
19-
[PGAC_PATH_PROGS(PYTHON, [python python3 python2])
22+
[PGAC_PATH_PROGS(PYTHON, [python3 python])
2023
AC_ARG_VAR(PYTHON, [Python program])dnl
2124
if test x"$PYTHON" = x""; then
2225
AC_MSG_ERROR([Python not found])
@@ -37,8 +40,8 @@ python_majorversion=`echo "$python_fullversion" | sed '[s/^\([0-9]*\).*/\1/]'`
3740
python_minorversion=`echo "$python_fullversion" | sed '[s/^[0-9]*\.\([0-9]*\).*/\1/]'`
3841
python_version=`echo "$python_fullversion" | sed '[s/^\([0-9]*\.[0-9]*\).*/\1/]'`
3942
# Reject unsupported Python versions as soon as practical.
40-
if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 7; then
41-
AC_MSG_ERROR([Python version $python_version is too old (version 2.7 or later is required)])
43+
if test "$python_majorversion" -lt 3; then
44+
AC_MSG_ERROR([Python version $python_version is too old (version 3 or later is required)])
4245
fi
4346
4447
AC_MSG_CHECKING([for Python sysconfig module])

‎configure‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10280,7 +10280,7 @@ fi
1028010280

1028110281
if test "$with_python" = yes; then
1028210282
if test -z "$PYTHON"; then
10283-
for ac_prog in python python3 python2
10283+
for ac_prog in python3 python
1028410284
do
1028510285
# Extract the first word of "$ac_prog", so it can be a program name with args.
1028610286
set dummy $ac_prog; ac_word=$2
@@ -10346,8 +10346,8 @@ python_majorversion=`echo "$python_fullversion" | sed 's/^\([0-9]*\).*/\1/'`
1034610346
python_minorversion=`echo "$python_fullversion" | sed 's/^[0-9]*\.\([0-9]*\).*/\1/'`
1034710347
python_version=`echo "$python_fullversion" | sed 's/^\([0-9]*\.[0-9]*\).*/\1/'`
1034810348
# Reject unsupported Python versions as soon as practical.
10349-
if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 7; then
10350-
as_fn_error $? "Python version $python_version is too old (version 2.7 or later is required)" "$LINENO" 5
10349+
if test "$python_majorversion" -lt 3; then
10350+
as_fn_error $? "Python version $python_version is too old (version 3 or later is required)" "$LINENO" 5
1035110351
fi
1035210352

1035310353
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python sysconfig module" >&5

‎doc/src/sgml/install-windows.sgml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
to specify the location of your <productname>Python</productname> installation,
137137
put the following in <filename>config.pl</filename>:
138138
<programlisting>
139-
$config->{python} = 'c:\python26';
139+
$config->{python} = 'c:\python310';
140140
</programlisting>
141141
You only need to specify those parameters that are different from what's in
142142
<filename>config_default.pl</filename>.

‎doc/src/sgml/installation.sgml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,7 @@ su - postgres
196196
language, you need a <productname>Python</productname>
197197
installation with the header files and
198198
the <application>sysconfig</application> module. The minimum
199-
required version is <productname>Python</productname> 2.7.
200-
<productname>Python 3</productname> is supported if it's
201-
version 3.2 or later; but see
202-
<xref linkend="plpython-python23"/>
203-
when using Python 3.
199+
required version is <productname>Python</productname> 3.2.
204200
</para>
205201

206202
<para>
@@ -1868,14 +1864,10 @@ build-postgresql:
18681864
<term><envar>PYTHON</envar></term>
18691865
<listitem>
18701866
<para>
1871-
Python interpreter program. This will be used to
1872-
determine the dependencies for building PL/Python. Also,
1873-
whether Python 2 or 3 is specified here (or otherwise
1874-
implicitly chosen) determines which variant of the PL/Python
1875-
language becomes available. See
1876-
<xref linkend="plpython-python23"/>
1877-
for more information. If this is not set, the following are probed
1878-
in this order: <literal>python python3 python2</literal>.
1867+
Python interpreter program. This will be used to determine the
1868+
dependencies for building PL/Python. If this is not set, the
1869+
following are probed in this order:
1870+
<literal>python3 python</literal>.
18791871
</para>
18801872
</listitem>
18811873
</varlistentry>

‎src/tools/msvc/Mkvcbuild.pm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,10 @@ sub mkvcbuild
490490
if (!(defined($pyprefix) && defined($pyver)));
491491

492492
my $pymajorver = substr($pyver, 0, 1);
493+
494+
die "Python version $pyver is too old (version 3 or later is required)"
495+
if int($pymajorver) < 3;
496+
493497
my $plpython = $solution->AddProject('plpython' . $pymajorver,
494498
'dll', 'PLs', 'src/pl/plpython');
495499
$plpython->AddIncludeDir($pyprefix . '/include');

0 commit comments

Comments
 (0)
0