rpms / python3

Clone
Source Code
GIT

#190 Update to 3.8.4
Merged 3 years ago by churchyard. Opened 3 years ago by thrnciar.
rpms/ thrnciar/python3 update-to-3-8-4  into  f32

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

- From 08c67bfedd07ebec54f5087b59045b8c78fa2a6d Mon Sep 17 00:00:00 2001
 

+ From 45b72bdeac12c9243667f94a07f46a7944b95a92 Mon Sep 17 00:00:00 2001
 

  From: David Malcolm <dmalcolm@redhat.com>
 

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

  Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
 
@@ -29,5 +29,5 @@ 
 

                      include_dirs=None, extra_preargs=None, extra_postargs=None):
 

           fixed_args = self._fix_compile_args(None, macros, include_dirs)
 

  -- 

- 2.26.2
 

+ 2.23.0

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

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

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

  From: David Malcolm <dmalcolm@redhat.com>
 

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

  Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
 
@@ -87,7 +87,7 @@ 
 

           check_path(cmd.install_headers,
 

                      os.path.join(destination, "include", "python", "foopkg"))
 

  diff --git a/Lib/site.py b/Lib/site.py
 

- index a065ab0b5d..22d53fa562 100644
 

+ index 9fa21cca38..2e24e86988 100644
 

  --- a/Lib/site.py
 

  +++ b/Lib/site.py
 

  @@ -335,11 +335,15 @@ def getsitepackages(prefixes=None):
 
@@ -139,7 +139,7 @@ 
 

           'scripts': '{userbase}/bin',
 

           'data': '{userbase}',
 

  diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
 

- index 1bbc697936..9a7e80dfa0 100644
 

+ index 9a047fd466..31c6f283e9 100644
 

  --- a/Lib/test/test_site.py
 

  +++ b/Lib/test/test_site.py
 

  @@ -267,8 +267,8 @@ class HelperFunctionsTests(unittest.TestCase):
 
@@ -198,7 +198,7 @@ 
 

           return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
 

       }
 

  diff --git a/configure b/configure
 

- index 8886561645..78867c6ffc 100755
 

+ index 96dcd0dcd5..0ce1db97ac 100755
 

  --- a/configure
 

  +++ b/configure
 

  @@ -15214,9 +15214,9 @@ fi
 
@@ -214,7 +214,7 @@ 
 

   

   

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

- index d8de9d4943..477a5ff1cb 100644
 

+ index 18a044629a..b1c80869e4 100644
 

  --- a/configure.ac
 

  +++ b/configure.ac
 

  @@ -4689,9 +4689,9 @@ fi
 
@@ -230,7 +230,7 @@ 
 

   AC_SUBST(LIBPL)
 

   

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

- index b168ed4082..8628b9d1cd 100644
 

+ index 6340669fff..84f73008e0 100644
 

  --- a/setup.py
 

  +++ b/setup.py
 

  @@ -649,7 +649,7 @@ class PyBuildExt(build_ext):
 
@@ -257,5 +257,5 @@ 
 

                                  libraries=readline_libs))
 

           else:
 

  -- 

- 2.26.2
 

+ 2.23.0

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

- From 50236468e82a7a19ed3dd7e13cb922e7d3e0ff7f Mon Sep 17 00:00:00 2001
 

+ From 7a3151c7bc83b67bd30cd9acb1d91118e7d32eae Mon Sep 17 00:00:00 2001
 

  From: David Malcolm <dmalcolm@redhat.com>
 

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

  Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
 
@@ -74,5 +74,5 @@ 
 

   	$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
 

   	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
 

  -- 

- 2.26.2
 

+ 2.23.0

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

- From 36f1f2b4620b13bdc7ac1c349253ac07960c33b3 Mon Sep 17 00:00:00 2001
 

+ From e34c7e188861647f2c9260a30da8d4b7cfb95c37 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] 00189: Instead of bundled wheels, use our RPM packaged wheels
 
@@ -9,7 +9,7 @@ 
 

   1 file changed, 22 insertions(+), 10 deletions(-)
 

  

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

- index 566fb2a096..47da08d3d5 100644
 

+ index f3152a55d4..f58dab1800 100644
 

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

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

  @@ -1,6 +1,7 @@
 
@@ -27,10 +27,10 @@ 
 

   

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

   

- -_SETUPTOOLS_VERSION = "41.2.0"
 

+ -_SETUPTOOLS_VERSION = "47.1.0"
 

  +_wheels = {}
 

   

- -_PIP_VERSION = "19.2.3"
 

+ -_PIP_VERSION = "20.1.1"
 

  +def _get_most_recent_wheel_version(pkg):
 

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

  +    _wheels[pkg] = {}
 
@@ -47,12 +47,12 @@ 
 

  +_PIP_VERSION = _get_most_recent_wheel_version("pip")
 

   

   _PROJECTS = [
 

-      ("setuptools", _SETUPTOOLS_VERSION),
 

+      ("setuptools", _SETUPTOOLS_VERSION, "py3"),
 

  @@ -105,13 +120,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
 

           # additional paths that need added to sys.path
 

           additional_paths = []
 

-          for project, version in _PROJECTS:
 

- -            wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
 

+          for project, version, py_tag in _PROJECTS:
 

+ -            wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag)
 

  -            whl = pkgutil.get_data(
 

  -                "ensurepip",
 

  -                "_bundled/{}".format(wheel_name),
 
@@ -67,5 +67,5 @@ 
 

               additional_paths.append(os.path.join(tmpdir, wheel_name))
 

   

  -- 

- 2.26.2
 

+ 2.23.0

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

- From 197b8de27ebcd17fc5dd51426a639950c6f6c284 Mon Sep 17 00:00:00 2001
 

+ From 8a62a97b989692c68470745193581e6dff599044 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] 00251: Change user install location
 
@@ -40,7 +40,7 @@ 
 

               else:
 

                   if self.exec_prefix is None:
 

  diff --git a/Lib/site.py b/Lib/site.py
 

- index 22d53fa562..9513526109 100644
 

+ index 2e24e86988..2581269999 100644
 

  --- a/Lib/site.py
 

  +++ b/Lib/site.py
 

  @@ -348,7 +348,14 @@ def getsitepackages(prefixes=None):
 
@@ -60,5 +60,5 @@ 
 

           if os.path.isdir(sitedir):
 

               addsitedir(sitedir, known_paths)
 

  -- 

- 2.26.2
 

+ 2.23.0

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

- From 3172104314227af128f3ce68e9650663a7c1268c Mon Sep 17 00:00:00 2001
 

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

  From: Petr Viktorin <pviktori@redhat.com>
 

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

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

   	ppc64le | powerpc64little)
 

   		basic_machine=powerpc64le-unknown
 

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

- index 477a5ff1cb..aea27ef86a 100644
 

+ index b1c80869e4..de4627e236 100644
 

  --- a/configure.ac
 

  +++ b/configure.ac
 

  @@ -747,9 +747,9 @@ cat >> conftest.c <<EOF
 
@@ -82,5 +82,5 @@ 
 

           s390x-linux-gnu
 

   # elif defined(__s390__)
 

  -- 

- 2.26.2
 

+ 2.23.0

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

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

+ From b7b76bfde0f5ac75978327836b8d32584b968547 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
 
@@ -51,5 +51,5 @@ 
 

       return wrapper
 

   

  -- 

- 2.26.2
 

+ 2.23.0

file removed
-76 
@@ -1,76 +0,0 @@ 
 

- commit 00a240bf7f95bbd220f1cfbf9eb58484a5f9681a
 

- Author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
 

- Date:   Fri May 29 05:46:34 2020 -0700
 

- 

-     bpo-40784: Fix sqlite3 deterministic test (GH-20448)
 

-     

-     (cherry picked from commit c610d970f5373b143bf5f5900d4645e6a90fb460)
 

-     

-     Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
 

- 

- diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
 

- index 9501f53..c11c82e 100644
 

- --- a/Lib/sqlite3/test/userfunctions.py
 

- +++ b/Lib/sqlite3/test/userfunctions.py
 

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

- -#-*- coding: iso-8859-1 -*-
 

-  # pysqlite2/test/userfunctions.py: tests for user-defined functions and
 

-  #                                  aggregates.
 

-  #
 

- -# Copyright (C) 2005-2007 Gerhard H�ring <gh@ghaering.de>
 

- +# Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de>
 

-  #
 

-  # This file is part of pysqlite.
 

-  #
 

- @@ -158,6 +157,7 @@ class FunctionTests(unittest.TestCase):
 

-          self.con.create_function("isblob", 1, func_isblob)
 

-          self.con.create_function("islonglong", 1, func_islonglong)
 

-          self.con.create_function("spam", -1, func)
 

- +        self.con.execute("create table test(t text)")
 

-  

-      def tearDown(self):
 

-          self.con.close()
 

- @@ -276,18 +276,36 @@ class FunctionTests(unittest.TestCase):
 

-          val = cur.fetchone()[0]
 

-          self.assertEqual(val, 2)
 

-  

- +    # Regarding deterministic functions:
 

- +    #
 

- +    # Between 3.8.3 and 3.15.0, deterministic functions were only used to
 

- +    # optimize inner loops, so for those versions we can only test if the
 

- +    # sqlite machinery has factored out a call or not. From 3.15.0 and onward,
 

- +    # deterministic functions were permitted in WHERE clauses of partial
 

- +    # indices, which allows testing based on syntax, iso. the query optimizer.
 

- +    @unittest.skipIf(sqlite.sqlite_version_info < (3, 8, 3), "Requires SQLite 3.8.3 or higher")
 

-      def CheckFuncNonDeterministic(self):
 

-          mock = unittest.mock.Mock(return_value=None)
 

- -        self.con.create_function("deterministic", 0, mock, deterministic=False)
 

- -        self.con.execute("select deterministic() = deterministic()")
 

- -        self.assertEqual(mock.call_count, 2)
 

- -
 

- -    @unittest.skipIf(sqlite.sqlite_version_info < (3, 8, 3), "deterministic parameter not supported")
 

- +        self.con.create_function("nondeterministic", 0, mock, deterministic=False)
 

- +        if sqlite.sqlite_version_info < (3, 15, 0):
 

- +            self.con.execute("select nondeterministic() = nondeterministic()")
 

- +            self.assertEqual(mock.call_count, 2)
 

- +        else:
 

- +            with self.assertRaises(sqlite.OperationalError):
 

- +                self.con.execute("create index t on test(t) where nondeterministic() is not null")
 

- +
 

- +    @unittest.skipIf(sqlite.sqlite_version_info < (3, 8, 3), "Requires SQLite 3.8.3 or higher")
 

-      def CheckFuncDeterministic(self):
 

-          mock = unittest.mock.Mock(return_value=None)
 

-          self.con.create_function("deterministic", 0, mock, deterministic=True)
 

- -        self.con.execute("select deterministic() = deterministic()")
 

- -        self.assertEqual(mock.call_count, 1)
 

- +        if sqlite.sqlite_version_info < (3, 15, 0):
 

- +            self.con.execute("select deterministic() = deterministic()")
 

- +            self.assertEqual(mock.call_count, 1)
 

- +        else:
 

- +            try:
 

- +                self.con.execute("create index t on test(t) where deterministic() is not null")
 

- +            except sqlite.OperationalError:
 

- +                self.fail("Unexpected failure while creating partial index")
 

-  

-      @unittest.skipIf(sqlite.sqlite_version_info >= (3, 8, 3), "SQLite < 3.8.3 needed")
 

-      def CheckFuncDeterministicNotSupported(self):

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

  

  #  WARNING  When rebasing to a new Python version,
 

  #           remember to update the python3-docs package as well
 

- %global general_version %{pybasever}.3
 

- #global prerel ...
 

+ %global general_version %{pybasever}.4
 

+ #global prerel rc1
 

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

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

- Release: 2%{?dist}
 

+ Release: 1%{?dist}
 

  License: Python
 

  

  
@@ -251,6 +251,12 @@ 
 

  # Downstream only: upstream bundles
 

  # We might eventually pursuit upstream support, but it's low prio
 

  Patch189: 00189-use-rpm-wheels.patch
 

+ # The following versions of setuptools/pip are bundled when this patch is not applied.
 

+ # The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
 

+ # When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly.
 

+ # In such cases, the patch needs to be amended and the versions updated here:
 

+ %global pip_version 20.1.1
 

+ %global setuptools_version 47.1.0
 

  

  # 00251
 

  # Set values of prefix and exec_prefix in distutils install command
 
@@ -271,12 +277,6 @@ 
 

  # Ideally, we should talk to upstream and explain why we don't want this
 

  Patch328: 00328-pyc-timestamp-invalidation-mode.patch
 

  

- # 00350 #
 

- # bpo-40784: Fix sqlite3 deterministic test (GH-20448)
 

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

- # https://github.com/python/cpython/commit/00a240bf7f95bbd220f1cfbf9eb58484a5f9681a
 

- Patch350: 00350-sqlite-fix-deterministic-test.patch
 

- 

  # (New patches go here ^^^)
 

  #
 

  # When adding new patches to "python" and "python3" in Fedora, EL, etc.,
 
@@ -394,8 +394,8 @@ 
 

  Requires: python-setuptools-wheel
 

  Requires: python-pip-wheel
 

  %else
 

- Provides: bundled(python3-pip) = 19.2.3
 

- Provides: bundled(python3-setuptools) = 41.2.0
 

+ Provides: bundled(python3dist(pip)) = %{pip_version}
 

+ Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
 

  %endif
 

  

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

  Requires: python-setuptools-wheel
 

  Requires: python-pip-wheel
 

  %else
 

- Provides: bundled(python3-pip) = 19.2.3
 

- Provides: bundled(python3-setuptools) = 41.2.0
 

+ Provides: bundled(python3dist(pip)) = %{pip_version}
 

+ Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
 

  %endif
 

  

  # The description for the flat package
 
@@ -624,7 +624,6 @@ 
 

  %patch251 -p1
 

  %patch274 -p1
 

  %patch328 -p1
 

- %patch350 -p1
 

  

  

  # Remove files that should be generated by the build
 
@@ -1568,6 +1567,12 @@ 
 

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

  

  %changelog
 

+ * Tue Jul 14 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.8.4-1
 

+ - Update to 3.8.4
 

+ 

+ * Tue Jun 30 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.4~rc1-1
 

+ - Rebased to 3.8.4rc1
 

+ 

  * Fri May 29 2020 Victor Stinner <vstinner@python.org> - 3.8.3-2
 

  - Fix sqlite3 deterministic test

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

- SHA512 (Python-3.8.3.tar.xz) = 3103bd8d944f3905eee3a2b52fd1f5c7dee380f9c5a99ad35a401fcba5a9117c3860ecec5cb47a92712c6549442fd2fa553a15c5657241dd09f5d00b9ed4f0f4
 

- SHA512 (Python-3.8.3.tar.xz.asc) = ab39e148475391e4e149ee3a8290e8ba872c758697a4a0b677585875695d107dfcc03a7ab51c5c5f42d65ef779121047a78c61e7789bb1ea7405f9b58aa420f1
 

+ SHA512 (Python-3.8.4.tar.xz) = 37a36d014a8372742be9d0bd9dd3a275e100dc21b1515c145bc62425d4d157327b6e63ad99bc888c0b36c1da4c05676c40eb086e75072d1906e3210ec3043dcb
 

+ SHA512 (Python-3.8.4.tar.xz.asc) = eabf5e26184bb84f763f899fd2148e7d456765dfb584d52cbb15a3ce7619f84c3b3ddab4c9f1dc619bab17c7d24e0888db41ef435ce95ff9494122d6844ef3ce

no initial comment

Taking a look.

You have removed patch 350 from the spec file, but the patch file was not removed from the dist git.

It's a very common mistake, so you gotta watch out for it :)

Found a bug in the first commit, communicated outside the PR.

Found a bug in the first commit, communicated outside the PR.

The missing prerel definition?

rebased onto 19d493e
3 years ago

Found a bug in the first commit, communicated outside the PR.

The missing prerel definition?

No, during backporting I accidentaly changed the versions of pip and setuptools. It should be fixed now.

rebased onto 8d7ce1f
3 years ago

The "Rebased to 3.8.4rc1" commit is missing this diff hunk:

-            #global prerel ...            
+            %global prerel rc1
Edited 3 years ago by churchyard

rebased onto b74f7bb
3 years ago

sorry, updated

The "Rebased to 3.8.4rc1" commit is missing this diff hunk:
- #global prerel ...
+ %global prerel rc1

Indeed. Besides that the PR looks good now!

Build failed.

sorry, updated

No need to be sorry about this ;)

The first commit is good now, however the latest commit (yours) now includes:

+ #%global prerel rc1

Instead of (from rawhide):

+ #global prerel rc1

There are 2 problems with that:

  1. The next cherry-pick will be non-trivial again. Always making sure the commits are the same when possible means next backports will be trivial.
  2. Commenting a macro definition like this is not sufficient in RPM, it is still defined to rc1.

3 new commits added

  • Update to 3.8.4
  • Define pip/setuptools versions in once place
  • Rebased to 3.8.4rc1
3 years ago

thank you for the explanation, updated

The commits look good now. Let's wait for the CI and merge and build.

For the bodhi update, we should also update python3-docs. Could you open a PR there as well, please?

Build succeeded.

armv7hl failed now with a new error:

gcc -pthread -c -Wno-unused-result -Wsign-compare -DDYNAMIC_ANNOTATIONS_ENABLED=1  -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches   -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard -D_GNU_SOURCE -fPIC -fwrapv -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches   -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard -D_GNU_SOURCE -fPIC -fwrapv   -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches   -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard -D_GNU_SOURCE -fPIC -fwrapv  -Og -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard -D_GNU_SOURCE -fPIC -fwrapv -fno-semantic-interposition -flto -fuse-linker-plugin -ffat-lto-objects -flto-partition=none -g -std=c99 -Wextra -Wno-unused-result -Wno-unused-parameter -Wno-missing-field-initializers -Werror=implicit-function-declaration -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard -D_GNU_SOURCE -fPIC -fwrapv -fno-semantic-interposition -Og -I/builddir/build/BUILD/Python-3.8.4/Include/internal -IObjects -IInclude -IPython -I. -I/builddir/build/BUILD/Python-3.8.4/Include   -fPIC -DPy_BUILD_CORE -o Objects/floatobject.o /builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1819:5: error: 'FLOAT_CONJUGATE_METHODDEF' undeclared here (not in a function)
 1819 |     FLOAT_CONJUGATE_METHODDEF
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1820:5: error: expected '}' before 'FLOAT___TRUNC___METHODDEF'
 1820 |     FLOAT___TRUNC___METHODDEF
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1818:38: note: to match this '{'
 1818 | static PyMethodDef float_methods[] = {
      |                                      ^
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1903:5: error: 'float_new__doc__' undeclared here (not in a function); did you mean 'floatinfo__doc__'?
 1903 |     float_new__doc__,                           /* tp_doc */
      |     ^~~~~~~~~~~~~~~~
      |     floatinfo__doc__
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1903:5: warning: initialization of 'const char *' from incompatible pointer type 'PyMethodDef *' [-Wincompatible-pointer-types]
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1903:5: note: (near initialization for 'PyFloat_Type.tp_doc')
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1903:5: error: initializer element is not constant
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1903:5: note: (near initialization for 'PyFloat_Type.tp_doc')
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1920:5: error: 'float_new' undeclared here (not in a function); did you mean 'float_neg'?
 1920 |     float_new,                                  /* tp_new */
      |     ^~~~~~~~~
      |     float_neg
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1920:5: warning: initialization of 'PyObject * (*)(struct _typeobject *, PyObject *, PyObject *)' {aka 'struct _object * (*)(struct _typeobject *, struct _object *, struct _object *)'} from incompatible pointer type 'PyMethodDef *' [-Wincompatible-pointer-types]
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1920:5: note: (near initialization for 'PyFloat_Type.tp_new')
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1920:5: error: initializer element is not constant
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1920:5: note: (near initialization for 'PyFloat_Type.tp_new')
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1800:1: warning: 'float___format___impl' defined but not used [-Wunused-function]
 1800 | float___format___impl(PyObject *self, PyObject *format_spec)
      | ^~~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1726:1: warning: 'float___set_format___impl' defined but not used [-Wunused-function]
 1726 | float___set_format___impl(PyTypeObject *type, const char *typestr,
      | ^~~~~~~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1674:1: warning: 'float___getformat___impl' defined but not used [-Wunused-function]
 1674 | float___getformat___impl(PyTypeObject *type, const char *typestr)
      | ^~~~~~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1641:1: warning: 'float___getnewargs___impl' defined but not used [-Wunused-function]
 1641 | float___getnewargs___impl(PyObject *self)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1514:1: warning: 'float_as_integer_ratio_impl' defined but not used [-Wunused-function]
 1514 | float_as_integer_ratio_impl(PyObject *self)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1255:1: warning: 'float_fromhex' defined but not used [-Wunused-function]
 1255 | float_fromhex(PyTypeObject *type, PyObject *string)
      | ^~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1184:1: warning: 'float_hex_impl' defined but not used [-Wunused-function]
 1184 | float_hex_impl(PyObject *self)
      | ^~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1086:1: warning: 'float_conjugate_impl' defined but not used [-Wunused-function]
 1086 | float_conjugate_impl(PyObject *self)
      | ^~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:1025:1: warning: 'float___round___impl' defined but not used [-Wunused-function]
 1025 | float___round___impl(PyObject *self, PyObject *o_ndigits)
      | ^~~~~~~~~~~~~~~~~~~~
/builddir/build/BUILD/Python-3.8.4/Objects/floatobject.c:841:1: warning: 'float_is_integer_impl' defined but not used [-Wunused-function]
  841 | float_is_integer_impl(PyObject *self)
      | ^~~~~~~~~~~~~~~~~~~~~
make: *** [Makefile:1691: Objects/floatobject.o] Error 1

Weird that the previous build didn't fail. The packages in the buildroot of this and previous scratch build are identical.

Here is a new scratch build:

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

It is a success.

The commits look good now. Let's wait for the CI and merge and build.
For the bodhi update, we should also update python3-docs. Could you open a PR there as well, please?

I did, here is the link: https://src.fedoraproject.org/rpms/python3-docs/pull-request/25

Pull-Request has been merged by churchyard
3 years ago

Thanks, please build it and created a joined bodhi update with large karma limit (e.g. +10, -5). According to the changelog, this bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1854932 can be associated as well and hence the update is type security, medium severity.
Changes Summary 10
+2 -2
file changed
00001-rpath.patch
+7 -7
file changed
00102-lib64.patch
+2 -2
file changed
00111-no-static-lib.patch
+8 -8
file changed
00189-use-rpm-wheels.patch
+3 -3
file changed
00251-change-user-install-location.patch
+3 -3
file changed
00274-fix-arch-names.patch
+2 -2
file changed
00328-pyc-timestamp-invalidation-mode.patch
-76
file removed
00350-sqlite-fix-deterministic-test.patch
+19 -14
file changed
python3.spec
+2 -2
file changed
sources
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.