From ddca3479842f4b46e814478892f246172c486aee Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Tue, 16 Apr 2024 22:53:52 -0400 Subject: [PATCH 1/9] Update python.yaml --- rosdep/python.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 4a6ba4d416f47..9441e0dc806a8 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9519,6 +9519,10 @@ python3-typing-extensions: bionic: pip: packages: [typing-extensions] +python3-types-pyyaml: + ubuntu: + pip: + packages: [types-pyyaml] python3-tz: alpine: [py3-tz] arch: [python-pytz] From 5474c032f227f98d4e62c130d417b5a19bcbaf66 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Tue, 16 Apr 2024 22:58:31 -0400 Subject: [PATCH 2/9] Update python.yaml --- rosdep/python.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 9441e0dc806a8..d2d4a2d7d13a7 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9519,7 +9519,10 @@ python3-typing-extensions: bionic: pip: packages: [typing-extensions] -python3-types-pyyaml: +python3-types-pyyaml-pip: + debian: + pip: + packages: [types-pyyaml] ubuntu: pip: packages: [types-pyyaml] From 5beea0f9f9a24c9b2293c950e2b315cf9eac137f Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Wed, 17 Apr 2024 15:59:05 -0400 Subject: [PATCH 3/9] Update python.yaml --- rosdep/python.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index d2d4a2d7d13a7..c98aa68e9c044 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9519,13 +9519,9 @@ python3-typing-extensions: bionic: pip: packages: [typing-extensions] -python3-types-pyyaml-pip: - debian: - pip: - packages: [types-pyyaml] - ubuntu: - pip: - packages: [types-pyyaml] +python3-typeshed: + debian: [python3-typeshed] + ubuntu: [python3-typeshed] python3-tz: alpine: [py3-tz] arch: [python-pytz] From 3b19a3b41e3617ed07dc4729f5beae9e7d315a62 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:24:49 -0400 Subject: [PATCH 4/9] Update python.yaml --- rosdep/python.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index c98aa68e9c044..339a468eeb21d 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9519,9 +9519,16 @@ python3-typing-extensions: bionic: pip: packages: [typing-extensions] -python3-typeshed: +python3-types-pyyaml: debian: [python3-typeshed] - ubuntu: [python3-typeshed] + ubuntu: + '*': [python3-typeshed] + focal: + pip: + packages: [types-pyyaml] + rhel: + pip: + packages: [types-pyyaml] python3-tz: alpine: [py3-tz] arch: [python-pytz] From 38fbcfcfc6834c4945a099b91bfcd8a203bd1f24 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:27:33 -0400 Subject: [PATCH 5/9] Update python.yaml --- rosdep/python.yaml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 339a468eeb21d..1a69b8f914160 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9505,6 +9505,19 @@ python3-typeguard-pip: ubuntu: pip: packages: [typeguard] +python3-types-pyyaml: + debian: [python3-typeshed] + fedora: + pip: + packages: [types-pyyaml] + ubuntu: + '*': [python3-typeshed] + focal: + pip: + packages: [types-pyyaml] + rhel: + pip: + packages: [types-pyyaml] python3-typing-extensions: arch: [python-typing_extensions] debian: [python3-typing-extensions] @@ -9519,16 +9532,6 @@ python3-typing-extensions: bionic: pip: packages: [typing-extensions] -python3-types-pyyaml: - debian: [python3-typeshed] - ubuntu: - '*': [python3-typeshed] - focal: - pip: - packages: [types-pyyaml] - rhel: - pip: - packages: [types-pyyaml] python3-tz: alpine: [py3-tz] arch: [python-pytz] From 89836c9dee79158d72a2f1e8fc1b50e97df472e2 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:35:16 -0400 Subject: [PATCH 6/9] Update rosdep/python.yaml Co-authored-by: Scott K Logan --- rosdep/python.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 1a69b8f914160..a37f77b1eaf1d 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9507,9 +9507,7 @@ python3-typeguard-pip: packages: [typeguard] python3-types-pyyaml: debian: [python3-typeshed] - fedora: - pip: - packages: [types-pyyaml] + fedora: [python3-types-pyyaml] ubuntu: '*': [python3-typeshed] focal: From 8a47ae83fdcf1eafcdc4a0512ee8af6c54408e42 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:36:09 -0400 Subject: [PATCH 7/9] Update rosdep/python.yaml Co-authored-by: Scott K Logan --- rosdep/python.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index a37f77b1eaf1d..3afdcece5563f 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9514,8 +9514,10 @@ python3-types-pyyaml: pip: packages: [types-pyyaml] rhel: - pip: - packages: [types-pyyaml] + '*': [python3-types-pyyaml] + '8': + pip: + packages: [types-pyyaml] python3-typing-extensions: arch: [python-typing_extensions] debian: [python3-typing-extensions] From 175f5f37e00cb99df047f43a267e5e21e852882f Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:49:47 -0400 Subject: [PATCH 8/9] Fix space --- rosdep/python.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 3afdcece5563f..cb6afe281545b 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9508,7 +9508,7 @@ python3-typeguard-pip: python3-types-pyyaml: debian: [python3-typeshed] fedora: [python3-types-pyyaml] - ubuntu: + ubuntu: '*': [python3-typeshed] focal: pip: From 0aee685b8207c54586096cf4690d4a044aeb9b59 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom <36806982+InvincibleRMC@users.noreply.github.com> Date: Thu, 18 Apr 2024 19:03:45 -0400 Subject: [PATCH 9/9] Update python.yaml --- rosdep/python.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index cb6afe281545b..e949da48361c0 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -9508,16 +9508,16 @@ python3-typeguard-pip: python3-types-pyyaml: debian: [python3-typeshed] fedora: [python3-types-pyyaml] - ubuntu: - '*': [python3-typeshed] - focal: - pip: - packages: [types-pyyaml] rhel: '*': [python3-types-pyyaml] '8': pip: packages: [types-pyyaml] + ubuntu: + '*': [python3-typeshed] + focal: + pip: + packages: [types-pyyaml] python3-typing-extensions: arch: [python-typing_extensions] debian: [python3-typing-extensions]