Skip to content

Commit 598bd3c

Browse files
Backport PR #38478: CI: Use --strict-markers for pytest 6.0.2 (#38497)
Co-authored-by: Matthew Roeschke <[email protected]>
1 parent 1278638 commit 598bd3c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Testing docstring validation script
6565
run: |
6666
source activate pandas-dev
67-
pytest --capture=no --strict scripts
67+
pytest --capture=no --strict-markers scripts
6868
if: always()
6969

7070
- name: Running benchmarks

ci/run_tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
2020
XVFB="xvfb-run "
2121
fi
2222

23-
PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict --durations=30 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas"
23+
PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas"
2424

2525
if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then
2626
# GH#37455 windows py38 build appears to be running out of memory

test_fast.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
:: test on windows
22
set PYTHONHASHSEED=314159265
3-
pytest --skip-slow --skip-network --skip-db -m "not single" -n 4 -r sXX --strict pandas
3+
pytest --skip-slow --skip-network --skip-db -m "not single" -n 4 -r sXX --strict-markers pandas

test_fast.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# https://github.com/pytest-dev/pytest/issues/1075
66
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
77

8-
pytest pandas --skip-slow --skip-network --skip-db -m "not single" -n 4 -r sxX --strict "$@"
8+
pytest pandas --skip-slow --skip-network --skip-db -m "not single" -n 4 -r sxX --strict-markers "$@"

0 commit comments

Comments
 (0)