From 8488793242bd206fd32fe921e76ab196bc5e0335 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sat, 27 Nov 2021 18:27:40 -0800 Subject: [PATCH 1/5] CI/TST: Add network tests to CI --- .github/workflows/posix.yml | 4 ++-- ci/azure/posix.yml | 4 ++-- ci/azure/windows.yml | 8 ++++---- ci/run_tests.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index f37f31686ef69..23ec6df975b95 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -27,12 +27,12 @@ jobs: settings: [ [actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], [actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""], - [actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], + [actions-38.yaml, "not slow and not clipboard", "", "", "", "", ""], [actions-38-slow.yaml, "slow", "", "", "", "", ""], [actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""], [actions-39-slow.yaml, "slow", "", "", "", "", ""], [actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], - [actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""] + [actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""] ] fail-fast: false env: diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index eaac17d50c315..36721037e55eb 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -12,12 +12,12 @@ jobs: py38_macos_1: ENV_FILE: ci/deps/azure-macos-38.yaml CONDA_PY: "38" - PATTERN: "not slow and not network" + PATTERN: "not slow" PYTEST_TARGET: "pandas/tests/[a-h]*" py38_macos_2: ENV_FILE: ci/deps/azure-macos-38.yaml CONDA_PY: "38" - PATTERN: "not slow and not network" + PATTERN: "not slow" PYTEST_TARGET: "pandas/tests/[i-z]*" steps: diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 3bd20b1399be2..7f3efb5a4dbf3 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -11,28 +11,28 @@ jobs: py38_np18_1: ENV_FILE: ci/deps/azure-windows-38.yaml CONDA_PY: "38" - PATTERN: "not slow and not network" + PATTERN: "not slow" PYTEST_WORKERS: 2 # GH-42236 PYTEST_TARGET: "pandas/tests/[a-h]*" py38_np18_2: ENV_FILE: ci/deps/azure-windows-38.yaml CONDA_PY: "38" - PATTERN: "not slow and not network" + PATTERN: "not slow" PYTEST_WORKERS: 2 # GH-42236 PYTEST_TARGET: "pandas/tests/[i-z]*" py39_1: ENV_FILE: ci/deps/azure-windows-39.yaml CONDA_PY: "39" - PATTERN: "not slow and not network and not high_memory" + PATTERN: "not slow and not high_memory" PYTEST_WORKERS: 2 # GH-42236 PYTEST_TARGET: "pandas/tests/[a-h]*" py39_2: ENV_FILE: ci/deps/azure-windows-39.yaml CONDA_PY: "39" - PATTERN: "not slow and not network and not high_memory" + PATTERN: "not slow and not high_memory" PYTEST_WORKERS: 2 # GH-42236 PYTEST_TARGET: "pandas/tests/[i-z]*" diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 9fea696b6ea81..6a728fdece6f8 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -19,7 +19,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then PYTEST_CMD="$PYTEST_CMD --ignore=pandas/tests/plotting/" From e0a1a6bdaeb3f7f3a2770e0219829a5c985d9b2d Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sat, 27 Nov 2021 20:51:54 -0800 Subject: [PATCH 2/5] Remove -v, rests are running --- ci/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 6a728fdece6f8..9fea696b6ea81 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -19,7 +19,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then PYTEST_CMD="$PYTEST_CMD --ignore=pandas/tests/plotting/" From 649b69f5a7752725f27cf9409eb8c0427b850d09 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 28 Nov 2021 10:00:38 -0800 Subject: [PATCH 3/5] Run network on slow and a db build --- .github/workflows/database.yml | 2 +- .github/workflows/posix.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 6da47c86026ed..30c0ee8200189 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -15,7 +15,7 @@ on: env: PYTEST_WORKERS: "auto" PANDAS_CI: 1 - PATTERN: ((not slow and not network and not clipboard) or (single and db)) + PATTERN: ((not slow and not clipboard) or (single and db)) COVERAGE: true jobs: diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 23ec6df975b95..39b6412047729 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -28,7 +28,7 @@ jobs: [actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], [actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""], [actions-38.yaml, "not slow and not clipboard", "", "", "", "", ""], - [actions-38-slow.yaml, "slow", "", "", "", "", ""], + [actions-38-slow.yaml, "slow and network", "", "", "", "", ""], [actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""], [actions-39-slow.yaml, "slow", "", "", "", "", ""], [actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], From 0847054cb921ce3a5165e3c250a5f767c997b365 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 28 Nov 2021 10:32:05 -0800 Subject: [PATCH 4/5] Revert "Run network on slow and a db build" This reverts commit 649b69f5a7752725f27cf9409eb8c0427b850d09. --- .github/workflows/database.yml | 2 +- .github/workflows/posix.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 30c0ee8200189..6da47c86026ed 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -15,7 +15,7 @@ on: env: PYTEST_WORKERS: "auto" PANDAS_CI: 1 - PATTERN: ((not slow and not clipboard) or (single and db)) + PATTERN: ((not slow and not network and not clipboard) or (single and db)) COVERAGE: true jobs: diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 39b6412047729..23ec6df975b95 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -28,7 +28,7 @@ jobs: [actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], [actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""], [actions-38.yaml, "not slow and not clipboard", "", "", "", "", ""], - [actions-38-slow.yaml, "slow and network", "", "", "", "", ""], + [actions-38-slow.yaml, "slow", "", "", "", "", ""], [actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""], [actions-39-slow.yaml, "slow", "", "", "", "", ""], [actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], From e50a24bf84932c2e567bfd0a41486dd86aa01fa1 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 28 Nov 2021 18:48:54 -0800 Subject: [PATCH 5/5] Trigger CI