Skip to content

Commit 6148e58

Browse files
TomAugspurgerjreback
authored andcommitted
BUG: Fix marker for high memory (pandas-dev#18526)
1 parent 7463f86 commit 6148e58

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

ci/run_circle.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ export PATH="$MINICONDA_DIR/bin:$PATH"
55

66
source activate pandas
77

8-
echo "pytest --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas"
9-
pytest --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas
8+
echo "pytest --strict --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas"
9+
pytest --strict --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas

ci/script_multi.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ elif [ "$DOC" ]; then
3838
echo "We are not running pytest as this is a doc-build"
3939

4040
elif [ "$COVERAGE" ]; then
41-
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
42-
pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
41+
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas
42+
pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas
4343

4444
elif [ "$SLOW" ]; then
4545
TEST_ARGS="--only-slow --skip-network"
46-
echo pytest -r xX -m "not single and slow" -v --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
47-
pytest -r xX -m "not single and slow" -v --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
46+
echo pytest -r xX -m "not single and slow" -v --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas
47+
pytest -r xX -m "not single and slow" -v --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas
4848

4949
else
50-
echo pytest -n 2 -r xX -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
51-
pytest -n 2 -r xX -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas # TODO: doctest
50+
echo pytest -n 2 -r xX -m "not single" --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas
51+
pytest -n 2 -r xX -m "not single" --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas # TODO: doctest
5252

5353
fi
5454

ci/script_single.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ elif [ "$DOC" ]; then
2323
echo "We are not running pytest as this is a doc-build"
2424

2525
elif [ "$COVERAGE" ]; then
26-
echo pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
27-
pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
26+
echo pytest -s -m "single" --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
27+
pytest -s -m "single" --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
2828

2929
else
30-
echo pytest -m "single" -r xX --junitxml=/tmp/single.xml $TEST_ARGS pandas
31-
pytest -m "single" -r xX --junitxml=/tmp/single.xml $TEST_ARGS pandas # TODO: doctest
30+
echo pytest -m "single" -r xX --junitxml=/tmp/single.xml --strict $TEST_ARGS pandas
31+
pytest -m "single" -r xX --junitxml=/tmp/single.xml --strict $TEST_ARGS pandas # TODO: doctest
3232

3333
fi
3434

pandas/tests/io/test_pytables.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -4269,9 +4269,10 @@ def test_select_as_multiple(self):
42694269
['df1', 'df3'], where=['A>0', 'B>0'],
42704270
selector='df1')
42714271

4272-
@pytest.mark.skipf(
4272+
@pytest.mark.skipif(
42734273
LooseVersion(tables.__version__) < '3.1.0',
4274-
"tables version does not support fix for nan selection bug: GH 4858")
4274+
reason=("tables version does not support fix for nan selection "
4275+
"bug: GH 4858"))
42754276
def test_nan_selection_bug_4858(self):
42764277

42774278
with ensure_clean_store(self.path) as store:

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ markers =
2727
single: mark a test as single cpu only
2828
slow: mark a test as slow
2929
network: mark a test as network
30-
highmemory: mark a test as a high-memory only
30+
high_memory: mark a test as a high-memory only

test.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
:: test on windows
22

3-
pytest --skip-slow --skip-network pandas -n 2 %*
3+
pytest --strict --skip-slow --skip-network pandas -n 2 %*

0 commit comments

Comments
 (0)