Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-cheroot for openSUSE:Factory checked in at 2021-12-25 20:16:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cheroot (Old) and /work/SRC/openSUSE:Factory/.python-cheroot.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cheroot" Sat Dec 25 20:16:31 2021 rev:17 rq:941567 version:8.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cheroot/python-cheroot.changes 2021-10-25 15:17:10.545665967 +0200 +++ /work/SRC/openSUSE:Factory/.python-cheroot.new.2520/python-cheroot.changes 2021-12-25 20:16:39.629250330 +0100 @@ -1,0 +2,10 @@ +Sun Dec 19 21:13:43 UTC 2021 - Ben Greiner <[email protected]> + +- Add patches fixing test suite failures due to Python 3.10 + deprecations: + * cheroot-pr370-py310-threaddeprecations.patch + * cheroot-pr371-py310-threaddeprecations.patch + * cheroot-c0b1b167-py310-threaddeprecations.patch +- Skip threadexceptions plugin for Pytest 6.2 + +------------------------------------------------------------------- New: ---- cheroot-c0b1b167-py310-threaddeprecations.patch cheroot-pr370-py310-threaddeprecations.patch cheroot-pr371-py310-threaddeprecations.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cheroot.spec ++++++ --- /var/tmp/diff_new_pack.wiWww7/_old 2021-12-25 20:16:40.197250792 +0100 +++ /var/tmp/diff_new_pack.wiWww7/_new 2021-12-25 20:16:40.205250799 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-cheroot +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -33,6 +33,9 @@ License: BSD-3-Clause URL: https://github.com/cherrypy/cheroot Source: https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Patch0: https://github.com/cherrypy/cheroot/pull/370.diff#/cheroot-pr370-py310-threaddeprecations.patch +Patch1: https://github.com/cherrypy/cheroot/pull/371.diff#/cheroot-pr371-py310-threaddeprecations.patch +Patch2: https://github.com/cherrypy/cheroot/commit/0b16749ecdfa064315fc7908f6865071fc33d778.diff#/cheroot-c0b1b167-py310-threaddeprecations.patch BuildRequires: %{python_module jaraco.functools} BuildRequires: %{python_module more-itertools >= 2.6} BuildRequires: %{python_module setuptools >= 34.4} @@ -88,7 +91,7 @@ Cheroot is the pure-Python HTTP server used by CherryPy. %prep -%autosetup -n cheroot-%{version} -p1 +%autosetup -p1 -n cheroot-%{version} -p1 # do not check coverage sed -i '/--cov/ d' pytest.ini @@ -106,6 +109,8 @@ # do not want to add python-jaraco.context to Ring1 pytest_opts="--ignore cheroot/test/test_wsgi.py" %endif +# https://github.com/cherrypy/cheroot/issues/355 +pytest_opts+=" -p no:threadexception" # test_tls_client_auth[...-False-localhost-builtin] fails ocassionally on server-side OBS %pytest $pytest_opts -k "not (test_tls_client_auth and False-localhost-builtin)" ++++++ cheroot-c0b1b167-py310-threaddeprecations.patch ++++++ diff --git a/cheroot/server.py b/cheroot/server.py index 8b59a33af..10153dde3 100644 --- a/cheroot/server.py +++ b/cheroot/server.py @@ -1841,7 +1841,7 @@ def _run_in_thread(self): """Context manager for running this server in a thread.""" self.prepare() thread = threading.Thread(target=self.serve) - thread.setDaemon(True) + thread.daemon = True thread.start() try: yield thread ++++++ cheroot-pr370-py310-threaddeprecations.patch ++++++ diff --git a/cheroot/workers/threadpool.py b/cheroot/workers/threadpool.py index 915934cce..57e6588dd 100644 --- a/cheroot/workers/threadpool.py +++ b/cheroot/workers/threadpool.py @@ -320,7 +320,7 @@ def _clear_threads(self): return ( thread for thread in threads - if thread is not threading.currentThread() + if thread is not threading.current_thread() ) @property ++++++ cheroot-pr371-py310-threaddeprecations.patch ++++++ diff --git a/cheroot/workers/threadpool.py b/cheroot/workers/threadpool.py index 57e6588dd..6305085de 100644 --- a/cheroot/workers/threadpool.py +++ b/cheroot/workers/threadpool.py @@ -108,7 +108,7 @@ def run(self): Retrieves incoming connections from thread pool. """ - self.server.stats['Worker Threads'][self.getName()] = self.stats + self.server.stats['Worker Threads'][self.name] = self.stats try: self.ready = True while True: @@ -176,9 +176,9 @@ def start(self): for i in range(self.min): self._threads.append(WorkerThread(self.server)) for worker in self._threads: - worker.setName( + worker.name = ( 'CP Server {worker_name!s}'. - format(worker_name=worker.getName()), + format(worker_name=worker.name), ) worker.start() for worker in self._threads: @@ -226,9 +226,9 @@ def grow(self, amount): def _spawn_worker(self): worker = WorkerThread(self.server) - worker.setName( + worker.name = ( 'CP Server {worker_name!s}'. - format(worker_name=worker.getName()), + format(worker_name=worker.name), ) worker.start() return worker
