Skip to content

Commit 320a64b

Browse files
committed
Merge branch 'add-meson-build-files' of github.com:lithomas1/pandas into add-meson-build-files
2 parents a862508 + de5c42f commit 320a64b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/32-bit-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
export PANDAS_CI=1 && \
4646
python -m pip install --no-build-isolation -ve . && \
4747
python -m pip list && \
48-
pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml --import-mode="importlib"
48+
pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml --import-mode=importlib"
4949
5050
- name: Publish test results for Python 3.8-32 bit full Linux
5151
uses: actions/upload-artifact@v3

ci/run_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [[ "not network" == *"$PATTERN"* ]]; then
1313
fi
1414

1515
if [[ "$COVERAGE" == "true" ]]; then
16-
COVERAGE="-s --cov=pandas --cov-report=xml --cov-append"
16+
COVERAGE="-s --cov=pandas --cov-report=xml --cov-append --cov-config=setup.cfg"
1717
else
1818
COVERAGE="" # We need to reset this for COVERAGE="false" case
1919
fi
@@ -43,7 +43,7 @@ sh -c "$PYTEST_CMD"
4343
if [[ "$PANDAS_DATA_MANAGER" != "array" && "$PYTEST_TARGET" == "pandas" ]]; then
4444
# The ArrayManager tests should have already been run by PYTEST_CMD if PANDAS_DATA_MANAGER was already set to array
4545
# If we're targeting specific files, e.g. test_downstream.py, don't run.
46-
PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE pandas"
46+
PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -n $PYTEST_WORKERS --dist=loadfile --import-mode=importlib $TEST_ARGS $COVERAGE pandas"
4747

4848
if [[ "$PATTERN" ]]; then
4949
PYTEST_AM_CMD="$PYTEST_AM_CMD -m \"$PATTERN and arraymanager\""

0 commit comments

Comments
 (0)