diff --git a/.gitignore b/.gitignore index 6856c74..724e5cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/Python-3.11.1.tar.xz +SOURCES/Python-3.11.2.tar.xz SOURCES/pgp_keys.asc diff --git a/.python3.11.metadata b/.python3.11.metadata index 801cfc5..0e4f954 100644 --- a/.python3.11.metadata +++ b/.python3.11.metadata @@ -1,2 +1,2 @@ -89ee31611b73dc0c32c178d15aa208734b462c5a SOURCES/Python-3.11.1.tar.xz +ae1c199ecb7a969588b15354e19e7b60cb65d1b9 SOURCES/Python-3.11.2.tar.xz befe131eceffa73877ba3adceca3b7b1da1d2319 SOURCES/pgp_keys.asc diff --git a/SOURCES/00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch b/SOURCES/00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch deleted file mode 100644 index c480127..0000000 --- a/SOURCES/00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Wed, 21 Dec 2022 02:24:19 -0800 -Subject: [PATCH] 00395: GH-100133: fix `asyncio` subprocess losing `stderr` - and `stdout` output - -(cherry picked from commit a7715ccfba5b86ab09f86ec56ac3755c93b46b48) - -Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> ---- - Lib/asyncio/base_subprocess.py | 3 --- - Lib/test/test_asyncio/test_subprocess.py | 17 +++++++++++++++++ - ...22-12-10-08-36-07.gh-issue-100133.g-zQlp.rst | 1 + - 3 files changed, 18 insertions(+), 3 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2022-12-10-08-36-07.gh-issue-100133.g-zQlp.rst - -diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py -index e15bb4141f..4c9b0dd565 100644 ---- a/Lib/asyncio/base_subprocess.py -+++ b/Lib/asyncio/base_subprocess.py -@@ -215,9 +215,6 @@ def _process_exited(self, returncode): - # object. On Python 3.6, it is required to avoid a ResourceWarning. - self._proc.returncode = returncode - self._call(self._protocol.process_exited) -- for p in self._pipes.values(): -- if p is not None: -- p.pipe.close() - - self._try_finish() - -diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py -index f71ad72f99..bea2314a52 100644 ---- a/Lib/test/test_asyncio/test_subprocess.py -+++ b/Lib/test/test_asyncio/test_subprocess.py -@@ -684,6 +684,23 @@ async def execute(): - - self.assertIsNone(self.loop.run_until_complete(execute())) - -+ def test_subprocess_communicate_stdout(self): -+ # See https://github.com/python/cpython/issues/100133 -+ async def get_command_stdout(cmd, *args): -+ proc = await asyncio.create_subprocess_exec( -+ cmd, *args, stdout=asyncio.subprocess.PIPE, -+ ) -+ stdout, _ = await proc.communicate() -+ return stdout.decode().strip() -+ -+ async def main(): -+ outputs = [f'foo{i}' for i in range(10)] -+ res = await asyncio.gather(*[get_command_stdout(sys.executable, '-c', -+ f'print({out!r})') for out in outputs]) -+ self.assertEqual(res, outputs) -+ -+ self.loop.run_until_complete(main()) -+ - - if sys.platform != 'win32': - # Unix -diff --git a/Misc/NEWS.d/next/Library/2022-12-10-08-36-07.gh-issue-100133.g-zQlp.rst b/Misc/NEWS.d/next/Library/2022-12-10-08-36-07.gh-issue-100133.g-zQlp.rst -new file mode 100644 -index 0000000000..881e6ed80f ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2022-12-10-08-36-07.gh-issue-100133.g-zQlp.rst -@@ -0,0 +1 @@ -+Fix regression in :mod:`asyncio` where a subprocess would sometimes lose data received from pipe. diff --git a/SOURCES/00396-gh-100160-remove-any-deprecation-warnings-in-asyncio-get_event_loop.patch b/SOURCES/00396-gh-100160-remove-any-deprecation-warnings-in-asyncio-get_event_loop.patch deleted file mode 100644 index bebae56..0000000 --- a/SOURCES/00396-gh-100160-remove-any-deprecation-warnings-in-asyncio-get_event_loop.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Serhiy Storchaka -Date: Tue, 10 Jan 2023 22:20:09 +0200 -Subject: [PATCH] 00396: gh-100160: Remove any deprecation warnings in - asyncio.get_event_loop() - -Some deprecation warnings will reappear (in a slightly different form) in 3.12. - -Co-authored-by: Guido van Rossum ---- - Doc/library/asyncio-eventloop.rst | 14 +++++++------- - Doc/library/asyncio-policy.rst | 9 +++++---- - Doc/whatsnew/3.10.rst | 13 ------------- - Lib/asyncio/events.py | 15 --------------- - Lib/test/test_asyncio/test_events.py | 12 +++--------- - ...2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst | 2 ++ - 6 files changed, 17 insertions(+), 48 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst - -diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst -index 28b7a90058..886399e7ae 100644 ---- a/Doc/library/asyncio-eventloop.rst -+++ b/Doc/library/asyncio-eventloop.rst -@@ -48,7 +48,7 @@ an event loop: - running event loop. - - If there is no running event loop set, the function will return -- the result of ``get_event_loop_policy().get_event_loop()`` call. -+ the result of the ``get_event_loop_policy().get_event_loop()`` call. - - Because this function has rather complex behavior (especially - when custom event loop policies are in use), using the -@@ -59,15 +59,15 @@ an event loop: - instead of using these lower level functions to manually create and close an - event loop. - -- .. deprecated:: 3.10 -- Deprecation warning is emitted if there is no current event loop. -- In Python 3.12 it will be an error. -- - .. note:: - In Python versions 3.10.0--3.10.8 and 3.11.0 this function -- (and other functions which used it implicitly) emitted a -+ (and other functions which use it implicitly) emitted a - :exc:`DeprecationWarning` if there was no running event loop, even if -- the current loop was set. -+ the current loop was set on the policy. -+ In Python versions 3.10.9, 3.11.1 and 3.12 they emit a -+ :exc:`DeprecationWarning` if there is no running event loop and no -+ current loop is set. -+ In some future Python release this will become an error. - - .. function:: set_event_loop(loop) - -diff --git a/Doc/library/asyncio-policy.rst b/Doc/library/asyncio-policy.rst -index d0af45febd..eb043b3e5e 100644 ---- a/Doc/library/asyncio-policy.rst -+++ b/Doc/library/asyncio-policy.rst -@@ -112,10 +112,11 @@ asyncio ships with the following built-in policies: - - On Windows, :class:`ProactorEventLoop` is now used by default. - -- .. deprecated:: 3.11.1 -- :meth:`get_event_loop` now emits a :exc:`DeprecationWarning` if there -- is no current event loop set and a new event loop has been implicitly -- created. In Python 3.12 it will be an error. -+ .. note:: -+ In Python versions 3.10.9, 3.11.1 and 3.12 this function emits a -+ :exc:`DeprecationWarning` if there is no running event loop and no -+ current loop is set. -+ In some future Python release this will become an error. - - - .. class:: WindowsSelectorEventLoopPolicy -diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst -index d0b436664a..38b30deff7 100644 ---- a/Doc/whatsnew/3.10.rst -+++ b/Doc/whatsnew/3.10.rst -@@ -1710,19 +1710,6 @@ Deprecated - scheduled for removal in Python 3.12. - (Contributed by Erlend E. Aasland in :issue:`42264`.) - --* :func:`asyncio.get_event_loop` now emits a deprecation warning if there is -- no running event loop. In the future it will be an alias of -- :func:`~asyncio.get_running_loop`. -- :mod:`asyncio` functions which implicitly create :class:`~asyncio.Future` -- or :class:`~asyncio.Task` objects now emit -- a deprecation warning if there is no running event loop and no explicit -- *loop* argument is passed: :func:`~asyncio.ensure_future`, -- :func:`~asyncio.wrap_future`, :func:`~asyncio.gather`, -- :func:`~asyncio.shield`, :func:`~asyncio.as_completed` and constructors of -- :class:`~asyncio.Future`, :class:`~asyncio.Task`, -- :class:`~asyncio.StreamReader`, :class:`~asyncio.StreamReaderProtocol`. -- (Contributed by Serhiy Storchaka in :issue:`39529`.) -- - * The undocumented built-in function ``sqlite3.enable_shared_cache`` is now - deprecated, scheduled for removal in Python 3.12. Its use is strongly - discouraged by the SQLite3 documentation. See `the SQLite3 docs -diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py -index af3f9e970b..b1799320ea 100644 ---- a/Lib/asyncio/events.py -+++ b/Lib/asyncio/events.py -@@ -671,21 +671,6 @@ def get_event_loop(self): - if (self._local._loop is None and - not self._local._set_called and - threading.current_thread() is threading.main_thread()): -- stacklevel = 2 -- try: -- f = sys._getframe(1) -- except AttributeError: -- pass -- else: -- while f: -- module = f.f_globals.get('__name__') -- if not (module == 'asyncio' or module.startswith('asyncio.')): -- break -- f = f.f_back -- stacklevel += 1 -- import warnings -- warnings.warn('There is no current event loop', -- DeprecationWarning, stacklevel=stacklevel) - self.set_event_loop(self.new_event_loop()) - - if self._local._loop is None: -diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py -index c431fea401..18c4fd15d9 100644 ---- a/Lib/test/test_asyncio/test_events.py -+++ b/Lib/test/test_asyncio/test_events.py -@@ -2547,9 +2547,7 @@ def test_event_loop_policy(self): - def test_get_event_loop(self): - policy = asyncio.DefaultEventLoopPolicy() - self.assertIsNone(policy._local._loop) -- with self.assertWarns(DeprecationWarning) as cm: -- loop = policy.get_event_loop() -- self.assertEqual(cm.filename, __file__) -+ loop = policy.get_event_loop() - self.assertIsInstance(loop, asyncio.AbstractEventLoop) - - self.assertIs(policy._local._loop, loop) -@@ -2563,10 +2561,8 @@ def test_get_event_loop_calls_set_event_loop(self): - policy, "set_event_loop", - wraps=policy.set_event_loop) as m_set_event_loop: - -- with self.assertWarns(DeprecationWarning) as cm: -- loop = policy.get_event_loop() -+ loop = policy.get_event_loop() - self.addCleanup(loop.close) -- self.assertEqual(cm.filename, __file__) - - # policy._local._loop must be set through .set_event_loop() - # (the unix DefaultEventLoopPolicy needs this call to attach -@@ -2755,10 +2751,8 @@ def test_get_event_loop_returns_running_loop2(self): - loop = asyncio.new_event_loop() - self.addCleanup(loop.close) - -- with self.assertWarns(DeprecationWarning) as cm: -- loop2 = asyncio.get_event_loop() -+ loop2 = asyncio.get_event_loop() - self.addCleanup(loop2.close) -- self.assertEqual(cm.filename, __file__) - asyncio.set_event_loop(None) - with self.assertRaisesRegex(RuntimeError, 'no current'): - asyncio.get_event_loop() -diff --git a/Misc/NEWS.d/next/Library/2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst b/Misc/NEWS.d/next/Library/2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst -new file mode 100644 -index 0000000000..c3b518ca85 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst -@@ -0,0 +1,2 @@ -+Remove any deprecation warnings in :func:`asyncio.get_event_loop`. They are -+deferred to Python 3.12. diff --git a/SOURCES/Python-3.11.1.tar.xz.asc b/SOURCES/Python-3.11.1.tar.xz.asc deleted file mode 100644 index af063cf..0000000 --- a/SOURCES/Python-3.11.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmOPlhsACgkQ/+h0BBaL -2EdY5w/+KKZY3ghMcjuxxF4o9CylFvhHGI7LP6FKZE5xnGtSZ2cXjcad+FwFMnFS -JE5fLpPD3xmkRoCIOwVKIos4l/chfAIE8gNlTBFOAwUYP0uVpA+SYNDOciT64Apj -32jELwHJJVgjG21Lubx35kOtmQa884hBB9T8RsovL35PhFvspSvTx8U+YfGKIZzG -liWwj/gBMMGd3p6pvz9UQsnqBLAfw50M6BDDQrQtoIDnw2R5s8oBqYa7uiRBzQch -dUGUm/gt9lBTI0fT3ZgCMD3Zu2et252nsbzMYgBuPSg6SlT63wHktzq1aewQ2lL2 -VcBBbIf4hpkL5QnPgzKuiHcU7tBeRngTaWhw0Nc8kfGuz56HsEJJyhaHtD5mlCx9 -0treI/NPAeA8KcrpnkufTpMCee7/R7CfH/dNp29yJlhbC+WYMbr6s600jJISf6zn -s0C40/MGLvVwIgT6HBkXkDL0Lii8vxc3w5smLiQ4xvQSHSS/fkP2qIDUhrX0eUlq -atacso0j7XAKYWBRHT70ZeXIN4UJuQ+dfK7xAC+bmyo9X9jcpUeozws8OvczYBRq -2qk4hCFFP/WgZ/MBiVoe2xmC6+ak2gH6xX6w2bB0/4Dc6KBMxWyUmRPuBVvx/cCp -AwXvH94gZl9wj/tmvOoZNqaMFG3tWuWo7+YzosWOBHAoUk8ILNM= -=ZuYB ------END PGP SIGNATURE----- diff --git a/SOURCES/Python-3.11.2.tar.xz.asc b/SOURCES/Python-3.11.2.tar.xz.asc new file mode 100644 index 0000000..1cd2b66 --- /dev/null +++ b/SOURCES/Python-3.11.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmPiV84ACgkQ/+h0BBaL +2EeZ1xAAwBi0AEjUlZ9oeC54VuqC/XLuVwc3xWf+Irw/5mJA2/weJHoQqG9aEDkB +ph1pDJ6G/vDyKdjh8NZKkKftIL9pggRpAcA4mQ3XcDMKI/J+EQe5P/BwsTGClLhK +cZg6IcQKZvo9djfyRz48w9wfKs34NasBgoFQP+hOzmU10UMrcR7gUSB2ZgMVMDID +0rK1w2aPmZmDLUltBhf6Xb2voUYo+3jINLHWmQC6tdDOBxtxv222dhxS1mvpV7Zu +Xw8do9OsQxonc+owkpciMKDLcFoVmkdQPz9bmvHJKovMXT2RY7FEam9H7ukr35fC +xA6BKnyMgvWIWQVTwjBhcz3C85adzAz/ypHNTbJOuPxp1ZP8qO3D6vPlhZIFyTeJ +7LhagUBUkIKKtbz7u3ERJgvA6tn3UVyLOXM1DnaKkXQ1FgSymgWPRU7BsxanQ8FD +QkfTjC8fatZLCewNfGInkeAdLue+rMwZc8Q6vw2CAmcVdOKsQ98Db/FLF5sC+Kjz +D3brUESEX1ELcVk7vumUI0/z+MECF11dpv5hPOZ4cZDoInsNu846TfU0rzOeVe7H +gGO6Ae/Lu5gG09TNqepbFGA/dWR8V3zdLs5ZShTT4FsNFrHh7GDAEAMZSwT3AsVZ +TjOdU3+xEGsEfrYWRXOkhVIQdJtuovwv9+me5YWeyC4Puzp0Zwk= +=8/cW +-----END PGP SIGNATURE----- diff --git a/SPECS/python3.11.spec b/SPECS/python3.11.spec index 2e78b71..0053ccb 100644 --- a/SPECS/python3.11.spec +++ b/SPECS/python3.11.spec @@ -16,11 +16,11 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well -%global general_version %{pybasever}.1 +%global general_version %{pybasever}.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 4%{?dist} +Release: 1%{?dist} License: Python @@ -343,16 +343,6 @@ Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-g # Upstream: https://bugs.python.org/issue46811 Patch378: 00378-support-expat-2-4-5.patch -# 00395 # 18ff37a92c507144edf32274b356dd1dd734cf07 -# GH-100133: fix `asyncio` subprocess losing `stderr` and `stdout` output -Patch395: 00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch - -# 00396 # 4c775fbed65016fec5dfd66316559024d2af9135 -# gh-100160: Remove any deprecation warnings in asyncio.get_event_loop() -# -# Some deprecation warnings will reappear (in a slightly different form) in 3.12. -Patch396: 00396-gh-100160-remove-any-deprecation-warnings-in-asyncio-get_event_loop.patch - # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -1639,6 +1629,7 @@ fi %{dynload_dir}/_ctypes_test.%{SOABI_optimized}.so %{dynload_dir}/_testbuffer.%{SOABI_optimized}.so %{dynload_dir}/_testcapi.%{SOABI_optimized}.so +%{dynload_dir}/_testclinic.%{SOABI_optimized}.so %{dynload_dir}/_testimportmultiple.%{SOABI_optimized}.so %{dynload_dir}/_testinternalcapi.%{SOABI_optimized}.so %{dynload_dir}/_testmultiphase.%{SOABI_optimized}.so @@ -1762,6 +1753,7 @@ fi %{dynload_dir}/_ctypes_test.%{SOABI_debug}.so %{dynload_dir}/_testbuffer.%{SOABI_debug}.so %{dynload_dir}/_testcapi.%{SOABI_debug}.so +%{dynload_dir}/_testclinic.%{SOABI_debug}.so %{dynload_dir}/_testimportmultiple.%{SOABI_debug}.so %{dynload_dir}/_testinternalcapi.%{SOABI_debug}.so %{dynload_dir}/_testmultiphase.%{SOABI_debug}.so @@ -1792,6 +1784,9 @@ fi # ====================================================== %changelog +* Thu Feb 09 2023 Charalampos Stratakis - 3.11.2-1 +- Update to 3.11.2 + * Tue Jan 31 2023 Charalampos Stratakis - 3.11.1-4 - Disable the builtin hashlib hashes except blake2