From 80e1e184819f9246c88d06f8e20eef5033fe0c14b13ea60a84015ddc3e03f0aa Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 16 Oct 2024 13:13:17 +0000 Subject: [PATCH] - Binary module _opcode is not build any more (gh#python/cpython!121555) - Add fix_test_ftp_error.patch to mark test_ftp_error as requiring network access. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python314?expand=0&rev=9 --- fix_test_ftp_error.patch | 22 ++++++++++++++++++++++ python314.changes | 5 ++++- python314.spec | 3 +++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 fix_test_ftp_error.patch diff --git a/fix_test_ftp_error.patch b/fix_test_ftp_error.patch new file mode 100644 index 0000000..5865f66 --- /dev/null +++ b/fix_test_ftp_error.patch @@ -0,0 +1,22 @@ +--- + Lib/test/test_urllib2.py | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/Lib/test/test_urllib2.py ++++ b/Lib/test/test_urllib2.py +@@ -1,6 +1,7 @@ + import unittest + from test import support + from test.support import os_helper ++from test.support import requires + from test.support import requires_subprocess + from test.support import warnings_helper + from test import test_urllib +@@ -795,6 +796,7 @@ class HandlerTests(unittest.TestCase): + self.assertEqual(int(headers["Content-length"]), len(data)) + + def test_ftp_error(self): ++ requires('network') + class ErrorFTPHandler(urllib.request.FTPHandler): + def __init__(self, exception): + self._exception = exception diff --git a/python314.changes b/python314.changes index f252e19..32aaa08 100644 --- a/python314.changes +++ b/python314.changes @@ -18,7 +18,10 @@ Wed Oct 16 07:00:15 UTC 2024 - Matej Cepl (gh#python/cpython#125535) - With python311-Sphinx we don't need no-skipif-doctests.patch any more. -- Binary module _opcode is not build any more (gh#python/cpython!121555). +- Binary module _opcode is not build any more + (gh#python/cpython!121555) +- Add fix_test_ftp_error.patch to mark test_ftp_error as + requiring network access. ------------------------------------------------------------------- Thu Oct 10 11:18:19 UTC 2024 - Matej Cepl diff --git a/python314.spec b/python314.spec index 7a5eedf..631d4f2 100644 --- a/python314.spec +++ b/python314.spec @@ -212,6 +212,9 @@ Patch40: fix-test-recursion-limit-15.6.patch # PATCH-FIX-UPSTREAM gh125535-Lib_IntVector_Intrinsics_vec128.patch gh#python/cpython#125535 mcepl@suse.com # Patch from https://github.com/python/cpython/pull/125244 Patch41: gh125535-Lib_IntVector_Intrinsics_vec128.patch +# PATCH-{FIX|FEATURE}-{OPENSUSE|SLE|UPSTREAM} name-of-file.patch bsc#[0-9]+ mcepl@suse.com +# this patch makes things totally awesome +Patch42: fix_test_ftp_error.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes