Accepting request 783774 from home:pgajdos:python

- version update to 6.0.4 General changes ~~~~~~~~~~~~~~ ``asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())`` for this platform/version. Bug fixes ~~~~~~~~ - Fixed an issue in `.IOStream` (introduced in 6.0.0) that resulted in ``StreamClosedError`` being incorrectly raised if a stream is closed mid-read but there is enough buffered data to satisfy the read. - `.AnyThreadEventLoopPolicy` now always uses the selector event loop on Windows. - modified patches % ignore-resourcewarning-doctests.patch (refreshed) % skip-failing-tests.patch (refreshed) % tornado-testsuite_timeout.patch (refreshed) OBS-URL: https://build.opensuse.org/request/show/783774 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tornado6?expand=0&rev=9
2020-03-11 11:21:53 +00:00
parent 444c98fdb2
commit 7636501f08
7 changed files with 103 additions and 82 deletions
--- a/ignore-resourcewarning-doctests.patch
+++ b/ignore-resourcewarning-doctests.patch
@@ -1,7 +1,7 @@
-Index: tornado-6.0.3/tornado/util.py
+Index: tornado-6.0.4/tornado/util.py
 ===================================================================
--- tornado-6.0.3.orig/tornado/util.py
-+++ tornado-6.0.3/tornado/util.py
+--- tornado-6.0.4.orig/tornado/util.py	2020-03-11 11:42:49.610254636 +0100
+++ tornado-6.0.4/tornado/util.py	2020-03-11 11:43:51.470603323 +0100
@@ -468,5 +468,7 @@ else:
 def doctests():
     # type: () -> unittest.TestSuite
@@ -10,10 +10,10 @@ Index: tornado-6.0.3/tornado/util.py
 +    warnings.simplefilter("ignore", ResourceWarning)
 
     return doctest.DocTestSuite()
-Index: tornado-6.0.3/tornado/httputil.py
+Index: tornado-6.0.4/tornado/httputil.py
 ===================================================================
--- tornado-6.0.3.orig/tornado/httputil.py
-+++ tornado-6.0.3/tornado/httputil.py
+--- tornado-6.0.4.orig/tornado/httputil.py	2020-03-11 11:42:49.610254636 +0100
+++ tornado-6.0.4/tornado/httputil.py	2020-03-11 11:44:46.178911693 +0100
@@ -1032,6 +1032,8 @@ def encode_username_password(
 def doctests():
     # type: () -> unittest.TestSuite
@@ -23,11 +23,11 @@ Index: tornado-6.0.3/tornado/httputil.py
 
     return doctest.DocTestSuite()
 
-Index: tornado-6.0.3/tornado/iostream.py
+Index: tornado-6.0.4/tornado/iostream.py
 ===================================================================
--- tornado-6.0.3.orig/tornado/iostream.py
-+++ tornado-6.0.3/tornado/iostream.py
-@@ -1651,5 +1651,7 @@ class PipeIOStream(BaseIOStream):
+--- tornado-6.0.4.orig/tornado/iostream.py	2020-03-11 11:42:49.610254636 +0100
+++ tornado-6.0.4/tornado/iostream.py	2020-03-11 11:45:31.015164413 +0100
+@@ -1677,5 +1677,7 @@ class PipeIOStream(BaseIOStream):
 
 def doctests() -> Any:
     import doctest
--- a/python-tornado6.changes
+++ b/python-tornado6.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Mar 11 10:47:24 UTC 2020 - pgajdos@suse.com
+
+- version update to 6.0.4
+  General changes
+  ~~~~~~~~~~~~~~
+    ``asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())`` for
+    this platform/version.
+  Bug fixes
+  ~~~~~~~~
+  - Fixed an issue in `.IOStream` (introduced in 6.0.0) that resulted in
+    ``StreamClosedError`` being incorrectly raised if a stream is closed mid-read
+    but there is enough buffered data to satisfy the read.
+  - `.AnyThreadEventLoopPolicy` now always uses the selector event loop on Windows.
+- modified patches
+  % ignore-resourcewarning-doctests.patch (refreshed)
+  % skip-failing-tests.patch (refreshed)
+  % tornado-testsuite_timeout.patch (refreshed)
+
 -------------------------------------------------------------------
 Mon Nov 18 04:00:14 UTC 2019 - Steve Kowalik <steven.kowalik@suse.com>

--- a/python-tornado6.spec
+++ b/python-tornado6.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-tornado6
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define         skip_python2 1
 Name:           python-tornado6
-Version:        6.0.3
+Version:        6.0.4
 Release:        0
 Summary:        Open source version of scalable, non-blocking web server that power FriendFeed
 License:        Apache-2.0
--- a/skip-failing-tests.patch
+++ b/skip-failing-tests.patch
@@ -10,19 +10,19 @@ Bug: https://github.com/tornadoweb/tornado/issues/2536
 tornado/test/iostream_test.py | 3 +++
 1 file changed, 3 insertions(+)

-diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
-index 56fffe6..b1d5f5d 100644
--- a/tornado/test/iostream_test.py
-+++ b/tornado/test/iostream_test.py
-@@ -166,6 +166,7 @@ class TestReadWriteMixin(object):
-         raise NotImplementedError
+Index: tornado-6.0.4/tornado/test/iostream_test.py
+===================================================================
+--- tornado-6.0.4.orig/tornado/test/iostream_test.py	2020-03-11 11:39:55.709274416 +0100
+++ tornado-6.0.4/tornado/test/iostream_test.py	2020-03-11 11:40:43.305542700 +0100
+@@ -189,6 +189,7 @@ class TestReadWriteMixin(object):
+         return IOStreamPairContext(self, kwargs)
 
     @gen_test
 +    @unittest.skip("Failing when using openssl 1.1.1 with TLS 1.3 support. See https://github.com/tornadoweb/tornado/issues/2536")
     def test_write_zero_bytes(self):
         # Attempting to write zero bytes should run the callback without
         # going into an infinite loop.
-@@ -217,6 +218,7 @@ class TestReadWriteMixin(object):
+@@ -240,6 +241,7 @@ class TestReadWriteMixin(object):
             rs.close()
 
     @gen_test
@@ -30,7 +30,7 @@ index 56fffe6..b1d5f5d 100644
     def test_read_until_close_after_close(self):
         # Similar to test_delayed_close_callback, but read_until_close takes
         # a separate code path so test it separately.
-@@ -736,6 +738,7 @@ class TestIOStreamMixin(object):
+@@ -793,6 +795,7 @@ class TestIOStreamMixin(TestReadWriteMix
     @skipIfNonUnix
     @skipPypy3V58
     @gen_test
--- a/tornado-6.0.3.tar.gz
+++ b/tornado-6.0.3.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9
-size 482444
--- a/tornado-6.0.4.tar.gz
+++ b/tornado-6.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc
+size 496204
--- a/tornado-testsuite_timeout.patch
+++ b/tornado-testsuite_timeout.patch
@@ -1,6 +1,8 @@
--- tornado-6.0.3/tornado/test/testing_test.py	2018/03/16 13:18:44	1.1
-+++ tornado-6.0.3/tornado/test/testing_test.py	2018/03/16 13:18:56
-@@ -54,7 +54,7 @@
+Index: tornado-6.0.4/tornado/test/testing_test.py
+===================================================================
+--- tornado-6.0.4.orig/tornado/test/testing_test.py	2020-03-11 11:37:45.016537755 +0100
+++ tornado-6.0.4/tornado/test/testing_test.py	2020-03-11 11:38:38.740840572 +0100
+@@ -54,7 +54,7 @@ class AsyncTestCaseTest(AsyncTestCase):
         self.io_loop.add_timeout(self.io_loop.time() + 0.00, self.stop)
         self.wait(timeout=0.02)
         self.io_loop.add_timeout(self.io_loop.time() + 0.03, self.stop)
@@ -9,7 +11,7 @@
 
 
 class LeakTest(AsyncTestCase):
-@@ -262,7 +262,7 @@
+@@ -262,7 +262,7 @@ class GenTest(AsyncTestCase):
         self.finished = True
 
     def test_timeout_environment_variable(self):