rpms / python3.8

Clone
Source Code
GIT

#4 Rebased to 3.8.4rc1
Merged 3 years ago by churchyard. Opened 3 years ago by churchyard.
rpms/ churchyard/python3.8 3.8.4rc1  into  master

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

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

+ From 96f709265ee207c0aab9023e9fc969bdc5e944a9 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

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

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

+ From b4cc171c0e08afc582d96ab45c12b4fb4c7da341 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/
 
@@ -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

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

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

+ From 980d366e4d1422de9d91723c8a33632861d5309b 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

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

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

+ From 22960e3e57a040a4695a0e020dbf7536bffb9ee6 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),

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

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

+ From c000bc02e571e68c35527f1d3280363ef337431b 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

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

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

+ From 4b55be571b62497e95192fb45de1f0a8b9807ea8 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

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

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

+ From 1c98aeef1c255231b25eda7e0907b0c15dcf9887 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 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
+10 -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: 3%{?dist}
 

+ Release: 1%{?dist}
 

  License: Python
 

  

  
@@ -289,12 +289,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.,
 
@@ -427,8 +421,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)) = 20.1.1
 

+ Provides: bundled(python3dist(setuptools)) = 47.1.0
 

  %endif
 

  

  # There are files in the standard library that have python shebang.
 
@@ -605,8 +599,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)) = 20.1.1
 

+ Provides: bundled(python3dist(setuptools)) = 47.1.0
 

  %endif
 

  

  # The description for the flat package (SRPM and built)
 
@@ -653,7 +647,6 @@ 
 

  %patch251 -p1
 

  %patch274 -p1
 

  %patch328 -p1
 

- %patch350 -p1
 

  

  

  # Remove files that should be generated by the build
 
@@ -1603,6 +1596,9 @@ 
 

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

  

  %changelog
 

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

+ - Rebased to 3.8.4rc1
 

+ 

  * Fri May 29 2020 Petr Viktorin <pviktori@redhat.com> - 3.8.3-3
 

  - Rebuild without bootstrap

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.4rc1.tar.xz) = 8b86a3f79d9343c853ccdde5dba562c32f4cb3e574cbad416998caa39879e72d753036f33ac93e8cd9eb8ade1d685bc1a8fed586521ee5971f34e25cb5b875ad
 

+ SHA512 (Python-3.8.4rc1.tar.xz.asc) = 95d1b345f23a185b4ef54c7d12eb209cdc658269d362309fb6f4e76911df8688bd1a37f176b5c41febf675b8198e947dcc4310d017cd2c9c4cd1aba16cb0921b

The ensurepip code changed upstream wrt py2.py3 tag, patch 189 rebased.
setuptools/pip versions updated, bundled() provides now also include python3dist().

rebased onto 8a76a6f
3 years ago

rebased onto f495843
3 years ago

+1. Patch looks good. I did smoke test in Mock: Python runs, I could install requests in venv from PyPI.

[recheck]

LGTM. I just read the PR. I didn't check versions of bundled pip and setuptools.

Build succeeded.

Pull-Request has been merged by churchyard
3 years ago
Changes Summary 10
+1 -1
file changed
00001-rpath.patch
+3 -3
file changed
00102-lib64.patch
+1 -1
file changed
00111-no-static-lib.patch
+7 -7
file changed
00189-use-rpm-wheels.patch
+1 -1
file changed
00251-change-user-install-location.patch
+2 -2
file changed
00274-fix-arch-names.patch
+1 -1
file changed
00328-pyc-timestamp-invalidation-mode.patch
-76
file removed
00350-sqlite-fix-deterministic-test.patch
+10 -14
file changed
python3.8.spec
+2 -2
file changed
sources
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.