From 8a93753951763f36c992fbd422362e10f5afde49 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 27 Jan 2023 21:12:09 +0900 Subject: [PATCH 1/3] add ga python check --- .github/workflows/python2.yml | 18 ++++++++++++++++++ .github/workflows/python3.yml | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 .github/workflows/python2.yml create mode 100644 .github/workflows/python3.yml diff --git a/.github/workflows/python2.yml b/.github/workflows/python2.yml new file mode 100644 index 000000000..72f28a322 --- /dev/null +++ b/.github/workflows/python2.yml @@ -0,0 +1,18 @@ +# generated by `./generate_action_config.py noetic` +# jsk_travis +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + name: check_python2 + + container: ubuntu:20.04 + + steps: + - name: Chcekout + uses: actions/checkout@v2 + - name: Check Python2 + run: | + apt update -q && apt install -y -q python2 + python2 -m compileall . diff --git a/.github/workflows/python3.yml b/.github/workflows/python3.yml new file mode 100644 index 000000000..2e6dc49d3 --- /dev/null +++ b/.github/workflows/python3.yml @@ -0,0 +1,22 @@ +# generated by `./generate_action_config.py noetic` +# jsk_travis +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + name: check_python3 + + container: ubuntu:20.04 + + steps: + - name: Install latest git to download .git directory in actions/checkout@v2 ( use sudo for ros-ubuntu ) + run: apt-get update && apt-get install -y software-properties-common && apt-get update && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git + - name: work around permission issue # https://github.com/actions/checkout/issues/760#issuecomment-1097501613 + run: git config --global --add safe.directory $GITHUB_WORKSPACE + - name: Chcekout + uses: actions/checkout@v2 + - name: Check Python3 + run: | + apt update -q && apt install -y -q python3 git 2to3 + bash -c "ret=0; trap 'ret=1' ERR; python3 -m compileall .; 2to3 -w -f except -f execfile -f has_key -f import -f raw_input -f zip .; git diff --exit-code . > /dev/null; echo Exitting with \$ret; exit \$ret" From 322724615486e9435ab3eea21b5129c4fe059340 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 27 Jan 2023 18:22:44 +0900 Subject: [PATCH 2/3] use items for python3 --- roseus/test/test_geneus_send_msgs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roseus/test/test_geneus_send_msgs.py b/roseus/test/test_geneus_send_msgs.py index ec4304d3a..530cf3ac5 100755 --- a/roseus/test/test_geneus_send_msgs.py +++ b/roseus/test/test_geneus_send_msgs.py @@ -44,7 +44,7 @@ def send_msgs(): rospy.init_node('test_geneus_send_msgs', anonymous=True) rate = rospy.Rate(10) # 10hz while not rospy.is_shutdown(): - for p,i in pubs.iteritems(): + for p,i in pubs.items(): p.publish(i) rate.sleep() From fa349501579eb3975da89ecd6797506483411a19 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 27 Jan 2023 21:14:43 +0900 Subject: [PATCH 3/3] use in instead of has_key --- roseus/cmake/get_all_depends.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roseus/cmake/get_all_depends.py b/roseus/cmake/get_all_depends.py index e42b229f7..6f007bc57 100755 --- a/roseus/cmake/get_all_depends.py +++ b/roseus/cmake/get_all_depends.py @@ -48,7 +48,7 @@ def get_pkg_map(): for ws in workspaces.get_spaces(): pkgs = packages.find_packages(ws) for pkg in pkgs.values(): - if not pkg_map.has_key(pkg.name): + if pkg.name not in pkg_map: pkg_map[pkg.name] = pkg return pkg_map geneus.geneus_main.pkg_map = get_pkg_map()