Skip to content

Commit f960825

Browse files
authored
CI: Skip testing step in Pypy job (#52638)
* CI: Remove Pypy build * Build but don't test pypy * Single quotes * Remove redundant if
1 parent eb58298 commit f960825

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
@@ -87,9 +87,6 @@ jobs:
8787
TEST_ARGS: ${{ matrix.test_args || '' }}
8888
PYTEST_WORKERS: 'auto'
8989
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
90-
IS_PYPY: ${{ contains(matrix.env_file, 'pypy') }}
91-
# TODO: re-enable coverage on pypy, its slow
92-
COVERAGE: ${{ !contains(matrix.env_file, 'pypy') }}
9390
concurrency:
9491
# https://github.community/t/concurrecy-not-work-for-push/183068/7
9592
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}
@@ -158,16 +155,13 @@ jobs:
158155

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

167163
- name: Test (single_cpu)
168164
uses: ./.github/actions/run-tests
169-
# TODO: Don't continue on error for PyPy
170-
continue-on-error: ${{ env.IS_PYPY == 'true' }}
171165
env:
172166
PATTERN: 'single_cpu'
173167
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)