From 83ae050ba047fedb7805c1a41b3765f6039b7527 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:41:23 -0400 Subject: [PATCH 1/5] Update __main__.py Signed-off-by: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> --- ros2_batch_job/__main__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ros2_batch_job/__main__.py b/ros2_batch_job/__main__.py index a26bc59e..f526c516 100644 --- a/ros2_batch_job/__main__.py +++ b/ros2_batch_job/__main__.py @@ -82,6 +82,7 @@ PipPackage('pytest-timeout', 'pytest_timeout', '==2.1.0'), PipPackage('pyyaml', 'yaml', ''), PipPackage('setuptools', 'setuptools', '==59.6.0'), + PipPackage('types-pyyaml', 'types_pyyaml', ''), PipPackage('vcstool', 'vcstool', ''), PipPackage('yamllint', 'yamllint', ''), ] From 20cc74f20e09fd7c1fd9b3061b81502b5dbf3e40 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:44:26 -0400 Subject: [PATCH 2/5] Update Dockerfile Signed-off-by: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> --- linux_docker_resources/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_docker_resources/Dockerfile b/linux_docker_resources/Dockerfile index 2c97f99c..67c69624 100644 --- a/linux_docker_resources/Dockerfile +++ b/linux_docker_resources/Dockerfile @@ -123,6 +123,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ python3-pytest-rerunfailures \ python3-pytest-runner \ python3-pytest-timeout \ + python3-typeshed \ python3-yaml \ uncrustify \ yamllint From 7a385cb4654964392f0d81bcde6f4dd7bb91cf69 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:45:19 -0400 Subject: [PATCH 3/5] Update Dockerfile-RHEL Signed-off-by: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> --- linux_docker_resources/Dockerfile-RHEL | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_docker_resources/Dockerfile-RHEL b/linux_docker_resources/Dockerfile-RHEL index 35d53cfe..7d817a5d 100644 --- a/linux_docker_resources/Dockerfile-RHEL +++ b/linux_docker_resources/Dockerfile-RHEL @@ -158,6 +158,7 @@ RUN dnf install \ python3-rosdistro \ python3-setuptools \ python3-sip-devel \ + python3-types-pyyaml \ qt5-qtbase \ qt5-qtbase-devel \ qt5-qtbase-gui \ From 02dff0c29e6b6123398953f88a3d617ccb60206c Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:12:21 -0400 Subject: [PATCH 4/5] Update linux_docker_resources/Dockerfile-RHEL Co-authored-by: Chris Lalancette Signed-off-by: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> --- linux_docker_resources/Dockerfile-RHEL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux_docker_resources/Dockerfile-RHEL b/linux_docker_resources/Dockerfile-RHEL index 7d817a5d..2a55fc5e 100644 --- a/linux_docker_resources/Dockerfile-RHEL +++ b/linux_docker_resources/Dockerfile-RHEL @@ -158,7 +158,7 @@ RUN dnf install \ python3-rosdistro \ python3-setuptools \ python3-sip-devel \ - python3-types-pyyaml \ + $(if test ${EL_RELEASE/.*/} = 8; then echo python3-types-pyyaml; fi) \ qt5-qtbase \ qt5-qtbase-devel \ qt5-qtbase-gui \ From 8f94aa26355dd3e1923e32e1115a38aba7aafc93 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:40:46 -0400 Subject: [PATCH 5/5] Update linux_docker_resources/Dockerfile-RHEL Co-authored-by: Chris Lalancette Signed-off-by: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> --- linux_docker_resources/Dockerfile-RHEL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux_docker_resources/Dockerfile-RHEL b/linux_docker_resources/Dockerfile-RHEL index 2a55fc5e..1ec450d5 100644 --- a/linux_docker_resources/Dockerfile-RHEL +++ b/linux_docker_resources/Dockerfile-RHEL @@ -158,7 +158,7 @@ RUN dnf install \ python3-rosdistro \ python3-setuptools \ python3-sip-devel \ - $(if test ${EL_RELEASE/.*/} = 8; then echo python3-types-pyyaml; fi) \ + $(if test ${EL_RELEASE/.*/} != 8; then echo python3-types-pyyaml; fi) \ qt5-qtbase \ qt5-qtbase-devel \ qt5-qtbase-gui \