Skip to content

Commit b241701

Browse files
Backport PR pandas-dev#45627: CLN: Use pytest -r to show skipped tests instead of print_skipped.py (pandas-dev#45645)
Co-authored-by: Matthew Roeschke <[email protected]>
1 parent 76c0a1d commit b241701

File tree

9 files changed

+3
-67
lines changed

9 files changed

+3
-67
lines changed

.github/workflows/assign.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ on:
44
types: created
55

66
jobs:
7-
one:
7+
issue_assign:
88
runs-on: ubuntu-latest
99
steps:
1010
- if: github.event.comment.body == 'take'
11-
name:
1211
run: |
1312
echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"
1413
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"assignees": ["${{ github.event.comment.user.login }}"]}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/assignees

.github/workflows/datamanger.yml

-3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,3 @@ jobs:
4949
run: |
5050
source activate pandas-dev
5151
ci/run_tests.sh
52-
53-
- name: Print skipped tests
54-
run: python ci/print_skipped.py

.github/workflows/docbuild-and-upload.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,7 @@ jobs:
4040
- name: Build documentation
4141
run: |
4242
source activate pandas-dev
43-
doc/make.py --warnings-are-errors | tee sphinx.log ; exit ${PIPESTATUS[0]}
44-
45-
# This can be removed when the ipython directive fails when there are errors,
46-
# including the `tee sphinx.log` in te previous step (https://github.com/ipython/ipython/issues/11547)
47-
- name: Check ipython directive errors
48-
run: "! grep -B10 \"^<<<-------------------------------------------------------------------------$\" sphinx.log"
43+
doc/make.py --warnings-are-errors
4944
5045
- name: Install ssh key
5146
run: |

.github/workflows/posix.yml

-3
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ jobs:
150150
path: test-data.xml
151151
if: failure()
152152

153-
- name: Print skipped tests
154-
run: python ci/print_skipped.py
155-
156153
- name: Upload coverage to Codecov
157154
uses: codecov/codecov-action@v2
158155
with:

.github/workflows/python-dev.yml

-4
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ jobs:
8585
path: test-data.xml
8686
if: failure()
8787

88-
- name: Print skipped tests
89-
run: |
90-
python ci/print_skipped.py
91-
9288
- name: Report Coverage
9389
run: |
9490
coverage report -m

ci/azure/posix.yml

-5
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,3 @@ jobs:
6161
testResultsFiles: 'test-data.xml'
6262
testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
6363
displayName: 'Publish test results'
64-
65-
- script: |
66-
source activate pandas-dev
67-
python ci/print_skipped.py
68-
displayName: 'Print skipped tests'

ci/azure/windows.yml

-5
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,3 @@ jobs:
7979
testResultsFiles: 'test-data.xml'
8080
testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
8181
displayName: 'Publish test results'
82-
83-
- bash: |
84-
source activate pandas-dev
85-
python ci/print_skipped.py
86-
displayName: 'Print skipped tests'

ci/print_skipped.py

-38
This file was deleted.

ci/run_tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
2424
XVFB="xvfb-run "
2525
fi
2626

27-
PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"
27+
PYTEST_CMD="${XVFB}pytest -r fEs -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"
2828

2929
if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then
3030
PYTEST_CMD="$PYTEST_CMD --ignore=pandas/tests/plotting/"

0 commit comments

Comments
 (0)