Update to 7.2.0

This commit is contained in:
Miro Hrončok 2019-10-14 20:40:57 +02:00
parent 707f9490c0
commit 2f53e9f20a
5 changed files with 15 additions and 27 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/pypy3-v6.0.0-src.tar.bz2 /pypy3-v6.0.0-src.tar.bz2
/pypy3.5-v7.0.0-src.tar.bz2 /pypy3.5-v7.0.0-src.tar.bz2
/pypy3.6-v7.1.1-src.tar.bz2 /pypy3.6-v7.1.1-src.tar.bz2
/pypy3.6-v7.2.0-src.tar.bz2

View File

@ -5,18 +5,18 @@ Date: Wed Mar 29 04:31:55 2017 +0200
011-no-faulthandler.patch 011-no-faulthandler.patch
diff --git a/lib-python/3/test/support/__init__.py b/lib-python/3/test/support/__init__.py diff --git a/lib-python/3/test/support/__init__.py b/lib-python/3/test/support/__init__.py
index 5d7f308..4424637 100644 index faa1ba7..2edadc9 100644
--- a/lib-python/3/test/support/__init__.py --- a/lib-python/3/test/support/__init__.py
+++ b/lib-python/3/test/support/__init__.py +++ b/lib-python/3/test/support/__init__.py
@@ -6,7 +6,6 @@ if __name__ != 'test.support': @@ -7,7 +7,6 @@ import collections.abc
import collections.abc
import contextlib import contextlib
import datetime
import errno import errno
-import faulthandler -import faulthandler
import fnmatch import fnmatch
import functools import functools
import gc import gc
@@ -65,6 +64,11 @@ try: @@ -70,6 +69,11 @@ try:
except ImportError: except ImportError:
resource = None resource = None
@ -28,7 +28,7 @@ index 5d7f308..4424637 100644
__all__ = [ __all__ = [
# globals # globals
"PIPE_MAX_SIZE", "verbose", "max_memuse", "use_resources", "failfast", "PIPE_MAX_SIZE", "verbose", "max_memuse", "use_resources", "failfast",
@@ -2060,7 +2064,8 @@ def start_threads(threads, unlock=None): @@ -2231,7 +2235,8 @@ def start_threads(threads, unlock=None):
finally: finally:
started = [t for t in started if t.isAlive()] started = [t for t in started if t.isAlive()]
if started: if started:

View File

@ -16,9 +16,9 @@ index 9f5d151..8b81155 100644
+_WHEEL_DIR = "/usr/share/python-wheels/" +_WHEEL_DIR = "/usr/share/python-wheels/"
-_SETUPTOOLS_VERSION = "28.8.0" -_SETUPTOOLS_VERSION = "40.6.2"
-_PIP_VERSION = "9.0.1" -_PIP_VERSION = "18.1"
+def _get_most_recent_wheel_version(pkg): +def _get_most_recent_wheel_version(pkg):
+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
+ suffix = "-py2.py3-none-any.whl" + suffix = "-py2.py3-none-any.whl"
@ -33,22 +33,6 @@ index 9f5d151..8b81155 100644
_PROJECTS = [ _PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION), ("setuptools", _SETUPTOOLS_VERSION),
@@ -24,8 +35,13 @@ def _run_pip(args, additional_paths=None):
sys.path = additional_paths + sys.path
# Install the bundled software
- import pip
- pip.main(args)
+ try:
+ # pip 10
+ from pip._internal import main
+ except ImportError:
+ # pip 9
+ from pip import main
+ main(args)
def version():
@@ -79,12 +95,9 @@ def bootstrap(*, root=None, upgrade=False, user=False, @@ -79,12 +95,9 @@ def bootstrap(*, root=None, upgrade=False, user=False,
additional_paths = [] additional_paths = []
for project, version in _PROJECTS: for project, version in _PROJECTS:

View File

@ -1,8 +1,8 @@
%global basever 7.1 %global basever 7.2
Name: pypy3 Name: pypy3
Version: %{basever}.1 Version: %{basever}.0
%global pyversion 3.6 %global pyversion 3.6
Release: 2%{?dist} Release: 1%{?dist}
Summary: Python 3 implementation with a Just-In-Time compiler Summary: Python 3 implementation with a Just-In-Time compiler
# LGPL and another free license we'd need to ask spot about are present in some # LGPL and another free license we'd need to ask spot about are present in some
@ -867,6 +867,9 @@ CheckPyPy %{name}-stackless
%changelog %changelog
* Mon Oct 14 2019 Miro Hrončok <mhroncok@redhat.com> - 7.2.0-1
- Update to 7.2.0 (#1757707)
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-2 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (pypy3.6-v7.1.1-src.tar.bz2) = 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473 SHA512 (pypy3.6-v7.2.0-src.tar.bz2) = bcbb53062a473d504bcc082cf6286f6169c83d1f38d22c4d7c4e46ddc32bca9d91e71194637e6650db5bec02b29fe262b22fe236d627b6bc3e6e0c59c66c07cc