File tree Expand file tree Collapse file tree 2 files changed +9
-8
lines changed Expand file tree Collapse file tree 2 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -202,10 +202,7 @@ jobs:
202202 if : ${{ !cancelled() && runner.os == 'Windows' }}
203203 run : python -m pip install --upgrade pip
204204 - name : Install dependencies for python ${{ matrix.python-version }} on ${{ matrix.os }}
205- run : |
206- pip install --upgrade "pip>=24.3.1" "setuptools>=45.0" "wheel>=0.37" ;
207- pip install -r ./requirements.txt ;
208- pip install -r ./test-requirements.txt || true ;
205+ run : make -f Makefile test-reqs ;
209206 - name : Pre-Clean
210207 id : clean
211208 run : make -j1 -f Makefile clean || true ;
@@ -241,10 +238,10 @@ jobs:
241238 run : |
242239 ./cc-test-reporter after-build --exit-code 0 || true ;
243240 - name : deepsource for ${{ matrix.python-version }}
244- if : ${{ runner.os }} == "Linux"
241+ if : ${{ !cancelled() && runner.os != 'Windows' }}
245242 shell : bash
246243 run : |
247- if [ "$OS" == "ubuntu-latest" ] ; then ./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml 2>/dev/null || true ; else echo "SKIP deepsource" ; fi ;
244+ ./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml 2>/dev/null || true ;
248245 - name : Post-Clean
249246 id : post
250247 run : make -j1 -f Makefile clean || true ;
Original file line number Diff line number Diff line change 7777
7878# Python command configuration
7979ifeq "$(PYTHON ) " ""
80- # Try to find python3, fallback to python
81- PY_CMD=$(shell $(COMMAND) python3)
80+ ifneq "$(PYTHON_VERSION)" ""
81+ PY_CMD=$(shell $(COMMAND) python$(PYTHON_VERSION))
82+ else
83+ # Try to find python3, fallback to python
84+ PY_CMD=$(shell $(COMMAND) python3)
85+ endif
8286 ifneq "$(PY_CMD)" ""
8387 # Only use -B arg with python3
8488 PY_ARGS=-B
You can’t perform that action at this time.
0 commit comments