Skip to content

Commit bcb7a71

Browse files
mroeschkemeeseeksmachine
authored andcommitted
Backport PR pandas-dev#52638: CI: Skip testing step in Pypy job
1 parent bbcc0ec commit bcb7a71

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

.github/workflows/ubuntu.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ jobs:
8686
TEST_ARGS: ${{ matrix.test_args || '' }}
8787
PYTEST_WORKERS: 'auto'
8888
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
89-
IS_PYPY: ${{ contains(matrix.env_file, 'pypy') }}
90-
# TODO: re-enable coverage on pypy, its slow
91-
COVERAGE: ${{ !contains(matrix.env_file, 'pypy') }}
9289
concurrency:
9390
# https://github.community/t/concurrecy-not-work-for-push/183068/7
9491
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}
@@ -157,16 +154,13 @@ jobs:
157154

158155
- name: Test (not single_cpu)
159156
uses: ./.github/actions/run-tests
160-
# TODO: Don't continue on error for PyPy
161-
continue-on-error: ${{ env.IS_PYPY == 'true' }}
157+
if: ${{ matrix.name != 'Pypy' }}
162158
env:
163159
# Set pattern to not single_cpu if not already set
164160
PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }}
165161

166162
- name: Test (single_cpu)
167163
uses: ./.github/actions/run-tests
168-
# TODO: Don't continue on error for PyPy
169-
continue-on-error: ${{ env.IS_PYPY == 'true' }}
170164
env:
171165
PATTERN: 'single_cpu'
172166
PYTEST_WORKERS: 1

ci/run_tests.sh

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ if [[ "not network" == *"$PATTERN"* ]]; then
1212
export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4;
1313
fi
1414

15-
if [[ "$COVERAGE" == "true" ]]; then
16-
COVERAGE="-s --cov=pandas --cov-report=xml --cov-append"
17-
else
18-
COVERAGE="" # We need to reset this for COVERAGE="false" case
19-
fi
15+
COVERAGE="-s --cov=pandas --cov-report=xml --cov-append"
2016

2117
# If no X server is found, we use xvfb to emulate it
2218
if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then

0 commit comments

Comments
 (0)