#21 Update to 7.3.9 + exclude ix86 on F37+
Merged a year ago by churchyard. Opened a year ago by churchyard.
rpms/ churchyard/pypy3.7 7.3.9  into  rawhide

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

  /pypy3.7-v7.3.6-src.tar.bz2

  /pypy3.7-v7.3.7-src.tar.bz2

  /pypy3.7-v7.3.8-src.tar.bz2

+ /pypy3.7-v7.3.9-src.tar.bz2

file modified
+12 -9
@@ -1,5 +1,5 @@ 

  diff --git a/lib-python/3/ensurepip/__init__.py b/lib-python/3/ensurepip/__init__.py

- index 94d40b0..9135b80 100644

+ index 8289c49..f0d7106 100644

  --- a/lib-python/3/ensurepip/__init__.py

  +++ b/lib-python/3/ensurepip/__init__.py

  @@ -1,3 +1,5 @@
@@ -8,14 +8,16 @@ 

   import os

   import os.path

   import pkgutil

- @@ -9,9 +11,24 @@ import tempfile

-  __all__ = ["version", "bootstrap"]

+ @@ -7,9 +9,26 @@ import tempfile

   

   

+  __all__ = ["version", "bootstrap"]

+ -_PACKAGE_NAMES = ('setuptools', 'pip')

  -_SETUPTOOLS_VERSION = "47.1.0"

+ -_PIP_VERSION = "22.0.4"

+ +

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

-  

- -_PIP_VERSION = "20.1.1"

+ + 

  +_wheels = {}

  +

  +def _get_most_recent_wheel_version(pkg):
@@ -32,10 +34,11 @@ 

  +_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")

  +

  +_PIP_VERSION = _get_most_recent_wheel_version("pip")

-  

+ +

   _PROJECTS = [

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

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

+      ("pip", _PIP_VERSION, "py3"),

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

           # additional paths that need added to sys.path

           additional_paths = []

           for project, version, py_tag in _PROJECTS:
@@ -50,6 +53,6 @@ 

  +            with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:

  +                with open(os.path.join(tmpdir, wheel_name), "wb") as fp:

  +                    fp.write(sfp.read())

- 

+  

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

- 

+  

file modified
+13 -3
@@ -1,13 +1,14 @@ 

  %global basever 7.3

  %global pyversion 3.7

  Name:           pypy%{pyversion}

- Version:        %{basever}.8

+ Version:        %{basever}.9

  # The Python version is included in Release to workaround debuginfo conflicts

  # and make pypy versions with otherwise the same version-release always sorted

  # by Python version as well.

  # This potentially allows tags like Obsoletes: pypy3 < %%{version}-%%{release}.

  # https://bugzilla.redhat.com/2053880

- Release:        1.%{pyversion}%{?dist}

+ %global baserelease 1

+ Release:        %{baserelease}.%{pyversion}%{?dist}

  Summary:        Python %{pyversion} implementation with a Just-In-Time compiler

  

  # PyPy is MIT
@@ -25,6 +26,11 @@ 

  License:        MIT and Python and UCD and BSD and (ASL 2.0 or BSD)

  URL:            http://pypy.org/

  

+ # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval

+ %if 0%{?fedora} >= 37 || 0%{?rhel} >= 10

+ ExcludeArch:    %{ix86}

+ %endif

+ 

  # High-level configuration of the build:

  

  # libmpdec (mpdecimal package in Fedora) is tightly coupled with the
@@ -292,7 +298,7 @@ 

  Requires: python-setuptools-wheel

  Requires: python-pip-wheel

  %else

- Provides: bundled(python3dist(pip)) = 20.1.1

+ Provides: bundled(python3dist(pip)) = 22.0.4

  Provides: bundled(python3dist(setuptools)) = 47.1.0

  %endif

  
@@ -884,6 +890,10 @@ 

  

  

  %changelog

+ * Wed Mar 30 2022 Miro Hrončok <mhroncok@redhat.com> - 7.3.9-1.3.7

+ - Update to 7.3.9

+ - Fixes: rhbz#2069873

+ 

  * Tue Mar 01 2022 Miro Hrončok <mhroncok@redhat.com> - 7.3.8-1.3.7

  - Include the Python version in Release to workaround debuginfo conflicts

    and make same builds of different PyPy sort in a predictable way (e.g. wrt Obsoletes)

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

- SHA512 (pypy3.7-v7.3.8-src.tar.bz2) = 654852caeeb4f01bd47807283d2cf1c19a504b207be23dc40cf3ca4369a14e8f71773a9641a5074de92acfda24d10092cb4d4778e806258dc23f2cfb4d5eaaae

+ SHA512 (pypy3.7-v7.3.9-src.tar.bz2) = 81812f40bb4386721934bca4f8b18660b9ff5c2fa8b87e6618c95068f7493db8b165590f703054e82fd327fcd1da135e7c86df0de3caa4af48300ce6065289a0

no initial comment

3 new commits added

  • Exclude ix86 on F37+
  • Update to 7.3.9
  • Define %baserelease to make bumpspec work properly
a year ago

3 new commits added

  • Exclude ix86 on F37+
  • Update to 7.3.9
  • Define %baserelease to make bumpspec work properly
a year ago

Pull-Request has been merged by churchyard

a year ago