Skip to content

Commit 3092f0f

Browse files
committed
Merge branch 'humble-devel' into neutral-steps
2 parents 2cffaaa + 49bc057 commit 3092f0f

10 files changed

Lines changed: 735 additions & 50 deletions

File tree

.github/workflows/python_lint.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Ensure Python code is linted and formatted, matching the style guide
2+
name: Python Linting
3+
4+
on: [push]
5+
6+
jobs:
7+
black-lint:
8+
runs-on: ubuntu-latest
9+
name: Python black Lint
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: psf/black@stable
13+
with:
14+
version: "22.3.0"
15+
# flake8-lint:
16+
# runs-on: ubuntu-latest
17+
# name: Python flake8 Lint
18+
# steps:
19+
# - name: Check out source repository
20+
# uses: actions/checkout@v3
21+
22+
# - name: Set up Python environment
23+
# uses: actions/setup-python@v4
24+
# with:
25+
# python-version: "3.11"
26+
27+
# - name: flake8 Lint
28+
# uses: py-actions/flake8@v2
29+
# with:
30+
# ignore: "E701,W503,E203"
31+
# exclude: "docs,.idea"
32+
# max-line-length: "88"
33+
# path: "."
34+
# plugins: "flake8-docstrings flake8-black"

.github/workflows/python_lint.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<a href="https://mmg-ai.com/en/"><img src="https://jderobot.github.io/assets/images/logo.png" width="100 " align="right" /></a>
2+
3+
# Contributing to RoboticsAcademy
4+
5+
First off, thanks for your interest in contributing to RoboticsApplicationManager! All contributors are welcome, from commenting issues to reviewing or sending Pull Requests.
6+
7+
## How to contribute?
8+
9+
If you are new to GitHub, visit the [first-contributions instructions](https://github.com/firstcontributions/first-contributions/blob/master/README.md) to learn how to contribute on GitHub.
10+
11+
To find issues you can help with, go though the list of [good first issues](https://github.com/JdeRobot/RoboticsApplicationManager/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) or issues labeled with [help wanted](https://github.com/JdeRobot/RoboticsApplicationManager/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22help%20wanted%22).
12+
13+
Once found or created an issue, let us know that you want to work on it by commenting in the issue.
14+
15+
Please, make sure to follow our [coding style guide](https://github.com/JdeRobot/RoboticsAcademy/blob/humble-devel/docs/coding_style_guide.md) while working.

LICENSE

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

manager/comms/websocker_server.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454

5555

5656
class API:
57-
5857
def run_forever(self, threaded=False):
5958
return self._run_forever(threaded)
6059

@@ -274,7 +273,6 @@ def _allow_new_connections(self):
274273

275274

276275
class WebSocketHandler(StreamRequestHandler):
277-
278276
def __init__(self, socket, addr, server):
279277
self.server = server
280278
assert not hasattr(self, "_send_lock"), "_send_lock already exists"

manager/libs/applications/compatibility/file_watchdog.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99

1010
class Handler(FileSystemEventHandler):
11-
1211
def __init__(self, file, callback):
1312
self.update_callback = callback
1413
self.file = file

manager/libs/applications/compatibility/robotics_application_wrapper.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525

2626
class RoboticsApplicationWrapper(IRoboticsPythonApplication):
27-
2827
def __init__(self, update_callback):
2928
super().__init__(update_callback)
3029
self.running = False

manager/manager/editor/serializers.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
class Completion:
5-
65
def __init__(self, completion):
76
self.label = completion.name
87
self.code = completion.name_with_symbols

manager/manager/launcher/launcher_ros.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class LauncherRos(ILauncher):
4444
def run(self):
4545
try:
4646
# generate entry_point environment variable
47-
os.environ["EXERCISE_FOLDER"] = (
48-
f"{os.environ.get('EXERCISES_STATIC_FOLDER')}/{self.exercise_id}"
49-
)
47+
os.environ[
48+
"EXERCISE_FOLDER"
49+
] = f"{os.environ.get('EXERCISES_STATIC_FOLDER')}/{self.exercise_id}"
5050

5151
# expand variables in configuration paths
5252
resource_folders = [
@@ -57,15 +57,15 @@ def run(self):
5757
launch_file = os.path.expandvars(self.launch_file)
5858

5959
env = dict(os.environ)
60-
env["GAZEBO_RESOURCE_PATH"] = (
61-
f"{env.get('GAZEBO_RESOURCE_PATH', '')}:{':'.join(resource_folders)}"
62-
)
63-
env["GAZEBO_MODEL_PATH"] = (
64-
f"{env.get('GAZEBO_MODEL_PATH', '')}:{':'.join(model_folders)}"
65-
)
66-
env["GAZEBO_PLUGIN_PATH"] = (
67-
f"{env.get('GAZEBO_PLUGIN_PATH', '')}:{':'.join(plugin_folders)}"
68-
)
60+
env[
61+
"GAZEBO_RESOURCE_PATH"
62+
] = f"{env.get('GAZEBO_RESOURCE_PATH', '')}:{':'.join(resource_folders)}"
63+
env[
64+
"GAZEBO_MODEL_PATH"
65+
] = f"{env.get('GAZEBO_MODEL_PATH', '')}:{':'.join(model_folders)}"
66+
env[
67+
"GAZEBO_PLUGIN_PATH"
68+
] = f"{env.get('GAZEBO_PLUGIN_PATH', '')}:{':'.join(plugin_folders)}"
6969

7070
parameters = " ".join(self.parameters)
7171
command = f"{self.ros_command_line} {parameters} {launch_file}"

manager/manager/lint/linter.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
class Lint:
9-
109
def clean_pylint_output(self, result, warnings=False):
1110

1211
# result = result.replace(os.path.basename(code_file_name), 'user_code')

0 commit comments

Comments
 (0)