From 6995ddf1a93a3e9df708d82ba026be4a6f5fe3d9 Mon Sep 17 00:00:00 2001 From: Evan Palmer Date: Mon, 19 Aug 2024 18:25:12 -0400 Subject: [PATCH 1/2] Update and remove stale project configurations (#256) * Updated and removed stale configs * Moved devcontainer specific configurations to devcontainer.json file * Removed stale C++ configurations * Fixed grammar in mergify prompt * Update Python version in settings.json (cherry picked from commit 992b51b6b6a061ff59918d88386d52cfd1129d74) --- .devcontainer/nouveau/devcontainer.json | 5 +++++ .devcontainer/nvidia/devcontainer.json | 5 +++++ .devcontainer/robot/devcontainer.json | 5 +++++ .github/ISSUE_TEMPLATE/documentation.yaml | 8 ++++---- .github/mergify.yml | 13 +++++++++++-- .github/workflows/ci-docs.yaml | 1 - .vscode/c_cpp_properties.json | 7 +------ .vscode/settings.json | 10 ++++------ 8 files changed, 35 insertions(+), 19 deletions(-) diff --git a/.devcontainer/nouveau/devcontainer.json b/.devcontainer/nouveau/devcontainer.json index 5dbcef35..5388c1d8 100644 --- a/.devcontainer/nouveau/devcontainer.json +++ b/.devcontainer/nouveau/devcontainer.json @@ -22,6 +22,11 @@ }, "customizations": { "vscode": { + "settings": { + "python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python", + "python.autoComplete.extraPaths": ["${workspaceFolder}/install/"], + "python.analysis.extraPaths": ["${workspaceFolder}/install/"] + }, "extensions": [ "ms-azuretools.vscode-docker", "ms-python.python", diff --git a/.devcontainer/nvidia/devcontainer.json b/.devcontainer/nvidia/devcontainer.json index 9359454f..30aeb8f5 100644 --- a/.devcontainer/nvidia/devcontainer.json +++ b/.devcontainer/nvidia/devcontainer.json @@ -26,6 +26,11 @@ }, "customizations": { "vscode": { + "settings": { + "python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python", + "python.autoComplete.extraPaths": ["${workspaceFolder}/install/"], + "python.analysis.extraPaths": ["${workspaceFolder}/install/"] + }, "extensions": [ "ms-azuretools.vscode-docker", "ms-python.python", diff --git a/.devcontainer/robot/devcontainer.json b/.devcontainer/robot/devcontainer.json index d57e5f09..88625d29 100644 --- a/.devcontainer/robot/devcontainer.json +++ b/.devcontainer/robot/devcontainer.json @@ -23,6 +23,11 @@ "containerEnv": {}, "customizations": { "vscode": { + "settings": { + "python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python", + "python.autoComplete.extraPaths": ["${workspaceFolder}/install/"], + "python.analysis.extraPaths": ["${workspaceFolder}/install/"] + }, "extensions": [ "ms-azuretools.vscode-docker", "ms-python.python", diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml index d0dcbb2c..c44b1e6b 100644 --- a/.github/ISSUE_TEMPLATE/documentation.yaml +++ b/.github/ISSUE_TEMPLATE/documentation.yaml @@ -1,5 +1,5 @@ name: Documentation Improvement -description: Report an issue related to the BlueROV2 driver documentation. +description: Report an issue related to the Blue documentation. title: "[DOC]: " labels: [documentation, needs triage] @@ -16,9 +16,9 @@ body: label: Documentation Change Type description: Please indicate what type of documentation issue you are reporting. options: - - Adding new documentation to the BlueROV2 driver documentation - - Changing existing BlueROV2 driver documentation - - Removing existing BlueROV2 driver documentation + - Adding new documentation to the Blue documentation + - Changing existing documentation + - Removing existing documentation validations: required: true diff --git a/.github/mergify.yml b/.github/mergify.yml index 89c72613..186c6951 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,5 +1,5 @@ pull_request_rules: - - name: backport to iron at reviewers discretion + - name: backport to iron at reviewers' discretion conditions: - base=main - "label=backport-iron" @@ -8,7 +8,7 @@ pull_request_rules: branches: - iron - - name: backport to humble at reviewers discretion + - name: backport to humble at reviewers' discretion conditions: - base=main - "label=backport-humble" @@ -17,6 +17,15 @@ pull_request_rules: branches: - humble + - name: backport to jazzy at reviewers' discretion + conditions: + - base=main + - "label=backport-jazzy" + actions: + backport: + branches: + - jazzy + - name: ask to resolve conflict conditions: - conflict diff --git a/.github/workflows/ci-docs.yaml b/.github/workflows/ci-docs.yaml index 53df3f65..0418984d 100644 --- a/.github/workflows/ci-docs.yaml +++ b/.github/workflows/ci-docs.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - 33-feature-ros2-control pull_request: paths: - docs/** diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 3c605782..15272365 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -2,12 +2,7 @@ "configurations": [ { "name": "Linux", - "includePath": [ - "${workspaceFolder}/**", - "/opt/ros/iron/include/**", - "/usr/include/eigen3/**", - "/home/ros/ws_ros/**" - ], + "includePath": ["${workspaceFolder}/**", "/opt/ros/rolling/include/**"], "defines": [], "compilerPath": "/usr/bin/gcc", "cStandard": "c99", diff --git a/.vscode/settings.json b/.vscode/settings.json index f6d45d50..2e9f83b2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,14 +23,12 @@ "autoDocstring.startOnNewLine": false, "autoDocstring.docstringFormat": "google-notypes", "python.autoComplete.extraPaths": [ - "/opt/ros/iron/lib/python3.10/site-packages/", - "/opt/ros/iron/local/lib/python3.10/dist-packages/", - "${workspaceFolder}/install/" + "/opt/ros/rolling/lib/python3.12/site-packages/", + "/opt/ros/rolling/local/lib/python3.12/dist-packages/" ], "python.analysis.extraPaths": [ - "/opt/ros/iron/lib/python3.10/site-packages/", - "/opt/ros/iron/local/lib/python3.10/dist-packages/", - "${workspaceFolder}/install/" + "/opt/ros/rolling/lib/python3.12/site-packages/", + "/opt/ros/rolling/local/lib/python3.12/dist-packages/" ], "[python]": { "editor.tabSize": 4, From 0c61a5932083e713055d597f7b0e4d5d8c51a02b Mon Sep 17 00:00:00 2001 From: Evan Palmer Date: Mon, 19 Aug 2024 15:39:44 -0700 Subject: [PATCH 2/2] Resolved cherry pick errors --- .devcontainer/nouveau/devcontainer.json | 1 - .devcontainer/nvidia/devcontainer.json | 1 - .devcontainer/robot/devcontainer.json | 1 - .vscode/settings.json | 8 ++++---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.devcontainer/nouveau/devcontainer.json b/.devcontainer/nouveau/devcontainer.json index 5388c1d8..a9cb299d 100644 --- a/.devcontainer/nouveau/devcontainer.json +++ b/.devcontainer/nouveau/devcontainer.json @@ -23,7 +23,6 @@ "customizations": { "vscode": { "settings": { - "python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python", "python.autoComplete.extraPaths": ["${workspaceFolder}/install/"], "python.analysis.extraPaths": ["${workspaceFolder}/install/"] }, diff --git a/.devcontainer/nvidia/devcontainer.json b/.devcontainer/nvidia/devcontainer.json index 30aeb8f5..b6f36a06 100644 --- a/.devcontainer/nvidia/devcontainer.json +++ b/.devcontainer/nvidia/devcontainer.json @@ -27,7 +27,6 @@ "customizations": { "vscode": { "settings": { - "python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python", "python.autoComplete.extraPaths": ["${workspaceFolder}/install/"], "python.analysis.extraPaths": ["${workspaceFolder}/install/"] }, diff --git a/.devcontainer/robot/devcontainer.json b/.devcontainer/robot/devcontainer.json index 88625d29..38e9e5a8 100644 --- a/.devcontainer/robot/devcontainer.json +++ b/.devcontainer/robot/devcontainer.json @@ -24,7 +24,6 @@ "customizations": { "vscode": { "settings": { - "python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python", "python.autoComplete.extraPaths": ["${workspaceFolder}/install/"], "python.analysis.extraPaths": ["${workspaceFolder}/install/"] }, diff --git a/.vscode/settings.json b/.vscode/settings.json index 2e9f83b2..864f8c9b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,12 +23,12 @@ "autoDocstring.startOnNewLine": false, "autoDocstring.docstringFormat": "google-notypes", "python.autoComplete.extraPaths": [ - "/opt/ros/rolling/lib/python3.12/site-packages/", - "/opt/ros/rolling/local/lib/python3.12/dist-packages/" + "/opt/ros/iron/lib/python3.10/site-packages/", + "/opt/ros/iron/local/lib/python3.10/dist-packages/" ], "python.analysis.extraPaths": [ - "/opt/ros/rolling/lib/python3.12/site-packages/", - "/opt/ros/rolling/local/lib/python3.12/dist-packages/" + "/opt/ros/iron/lib/python3.10/site-packages/", + "/opt/ros/iron/local/lib/python3.10/dist-packages/" ], "[python]": { "editor.tabSize": 4,