From 143e377b2ec64554877956ebe6b0f8374ae076d26636c72ac439863586913565 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 21 May 2021 15:18:30 +0000 Subject: [PATCH 1/4] - Stop providing "python" symbol (bsc#1185588), which means python2 currently. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=68 --- python39.changes | 6 ++++++ python39.spec | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python39.changes b/python39.changes index 0ec11a7..4ee00ff 100644 --- a/python39.changes +++ b/python39.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 21 15:13:59 UTC 2021 - Matej Cepl + +- Stop providing "python" symbol (bsc#1185588), which means + python2 currently. + ------------------------------------------------------------------- Wed May 5 15:16:58 UTC 2021 - Matej Cepl diff --git a/python39.spec b/python39.spec index 384acf7..7b1d16e 100644 --- a/python39.spec +++ b/python39.spec @@ -1,5 +1,5 @@ # -# spec file for package python39-core +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -186,7 +186,6 @@ Requires: %{python_pkg_name}-base = %{version} Recommends: %{python_pkg_name}-curses Recommends: %{python_pkg_name}-dbm Recommends: %{python_pkg_name}-pip -Provides: python = %{python_version} %if %{primary_interpreter} Provides: python3 = %{python_version} %endif From 1e1de10cdda414029574033b00a060389db04c57bffabba68391391bfdd03f2c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 3 Jun 2021 12:22:24 +0000 Subject: [PATCH 2/4] Accepting request 896921 from home:dancermak:branches:devel:languages:python:Factory Exclude test_capi on Leap (test fails there) OBS-URL: https://build.opensuse.org/request/show/896921 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=69 --- python39.changes | 5 +++++ python39.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/python39.changes b/python39.changes index 4ee00ff..cd17c25 100644 --- a/python39.changes +++ b/python39.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 2 13:12:04 UTC 2021 - Dan Čermák + +- Exclude test_capi on Leap (test fails there) + ------------------------------------------------------------------- Fri May 21 15:13:59 UTC 2021 - Matej Cepl diff --git a/python39.spec b/python39.spec index 7b1d16e..5bd3037 100644 --- a/python39.spec +++ b/python39.spec @@ -498,6 +498,11 @@ EXCLUDE="$EXCLUDE test_multiprocessing_forkserver test_multiprocessing_spawn tes # done have any such interface breaking the uuid module. EXCLUDE="$EXCLUDE test_uuid" +# EXCLUDE test_capi bpo#37169 for Leap <= 15.3 +%if 0%{?sle_version} <= 150300 +EXCLUDE="$EXCLUDE test_capi" +%endif + # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : From d412267ee4f8d1302091846a207471ede3b93b3b59e54a6286a2bc98021f6f79 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 5 Jun 2021 07:02:53 +0000 Subject: [PATCH 3/4] Accepting request 897590 from home:dirkmueller:Factory - allow build with Sphinx >= 3.x OBS-URL: https://build.opensuse.org/request/show/897590 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=70 --- python39.changes | 5 +++++ python39.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python39.changes b/python39.changes index cd17c25..0aad0b9 100644 --- a/python39.changes +++ b/python39.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 4 21:36:30 UTC 2021 - Dirk Müller + +- allow build with Sphinx >= 3.x + ------------------------------------------------------------------- Wed Jun 2 13:12:04 UTC 2021 - Dan Čermák diff --git a/python39.spec b/python39.spec index 5bd3037..6f329e6 100644 --- a/python39.spec +++ b/python39.spec @@ -164,7 +164,7 @@ BuildRequires: pkgconfig(libtirpc) %if %{with doc} # Here we just run sphinx and we can use generic one, we don't need # the flavor variant -BuildRequires: python3-Sphinx < 3.0 +BuildRequires: python3-Sphinx %if 0%{?suse_version} >= 1500 BuildRequires: python3-python-docs-theme %endif From 4ae49af4ba6b1e33f6014229370da66525ae948338c6f336517afd9778ea1dbf Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 7 Jun 2021 14:28:29 +0000 Subject: [PATCH 4/4] Accepting request 898147 from home:mcepl:branches:devel:languages:python:Factory - Revert previous skip over test_capi - Add skip-test_pyobject_freed_is_freed.patch to skip failing test on SLE-15. OBS-URL: https://build.opensuse.org/request/show/898147 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=71 --- python39.changes | 7 +++++++ python39.spec | 13 ++++++------- skip-test_pyobject_freed_is_freed.patch | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 skip-test_pyobject_freed_is_freed.patch diff --git a/python39.changes b/python39.changes index 0aad0b9..d4a8249 100644 --- a/python39.changes +++ b/python39.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jun 5 21:21:38 UTC 2021 - Matej Cepl + +- Revert previous skip over test_capi +- Add skip-test_pyobject_freed_is_freed.patch to skip failing + test on SLE-15. + ------------------------------------------------------------------- Fri Jun 4 21:36:30 UTC 2021 - Dirk Müller diff --git a/python39.spec b/python39.spec index 6f329e6..df1cbab 100644 --- a/python39.spec +++ b/python39.spec @@ -142,6 +142,9 @@ Patch32: sphinx-update-removed-function.patch # PATCH-FIX-SLE no-skipif-doctests.patch jsc#SLE-13738 mcepl@suse.com # SLE-15 version of Sphinx doesn't know about skipif directive in doctests. 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 BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes @@ -162,8 +165,6 @@ BuildRequires: pkgconfig(libnsl) BuildRequires: pkgconfig(libtirpc) %endif %if %{with doc} -# Here we just run sphinx and we can use generic one, we don't need -# the flavor variant BuildRequires: python3-Sphinx %if 0%{?suse_version} >= 1500 BuildRequires: python3-python-docs-theme @@ -387,6 +388,9 @@ other applications. %if 0%{?suse_version} <= 1500 %patch33 -p1 %endif +%if 0%{?sle_version} && 0%{?sle_version} <= 150300 +%patch34 -p1 +%endif # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac @@ -498,11 +502,6 @@ EXCLUDE="$EXCLUDE test_multiprocessing_forkserver test_multiprocessing_spawn tes # done have any such interface breaking the uuid module. EXCLUDE="$EXCLUDE test_uuid" -# EXCLUDE test_capi bpo#37169 for Leap <= 15.3 -%if 0%{?sle_version} <= 150300 -EXCLUDE="$EXCLUDE test_capi" -%endif - # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : diff --git a/skip-test_pyobject_freed_is_freed.patch b/skip-test_pyobject_freed_is_freed.patch new file mode 100644 index 0000000..a13a2da --- /dev/null +++ b/skip-test_pyobject_freed_is_freed.patch @@ -0,0 +1,14 @@ +--- + Lib/test/test_capi.py | 1 + + 1 file changed, 1 insertion(+) + +--- a/Lib/test/test_capi.py ++++ b/Lib/test/test_capi.py +@@ -794,6 +794,7 @@ class PyMemDebugTests(unittest.TestCase) + def test_pyobject_forbidden_bytes_is_freed(self): + self.check_pyobject_is_freed('check_pyobject_forbidden_bytes_is_freed') + ++ @unittest.skip('Failing on Leap 15.*') + def test_pyobject_freed_is_freed(self): + self.check_pyobject_is_freed('check_pyobject_freed_is_freed') +