commit python-eventlet for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-eventlet for openSUSE:Factory checked in at 2023-07-01 23:17:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-eventlet (Old) and /work/SRC/openSUSE:Factory/.python-eventlet.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-eventlet" Sat Jul 1 23:17:59 2023 rev:51 rq:1096209 version:0.33.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-eventlet/python-eventlet.changes 2023-04-22 22:02:06.401806992 +0200 +++ /work/SRC/openSUSE:Factory/.python-eventlet.new.13546/python-eventlet.changes 2023-07-01 23:18:05.446274518 +0200 @@ -4,0 +5,2 @@ +- Remove upstreamed newdnspython.patch (bsc#1208126). +- skip test_raise_dns_tcp test (gh#eventlet/eventlet#803) Old: ---- newdnspython.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-eventlet.spec ++++++ --- /var/tmp/diff_new_pack.cGO4nr/_old 2023-07-01 23:18:06.890283174 +0200 +++ /var/tmp/diff_new_pack.cGO4nr/_new 2023-07-01 23:18:06.898283221 +0200 @@ -29,8 +29,6 @@ # PATCH-FEATURE-UPSTREAM remove_nose.patch gh#eventlet/eventlet#638 mcepl@suse.com # Removes dependency on nose Patch0: denose-eventlet.patch -# PATCH-FIX-UPSTREAM newdnspython.patch mcepl@suse.com -- patch is from gh#rthalley/dnspython#519, discussion in gh#eventlet/eventlet#638 -Patch1: newdnspython.patch # PATCH-FIX-UPSTREAM https://github.com/eventlet/eventlet/pull/643 Patch2: python-eventlet-FTBFS2028.patch # PATCH-FIX-UPSTREAM fix-py3-rlock.patch gh#eventlet/eventlet#754 @@ -68,8 +66,7 @@ interpreter, or as part of a larger application. %prep -%setup -q -n eventlet-%{version} -%autopatch -p1 +%autosetup -p1 -n eventlet-%{version} # Fix non-executable script sed -i '1{/^#!/ d}' eventlet/support/greendns.py @@ -96,6 +93,8 @@ skiptests+=" or test_017_ssl_zeroreturnerror" # it is racy, see: https://lore.kernel.org/all/CADVnQy=AnJY9NZ3w_xNghEG80-DhsXL0r_vEtkr=dmz0ugc... (bsc#1202188) skiptests+=" or test_018b_http_10_keepalive_framing" +# gh#eventlet/eventlet#803 +skiptests+=" or test_raise_dns_tcp" # Unknown Python 3.6 specific errors # TypeError: _wrap_socket() argument 1 must be _socket.socket, not SSLSocket ++++++ denose-eventlet.patch ++++++ --- /var/tmp/diff_new_pack.cGO4nr/_old 2023-07-01 23:18:06.926283389 +0200 +++ /var/tmp/diff_new_pack.cGO4nr/_new 2023-07-01 23:18:06.930283414 +0200 @@ -1,20 +1,14 @@ -Index: eventlet-0.33.0/setup.py -=================================================================== ---- eventlet-0.33.0.orig/setup.py -+++ eventlet-0.33.0/setup.py -@@ -27,7 +27,7 @@ setuptools.setup( - 'README.rst' - ) - ).read(), -- test_suite='nose.collector', -+ test_suite='tests', - classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", -Index: eventlet-0.33.0/eventlet.egg-info/SOURCES.txt -=================================================================== ---- eventlet-0.33.0.orig/eventlet.egg-info/SOURCES.txt -+++ eventlet-0.33.0/eventlet.egg-info/SOURCES.txt +--- + eventlet.egg-info/SOURCES.txt | 3 + setup.py | 2 + tests/__init__.py | 3 + tests/dagpool_test.py | 149 ++++++++++++++++++++---------------------- + tests/greenio_test.py | 8 -- + tests/nosewrapper.py | 13 --- + 6 files changed, 83 insertions(+), 95 deletions(-) + +--- a/eventlet.egg-info/SOURCES.txt ++++ b/eventlet.egg-info/SOURCES.txt @@ -175,7 +175,6 @@ tests/greenthread_test.py tests/hub_test.py tests/mock.py @@ -30,71 +24,19 @@ -tests/stdlib/test_urllib2_localnet.py \ No newline at end of file +tests/stdlib/test_urllib2_localnet.py -Index: eventlet-0.33.0/tests/greenio_test.py -=================================================================== ---- eventlet-0.33.0.orig/tests/greenio_test.py -+++ eventlet-0.33.0/tests/greenio_test.py -@@ -9,8 +9,6 @@ import socket as _orig_sock - import sys - import tempfile - --from nose.tools import eq_ -- - import eventlet - from eventlet import event, greenio, debug - from eventlet.hubs import get_hub -@@ -39,7 +37,7 @@ def expect_socket_timeout(function, *arg - raise AssertionError("socket.timeout not raised") - except socket.timeout as e: - assert hasattr(e, 'args') -- eq_(e.args[0], 'timed out') -+ assert e.args[0] == 'timed out' - - - def min_buf_size(): -@@ -674,8 +672,8 @@ class TestGreenSocket(tests.LimitedTestC - sender.sendto(b'second', 0, address) - - sender_address = ('127.0.0.1', sender.getsockname()[1]) -- eq_(receiver.recvfrom(1024), (b'first', sender_address)) -- eq_(receiver.recvfrom(1024), (b'second', sender_address)) -+ assert receiver.recvfrom(1024) == (b'first', sender_address) -+ assert receiver.recvfrom(1024) == (b'second', sender_address) - - - def test_get_fileno_of_a_socket_works(): -Index: eventlet-0.33.0/tests/nosewrapper.py -=================================================================== ---- eventlet-0.33.0.orig/tests/nosewrapper.py -+++ eventlet-0.33.0/tests/nosewrapper.py -@@ -1,20 +1,13 @@ - """ This script simply gets the paths correct for testing eventlet with the - hub extension for Nose.""" --import nose - from os.path import dirname, realpath, abspath - import sys -+import unittest - - - parent_dir = dirname(dirname(realpath(abspath(__file__)))) - if parent_dir not in sys.path: - sys.path.insert(0, parent_dir) - --# hudson does a better job printing the test results if the exit value is 0 --zero_status = '--force-zero-status' --if zero_status in sys.argv: -- sys.argv.remove(zero_status) -- launch = nose.run --else: -- launch = nose.main -- --launch(argv=sys.argv) -+if __name__ == '__main__': -+ unittest.main() -Index: eventlet-0.33.0/tests/__init__.py -=================================================================== ---- eventlet-0.33.0.orig/tests/__init__.py -+++ eventlet-0.33.0/tests/__init__.py +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,7 @@ setuptools.setup( + 'README.rst' + ) + ).read(), +- test_suite='nose.collector', ++ test_suite='tests', + classifiers=[ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", +--- a/tests/__init__.py ++++ b/tests/__init__.py @@ -20,7 +20,7 @@ import sys import unittest import warnings @@ -112,10 +54,8 @@ raise SkipTest('CPU usage testing not supported (`import resource` failed)') r1 = resource.getrusage(resource.RUSAGE_SELF) -Index: eventlet-0.33.0/tests/dagpool_test.py -=================================================================== ---- eventlet-0.33.0.orig/tests/dagpool_test.py -+++ eventlet-0.33.0/tests/dagpool_test.py +--- a/tests/dagpool_test.py ++++ b/tests/dagpool_test.py @@ -5,7 +5,6 @@ @brief Test DAGPool class """ @@ -433,4 +373,61 @@ + assert dict(pool.wait_each_exception("ab")) == dict(b=bogub) + assert dict(pool.wait_each_exception("a")) == {} + assert dict(pool.wait_each_exception("b")) == dict(b=bogub) +--- a/tests/greenio_test.py ++++ b/tests/greenio_test.py +@@ -9,8 +9,6 @@ import socket as _orig_sock + import sys + import tempfile + +-from nose.tools import eq_ +- + import eventlet + from eventlet import event, greenio, debug + from eventlet.hubs import get_hub +@@ -39,7 +37,7 @@ def expect_socket_timeout(function, *arg + raise AssertionError("socket.timeout not raised") + except socket.timeout as e: + assert hasattr(e, 'args') +- eq_(e.args[0], 'timed out') ++ assert e.args[0] == 'timed out' + + + def min_buf_size(): +@@ -674,8 +672,8 @@ class TestGreenSocket(tests.LimitedTestC + sender.sendto(b'second', 0, address) + + sender_address = ('127.0.0.1', sender.getsockname()[1]) +- eq_(receiver.recvfrom(1024), (b'first', sender_address)) +- eq_(receiver.recvfrom(1024), (b'second', sender_address)) ++ assert receiver.recvfrom(1024) == (b'first', sender_address) ++ assert receiver.recvfrom(1024) == (b'second', sender_address) + + + def test_get_fileno_of_a_socket_works(): +--- a/tests/nosewrapper.py ++++ b/tests/nosewrapper.py +@@ -1,20 +1,13 @@ + """ This script simply gets the paths correct for testing eventlet with the + hub extension for Nose.""" +-import nose + from os.path import dirname, realpath, abspath + import sys ++import unittest + + + parent_dir = dirname(dirname(realpath(abspath(__file__)))) + if parent_dir not in sys.path: + sys.path.insert(0, parent_dir) + +-# hudson does a better job printing the test results if the exit value is 0 +-zero_status = '--force-zero-status' +-if zero_status in sys.argv: +- sys.argv.remove(zero_status) +- launch = nose.run +-else: +- launch = nose.main +- +-launch(argv=sys.argv) ++if __name__ == '__main__': ++ unittest.main() ++++++ fix-py3-rlock.patch ++++++ --- /var/tmp/diff_new_pack.cGO4nr/_old 2023-07-01 23:18:06.946283509 +0200 +++ /var/tmp/diff_new_pack.cGO4nr/_new 2023-07-01 23:18:06.946283509 +0200 @@ -1,5 +1,9 @@ -diff --git a/eventlet/patcher.py b/eventlet/patcher.py -index b249d6f19..4eeb93439 100644 +--- + eventlet/patcher.py | 42 +++++++++++++---- + tests/isolated/patcher_existing_logging_module_lock.py | 30 ++++++++++++ + tests/patcher_test.py | 4 + + 3 files changed, 68 insertions(+), 8 deletions(-) + --- a/eventlet/patcher.py +++ b/eventlet/patcher.py @@ -412,6 +412,23 @@ def _green_existing_locks(): @@ -66,9 +70,6 @@ def _green_os_modules(): -diff --git a/tests/isolated/patcher_existing_logging_module_lock.py b/tests/isolated/patcher_existing_logging_module_lock.py -new file mode 100644 -index 000000000..2acad62ee --- /dev/null +++ b/tests/isolated/patcher_existing_logging_module_lock.py @@ -0,0 +1,30 @@ @@ -102,11 +103,9 @@ + t.join(timeout=0.1) + assert not t.is_alive() + print("pass") -diff --git a/tests/patcher_test.py b/tests/patcher_test.py -index dbf6e1c71..e8d6f3300 100644 --- a/tests/patcher_test.py +++ b/tests/patcher_test.py -@@ -485,6 +485,10 @@ def test_patcher_existing_locks_unlocked(): +@@ -485,6 +485,10 @@ def test_patcher_existing_locks_unlocked tests.run_isolated('patcher_existing_locks_unlocked.py') ++++++ python-eventlet-FTBFS2028.patch ++++++ --- /var/tmp/diff_new_pack.cGO4nr/_old 2023-07-01 23:18:06.958283581 +0200 +++ /var/tmp/diff_new_pack.cGO4nr/_new 2023-07-01 23:18:06.962283605 +0200 @@ -13,11 +13,9 @@ See https://reproducible-builds.org/ for why this matters. --- - tests/test_server.crt | 16 ++++++++-------- + tests/test_server.crt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -diff --git a/tests/test_server.crt b/tests/test_server.crt -index 67c9adc8b..78759e810 100644 --- a/tests/test_server.crt +++ b/tests/test_server.crt @@ -2,7 +2,7 @@ @@ -29,7 +27,7 @@ djELMAkGA1UEBhMCVFMxDTALBgNVBAgMBFRlc3QxDTALBgNVBAcMBFRlc3QxFjAU BgNVBAoMDVRlc3QgRXZlbnRsZXQxDTALBgNVBAsMBFRlc3QxDTALBgNVBAMMBFRl c3QxEzARBgkqhkiG9w0BCQEWBFRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -@@ -13,11 +13,11 @@ Lvc6cJHMKaxHCeIBOL+z/9kJqhh30eqsmNB5AXSoV8b2B3MV3glW2vd5WJVYEWxl +@@ -13,11 +13,11 @@ Lvc6cJHMKaxHCeIBOL+z/9kJqhh30eqsmNB5AXSo 3+GNgzZJ3KGape7pcBYER7zg/yZLZxgNFlTCOZiysjNxC0liJA9tgUQhRc1gsqA8 dQxzvqW8kuZedmatjyM58WixvjymobC3AgMBAAGjUzBRMB0GA1UdDgQWBBQT3V3f 8vCoqGXe6zySSjVP+J/P7zAfBgNVHSMEGDAWgBQT3V3f8vCoqGXe6zySSjVP+J/P
participants (1)
-
Source-Sync