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

Switch CI to Jazzy #9

Open
wants to merge 3 commits into
base: nobleo-ros2
Choose a base branch
from
Open
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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ jobs:
fail-fast: false
matrix:
env:
- {ROS_DISTRO: humble, ROS_REPO: ros}
- {ROS_DISTRO: jazzy, ROS_REPO: ros}
- {ROS_DISTRO: rolling, ROS_REPO: ros}
env:
PYLINT_ARGS: "--errors-only --ignore-paths=^.*src/executive_smach/smach/smach/user_data.py$,^.*src/executive_smach/smach/smach/user_data.py$,^.*src/executive_smach/smach_ros/smach_ros/service_state.py$,^.*src/executive_smach/smach_ros/smach_ros/simple_action_state.py$,^.*src/executive_smach/smach_ros/test/.*$"
PYLINT_CHECK: true
runs-on: ubuntu-22.04
PYTHONWARNINGS: "$PYTHONWARNINGS,ignore:setup.py install is deprecated::setuptools.command.install,ignore:easy_install command is deprecated::setuptools.command.easy_install"
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
- uses: 'ros-industrial/industrial_ci@master'
Expand Down
4 changes: 2 additions & 2 deletions smach/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[develop]
script-dir=$base/lib/smach
script_dir=$base/lib/smach
[install]
install-scripts=$base/lib/smach
install_scripts=$base/lib/smach
7 changes: 1 addition & 6 deletions smach/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@
zip_safe=True,
maintainer='Isaac I. Y. Saito',
maintainer_email='[email protected]',
description='''
SMACH is a task-level architecture for rapidly creating complex robot
behavior. At its core, SMACH is a ROS-independent Python library to build
hierarchical state machines. SMACH is a new library that takes advantage of
very old concepts in order to quickly create robust robot behavior with
maintainable and modular code.''',
description='''SMACH is a task-level architecture for rapidly creating complex robot behavior. At its core, SMACH is a ROS-independent Python library to build hierarchical state machines. SMACH is a new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.''',
license='BSD',
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
2 changes: 1 addition & 1 deletion smach/smach/state_machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def __init__(self, outcomes, input_keys=[], output_keys=[]):

### Getter and Setter to allow pickling and unpickling state machines
def __getstate__(self):
return {k:v for (k, v) in self.__dict__.items() if k is not "_state_transitioning_lock"}
return {k:v for (k, v) in self.__dict__.items() if k != "_state_transitioning_lock"}

def __setstate__(self, d):
self.__dict__ = d
Expand Down
4 changes: 2 additions & 2 deletions smach_ros/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[develop]
script-dir=$base/lib/smach_ros
script_dir=$base/lib/smach_ros
[install]
install-scripts=$base/lib/smach_ros
install_scripts=$base/lib/smach_ros
7 changes: 1 addition & 6 deletions smach_ros/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@
zip_safe=True,
maintainer='Isaac I. Y. Saito',
maintainer_email='[email protected]',
description='''
SMACH is a task-level architecture for rapidly creating complex robot
behavior. At its core, SMACH is a ROS-independent Python library to build
hierarchical state machines. SMACH is a new library that takes advantage of
very old concepts in order to quickly create robust robot behavior with
maintainable and modular code.''',
description='''SMACH is a task-level architecture for rapidly creating complex robot behavior. At its core, SMACH is a ROS-independent Python library to build hierarchical state machines. SMACH is a new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.''',
license='BSD',
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
Loading