Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/fixing ws #6

Open
wants to merge 2 commits into
base: kinetic
Choose a base branch
from
Open

Fix/fixing ws #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a1648d
changing python to python3
ConstantConstantin Apr 12, 2024
81e513f
changing dict.iteritems() to python3 method
ConstantConstantin Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<name>org.python3.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.python.pydev.pythonNature</nature>
<nature>org.python3.pydev.pythonNature</nature>
</natures>
</projectDescription>
6 changes: 3 additions & 3 deletions .pydevproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<pydev_pathproperty name="org.python3.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/src</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python3.pydev.PYTHON_PROJECT_VERSION">python3 2.7</pydev_property>
<pydev_property name="org.python3.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
</pydev_project>
2 changes: 1 addition & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
19 changes: 11 additions & 8 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@
<author>Daniel Stonier</author>

<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
<build_depend>genmsg</build_depend>
<build_depend>python3-catkin-pkg</build_depend>
<build_depend>python3-rospkg</build_depend>
<build_depend>rosjava_bootstrap</build_depend>
<build_depend>rosjava_build_tools</build_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>

<depend>genmsg</depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg</depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</depend>
<depend>rosjava_bootstrap</depend>
<depend>rosjava_build_tools</depend>
<run_depend>genmsg</run_depend>
<run_depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg</run_depend>
<run_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</run_depend>
<run_depend>rosjava_bootstrap</run_depend>
<run_depend>rosjava_build_tools</run_depend>

<export>
<message_generator>java</message_generator>
Expand Down
2 changes: 1 addition & 1 deletion scripts/genjava_gradle_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

"""
ROS message source code generation for Java, integration with ros' message_generation.
Expand Down
2 changes: 1 addition & 1 deletion scripts/genjava_message_artifacts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

"""
ROS message source code generation for Java, from the command line.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file added src/genjava/__pycache__/genjava_main.cpython-38.pyc
View file
Open in desktop
Binary file not shown.
Binary file added src/genjava/__pycache__/gradle_project.cpython-38.pyc
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/genjava/gradle_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

##############################################################################
# Imports
Expand Down