forked from pool/python-tornado
Accepting request 664410 from devel:languages:python
- Add patch really fixing the tests/tool to work on py3.7: * asyncio.patch - Add patch to enlarge key size for openssl 1.1.1: * openssl-cert-size.patch - Drop patch tornado-async-deprecations.patch that does not fix stuff on py3.7 OBS-URL: https://build.opensuse.org/request/show/664410 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-tornado?expand=0&rev=51
This commit is contained in:
Git OBS Bridge
51
asyncio.patch
Normal file
51
asyncio.patch
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
From: Benjamin Drung <benjamin.drung@cloud.ionos.com>
|
||||||
|
Date: Thu, 15 Nov 2018 16:18:51 +0100
|
||||||
|
Subject: [PATCH] Add support for Python 3.7
|
||||||
|
|
||||||
|
---
|
||||||
|
tornado/gen.py | 3 +--
|
||||||
|
tornado/queues.py | 1 -
|
||||||
|
tornado/test/asyncio_test.py | 3 ++-
|
||||||
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tornado/gen.py b/tornado/gen.py
|
||||||
|
index 99f9106..bdb32ff 100644
|
||||||
|
--- a/tornado/gen.py
|
||||||
|
+++ b/tornado/gen.py
|
||||||
|
@@ -482,9 +482,8 @@ class WaitIterator(object):
|
||||||
|
self.current_future = done
|
||||||
|
self.current_index = self._unfinished.pop(done)
|
||||||
|
|
||||||
|
- @coroutine
|
||||||
|
def __aiter__(self):
|
||||||
|
- raise Return(self)
|
||||||
|
+ return self
|
||||||
|
|
||||||
|
def __anext__(self):
|
||||||
|
if self.done():
|
||||||
|
diff --git a/tornado/queues.py b/tornado/queues.py
|
||||||
|
index 0041a80..141c539 100644
|
||||||
|
--- a/tornado/queues.py
|
||||||
|
+++ b/tornado/queues.py
|
||||||
|
@@ -253,7 +253,6 @@ class Queue(object):
|
||||||
|
"""
|
||||||
|
return self._finished.wait(timeout)
|
||||||
|
|
||||||
|
- @gen.coroutine
|
||||||
|
def __aiter__(self):
|
||||||
|
return _QueueIterator(self)
|
||||||
|
|
||||||
|
diff --git a/tornado/test/asyncio_test.py b/tornado/test/asyncio_test.py
|
||||||
|
index d0e3f2b..ae9125f 100644
|
||||||
|
--- a/tornado/test/asyncio_test.py
|
||||||
|
+++ b/tornado/test/asyncio_test.py
|
||||||
|
@@ -46,7 +46,8 @@ class AsyncIOLoopTest(AsyncTestCase):
|
||||||
|
if hasattr(asyncio, 'ensure_future'):
|
||||||
|
ensure_future = asyncio.ensure_future
|
||||||
|
else:
|
||||||
|
- ensure_future = asyncio.async
|
||||||
|
+ # async is a reserved word in Python 3.7
|
||||||
|
+ ensure_future = getattr(asyncio, "async")
|
||||||
|
|
||||||
|
x = yield ensure_future(
|
||||||
|
asyncio.get_event_loop().run_in_executor(None, lambda: 42))
|
||||||
95
openssl-cert-size.patch
Normal file
95
openssl-cert-size.patch
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
From: =?utf-8?b?T25kxZllaiBOb3bDvQ==?= <onovy@debian.org>
|
||||||
|
Date: Thu, 27 Dec 2018 01:18:41 +0000
|
||||||
|
Subject: Regenerate test crt
|
||||||
|
|
||||||
|
Forwarded: https://github.com/tornadoweb/tornado/pull/2509
|
||||||
|
---
|
||||||
|
tornado/test/test.crt | 31 ++++++++++++++++++-------------
|
||||||
|
tornado/test/test.key | 40 ++++++++++++++++++++++++++--------------
|
||||||
|
2 files changed, 44 insertions(+), 27 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tornado/test/test.crt b/tornado/test/test.crt
|
||||||
|
index 25538c8..ffc49b0 100644
|
||||||
|
--- a/tornado/test/test.crt
|
||||||
|
+++ b/tornado/test/test.crt
|
||||||
|
@@ -1,15 +1,20 @@
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
-MIICSDCCAbGgAwIBAgIJAN1oTowzMbkzMA0GCSqGSIb3DQEBBQUAMD0xCzAJBgNV
|
||||||
|
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRkwFwYDVQQKDBBUb3JuYWRvIFdl
|
||||||
|
-YiBUZXN0MB4XDTEwMDgyNTE4MjQ0NFoXDTIwMDgyMjE4MjQ0NFowPTELMAkGA1UE
|
||||||
|
-BhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExGTAXBgNVBAoMEFRvcm5hZG8gV2Vi
|
||||||
|
-IFRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALirW3mX4jbdFse2aZwW
|
||||||
|
-zszCJ1IsRDrzALpbvMYLLbIZqo+Z8v5aERKTRQpXFqGaZyY+tdwYy7X7YXcLtKqv
|
||||||
|
-jnw/MSeIaqkw5pROKz5aR0nkPLvcTmhJVLVPCLc8dFnIlu8aC9TrDhr90P+PzU39
|
||||||
|
-UG7zLweA9zXKBuW3Tjo5dMP3AgMBAAGjUDBOMB0GA1UdDgQWBBRhJjMBYrzddCFr
|
||||||
|
-/0vvPyHMeqgo0TAfBgNVHSMEGDAWgBRhJjMBYrzddCFr/0vvPyHMeqgo0TAMBgNV
|
||||||
|
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGP6GaxSfb21bikcqaK3ZKCC1sRJ
|
||||||
|
-tiCuvJZbBUFUCAzl05dYUfJZim/oWK+GqyUkUB8ciYivUNnn9OtS7DnlTgT2ws2e
|
||||||
|
-lNgn5cuFXoAGcHXzVlHG3yoywYBf3y0Dn20uzrlLXUWJAzoSLOt2LTaXvwlgm7hF
|
||||||
|
-W1q8SQ6UBshRw2X0
|
||||||
|
+MIIDWzCCAkOgAwIBAgIUV4spou0CenmvKqa7Hml/MC+JKiAwDQYJKoZIhvcNAQEL
|
||||||
|
+BQAwPTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExGTAXBgNVBAoM
|
||||||
|
+EFRvcm5hZG8gV2ViIFRlc3QwHhcNMTgwOTI5MTM1NjQ1WhcNMjgwOTI2MTM1NjQ1
|
||||||
|
+WjA9MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEZMBcGA1UECgwQ
|
||||||
|
+VG9ybmFkbyBXZWIgVGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
|
||||||
|
+AKT0LdyI8tW5uwP3ahE8BFSz+j3SsKBDv/0cKvqxVVE6sLEST2s3HjArZvIIG5sb
|
||||||
|
+iBkWDrqnZ6UKDvB4jlobLGAkepxDbrxHWxK53n0C28XXGLqJQ01TlTZ5rpjttMeg
|
||||||
|
+5SKNjHbxpOvpUwwQS4br4WjZKKyTGiXpFkFUty+tYVU35/U2yyvreWHmzpHx/25t
|
||||||
|
+H7O2RBARVwJYKOGPtlH62lQjpIWfVfklY4Ip8Hjl3B6rBxPyBULmVQw0qgoZn648
|
||||||
|
+oa4oLjs0wnYBz01gVjNMDHej52SsB/ieH7W1TxFMzqOlcvHh41uFbQJPgcXsruSS
|
||||||
|
+9Z4twzSWkUp2vk/C//4Sz38CAwEAAaNTMFEwHQYDVR0OBBYEFLf8fQ5+u8sDWAd3
|
||||||
|
+r5ZjZ5MmDWJeMB8GA1UdIwQYMBaAFLf8fQ5+u8sDWAd3r5ZjZ5MmDWJeMA8GA1Ud
|
||||||
|
+EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADkkm3pIb9IeqVNmQ2uhQOgw
|
||||||
|
+UwyToTYUHNTb/Nm5lzBTBqC8gbXAS24RQ30AB/7G115Uxeo+YMKfITxm/CgR+vhF
|
||||||
|
+F59/YrzwXj+G8bdbuVl/UbB6f9RSp+Zo93rUZAtPWr77gxLUrcwSRzzDwxFjC2nC
|
||||||
|
+6eigbkvt1OQY775RwnFAt7HKPclE0Out+cGJIboJuO1f3r57ZdyFH0GzbZEff/7K
|
||||||
|
+atGXohijWJjYvU4mk0KFHORZrcBpsv9cfkFbmgVmiRwxRJ1tLauHM3Ne+VfqYE5M
|
||||||
|
+4rTStSyz3ASqVKJ2iFMQueNR/tUOuDlfRt+0nhJMuYSSkW+KTgnwyOGU9cv+mxA=
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
diff --git a/tornado/test/test.key b/tornado/test/test.key
|
||||||
|
index 577d518..7cb7d8d 100644
|
||||||
|
--- a/tornado/test/test.key
|
||||||
|
+++ b/tornado/test/test.key
|
||||||
|
@@ -1,16 +1,28 @@
|
||||||
|
-----BEGIN PRIVATE KEY-----
|
||||||
|
-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALirW3mX4jbdFse2
|
||||||
|
-aZwWzszCJ1IsRDrzALpbvMYLLbIZqo+Z8v5aERKTRQpXFqGaZyY+tdwYy7X7YXcL
|
||||||
|
-tKqvjnw/MSeIaqkw5pROKz5aR0nkPLvcTmhJVLVPCLc8dFnIlu8aC9TrDhr90P+P
|
||||||
|
-zU39UG7zLweA9zXKBuW3Tjo5dMP3AgMBAAECgYEAiygNaWYrf95AcUQi9w00zpUr
|
||||||
|
-nj9fNvCwxr2kVbRMvd2balS/CC4EmXPCXdVcZ3B7dBVjYzSIJV0Fh/iZLtnVysD9
|
||||||
|
-fcNMZ+Cz71b/T0ItsNYOsJk0qUVyP52uqsqkNppIPJsD19C+ZeMLZj6iEiylZyl8
|
||||||
|
-2U16c/kVIjER63mUEGkCQQDayQOTGPJrKHqPAkUqzeJkfvHH2yCf+cySU+w6ezyr
|
||||||
|
-j9yxcq8aZoLusCebDVT+kz7RqnD5JePFvB38cMuepYBLAkEA2BTFdZx30f4moPNv
|
||||||
|
-JlXlPNJMUTUzsXG7n4vNc+18O5ous0NGQII8jZWrIcTrP8wiP9fF3JwUsKrJhcBn
|
||||||
|
-xRs3hQJBAIDUgz1YIE+HW3vgi1gkOh6RPdBAsVpiXtr/fggFz3j60qrO7FswaAMj
|
||||||
|
-SX8c/6KUlBYkNjgP3qruFf4zcUNvEzcCQQCaioCPFVE9ByBpjLG6IUTKsz2R9xL5
|
||||||
|
-nfYqrbpLZ1aq6iLsYvkjugHE4X57sHLwNfdo4dHJbnf9wqhO2MVe25BhAkBdKYpY
|
||||||
|
-7OKc/2mmMbJDhVBgoixz/muN/5VjdfbvVY48naZkJF1p1tmogqPC5F1jPCS4rM+S
|
||||||
|
-FfPJIHRNEn2oktw5
|
||||||
|
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCk9C3ciPLVubsD
|
||||||
|
+92oRPARUs/o90rCgQ7/9HCr6sVVROrCxEk9rNx4wK2byCBubG4gZFg66p2elCg7w
|
||||||
|
+eI5aGyxgJHqcQ268R1sSud59AtvF1xi6iUNNU5U2ea6Y7bTHoOUijYx28aTr6VMM
|
||||||
|
+EEuG6+Fo2Siskxol6RZBVLcvrWFVN+f1Nssr63lh5s6R8f9ubR+ztkQQEVcCWCjh
|
||||||
|
+j7ZR+tpUI6SFn1X5JWOCKfB45dweqwcT8gVC5lUMNKoKGZ+uPKGuKC47NMJ2Ac9N
|
||||||
|
+YFYzTAx3o+dkrAf4nh+1tU8RTM6jpXLx4eNbhW0CT4HF7K7kkvWeLcM0lpFKdr5P
|
||||||
|
+wv/+Es9/AgMBAAECggEABi6AaXtYXloPgB6NgwfUwbfc8OQsalUfpMShd7OdluW0
|
||||||
|
+KW6eO05de0ClIvzay/1EJGyHMMeFQtIVrT1XWFkcWJ4FWkXMqJGkABenFtg8lDVz
|
||||||
|
+X8o1E3jGZrw4ptKBq9mDvL/BO9PiclTUH+ecbPn6AIvi0lTQ7grGIryiAM9mjmLy
|
||||||
|
+jpCwoutF2LD4RPNg8vqWe/Z1rQw5lp8FOHhRwPooHHeoq1bSrp8dqvVAwAam7Mmf
|
||||||
|
+uFgI8jrNycPgr2cwEEtbq2TQ625MhVnCpwT+kErmAStfbXXuqv1X1ZZgiNxf+61C
|
||||||
|
+OL0bhPRVIHmmjiK/5qHRuN4Q5u9/Yp2SJ4W5xadSQQKBgQDR7dnOlYYQiaoPJeD/
|
||||||
|
+7jcLVJbWwbr7bE19O/QpYAtkA/FtGlKr+hQxPhK6OYp+in8eHf+ga/NSAjCWRBoh
|
||||||
|
+MNAVCJtiirHo2tFsLFOmlJpGL9n3sX8UnkJN90oHfWrzJ8BZnXaSw2eOuyw8LLj+
|
||||||
|
+Q+ISl6Go8/xfsuy3EDv4AP1wCwKBgQDJJ4vEV3Kr+bc6N/xeu+G0oHvRAWwuQpcx
|
||||||
|
+9D+XpnqbJbFDnWKNE7oGsDCs8Qjr0CdFUN1pm1ppITDZ5N1cWuDg/47ZAXqEK6D1
|
||||||
|
+z13S7O0oQPlnsPL7mHs2Vl73muAaBPAojFvceHHfccr7Z94BXqKsiyfaWz6kclT/
|
||||||
|
+Nl4JTdsC3QKBgQCeYgozL2J/da2lUhnIXcyPstk+29kbueFYu/QBh2HwqnzqqLJ4
|
||||||
|
+5+t2H3P3plQUFp/DdDSZrvhcBiTsKiNgqThEtkKtfSCvIvBf4a2W/4TJsW6MzxCm
|
||||||
|
+2KQDuK/UqM4Y+APKWN/N6Lln2VWNbNyBkWuuRVKFatccyJyJnSjxeqW7cwKBgGyN
|
||||||
|
+idCYPIrwROAHLItXKvOWE5t0ABRq3TsZC2RkdA/b5HCPs4pclexcEriRjvXrK/Yt
|
||||||
|
+MH94Ve8b+UftSUQ4ytjBMS6MrLg87y0YDhLwxv8NKUq65DXAUOW+8JsAmmWQOqY3
|
||||||
|
+MK+m1BT4TMklgVoN3w3sPsKIsSJ/jLz5cv/kYweFAoGAG4iWU1378tI2Ts/Fngsv
|
||||||
|
+7eoWhoda77Y9D0Yoy20aN9VdMHzIYCBOubtRPEuwgaReNwbUBWap01J63yY/fF3K
|
||||||
|
+8PTz6covjoOJqxQJOvM7nM0CsJawG9ccw3YXyd9KgRIdSt6ooEhb7N8W2EXYoKl3
|
||||||
|
+g1i2t41Q/SC3HUGC5mJjpO8=
|
||||||
|
-----END PRIVATE KEY-----
|
||||||
@@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 10 14:50:55 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
- Add patch really fixing the tests/tool to work on py3.7:
|
||||||
|
* asyncio.patch
|
||||||
|
- Add patch to enlarge key size for openssl 1.1.1:
|
||||||
|
* openssl-cert-size.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 10 14:47:39 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
- Drop patch tornado-async-deprecations.patch that does not fix
|
||||||
|
stuff on py3.7
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 10 16:35:09 UTC 2018 - toddrme2178@gmail.com
|
Thu May 10 16:35:09 UTC 2018 - toddrme2178@gmail.com
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-tornado
|
# spec file for package python-tornado
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@@ -26,8 +26,10 @@ License: Apache-2.0
|
|||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
Url: http://www.tornadoweb.org
|
Url: http://www.tornadoweb.org
|
||||||
Source: https://files.pythonhosted.org/packages/source/t/tornado/tornado-%{version}.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/t/tornado/tornado-%{version}.tar.gz
|
||||||
Patch0: tornado-async-deprecations.patch
|
|
||||||
Patch1: tornado-testsuite_timeout.patch
|
Patch1: tornado-testsuite_timeout.patch
|
||||||
|
# meshed from upstream and local changes (Tornado 5 update blocked by salt)
|
||||||
|
Patch2: asyncio.patch
|
||||||
|
Patch3: openssl-cert-size.patch
|
||||||
BuildRequires: %{python_module devel}
|
BuildRequires: %{python_module devel}
|
||||||
BuildRequires: %{python_module pycurl}
|
BuildRequires: %{python_module pycurl}
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
@@ -90,8 +92,9 @@ thousands of clients, see The C10K problem.)
|
|||||||
%setup -q -n tornado-%{version}
|
%setup -q -n tornado-%{version}
|
||||||
# Fix non-executable script rpmlint issue:
|
# Fix non-executable script rpmlint issue:
|
||||||
find demos tornado -name "*.py" -exec sed -i "/#\!\/usr\/bin\/.*/d" {} \;
|
find demos tornado -name "*.py" -exec sed -i "/#\!\/usr\/bin\/.*/d" {} \;
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
# remove egg-info _file_, being replaced by an egg-info directory
|
# remove egg-info _file_, being replaced by an egg-info directory
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
Index: tornado-4.4.2/tornado/test/runtests.py
|
|
||||||
===================================================================
|
|
||||||
--- tornado-4.4.2.orig/tornado/test/runtests.py
|
|
||||||
+++ tornado-4.4.2/tornado/test/runtests.py
|
|
||||||
@@ -125,6 +125,9 @@ def main():
|
|
||||||
# 3.5.2's PendingDeprecationWarning became a DeprecationWarning in 3.6.
|
|
||||||
warnings.filterwarnings("ignore", category=DeprecationWarning,
|
|
||||||
message=".*legacy __aiter__ protocol")
|
|
||||||
+ # simply ignore all async-related deprecations, for a rough support for python 3.6
|
|
||||||
+ warnings.filterwarnings("ignore", category=DeprecationWarning,
|
|
||||||
+ message="async")
|
|
||||||
|
|
||||||
logging.getLogger("tornado.access").setLevel(logging.CRITICAL)
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user