Accepting request 1190624 from home:dimstar:Factory

Update to 6.4.1 - does NOT fix the test issue with cURL 8.9.1

OBS-URL: https://build.opensuse.org/request/show/1190624
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tornado6?expand=0&rev=42

.gitattributes

@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -0,0 +1 @@
+.osc

ignore-resourcewarning-doctests.patch

@@ -0,0 +1,37 @@
+Index: tornado-6.0.4/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
+     import doctest
++    import warnings
++    warnings.simplefilter("ignore", ResourceWarning)
+ 
+     return doctest.DocTestSuite()
+Index: tornado-6.0.4/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
+     import doctest
++    import warnings
++    warnings.simplefilter("ignore", ResourceWarning)
+ 
+     return doctest.DocTestSuite()
+ 
+Index: tornado-6.0.4/tornado/iostream.py
+===================================================================
+--- 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
++    import warnings
++    warnings.simplefilter("ignore", ResourceWarning)
+ 
+     return doctest.DocTestSuite()

openssl-3.2.patch

@@ -0,0 +1,13 @@
+Index: tornado-6.4/tornado/iostream.py
+===================================================================
+--- tornado-6.4.orig/tornado/iostream.py
++++ tornado-6.4/tornado/iostream.py
+@@ -1374,7 +1374,7 @@ class SSLIOStream(IOStream):
+                 return
+             elif err.args[0] in (ssl.SSL_ERROR_EOF, ssl.SSL_ERROR_ZERO_RETURN):
+                 return self.close(exc_info=err)
+-            elif err.args[0] == ssl.SSL_ERROR_SSL:
++            elif err.args[0] in (ssl.SSL_ERROR_SSL, ssl.SSL_ERROR_SYSCALL):
+                 try:
+                     peer = self.socket.getpeername()
+                 except Exception:

python-tornado6-rpmlintrc

@@ -0,0 +1,2 @@
+# keep the empty javascript resource for the demo
+addFilter("zero-length .*demos/facebook/static/facebook.js")

python-tornado6.spec

@@ -0,0 +1,109 @@
+#
+# spec file for package python-tornado6
+#
+# Copyright (c) 2024 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%{?sle15_python_module_pythons}
+%define         skip_python2 1
+Name:           python-tornado6
+Version:        6.4.1
+Release:        0
+Summary:        Open source version of scalable, non-blocking web server that power FriendFeed
+License:        Apache-2.0
+URL:            https://www.tornadoweb.org
+Source:         https://files.pythonhosted.org/packages/source/t/tornado/tornado-%{version}.tar.gz
+Source99:       python-tornado6-rpmlintrc
+# PATCH-FIX-OPENSUSE ignore-resourcewarning-doctests.patch -- ignore resource warnings on OBS
+Patch0:         ignore-resourcewarning-doctests.patch
+BuildRequires:  %{python_module base >= 3.8}
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module pycares}
+BuildRequires:  %{python_module pycurl}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+Requires:       python
+Recommends:     python-Twisted
+Recommends:     python-pycares
+Recommends:     python-pycurl
+Recommends:     python-service_identity
+Conflicts:      python-tornado-impl
+Provides:       python-tornado = %{version}
+Provides:       python-tornado-impl = %{version}
+Provides:       python-toro = %{version}
+Obsoletes:      python-toro < %{version}
+%python_subpackages
+
+%description
+Tornado is an open source version of the scalable, non-blocking web server and
+tools that power FriendFeed. The FriendFeed application is written using a web
+framework that looks a bit like web.py or Google's webapp, but with additional
+tools and optimizations to take advantage of the underlying non-blocking
+infrastructure.
+
+The framework is distinct from most mainstream web server frameworks (and
+certainly most Python frameworks) because it is non-blocking and reasonably
+fast. Because it is non-blocking and uses epoll, it can handle thousands of
+simultaneous standing connections, which means it is ideal for real-time web
+services. We built the web server specifically to handle FriendFeed's real-time
+features — every active user of FriendFeed maintains an open connection to the
+FriendFeed servers. (For more information on scaling servers to support
+thousands of clients, see The C10K problem.)
+
+%prep
+%autosetup -p1 -n tornado-%{version}
+# Fix non-executable script rpmlint issue:
+find tornado -name "*.py" -exec sed -i "/#\!\/usr\/bin\/.*/d" {} \;
+
+%pre
+# remove egg-info _file_, being replaced by an egg-info directory
+if [ -f %{python_sitearch}/tornado-%{version}-py%{python_version}.egg-info ]; then
+    rm %{python_sitearch}/tornado-%{version}-py%{python_version}.egg-info
+fi
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%{python_expand #
+# do not install tests
+rm -r %{buildroot}%{$python_sitearch}/tornado/test
+# deduplicate files in python platlibdir
+%fdupes %{buildroot}%{$python_sitearch}
+# install demos into docdir and deduplicate
+pdocdir=%{buildroot}%{_docdir}/$python-tornado6
+mkdir -p ${pdocdir}
+find ${pdocdir} -name "*.py" -exec sed -i "1{s|^#!.*$|%{_bindir}/$python|}" {} \;
+find ${pdocdir} -type f -exec chmod a-x {} \;
+%fdupes ${pdocdir}
+}
+
+%check
+export ASYNC_TEST_TIMEOUT=30
+export PYTHONDONTWRITEBYTECODE=1
+export TRAVIS=1
+%python_exec -m tornado.test.runtests --verbose
+
+%files %{python_files}
+%license LICENSE
+%doc %{_docdir}/%{python_prefix}-tornado6
+%{python_sitearch}/tornado
+%{python_sitearch}/tornado-%{version}*-info
+
+%changelog

support-pytest-8.2.patch

@@ -0,0 +1,66 @@
+From c851aa8a949524b35f72c82b45a52353aa3c0558 Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Sun, 28 Apr 2024 14:17:54 +0300
+Subject: [PATCH] testing: allow to instantiate an empty AsyncTestCase
+
+`unittest.TestCase` has a feature where it allows instantiating
+`MyTestClass()` with the default method name `runTest` even if a
+`runTest` method doesn't actually exist. This is documented in
+`TestCase`'s docs under "Changed in version 3.2"[0].
+
+Since version 8.2, pytest relies on this, and started breaking on
+Tornado's `AsyncTestCase`[1].
+
+Change `AsyncTestCase` to allow empty instatiation, by matching the
+upstream code.
+
+[0] https://docs.python.org/3/library/unittest.html#unittest.TestCase
+[1] https://github.com/pytest-dev/pytest/issues/12263
+---
+ tornado/test/testing_test.py |  9 +++++++++
+ tornado/testing.py           | 12 +++++++++++-
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py
+index 0429feee83..8e2b8db428 100644
+--- a/tornado/test/testing_test.py
++++ b/tornado/test/testing_test.py
+@@ -61,6 +61,15 @@ def test_subsequent_wait_calls(self):
+         self.io_loop.add_timeout(self.io_loop.time() + 0.2, self.stop)
+         self.wait(timeout=0.4)
+ 
++    def test_empty_instantation_is_allowed(self):
++        """
++        Test that empty instatiation of an AsyncTestCase is allowed.
++
++        unittest.TestCase docs guarantee this working, and pytest's unittest
++        support relies on it.
++        """
++        AsyncTestCaseTest()
++
+ 
+ class LeakTest(AsyncTestCase):
+     def tearDown(self):
+diff --git a/tornado/testing.py b/tornado/testing.py
+index bdbff87bc3..9455411a6d 100644
+--- a/tornado/testing.py
++++ b/tornado/testing.py
+@@ -177,7 +177,17 @@ def __init__(self, methodName: str = "runTest") -> None:
+         # the test will silently be ignored because nothing will consume
+         # the generator.  Replace the test method with a wrapper that will
+         # make sure it's not an undecorated generator.
+-        setattr(self, methodName, _TestMethodWrapper(getattr(self, methodName)))
++        try:
++            test_method = getattr(self, methodName)
++        except AttributeError:
++            if methodName != "runTest":
++                # We allow instantiation with no explicit method name
++                # but not an *incorrect* or missing method name.
++                raise ValueError(
++                    "no such test method in %s: %s" % (self.__class__, methodName)
++                )
++        else:
++            setattr(self, methodName, _TestMethodWrapper(test_method))
+ 
+         # Not used in this class itself, but used by @gen_test
+         self._test_generator = None  # type: Optional[Union[Generator, Coroutine]]

tornado-6.4.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92d3ab53183d8c50f8204a51e6f91d18a15d5ef261e84d452800d4ff6fc504e9
+size 500623