mawei/openpilot-meb
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

replace python with python3 (#33303)

Browse Source 
3
old-commit-hash: 406939b9c09c9f29526c18fe2f106c2059decf1e
This commit is contained in:
Maxime Desroches
2024-08-14 15:14:31 -07:00
committed by GitHub
parent f8ef09fcb2
commit 8c8a4b4961
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/badges.yaml vendored
View File

@@ -23,7 +23,7 @@ jobs:
- uses: ./.github/workflows/setup-with-retry - uses: ./.github/workflows/setup-with-retry
- name: Push badges - name: Push badges
run: | run: |
${{ env.RUN }} "scons -j$(nproc) && python selfdrive/ui/translations/create_badges.py" ${{ env.RUN }} "scons -j$(nproc) && python3 selfdrive/ui/translations/create_badges.py"
rm .gitattributes rm .gitattributes

10
.github/workflows/selfdrive_tests.yaml vendored
View File

@@ -54,7 +54,7 @@ jobs:
timeout-minutes: ${{ ((steps.restore-scons-cache.outputs.cache-hit == 'true') && 10 || 30) }} # allow more time when we missed the scons cache timeout-minutes: ${{ ((steps.restore-scons-cache.outputs.cache-hit == 'true') && 10 || 30) }} # allow more time when we missed the scons cache
run: | run: |
cd $STRIPPED_DIR cd $STRIPPED_DIR
${{ env.RUN }} "python system/manager/build.py" ${{ env.RUN }} "python3 system/manager/build.py"
- name: Run tests - name: Run tests
timeout-minutes: 3 timeout-minutes: 3
run: | run: |
@@ -221,7 +221,7 @@ jobs:
- name: Upload reference logs - name: Upload reference logs
if: ${{ failure() && steps.print-diff.outcome == 'success' && github.repository == 'commaai/openpilot' && env.AZURE_TOKEN != '' }} if: ${{ failure() && steps.print-diff.outcome == 'success' && github.repository == 'commaai/openpilot' && env.AZURE_TOKEN != '' }}
run: | run: |
${{ env.RUN }} "unset PYTHONWARNINGS && AZURE_TOKEN='$AZURE_TOKEN' python selfdrive/test/process_replay/test_processes.py -j$(nproc) --upload-only" ${{ env.RUN }} "unset PYTHONWARNINGS && AZURE_TOKEN='$AZURE_TOKEN' python3 selfdrive/test/process_replay/test_processes.py -j$(nproc) --upload-only"
# PYTHONWARNINGS triggers a SyntaxError in onnxruntime # PYTHONWARNINGS triggers a SyntaxError in onnxruntime
- name: Run model replay with ONNX - name: Run model replay with ONNX
timeout-minutes: 4 timeout-minutes: 4
@@ -291,7 +291,7 @@ jobs:
- uses: ./.github/workflows/setup-with-retry - uses: ./.github/workflows/setup-with-retry
- name: Get base car info - name: Get base car info
run: | run: |
${{ env.RUN }} "scons -j$(nproc) && python selfdrive/debug/dump_car_docs.py --path /tmp/openpilot_cache/base_car_docs" ${{ env.RUN }} "scons -j$(nproc) && python3 selfdrive/debug/dump_car_docs.py --path /tmp/openpilot_cache/base_car_docs"
sudo chown -R $USER:$USER ${{ github.workspace }} sudo chown -R $USER:$USER ${{ github.workspace }}
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@@ -303,7 +303,7 @@ jobs:
run: | run: |
cd current cd current
${{ env.RUN }} "scons -j$(nproc)" ${{ env.RUN }} "scons -j$(nproc)"
output=$(${{ env.RUN }} "python selfdrive/debug/print_docs_diff.py --path /tmp/openpilot_cache/base_car_docs") output=$(${{ env.RUN }} "python3 selfdrive/debug/print_docs_diff.py --path /tmp/openpilot_cache/base_car_docs")
output="${output//$'\n'/'%0A'}" output="${output//$'\n'/'%0A'}"
echo "::set-output name=diff::$output" echo "::set-output name=diff::$output"
- name: Find comment - name: Find comment
@@ -348,7 +348,7 @@ jobs:
run: > run: >
${{ env.RUN }} "PYTHONWARNINGS=ignore && ${{ env.RUN }} "PYTHONWARNINGS=ignore &&
source selfdrive/test/setup_xvfb.sh && source selfdrive/test/setup_xvfb.sh &&
python selfdrive/ui/tests/test_ui/run.py" python3 selfdrive/ui/tests/test_ui/run.py"
- name: Upload Test Report - name: Upload Test Report
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:

2
tools/cabana/streams/replaystream.cc
View File

@@ -63,7 +63,7 @@ bool ReplayStream::loadRoute(const QString &route, const QString &data_dir, uint
QString message; QString message;
if (auth_content.empty()) { if (auth_content.empty()) {
message = "Authentication Required. Please run the following command to authenticate:\n\n" message = "Authentication Required. Please run the following command to authenticate:\n\n"
"python tools/lib/auth.py\n\n" "python3 tools/lib/auth.py\n\n"
"This will grant access to routes from your comma account."; "This will grant access to routes from your comma account.";
} else { } else {
message = tr("Access Denied. You do not have permission to access route:\n\n%1\n\n" message = tr("Access Denied. You do not have permission to access route:\n\n%1\n\n"

8
tools/camerastream/README.md
View File

@@ -1,10 +1,10 @@
# Camera stream # Camera stream
`compressed_vipc.py` connects to a remote device running openpilot, decodes the video streams, and republishes them over VisionIPC. `compressed_vipc.py` connects to a remote device running openpilot, decodes the video streams, and republishes them over VisionIPC.
## Usage ## Usage
### On the device ### On the device
SSH into the device and run following in separate terminals: SSH into the device and run following in separate terminals:
`cd /data/openpilot/cereal/messaging && ./bridge` `cd /data/openpilot/cereal/messaging && ./bridge`
@@ -30,7 +30,7 @@ Alternatively paste this as a single command:
wait wait
) ; trap 'kill $(jobs -p)' SIGINT ) ; trap 'kill $(jobs -p)' SIGINT
``` ```
Ctrl+C will stop all three processes. Ctrl+C will stop all three processes.
### On the PC ### On the PC
Decode the stream with `compressed_vipc.py`: Decode the stream with `compressed_vipc.py`:
@@ -43,7 +43,7 @@ To actually display the stream, run `watch3` in separate terminal:
## compressed_vipc.py usage ## compressed_vipc.py usage
``` ```
$ python compressed_vipc.py -h $ python3 compressed_vipc.py -h
usage: compressed_vipc.py [-h] [--nvidia] [--cams CAMS] [--silent] addr usage: compressed_vipc.py [-h] [--nvidia] [--cams CAMS] [--silent] addr
Decode video streams and broadcast on VisionIPC Decode video streams and broadcast on VisionIPC

6
tools/car_porting/README.md
View File

@@ -21,7 +21,7 @@ Given a route and platform, automatically inserts FW fingerprints from the platf
Example: Example:
```bash ```bash
> python tools/car_porting/auto_fingerprint.py '1bbe6bf2d62f58a8|2022-07-14--17-11-43' 'OUTBACK' > python3 tools/car_porting/auto_fingerprint.py '1bbe6bf2d62f58a8|2022-07-14--17-11-43' 'OUTBACK'
Attempting to add fw version for: OUTBACK Attempting to add fw version for: OUTBACK
``` ```
@@ -45,7 +45,7 @@ Given a route, runs most of the car interface to check for common errors like mi
#### Example: panda safety mismatch for gasPressed #### Example: panda safety mismatch for gasPressed
```bash ```bash
> python tools/car_porting/test_car_model.py '4822a427b188122a|2023-08-14--16-22-21' > python3 tools/car_porting/test_car_model.py '4822a427b188122a|2023-08-14--16-22-21'
===================================================================== =====================================================================
FAIL: test_panda_safety_carstate (__main__.CarModelTestCase.test_panda_safety_carstate) FAIL: test_panda_safety_carstate (__main__.CarModelTestCase.test_panda_safety_carstate)
@@ -93,4 +93,4 @@ vin: 1FM5K8GC7NGXXXXXX real platform: FORD EXPLORER 6TH GEN determi
vin: 5LM5J7XC8MGXXXXXX real platform: FORD EXPLORER 6TH GEN determined platform: mock correct: False vin: 5LM5J7XC8MGXXXXXX real platform: FORD EXPLORER 6TH GEN determined platform: mock correct: False
vin: 3FTTW8E31PRXXXXXX real platform: FORD MAVERICK 1ST GEN determined platform: mock correct: False vin: 3FTTW8E31PRXXXXXX real platform: FORD MAVERICK 1ST GEN determined platform: mock correct: False
vin: 3FTTW8E99NRXXXXXX real platform: FORD MAVERICK 1ST GEN determined platform: mock correct: False vin: 3FTTW8E99NRXXXXXX real platform: FORD MAVERICK 1ST GEN determined platform: mock correct: False
``` ```

2
tools/latencylogger/README.md
View File

@@ -5,7 +5,7 @@ LatencyLogger is a tool to track the time from first pixel to actuation. Timesta
## Usage ## Usage
``` ```
$ python latency_logger.py -h $ python3 latency_logger.py -h
usage: latency_logger.py [-h] [--relative] [--demo] [--plot] [route_or_segment_name] usage: latency_logger.py [-h] [--relative] [--demo] [--plot] [route_or_segment_name]
A tool for analyzing openpilot's end-to-end latency A tool for analyzing openpilot's end-to-end latency

4
tools/replay/README.md
View File

@@ -6,7 +6,7 @@
```bash ```bash
# Log in via browser to have access to routes from your comma account # Log in via browser to have access to routes from your comma account
python tools/lib/auth.py python3 tools/lib/auth.py
# Start a replay # Start a replay
tools/replay/replay <route-name> tools/replay/replay <route-name>
@@ -20,7 +20,7 @@ tools/replay/replay --demo
cd selfdrive/ui && ./ui cd selfdrive/ui && ./ui
# or try out radar point visualization in Rerun: # or try out radar point visualization in Rerun:
python replay/rp_visualization.py python3 replay/rp_visualization.py
# NOTE: To visualize radar points, make sure tools/replay/replay is running. # NOTE: To visualize radar points, make sure tools/replay/replay is running.
``` ```

2
tools/sim/launch_openpilot.sh
View File

@@ -12,7 +12,7 @@ if [[ "$CI" ]]; then
export BLOCK="${BLOCK},ui" export BLOCK="${BLOCK},ui"
fi fi
python -c "from openpilot.selfdrive.test.helpers import set_params_enabled; set_params_enabled()" python3 -c "from openpilot.selfdrive.test.helpers import set_params_enabled; set_params_enabled()"
SCRIPT_DIR=$(dirname "$0") SCRIPT_DIR=$(dirname "$0")
OPENPILOT_DIR=$SCRIPT_DIR/../../ OPENPILOT_DIR=$SCRIPT_DIR/../../