From ffc92e95ce92fca28a28a8a6c2b7e41e3e36afed Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 9 Jul 2021 20:48:31 +0200 Subject: [PATCH] Update to 1.8.1. --- 127.patch | 66 --------------------------------------------- python-execnet.spec | 12 ++++----- sources | 2 +- 3 files changed, 6 insertions(+), 74 deletions(-) delete mode 100644 127.patch diff --git a/127.patch b/127.patch deleted file mode 100644 index 59a7ab9..0000000 --- a/127.patch +++ /dev/null @@ -1,66 +0,0 @@ -From dd2de983417a72efcbe35150a5166de0f4965c65 Mon Sep 17 00:00:00 2001 -From: Florian Bruhin -Date: Tue, 4 May 2021 16:46:46 +0200 -Subject: [PATCH] Update threading.Event.isSet() calls - -The new is_set() snake-case spelling has been available since -Python 2.6: -https://docs.python.org/2/library/threading.html#threading.Event.is_set - -The old isSet() camel-case spelling raises a deprecation warning with -Python 3.10: -https://docs.python.org/3.10/whatsnew/3.10.html#deprecated -(almost at the end) ---- - execnet/gateway_base.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/execnet/gateway_base.py b/execnet/gateway_base.py -index a230683..a75b584 100644 ---- a/execnet/gateway_base.py -+++ b/execnet/gateway_base.py -@@ -295,7 +295,7 @@ def _try_send_to_primary_thread(self, reply): - # note that we should be called with _running_lock hold - primary_thread_task_ready = self._primary_thread_task_ready - if primary_thread_task_ready is not None: -- if not primary_thread_task_ready.isSet(): -+ if not primary_thread_task_ready.is_set(): - self._primary_thread_task = reply - # wake up primary thread - primary_thread_task_ready.set() -@@ -591,7 +591,7 @@ def setcallback(self, callback, endmarker=NO_ENDMARKER_WANTED): - try: - olditem = items.get(block=False) - except self.gateway.execmodel.queue.Empty: -- if not (self._closed or self._receiveclosed.isSet()): -+ if not (self._closed or self._receiveclosed.is_set()): - _callbacks[self.id] = (callback, endmarker, self._strconfig) - break - else: -@@ -616,7 +616,7 @@ def __del__(self): - # state transition "closed" --> "deleted" - for error in self._remoteerrors: - error.warn() -- elif self._receiveclosed.isSet(): -+ elif self._receiveclosed.is_set(): - # state transition "sendonly" --> "deleted" - # the remote channel is already in "deleted" state, nothing to do - pass -@@ -682,7 +682,7 @@ def close(self, error=None): - # but it's never damaging to send too many CHANNEL_CLOSE messages - # however, if the other side triggered a close already, we - # do not send back a closed message. -- if not self._receiveclosed.isSet(): -+ if not self._receiveclosed.is_set(): - put = self.gateway._send - if error is not None: - put(Message.CHANNEL_CLOSE_ERROR, self.id, dumps_internal(error)) -@@ -711,7 +711,7 @@ def waitclose(self, timeout=None): - """ - # wait for non-"opened" state - self._receiveclosed.wait(timeout=timeout) -- if not self._receiveclosed.isSet(): -+ if not self._receiveclosed.is_set(): - raise self.TimeoutError("Timeout after %r seconds" % timeout) - error = self._getremoteerror() - if error: diff --git a/python-execnet.spec b/python-execnet.spec index 8cdbb84..aecc86e 100644 --- a/python-execnet.spec +++ b/python-execnet.spec @@ -1,18 +1,13 @@ %global srcname execnet Name: python-%{srcname} -Version: 1.8.0 -Release: 3%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: Distributed Python deployment and communication License: MIT URL: https://github.com/pytest-dev/execnet Source0: %pypi_source -# Update threading.Event.isSet() calls to .is_set() -# This avoids a DeprecationWarning with Python 3.10 -# Merged upstream -Patch1: https://github.com/pytest-dev/execnet/pull/127.patch - BuildArch: noarch BuildRequires: make BuildRequires: %{_bindir}/ps @@ -94,6 +89,9 @@ py.test-%{python3_version} -r s \ %changelog +* Fri Jul 9 2021 Thomas Moschny - 1.8.1-1 +- Update to 1.8.1. + * Fri Jun 04 2021 Python Maint - 1.8.0-3 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 3321f7d..d1167a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (execnet-1.8.0.tar.gz) = a0ca76002270daa5cbfa00563a51a3412008f893f755a1eb84f53e228dd61a82bdc94fe6152e30d471b4caff3059c662bb9de82100ec2c96df4d014836452698 +SHA512 (execnet-1.8.1.tar.gz) = 183c89961b8b5db4eca5b64ff6b179f9faa19d26f04ad07740c818a471aedb02b2e7837fb7cedb6b1e4a538b0bd62cc4eff602dffe4c3c35bf826aa5a627afb2