#39 Update to 3.8.0b3
Merged 2 years ago by churchyard. Opened 2 years ago by churchyard.
rpms/ churchyard/python38 b3  into  master

file modified
+3 -3
@@ -1,8 +1,8 @@ 

- From 8738c39204297788bcb07940a99608f80592829f Mon Sep 17 00:00:00 2001

+ From 8a93e612de3f9f1e1c04ca2b31f207a2ce611fe1 Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  Date: Wed, 13 Jan 2010 21:25:18 +0000

- Subject: [PATCH 1/7] 00001: Fixup distutils/unixccompiler.py to remove

-  standard library path from rpath Was Patch0 in ivazquez' python3000 specfile

+ Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard

+  library path from rpath Was Patch0 in ivazquez' python3000 specfile

  

  ---

   Lib/distutils/unixccompiler.py | 9 +++++++++

file modified
+9 -9
@@ -1,8 +1,8 @@ 

- From 6a503d0ad4512af57ef8a784f12bc439701d8cc7 Mon Sep 17 00:00:00 2001

+ From ee7b218babbed91c283445021a99d4b28fc12b2f Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  Date: Wed, 13 Jan 2010 21:25:18 +0000

- Subject: [PATCH 2/7] 00102: Change the various install paths to use

-  /usr/lib64/ instead or /usr/lib/

+ Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/

+  instead or /usr/lib/

  MIME-Version: 1.0

  Content-Type: text/plain; charset=UTF-8

  Content-Transfer-Encoding: 8bit
@@ -154,7 +154,7 @@ 

                                     'site-packages')

               self.assertEqual(dirs[0], wanted)

  diff --git a/Makefile.pre.in b/Makefile.pre.in

- index 88abb56360..6c2edf32f7 100644

+ index 6a9f4b5270..61d650882f 100644

  --- a/Makefile.pre.in

  +++ b/Makefile.pre.in

  @@ -143,7 +143,7 @@ LIBDIR=		@libdir@
@@ -198,10 +198,10 @@ 

           return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);

       }

  diff --git a/configure b/configure

- index 6e7f277bac..6cd8344c21 100755

+ index cb5f130d38..b30b4008f2 100755

  --- a/configure

  +++ b/configure

- @@ -15181,9 +15181,9 @@ fi

+ @@ -15195,9 +15195,9 @@ fi

   

   

   if test x$PLATFORM_TRIPLET = x; then
@@ -214,10 +214,10 @@ 

   

   

  diff --git a/configure.ac b/configure.ac

- index 324ce0bd99..9a587f3c3f 100644

+ index b31ed242f1..42d17bc0ad 100644

  --- a/configure.ac

  +++ b/configure.ac

- @@ -4655,9 +4655,9 @@ fi

+ @@ -4663,9 +4663,9 @@ fi

   dnl define LIBPL after ABIFLAGS and LDVERSION is defined.

   AC_SUBST(PY_ENABLE_SHARED)

   if test x$PLATFORM_TRIPLET = x; then
@@ -230,7 +230,7 @@ 

   AC_SUBST(LIBPL)

   

  diff --git a/setup.py b/setup.py

- index edc3434242..59cfc01a2a 100644

+ index 6cbbec9e12..a5092861cf 100644

  --- a/setup.py

  +++ b/setup.py

  @@ -648,7 +648,7 @@ class PyBuildExt(build_ext):

file modified
+7 -7
@@ -1,7 +1,7 @@ 

- From efbafc6328f45da6d38a1848933a37497206fb3f Mon Sep 17 00:00:00 2001

+ From 65208ffdf868d06e6e16eeb12e3f47205a738ed3 Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  Date: Mon, 18 Jan 2010 17:59:07 +0000

- Subject: [PATCH 3/7] 00111: Don't try to build a libpythonMAJOR.MINOR.a

+ Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a

  MIME-Version: 1.0

  Content-Type: text/plain; charset=UTF-8

  Content-Transfer-Encoding: 8bit
@@ -21,10 +21,10 @@ 

   1 file changed, 2 insertions(+), 19 deletions(-)

  

  diff --git a/Makefile.pre.in b/Makefile.pre.in

- index 6c2edf32f7..28c0cead24 100644

+ index 61d650882f..3f5be819c4 100644

  --- a/Makefile.pre.in

  +++ b/Makefile.pre.in

- @@ -560,7 +560,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c

+ @@ -561,7 +561,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c

   	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)

   

   # Build the interpreter
@@ -33,7 +33,7 @@ 

   	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)

   

   platform: $(BUILDPYTHON) pybuilddir.txt

- @@ -608,12 +608,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o

+ @@ -609,12 +609,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o

   		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \

   		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build

   
@@ -46,7 +46,7 @@ 

   libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)

   	if test $(INSTSONAME) != $(LDLIBRARY); then \

   		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \

- @@ -691,7 +685,7 @@ Makefile Modules/config.c: Makefile.pre \

+ @@ -692,7 +686,7 @@ Makefile Modules/config.c: Makefile.pre \

   	@echo "The Makefile was updated, you may need to re-run make."

   

   
@@ -55,7 +55,7 @@ 

   	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)

   

   ############################################################################

- @@ -1551,17 +1545,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config

+ @@ -1552,17 +1546,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config

   		else	true; \

   		fi; \

   	done

file modified
+5 -6
@@ -1,8 +1,7 @@ 

- From 2edaa31dec042fb8720add80814ca4a3cc4f788f Mon Sep 17 00:00:00 2001

+ From 327e040bd14b6bd05314b24e59ffcdb2179f9757 Mon Sep 17 00:00:00 2001

  From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

  Date: Wed, 15 Aug 2018 15:36:29 +0200

- Subject: [PATCH 4/7] 00189: Instead of bundled wheels, use our RPM packaged

-  wheels

+ Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels

  

  We keep them in /usr/share/python-wheels

  ---
@@ -10,7 +9,7 @@ 

   1 file changed, 17 insertions(+), 9 deletions(-)

  

  diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py

- index 6f2569da81..4d17e413db 100644

+ index 63de20e288..4d17e413db 100644

  --- a/Lib/ensurepip/__init__.py

  +++ b/Lib/ensurepip/__init__.py

  @@ -1,16 +1,27 @@
@@ -27,9 +26,9 @@ 

   

  +_WHEEL_DIR = "/usr/share/python-wheels/"

   

- -_SETUPTOOLS_VERSION = "40.8.0"

+ -_SETUPTOOLS_VERSION = "41.0.1"

   

- -_PIP_VERSION = "19.0.3"

+ -_PIP_VERSION = "19.2.1"

  +def _get_most_recent_wheel_version(pkg):

  +    prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))

  +    suffix = "-py2.py3-none-any.whl"

@@ -1,7 +1,7 @@ 

- From 3e26b01573488b015065139689be3aa47dac17cf Mon Sep 17 00:00:00 2001

+ From 27348866d660c1344a1f78a6337436443e1ed19c Mon Sep 17 00:00:00 2001

  From: Michal Cyprian <m.cyprian@gmail.com>

  Date: Mon, 26 Jun 2017 16:32:56 +0200

- Subject: [PATCH 5/7] 00251: Change user install location

+ Subject: [PATCH] 00251: Change user install location

  

  Set values of prefix and exec_prefix in distutils install command

  to /usr/local if executable is /usr/bin/python* and RPM build

file modified
+4 -4
@@ -1,8 +1,8 @@ 

- From b92e29a8cc17f9c02a08b7a005e5ece71a409a0b Mon Sep 17 00:00:00 2001

+ From c827bec294a7fb9481a55c1f7d78e80007e38816 Mon Sep 17 00:00:00 2001

  From: Petr Viktorin <pviktori@redhat.com>

  Date: Mon, 28 Aug 2017 17:16:46 +0200

- Subject: [PATCH 6/7] 00274: Upstream uses Debian-style architecture naming,

-  change to match Fedora

+ Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change

+  to match Fedora

  MIME-Version: 1.0

  Content-Type: text/plain; charset=UTF-8

  Content-Transfer-Encoding: 8bit
@@ -29,7 +29,7 @@ 

   	ppc64le | powerpc64little)

   		basic_machine=powerpc64le-unknown

  diff --git a/configure.ac b/configure.ac

- index 9a587f3c3f..695ff85e4b 100644

+ index 42d17bc0ad..637a99f159 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -741,9 +741,9 @@ cat >> conftest.c <<EOF

@@ -1,4 +1,4 @@ 

- From 746a45acd333174c3174230833b45f537bd92889 Mon Sep 17 00:00:00 2001

+ From 1df081ef9044c6b30fd75d591b6999eb62c48d9b Mon Sep 17 00:00:00 2001

  From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

  Date: Thu, 11 Jul 2019 13:44:13 +0200

  Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default

file modified
+11 -13
@@ -14,10 +14,10 @@ 

  #  WARNING  When rebasing to a new Python version,

  #           remember to update the python3-docs package as well

  %global general_version %{pybasever}.0

- %global prerel b2

+ %global prerel b3

  %global upstream_version %{general_version}%{?prerel}

  Version: %{general_version}%{?prerel:~%{prerel}}

- Release: 2%{?dist}

+ Release: 1%{?dist}

  License: Python

  

  
@@ -379,8 +379,8 @@ 

  Requires: python-setuptools-wheel

  Requires: python-pip-wheel

  %else

- Provides: bundled(python3-pip) = 19.0.3

- Provides: bundled(python3-setuptools) = 40.8.0

+ Provides: bundled(python3-pip) = 19.2.1

+ Provides: bundled(python3-setuptools) = 41.0.1

  %endif

  

  %{?python_provide:%python_provide python3-libs}
@@ -554,8 +554,8 @@ 

  Requires: python-setuptools-wheel

  Requires: python-pip-wheel

  %else

- Provides: bundled(python3-pip) = 19.0.3

- Provides: bundled(python3-setuptools) = 40.8.0

+ Provides: bundled(python3-pip) = 19.2.1

+ Provides: bundled(python3-setuptools) = 41.0.1

  %endif

  

  # The description for the flat package
@@ -1015,12 +1015,10 @@ 

    LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.pythoninfo

  

    # Run the upstream test suite

-   # test_gdb skipped on armv7hl:

-   #   https://bugzilla.redhat.com/show_bug.cgi?id=1196181

    # test_gdb skipped on s390x:

    #   https://bugzilla.redhat.com/show_bug.cgi?id=1678277

-   # test_asyncio skipped:

-   #   https://bugs.python.org/issue35998

+   # test_gdb skipped everywhere:

+   #   https://bugzilla.redhat.com/show_bug.cgi?id=1734327

    # test_distutils

    #   distutils.tests.test_bdist_rpm tests fail when bootstraping the Python

    #   package: rpmbuild requires /usr/bin/pythonX.Y to be installed
@@ -1029,13 +1027,10 @@ 

      %if %{with bootstrap}

      -x test_distutils \

      %endif

-     %ifarch %{arm} s390x

      -x test_gdb \

-     %endif

      %ifarch %{mips64}

      -x test_ctypes \

      %endif

-     -x test_asyncio \

  

    echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName

  
@@ -1531,6 +1526,9 @@ 

  # ======================================================

  

  %changelog

+ * Mon Jul 29 2019 Miro Hrončok <mhroncok@redhat.com> - 3.8.0~b3-1

+ - Update to 3.8.0b3

+ 

  * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0~b2-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (Python-3.8.0b2.tar.xz) = 5d4fdabad098b5273d34ecd939e7f7c104f4f9fc1460e5abaf4a8d1ad1c5d2ff26d579de03106f000672e0a20fcd6e4e1e44ce03be4bb4a734f937f3cc81cb3e

+ SHA512 (Python-3.8.0b3.tar.xz) = 5b29e580514704150b397850b5bf5f3e4b98a45d9a9f8ac0364bef51caac74862f9f349b5d3d1bbcdcc5b48b2722f1a9e5e0a9837bf44360fe74a396e915ae35

rebased onto 29530ba

2 years ago

The Copr build failed with:

=========================
FAIL: test_printing_builtin (test.test_gdb.PyPrintTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/build/BUILD/Python-3.8.0b3/Lib/test/test_gdb.py", line 942, in test_printing_builtin
    self.assertMultilineMatches(bt,
  File "/builddir/build/BUILD/Python-3.8.0b3/Lib/test/test_gdb.py", line 272, in assertMultilineMatches
    self.fail(msg='%r did not match %r' % (actual, pattern))
AssertionError: 'Breakpoint 1 (builtin_id) pending.\n[Thread debugging using libthread_db enabled]\nUsing host libthread_db library "/lib64/libthread_db.so.1".\n\nBreakpoint 1, builtin_id (self=, v=42) at /builddir/build/BUILD/Python-3.8.0b3/Python/bltinmodule.c:1172\n1172\t    PyObject *id = PyLong_FromVoidPtr(v);\n#2 <built-in method id of module object at remote 0x7fffea80ef50>\nUnable to read information on python frame\n' did not match ".*\\nbuiltin 'len' = <built-in method len of module object at remote 0x-?[0-9a-f]+>\\n.*"

======================================================================
FAIL: test_printing_global (test.test_gdb.PyPrintTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/build/BUILD/Python-3.8.0b3/Lib/test/test_gdb.py", line 934, in test_printing_global
    self.assertMultilineMatches(bt,
  File "/builddir/build/BUILD/Python-3.8.0b3/Lib/test/test_gdb.py", line 272, in assertMultilineMatches
    self.fail(msg='%r did not match %r' % (actual, pattern))
AssertionError: 'Breakpoint 1 (builtin_id) pending.\n[Thread debugging using libthread_db enabled]\nUsing host libthread_db library "/lib64/libthread_db.so.1".\n\nBreakpoint 1, builtin_id (self=, v=42) at /builddir/build/BUILD/Python-3.8.0b3/Python/bltinmodule.c:1172\n1172\t    PyObject *id = PyLong_FromVoidPtr(v);\n#2 <built-in method id of module object at remote 0x7fffea80ef50>\nUnable to read information on python frame\n' did not match ".*\\nglobal '__name__' = '__main__'\\n.*"

======================================================================
FAIL: test_basic_command (test.test_gdb.PyLocalsTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/build/BUILD/Python-3.8.0b3/Lib/test/test_gdb.py", line 951, in test_basic_command
    self.assertMultilineMatches(bt,
  File "/builddir/build/BUILD/Python-3.8.0b3/Lib/test/test_gdb.py", line 272, in assertMultilineMatches
    self.fail(msg='%r did not match %r' % (actual, pattern))
AssertionError: 'Breakpoint 1 (builtin_id) pending.\n[Thread debugging using libthread_db enabled]\nUsing host libthread_db library "/lib64/libthread_db.so.1".\n\nBreakpoint 1, builtin_id (self=, v=42) at /builddir/build/BUILD/Python-3.8.0b3/Python/bltinmodule.c:1172\n1172\t    PyObject *id = PyLong_FromVoidPtr(v);\n#2 <built-in method id of module object at remote 0x7fffea80ef50>\nUnable to read information on python frame\n' did not match '.*\\nargs = \\(1, 2, 3\\)\\n.*'

======================================================================
FAIL: test_locals_after_up (test.test_gdb.PyLocalsTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/build/BUILD/Python-3.8.0b3/Lib/test/test_gdb.py", line 960, in test_locals_after_up
    self.assertMultilineMatches(bt,
  File "/builddir/build/BUILD/Python-3.8.0b3/Lib/test/test_gdb.py", line 272, in assertMultilineMatches
    self.fail(msg='%r did not match %r' % (actual, pattern))
AssertionError: 'Breakpoint 1 (builtin_id) pending.\n[Thread debugging using libthread_db enabled]\nUsing host libthread_db library "/lib64/libthread_db.so.1".\n\nBreakpoint 1, builtin_id (self=, v=42) at /builddir/build/BUILD/Python-3.8.0b3/Python/bltinmodule.c:1172\n1172\t    PyObject *id = PyLong_FromVoidPtr(v);\n#2 <built-in method id of module object at remote 0x7fffea80ef50>\n#5 Frame 0x7fffea7a18c0, for file /builddir/build/BUILD/Python-3.8.0b3/Lib/test/gdb_sample.py, line 10, in error: Bad exit status from /var/tmp/rpm-tmp.qa4r5t (%check)
baz (args=(1, 2, 3))\n    id(42)\nargs = (1, 2, 3)\n' did not match '.*\\na = 1\\nb = 2\\nc = 3\\n.*'

----------------------------------------------------------------------

I believe this is caused by https://bugs.python.org/issue37631 and here is a scratch build --without flatpackage to see more architectures:

https://koji.fedoraproject.org/koji/taskinfo?taskID=36670011

Meanwhile, in copr I have tried a build with:

%make_build EXTRA_CFLAGS="$CFLAGS $MoreCFlags" CFLAGS_NODIST="$CFLAGS_NODIST $MoreCFlags"

https://copr.fedorainfracloud.org/coprs/build/988446

Here is a Koji scratchbuild with the same: https://koji.fedoraproject.org/koji/taskinfo?taskID=36670081

And here is a scratch build with:

%make_build EXTRA_CFLAGS="$MoreCFlags" CFLAGS_NODIST="$CFLAGS_NODIST $MoreCFlags"

https://koji.fedoraproject.org/koji/taskinfo?taskID=36670065

OK, this was not the case :(

Since we don't build debug build with flatpackage, I've opened https://bugzilla.redhat.com/show_bug.cgi?id=1734327 and we can merge this.

2 new commits added

  • Stop disabling test_asyncio, the problem was fixed
  • Skip test_gdb everywhere
2 years ago

IMHO It's good to merge now.

Pull-Request has been merged by churchyard

2 years ago