Accepting request 935211 from devel:languages:python:Factory

- Add pdb_adjust_breakpoints.patch fixing expectd results in
  test_pdb_breakpoints_preserved_across_interactive_sessions
  (bpo#45964).
- Remove shebangs from from python-base libraries in _libdir
  (bsc#1193179).
- Readjust patches:
  - bpo-31046_ensurepip_honours_prefix.patch
  - decimal.patch
  - python-3.3.0b1-fix_date_time_compiler.patch

OBS-URL: https://build.opensuse.org/request/show/935211
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python310?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2021-12-02 21:30:24 +00:00 committed by Git OBS Bridge
commit 7f79d66838
4 changed files with 50 additions and 4 deletions

View File

@ -0,0 +1,15 @@
---
Lib/test/test_pdb.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -362,7 +362,7 @@ def test_pdb_breakpoints_preserved_acros
1 breakpoint keep yes at ...test_pdb.py:...
2 breakpoint keep yes at ...test_pdb.py:...
(Pdb) break pdb.find_function
- Breakpoint 3 at ...pdb.py:94
+ Breakpoint 3 at ...pdb.py:93
(Pdb) break
Num Type Disp Enb Where
1 breakpoint keep yes at ...test_pdb.py:...

1
python310-rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter("pem-certificate.*/usr/lib.*/python.*/test/*.pem")

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Dec 2 13:51:57 UTC 2021 - Matej Cepl <mcepl@suse.com>
- Add pdb_adjust_breakpoints.patch fixing expectd results in
test_pdb_breakpoints_preserved_across_interactive_sessions
(bpo#45964).
-------------------------------------------------------------------
Mon Nov 29 00:17:07 UTC 2021 - Matej Cepl <mcepl@suse.com>
- Remove shebangs from from python-base libraries in _libdir
(bsc#1193179).
- Readjust patches:
- bpo-31046_ensurepip_honours_prefix.patch
- decimal.patch
- python-3.3.0b1-fix_date_time_compiler.patch
-------------------------------------------------------------------
Tue Nov 16 16:03:43 UTC 2021 - Matej Cepl <mcepl@suse.com>

View File

@ -111,6 +111,7 @@ Source20: idle3.appdata.xml
# 3. mkdir Vendor && mv usr/include/* Vendor/
# 4. tar cJf bluez-devel-vendor.tar.xz Vendor/
Source21: bluez-devel-vendor.tar.xz
Source98: python310-rpmlintrc
# Tarball is signed by the GPG key of Pablo Galindo Salgado (0x64E628F8D684696D)
# https://keybase.io/pablogsal/pgp_keys.asc?fingerprint=a035c8c19219ba821ecea86b64e628f8d684696d
Source99: python.keyring
@ -145,6 +146,9 @@ Patch33: no-skipif-doctests.patch
# PATCH-FIX-SLE skip-test_pyobject_freed_is_freed.patch mcepl@suse.com
# skip a test failing on SLE-15
Patch34: skip-test_pyobject_freed_is_freed.patch
# PATCH-FIX-UPSTREAM pdb_adjust_breakpoints.patch bugno mcepl@suse.com
# adjust results of a doctest
Patch35: pdb_adjust_breakpoints.patch
BuildRequires: autoconf-archive
BuildRequires: automake
BuildRequires: fdupes
@ -153,10 +157,6 @@ BuildRequires: lzma-devel
BuildRequires: netcfg
BuildRequires: openssl-devel
BuildRequires: pkgconfig
%if 0%{?suse_version} >= 1550
# The provider for python(abi) is in rpm-build-python
BuildRequires: rpm-build-python
%endif
BuildRequires: xz
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(expat)
@ -164,6 +164,10 @@ BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(zlib)
#!BuildIgnore: gdk-pixbuf-loader-rsvg
%if 0%{?suse_version} >= 1550
# The provider for python(abi) is in rpm-build-python
BuildRequires: rpm-build-python
%endif
%if 0%{?suse_version} >= 1500
BuildRequires: pkgconfig(libnsl)
BuildRequires: pkgconfig(libtirpc)
@ -398,10 +402,12 @@ other applications.
%if 0%{?sle_version} && 0%{?sle_version} <= 150300
%patch34 -p1
%endif
%patch35 -p1
# drop Autoconf version requirement
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
%if %{primary_interpreter}
# fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3
for dir in Lib Tools; do
# find *.py, filter to files that contain bad shebangs
@ -410,6 +416,13 @@ for dir in Lib Tools; do
| xargs -0 grep -lE '^#! *(/''usr/.*bin/(env +)?)?python' \
| xargs sed -r -i -e '1s@^#![[:space:]]*(/''usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!%{_bindir}/python3@'
done
%else
# For non-primary Python, just don't bother (bsc#1193179) and remove all
# those shebangs
for dir in Lib Tools; do
find $dir -name '*.py' -type f -exec sed -i '1{/^#!.*python/ d}' '{}' \;
done
%endif
# drop in-tree libffi and expat
rm -r Modules/_ctypes/libffi* Modules/_ctypes/darwin