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

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

  /pypy3.9-v7.3.8rc1-src.tar.bz2

  /pypy3.9-v7.3.8rc2-src.tar.bz2

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

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

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

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

- index 597a1ef9ee..3bfab52083 100644

+ index e510cc7..8b736b8 100644

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

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

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

   import os

   import os.path

   import sys

- @@ -6,13 +8,29 @@ import tempfile

+ @@ -6,13 +8,28 @@ import tempfile

   import subprocess

   from importlib import resources

   

  -from . import _bundled

- -

   

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

   

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

- -_SETUPTOOLS_VERSION = "58.1.0"

- -_PIP_VERSION = "21.2.4"

- +

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

  +

  +_wheels = {}
@@ -38,11 +34,14 @@ 

  +_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")

  +

  +_PIP_VERSION = _get_most_recent_wheel_version("pip")

- +

+  

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

+ -_SETUPTOOLS_VERSION = "58.1.0"

+ -_PIP_VERSION = "22.0.4"

   _PROJECTS = [

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

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

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

+ @@ -101,13 +118,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:

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

  %global basever 7.3

- %global micro 8

+ %global micro 9

  #global pre ...

  %global pyversion 3.9

  Name:           pypy%{pyversion}
@@ -10,7 +10,8 @@ 

  # 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
@@ -28,6 +29,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
@@ -235,7 +241,7 @@ 

  Requires: python-setuptools-wheel

  Requires: python-pip-wheel

  %else

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

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

  Provides: bundled(python3dist(setuptools)) = 58.1.0

  %endif

  
@@ -820,6 +826,10 @@ 

  

  

  %changelog

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

+ - Update to 7.3.9

+ - Fixes: rhbz#2069873

+ 

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

  - 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.9-v7.3.8-src.tar.bz2) = aed018738af7a225f516ec37d059d539f486d9dd427fe000805147b197f496d5fcb0387e47008524753ad18224aebeb1e68f9e2093acbe37468e02bff92f7126

+ SHA512 (pypy3.9-v7.3.9-src.tar.bz2) = 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a

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

Pull-Request has been merged by churchyard

a year ago