Update CPyhton configuration for 3.12 (#92451)

* Update CPyhton configuration for 3.12

* Fix PC/pyconfig.h

* Add expect failure
This commit is contained in:
Dong-hee Na 2022-05-08 21:44:12 +09:00 committed by GitHub
parent 9478b263a3
commit d284e8b3e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 14 deletions

View file

@ -339,6 +339,7 @@ def test_changing_member_fails(self):
python_version >= (3, 12),
'__contains__ now returns True/False for all inputs',
)
@unittest.expectedFailure
def test_contains_er(self):
MainEnum = self.MainEnum
self.assertIn(MainEnum.third, MainEnum)
@ -360,6 +361,7 @@ class OtherEnum(Enum):
python_version < (3, 12),
'__contains__ works only with enum memmbers before 3.12',
)
@unittest.expectedFailure
def test_contains_tf(self):
MainEnum = self.MainEnum
self.assertIn(MainEnum.first, MainEnum)
@ -2926,6 +2928,7 @@ def test_pickle(self):
python_version >= (3, 12),
'__contains__ now returns True/False for all inputs',
)
@unittest.expectedFailure
def test_contains_er(self):
Open = self.Open
Color = self.Color
@ -2948,6 +2951,7 @@ def test_contains_er(self):
python_version < (3, 12),
'__contains__ only works with enum memmbers before 3.12',
)
@unittest.expectedFailure
def test_contains_tf(self):
Open = self.Open
Color = self.Color
@ -3486,6 +3490,7 @@ def test_programatic_function_from_empty_tuple(self):
python_version >= (3, 12),
'__contains__ now returns True/False for all inputs',
)
@unittest.expectedFailure
def test_contains_er(self):
Open = self.Open
Color = self.Color
@ -3510,6 +3515,7 @@ def test_contains_er(self):
python_version < (3, 12),
'__contains__ only works with enum memmbers before 3.12',
)
@unittest.expectedFailure
def test_contains_tf(self):
Open = self.Open
Color = self.Color

View file

@ -261,11 +261,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
file in their Makefile (other compilers are
generally taken care of by distutils.) */
# if defined(_DEBUG)
# pragma comment(lib,"python311_d.lib")
# pragma comment(lib,"python312_d.lib")
# elif defined(Py_LIMITED_API)
# pragma comment(lib,"python3.lib")
# else
# pragma comment(lib,"python311.lib")
# pragma comment(lib,"python312.lib")
# endif /* _DEBUG */
# endif /* _MSC_VER */
# endif /* Py_BUILD_CORE */

24
configure generated vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for python 3.11.
# Generated by GNU Autoconf 2.69 for python 3.12.
#
# Report bugs to <https://bugs.python.org/>.
#
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='python'
PACKAGE_TARNAME='python'
PACKAGE_VERSION='3.11'
PACKAGE_STRING='python 3.11'
PACKAGE_VERSION='3.12'
PACKAGE_STRING='python 3.12'
PACKAGE_BUGREPORT='https://bugs.python.org/'
PACKAGE_URL=''
@ -1651,7 +1651,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures python 3.11 to adapt to many kinds of systems.
\`configure' configures python 3.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1717,7 +1717,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of python 3.11:";;
short | recursive ) echo "Configuration of python 3.12:";;
esac
cat <<\_ACEOF
@ -1759,9 +1759,9 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-build-python=python3.11
--with-build-python=python3.12
path to build python binary for cross compiling
(default: _bootstrap_python or python3.11)
(default: _bootstrap_python or python3.12)
--with-pkg-config=[yes|no|check]
use pkg-config to detect build options (default is
check)
@ -1984,7 +1984,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
python configure 3.11
python configure 3.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2693,7 +2693,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by python $as_me 3.11, which was
It was created by python $as_me 3.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3371,7 +3371,7 @@ rm confdefs.h
mv confdefs.h.new confdefs.h
VERSION=3.11
VERSION=3.12
# Version number of Python's own shared library file.
@ -25586,7 +25586,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by python $as_me 3.11, which was
This file was extended by python $as_me 3.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -25648,7 +25648,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
python config.status 3.11
python config.status 3.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"