Skip to content

Commit

Permalink
Backport PR #52638 on branch 2.0.x (CI: Skip testing step in Pypy job) (
Browse files Browse the repository at this point in the history
#52671)

Backport PR #52638: CI: Skip testing step in Pypy job

Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
  • Loading branch information
meeseeksmachine and mroeschke committed Apr 14, 2023
1 parent bbcc0ec commit a8b5686
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ jobs:
TEST_ARGS: ${{ matrix.test_args || '' }}
PYTEST_WORKERS: 'auto'
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
IS_PYPY: ${{ contains(matrix.env_file, 'pypy') }}
# TODO: re-enable coverage on pypy, its slow
COVERAGE: ${{ !contains(matrix.env_file, 'pypy') }}
concurrency:
# https://github.community/t/concurrecy-not-work-for-push/183068/7
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}
Expand Down Expand Up @@ -157,16 +154,13 @@ jobs:

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

- name: Test (single_cpu)
uses: ./.github/actions/run-tests
# TODO: Don't continue on error for PyPy
continue-on-error: ${{ env.IS_PYPY == 'true' }}
env:
PATTERN: 'single_cpu'
PYTEST_WORKERS: 1
Expand Down
6 changes: 1 addition & 5 deletions ci/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ if [[ "not network" == *"$PATTERN"* ]]; then
export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4;
fi

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

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

0 comments on commit a8b5686

Please sign in to comment.