From 2a1648db0a5161616b2adfd6e9899cd1a255f315 Mon Sep 17 00:00:00 2001 From: ConstantConstantin Date: Fri, 12 Apr 2024 15:11:57 +0200 Subject: [PATCH 1/2] changing python to python3 --- .project | 4 ++-- .pydevproject | 6 +++--- CHANGELOG.rst | 2 +- package.xml | 19 ++++++++++-------- scripts/genjava_gradle_project.py | 2 +- scripts/genjava_message_artifacts | 2 +- setup.py | 2 +- .../__pycache__/genjava_main.cpython-38.pyc | Bin 0 -> 3166 bytes .../__pycache__/gradle_project.cpython-38.pyc | Bin 0 -> 5719 bytes 9 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 src/genjava/__pycache__/genjava_main.cpython-38.pyc create mode 100644 src/genjava/__pycache__/gradle_project.cpython-38.pyc diff --git a/.project b/.project index e88e447..4203c0e 100644 --- a/.project +++ b/.project @@ -6,12 +6,12 @@ - org.python.pydev.PyDevBuilder + org.python3.pydev.PyDevBuilder - org.python.pydev.pythonNature + org.python3.pydev.pythonNature diff --git a/.pydevproject b/.pydevproject index 0ebadbb..a6ba252 100644 --- a/.pydevproject +++ b/.pydevproject @@ -1,8 +1,8 @@ - + /${PROJECT_DIR_NAME}/src -python 2.7 -Default +python3 2.7 +Default diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c521aa9..19f7f01 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -34,7 +34,7 @@ Changelog for package genjava 0.1.3 (2015-02-28) ------------------ -* add data parts to the python package. +* add data parts to the python3 package. * Contributors: Daniel Stonier 0.1.2 (2015-02-27) diff --git a/package.xml b/package.xml index 86233ab..779970f 100644 --- a/package.xml +++ b/package.xml @@ -20,16 +20,19 @@ Daniel Stonier catkin - python-setuptools + python3-setuptools + genmsg + python3-catkin-pkg + python3-rospkg + rosjava_bootstrap + rosjava_build_tools python3-setuptools - genmsg - python-catkin-pkg - python-rospkg - python3-catkin-pkg - python3-rospkg - rosjava_bootstrap - rosjava_build_tools + genmsg + python3-catkin-pkg + python3-rospkg + rosjava_bootstrap + rosjava_build_tools java diff --git a/scripts/genjava_gradle_project.py b/scripts/genjava_gradle_project.py index 57fc504..31bbee5 100755 --- a/scripts/genjava_gradle_project.py +++ b/scripts/genjava_gradle_project.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ ROS message source code generation for Java, integration with ros' message_generation. diff --git a/scripts/genjava_message_artifacts b/scripts/genjava_message_artifacts index 4453283..6c1aa1f 100755 --- a/scripts/genjava_message_artifacts +++ b/scripts/genjava_message_artifacts @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ ROS message source code generation for Java, from the command line. diff --git a/setup.py b/setup.py index cf9ec7a..6b7fd2a 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup diff --git a/src/genjava/__pycache__/genjava_main.cpython-38.pyc b/src/genjava/__pycache__/genjava_main.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d01a96d046f3292f1bdc4a5d756f9fd45e97b37c GIT binary patch literal 3166 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 Date: Fri, 12 Apr 2024 15:13:21 +0200 Subject: [PATCH 2/2] changing dict.iteritems() to python3 method --- src/genjava/gradle_project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/genjava/gradle_project.py b/src/genjava/gradle_project.py index 5ecfbca..ff336e0 100644 --- a/src/genjava/gradle_project.py +++ b/src/genjava/gradle_project.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ############################################################################## # Imports