From 7c0320e76c8e356c9e19aba2ebd8a7222afc06b2 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Sun, 1 Dec 2024 18:00:55 -0500 Subject: [PATCH 1/4] Remove CODEOWNERS. (#98) It is out of date and no longer serving its intended purpose. Signed-off-by: Chris Lalancette --- CODEOWNERS | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index bbfd6e0..0000000 --- a/CODEOWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by https://github.com/audrow/update-ros2-repos -* @wjwwood From 66ffe9c61c16c1334ab0b3b3419dd2956df7424a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Mon, 2 Dec 2024 14:51:53 -0800 Subject: [PATCH 2/4] Update deb platforms for release (#95) Added: * Ubuntu Noble (24.04 LTS pre-release) * Debian Trixie (testing) Dropped: * Debian Bullseye (oldstable) Retained: * Debian Bookworm (stable) * Ubuntu Focal (20.04 LTS) * Ubuntu Jammy (22.04 LTS) --- stdeb.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdeb.cfg b/stdeb.cfg index e1a8554..8aca44d 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,6 +1,6 @@ [DEFAULT] Depends3: python3-setuptools, python3-importlib-metadata Conflicts3: python-osrf-pycommon -Suite3: focal jammy bullseye bookworm +Suite3: focal jammy noble bookworm trixie X-Python3-Version: >= 3.8 No-Python2: From 8fbffef05f4530ee375cd53f66342513a248c2d7 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 3 Dec 2024 07:20:39 -0600 Subject: [PATCH 3/4] Resolve outstanding resource warnings when running tests (#99) --- .../process_utils/execute_process_nopty.py | 22 ++++++++----------- .../test_process_utils/impl_aep_asyncio.py | 1 + 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/osrf_pycommon/process_utils/execute_process_nopty.py b/osrf_pycommon/process_utils/execute_process_nopty.py index fd22aee..65a7ec1 100644 --- a/osrf_pycommon/process_utils/execute_process_nopty.py +++ b/osrf_pycommon/process_utils/execute_process_nopty.py @@ -130,18 +130,14 @@ def yield_to_stream(data, stream): def _execute_process_nopty(cmd, cwd, env, shell, stderr_to_stdout=True): - if stderr_to_stdout: - p = Popen(cmd, - stdin=PIPE, stdout=PIPE, stderr=STDOUT, - cwd=cwd, env=env, shell=shell, close_fds=False) - else: - p = Popen(cmd, - stdin=PIPE, stdout=PIPE, stderr=PIPE, - cwd=cwd, env=env, shell=shell, close_fds=False) - - # Left over data from read which isn't a complete line yet - left_overs = {p.stdout: b'', p.stderr: b''} + stderr = STDOUT if stderr_to_stdout else PIPE + with Popen( + cmd, stdin=PIPE, stdout=PIPE, stderr=stderr, + cwd=cwd, env=env, shell=shell, close_fds=False + ) as p: + # Left over data from read which isn't a complete line yet + left_overs = {p.stdout: b'', p.stderr: b''} - fds = list(filter(None, [p.stdout, p.stderr])) + fds = list(filter(None, [p.stdout, p.stderr])) - return _yield_data(p, fds, left_overs, os.linesep) + yield from _yield_data(p, fds, left_overs, os.linesep) diff --git a/tests/unit/test_process_utils/impl_aep_asyncio.py b/tests/unit/test_process_utils/impl_aep_asyncio.py index a478304..b3ab108 100644 --- a/tests/unit/test_process_utils/impl_aep_asyncio.py +++ b/tests/unit/test_process_utils/impl_aep_asyncio.py @@ -10,4 +10,5 @@ async def run(cmd, **kwargs): transport, protocol = await async_execute_process( create_protocol(), cmd, **kwargs) retcode = await protocol.complete + transport.close() return protocol.stdout_buffer, protocol.stderr_buffer, retcode From 4eb6cec3793adb3bfe61a84b9c1eea00605c2eed Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Tue, 3 Dec 2024 17:10:03 +0100 Subject: [PATCH 4/4] Updated python version (#97) Python version 3.7 is no longer supported as of June 27, 2023 Co-authored-by: Scott K Logan --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index da4b6ed..2f40ab8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-22.04, windows-latest] - python: ['3.7', '3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11', '3.12'] include: - os: ubuntu-20.04 python: '3.6'