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.

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

Setup fix and version-up #131

Merged
merged 5 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ If applicable, add screenshots to help explain your problem.

**Version information (please complete the following information):**
- OS: [e.g. Ubuntu 22.04]
- Version [e.g. 1.1.0]
- Version [e.g. 1.2.0]
- ROS version: [e.g. humble]

**Additional context**
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
copyright = f"{datetime.datetime.now()}, Intel"
author = "Intel"

version = '1.1.0'
release = '1.1.0'
version = '1.2.0'
release = '1.2.0'

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
2 changes: 1 addition & 1 deletion examples/example_external_method/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion examples/example_library/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion examples/example_multi_robot/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>example_multi_robot</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Example Multi Robot</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion examples/example_multi_robot/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion examples/example_scenario_control/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>example_scenario_control</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution Example for Scenario Control using RVIZ</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion examples/example_scenario_control/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=[PACKAGE_NAME],
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion examples/example_simulation/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>example_simulation</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution Example for Simulation</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion examples/example_simulation/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=[PACKAGE_NAME],
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_floorplan_dsl/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_floorplan_dsl</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution library for Floorplan DSL</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_floorplan_dsl/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_gazebo/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_gazebo</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution library for Gazebo</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_gazebo/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_nav2/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_nav2</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution library for Nav2</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_nav2/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_os/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_os</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution library for OS interactions</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_os/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_pybullet/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_pybullet</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution library for PyBullet</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_pybullet/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion scenario_coverage/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_coverage</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Robotics Scenario Execution Coverage Tools</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion scenario_coverage/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion scenario_execution/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
14 changes: 9 additions & 5 deletions scenario_execution/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,17 @@
PACKAGE_NAME = 'scenario_execution'

# read the contents of the README file
this_directory = Path(__file__).resolve()
root_directory = [p for p in this_directory.parents if p.parts[-1] == PACKAGE_NAME][0]
long_description = Path.joinpath(root_directory, "README.md").read_text()
this_directory = Path(__file__).parent
try:
LONG_DESCRIPTION = (this_directory / "README.md").read_text()
except: # pylint: disable=W0702
# in case we do colcon build --symlink-install, wo do not need the
# description
LONG_DESCRIPTION = ''

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(exclude=['test*']),
data_files=[
('share/ament_index/resource_index/packages',
Expand All @@ -54,7 +58,7 @@
"Issues": "https://github.com/IntelLabs/scenario_execution/issues",
},
description='Scenario Execution for Robotics',
long_description=long_description,
long_description=LONG_DESCRIPTION,
long_description_content_type='text/markdown',
license='Apache License 2.0',
classifiers=[
Expand Down
2 changes: 1 addition & 1 deletion scenario_execution_control/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>scenario_execution_control</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution Control</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion scenario_execution_control/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
PACKAGE_NAME = 'scenario_execution_control'
setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=[PACKAGE_NAME],
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion scenario_execution_interfaces/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_interfaces</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>ROS2 Interfaces for Scenario Execution</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion scenario_execution_ros/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_ros</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Scenario Execution for ROS</description>
<author email="[email protected]">Frederik Pasch</author>
<author email="[email protected]">Florian Mirus</author>
Expand Down
2 changes: 1 addition & 1 deletion scenario_execution_ros/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion simulation/gazebo/gazebo_static_camera/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>gazebo_static_camera</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Spawn a static camera within a gazebo world</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion simulation/gazebo/gazebo_static_camera/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion simulation/gazebo/gazebo_tf_publisher/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>gazebo_tf_publisher</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>
Node to publish ignition ground truth TF tree
</description>
Expand Down
2 changes: 1 addition & 1 deletion simulation/gazebo/tb4_sim_scenario/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>tb4_sim_scenario</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>TurtleBot 4 Simulation Scenario Execution</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario_execution_gazebo_test/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_gazebo_test</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Tests for Scenario Execution library for Gazebo</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario_execution_gazebo_test/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion test/scenario_execution_ros_test/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_ros_test</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Tests for Scenario Execution library for ROS</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario_execution_ros_test/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion test/scenario_execution_test/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_test</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Tests for Scenario Execution library</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario_execution_test/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion tools/message_modification/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>message_modification</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Modification of message data</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion tools/message_modification/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
PACKAGE_NAME = 'message_modification'
setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=[PACKAGE_NAME],
data_files=[
('share/ament_index/resource_index/packages', ['resource/' + PACKAGE_NAME]),
Expand Down
Loading