Skip to content

Commit 93cb20b

Browse files
fabiobaltierikartben
authored andcommitted
ci: general pip cleanup
Cleanup all pip commands in the various workflow - drop the install/upgrade for setuptool pip and wheel, seems like this was introduced few years back to work around some old bug and it's not needed anymore - use pip instead of pip3, that's probably been equivalent for quite a long time in the CI image Signed-off-by: Fabio Baltieri <[email protected]>
1 parent 6eff676 commit 93cb20b

20 files changed

+32
-42
lines changed

.github/workflows/assigner.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ jobs:
2424
steps:
2525
- name: Install Python dependencies
2626
run: |
27-
sudo pip3 install -U setuptools wheel pip
28-
pip3 install -U PyGithub>=1.55 west
27+
pip install -U PyGithub>=1.55 west
2928
3029
- name: Check out source code
3130
uses: actions/checkout@v4

.github/workflows/backport_issue_check.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525

2626
- name: Install Python dependencies
2727
run: |
28-
sudo pip3 install -U setuptools wheel pip
29-
pip3 install -U pygithub
28+
pip install -U pygithub
3029
3130
- name: Run backport issue checker
3231
env:

.github/workflows/bsim-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
171171
- name: Merge Test Results
172172
run: |
173-
pip3 install junitparser junit2html
173+
pip install junitparser junit2html
174174
junitparser merge --glob "./bsim_*/*bsim_results.*.xml" "./twister-out/twister.xml" junit.xml
175175
junit2html junit.xml junit.html
176176

.github/workflows/bug_snapshot.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525

2626
- name: Install Python dependencies
2727
run: |
28-
sudo pip3 install -U setuptools wheel pip
29-
pip3 install -U pygithub
28+
pip install -U pygithub
3029
3130
- name: Snapshot bugs
3231
env:

.github/workflows/clang.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
path: artifacts
145145
- name: Merge Test Results
146146
run: |
147-
pip3 install junitparser junit2html
147+
pip install junitparser junit2html
148148
junitparser merge artifacts/*/twister.xml junit.xml
149149
junit2html junit.xml junit-clang.html
150150

.github/workflows/codecov.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
export ZEPHYR_BASE=${PWD}
102102
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
103103
mkdir -p coverage/reports
104-
pip3 install gcovr==6.0
104+
pip install gcovr==6.0
105105
./scripts/twister -E ${{matrix.normalized}}-testplan.json
106106
ls -la
107107
./scripts/twister \
@@ -182,7 +182,7 @@ jobs:
182182
- name: Merge coverage files
183183
run: |
184184
pushd ./coverage/reports
185-
pip3 install gcovr==6.0
185+
pip install gcovr==6.0
186186
gcovr ${{ steps.get-coverage-files.outputs.mergefiles }} --merge-mode-functions=separate --json merged.json
187187
gcovr ${{ steps.get-coverage-files.outputs.mergefiles }} --merge-mode-functions=separate --cobertura merged.xml
188188
popd

.github/workflows/coding_guidelines.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ jobs:
2121

2222
- name: Install python dependencies
2323
run: |
24-
pip3 install unidiff
25-
pip3 install wheel
26-
pip3 install sh
24+
pip install unidiff
25+
pip install sh
2726
2827
- name: Install Packages
2928
run: |

.github/workflows/compliance.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ jobs:
5353

5454
- name: Install python dependencies
5555
run: |
56-
pip3 install setuptools
57-
pip3 install wheel
58-
pip3 install -r scripts/requirements-compliance.txt
59-
pip3 install west
56+
pip install -r scripts/requirements-compliance.txt
57+
pip install west
6058
6159
- name: west setup
6260
run: |

.github/workflows/daily_test_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: install-pip
2727
run: |
28-
pip3 install gitpython
28+
pip install gitpython
2929
3030
- name: checkout
3131
uses: actions/checkout@v4

.github/workflows/devicetree_checks.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ jobs:
6262
${{ runner.os }}-pip-${{ matrix.python-version }}
6363
- name: install python dependencies
6464
run: |
65-
pip3 install wheel
66-
pip3 install pytest pyyaml tox
65+
pip install pytest pyyaml tox
6766
- name: run tox
6867
working-directory: scripts/dts/python-devicetree
6968
run: |

0 commit comments

Comments
 (0)