From d3c66708b1a1df673c11153e2a0af2f17c6ed15e Mon Sep 17 00:00:00 2001 From: Barry Xu Date: Wed, 13 Nov 2024 14:32:39 +0800 Subject: [PATCH 1/6] Add python3-validators-pip to rosdistro Signed-off-by: Barry Xu --- rosdep/python.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index c463d8df3ed64..5033b602df9a7 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -10253,6 +10253,19 @@ python3-uvloop: nixos: [python3Packages.uvloop] openembedded: [python3-uvloop@meta-ros2] ubuntu: [python3-uvloop] +python3-validators-pip: + debian: + pip: + packages: [validotors] + fedora: + pip: + packages: [validotors] + rhel: + pip: + packages: [validotors] + ubuntu: + pip: + packages: [validotors] python3-vcstool: alpine: [vcstool] debian: [python3-vcstool] From 769d912fb3f15a8f79b632936eab34c61031c174 Mon Sep 17 00:00:00 2001 From: Barry Xu Date: Mon, 18 Nov 2024 10:20:41 +0800 Subject: [PATCH 2/6] Change to a system package key instead of a pip key Signed-off-by: Barry Xu --- rosdep/python.yaml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 5033b602df9a7..3274e26e9fd74 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -10253,19 +10253,10 @@ python3-uvloop: nixos: [python3Packages.uvloop] openembedded: [python3-uvloop@meta-ros2] ubuntu: [python3-uvloop] -python3-validators-pip: - debian: - pip: - packages: [validotors] - fedora: - pip: - packages: [validotors] - rhel: - pip: - packages: [validotors] - ubuntu: - pip: - packages: [validotors] +python3-validators: + debian: [python3-validators] + fedora: [python3-validators] + ubuntu: [python3-validators] python3-vcstool: alpine: [vcstool] debian: [python3-vcstool] From 4a2f54ca163914d9fc82eb27d540800ea3681959 Mon Sep 17 00:00:00 2001 From: Barry Xu Date: Mon, 18 Nov 2024 13:34:21 +0800 Subject: [PATCH 3/6] Update configuration for different ubuntu version Signed-off-by: Barry Xu --- rosdep/python.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 3274e26e9fd74..a82374964880c 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -10256,7 +10256,14 @@ python3-uvloop: python3-validators: debian: [python3-validators] fedora: [python3-validators] - ubuntu: [python3-validators] + ubuntu: + '*': [python3-validators] + bionic: + pip: + packages: [validators] + focal: + pip: + packages: [validators] python3-vcstool: alpine: [vcstool] debian: [python3-vcstool] From d15fa53e857bb1e22dc8122fd74120ad3c042c0d Mon Sep 17 00:00:00 2001 From: Barry Xu Date: Tue, 19 Nov 2024 10:21:13 +0800 Subject: [PATCH 4/6] Add opensuse platform Signed-off-by: Barry Xu --- rosdep/python.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index a82374964880c..334bcd13f2748 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -10256,6 +10256,7 @@ python3-uvloop: python3-validators: debian: [python3-validators] fedora: [python3-validators] + opensuse: [python3-validators] ubuntu: '*': [python3-validators] bionic: From aaebac2874a65a9a53b6fe0324f1a272687792a0 Mon Sep 17 00:00:00 2001 From: Barry Xu Date: Thu, 21 Nov 2024 15:05:41 +0800 Subject: [PATCH 5/6] Remove Bionic config for Ubuntu Signed-off-by: Barry Xu --- rosdep/python.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 334bcd13f2748..c4612cb3d99eb 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -10257,14 +10257,9 @@ python3-validators: debian: [python3-validators] fedora: [python3-validators] opensuse: [python3-validators] - ubuntu: + ubuntu: '*': [python3-validators] - bionic: - pip: - packages: [validators] - focal: - pip: - packages: [validators] + focal: null python3-vcstool: alpine: [vcstool] debian: [python3-vcstool] From 5fb0bc5825ba1c985bce1d0b7ca381af40d365f9 Mon Sep 17 00:00:00 2001 From: Barry Xu Date: Thu, 21 Nov 2024 15:08:18 +0800 Subject: [PATCH 6/6] Remove trailing spaces Signed-off-by: Barry Xu --- rosdep/python.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index c4612cb3d99eb..2a2a230b0a5d0 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -10257,7 +10257,7 @@ python3-validators: debian: [python3-validators] fedora: [python3-validators] opensuse: [python3-validators] - ubuntu: + ubuntu: '*': [python3-validators] focal: null python3-vcstool: