From 2c03a87103577c8630878aa394211d86cc2d8a3a Mon Sep 17 00:00:00 2001 From: tgaspar Date: Wed, 2 Feb 2022 11:55:53 +0100 Subject: [PATCH 1/7] Pymodbus from pip --- rosdep/python.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 71027f2218255..7a36c36dab71d 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -3692,8 +3692,12 @@ python-pymavlink: pip: packages: [pymavlink] python-pymodbus: - debian: [python-pymodbus] - ubuntu: [python-pymodbus] + debian: + pip: + packages: [pymodbus] + ubuntu: + pip: + packages: [pymodbus] python-pymongo: arch: [python2-pymongo] debian: [python-pymongo] From 1e656d6564b82cd6ce7a83b66cb9b92ee9fae9f1 Mon Sep 17 00:00:00 2001 From: tgaspar Date: Wed, 2 Feb 2022 12:13:47 +0100 Subject: [PATCH 2/7] Added rule to install pymodbus from pip --- rosdep/python.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 7a36c36dab71d..2cb65caffdcfc 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -3692,6 +3692,9 @@ python-pymavlink: pip: packages: [pymavlink] python-pymodbus: + debian: [python-pymodbus] + ubuntu: [python-pymodbus] +python-pymodbus-pip: debian: pip: packages: [pymodbus] From d996bce6abec80e804574a340d88d74f8d828335 Mon Sep 17 00:00:00 2001 From: tgaspar Date: Thu, 3 Feb 2022 16:08:52 +0100 Subject: [PATCH 3/7] Adds Python3 support for pymodbus --- rosdep/python.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 2cb65caffdcfc..6d967bb17b859 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -3701,6 +3701,13 @@ python-pymodbus-pip: ubuntu: pip: packages: [pymodbus] +python3-pymodbus-pip: + debian: + pip: + packages: [pymodbus] + ubuntu: + pip: + packages: [pymodbus] python-pymongo: arch: [python2-pymongo] debian: [python-pymongo] From 18107ad26b60a42c001e672d6d6aac798851cdb9 Mon Sep 17 00:00:00 2001 From: Timotej Gaspar Date: Thu, 3 Feb 2022 16:46:45 +0100 Subject: [PATCH 4/7] Fixing alphabetical order --- rosdep/python.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 6d967bb17b859..bc04da21254c7 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -3701,13 +3701,6 @@ python-pymodbus-pip: ubuntu: pip: packages: [pymodbus] -python3-pymodbus-pip: - debian: - pip: - packages: [pymodbus] - ubuntu: - pip: - packages: [pymodbus] python-pymongo: arch: [python2-pymongo] debian: [python-pymongo] @@ -7576,6 +7569,13 @@ python3-pymodbus: ubuntu: '*': [python3-pymodbus] xenial: null +python3-pymodbus-pip: + debian: + pip: + packages: [pymodbus] + ubuntu: + pip: + packages: [pymodbus] python3-pymongo: arch: [python-pymongo] debian: [python3-pymongo] From 0e6948b8b6b7de5daa8dfb8bb2d07744d40516d5 Mon Sep 17 00:00:00 2001 From: Timotej Gaspar Date: Thu, 10 Feb 2022 09:56:44 +0100 Subject: [PATCH 5/7] Added alias --- rosdep/python.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index bc04da21254c7..320adf953c14b 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -3694,7 +3694,7 @@ python-pymavlink: python-pymodbus: debian: [python-pymodbus] ubuntu: [python-pymodbus] -python-pymodbus-pip: +python-pymodbus-pip: &migrate_eol_2027_04_30_python3_pymodbus_pip debian: pip: packages: [pymodbus] @@ -7569,13 +7569,7 @@ python3-pymodbus: ubuntu: '*': [python3-pymodbus] xenial: null -python3-pymodbus-pip: - debian: - pip: - packages: [pymodbus] - ubuntu: - pip: - packages: [pymodbus] +python3-pymodbus-pip: *migrate_eol_2027_04_30_python3_pymodbus_pip python3-pymongo: arch: [python-pymongo] debian: [python3-pymongo] From 08eb9eef6c346bee7416150a0c4ce2d61d079589 Mon Sep 17 00:00:00 2001 From: Timotej Gaspar Date: Thu, 10 Feb 2022 14:56:46 +0100 Subject: [PATCH 6/7] Adds focal and jammy exceptions --- rosdep/python.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 320adf953c14b..97295ee691b36 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -3693,7 +3693,10 @@ python-pymavlink: packages: [pymavlink] python-pymodbus: debian: [python-pymodbus] - ubuntu: [python-pymodbus] + ubuntu: + '*': [python-pymodbus] + focal: null + jammy: null python-pymodbus-pip: &migrate_eol_2027_04_30_python3_pymodbus_pip debian: pip: From 568be8b4916f4877a8aeb2fc77359ae39da85ce6 Mon Sep 17 00:00:00 2001 From: tgaspar Date: Thu, 10 Feb 2022 15:24:55 +0100 Subject: [PATCH 7/7] Only melodic supports python2 packages Co-authored-by: Ivan Santiago Paunovic --- rosdep/python.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rosdep/python.yaml b/rosdep/python.yaml index 97295ee691b36..37ce1ab9882be 100644 --- a/rosdep/python.yaml +++ b/rosdep/python.yaml @@ -3694,9 +3694,7 @@ python-pymavlink: python-pymodbus: debian: [python-pymodbus] ubuntu: - '*': [python-pymodbus] - focal: null - jammy: null + bionic: [python-pymodbus] python-pymodbus-pip: &migrate_eol_2027_04_30_python3_pymodbus_pip debian: pip: