Skip to content

Commit 82f3618

Browse files
mroeschkemroeschke
committed
Undo all changes and update test
1 parent 28b7f93 commit 82f3618

File tree

3 files changed

+2199
-100
lines changed

3 files changed

+2199
-100
lines changed

‎.github/workflows/unit-tests.yml

Lines changed: 62 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -27,65 +27,65 @@ jobs:
2727
strategy:
2828
matrix:
2929
platform: [ubuntu-22.04, ubuntu-24.04-arm]
30-
env_file: [actions-313.yaml]
30+
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml, actions-313.yaml]
3131
# Prevent the include jobs from overriding other jobs
3232
pattern: [""]
3333
pandas_future_infer_string: ["0"]
34-
# include:
35-
# - name: "Downstream Compat"
36-
# env_file: actions-311-downstream_compat.yaml
37-
# pattern: "not slow and not network and not single_cpu"
38-
# pytest_target: "pandas/tests/test_downstream.py"
39-
# platform: ubuntu-22.04
40-
# - name: "Minimum Versions"
41-
# env_file: actions-310-minimum_versions.yaml
42-
# pattern: "not slow and not network and not single_cpu"
43-
# platform: ubuntu-22.04
44-
# - name: "Locale: it_IT"
45-
# env_file: actions-311.yaml
46-
# pattern: "not slow and not network and not single_cpu"
47-
# extra_apt: "language-pack-it"
48-
# # Use the utf8 version as the default, it has no bad side-effect.
49-
# lang: "it_IT.utf8"
50-
# lc_all: "it_IT.utf8"
51-
# # Also install it_IT (its encoding is ISO8859-1) but do not activate it.
52-
# # It will be temporarily activated during tests with locale.setlocale
53-
# extra_loc: "it_IT"
54-
# platform: ubuntu-22.04
55-
# - name: "Locale: zh_CN"
56-
# env_file: actions-311.yaml
57-
# pattern: "not slow and not network and not single_cpu"
58-
# extra_apt: "language-pack-zh-hans"
59-
# # Use the utf8 version as the default, it has no bad side-effect.
60-
# lang: "zh_CN.utf8"
61-
# lc_all: "zh_CN.utf8"
62-
# # Also install zh_CN (its encoding is gb2312) but do not activate it.
63-
# # It will be temporarily activated during tests with locale.setlocale
64-
# extra_loc: "zh_CN"
65-
# platform: ubuntu-22.04
66-
# - name: "Future infer strings"
67-
# env_file: actions-312.yaml
68-
# pandas_future_infer_string: "1"
69-
# platform: ubuntu-22.04
70-
# - name: "Future infer strings (without pyarrow)"
71-
# env_file: actions-311.yaml
72-
# pandas_future_infer_string: "1"
73-
# platform: ubuntu-22.04
74-
# - name: "Pypy"
75-
# env_file: actions-pypy-39.yaml
76-
# pattern: "not slow and not network and not single_cpu"
77-
# test_args: "--max-worker-restart 0"
78-
# platform: ubuntu-22.04
79-
# - name: "Numpy Dev"
80-
# env_file: actions-311-numpydev.yaml
81-
# pattern: "not slow and not network and not single_cpu"
82-
# test_args: "-W error::DeprecationWarning -W error::FutureWarning"
83-
# platform: ubuntu-22.04
84-
# - name: "Pyarrow Nightly"
85-
# env_file: actions-311-pyarrownightly.yaml
86-
# pattern: "not slow and not network and not single_cpu"
87-
# pandas_future_infer_string: "1"
88-
# platform: ubuntu-22.04
34+
include:
35+
- name: "Downstream Compat"
36+
env_file: actions-311-downstream_compat.yaml
37+
pattern: "not slow and not network and not single_cpu"
38+
pytest_target: "pandas/tests/test_downstream.py"
39+
platform: ubuntu-22.04
40+
- name: "Minimum Versions"
41+
env_file: actions-310-minimum_versions.yaml
42+
pattern: "not slow and not network and not single_cpu"
43+
platform: ubuntu-22.04
44+
- name: "Locale: it_IT"
45+
env_file: actions-311.yaml
46+
pattern: "not slow and not network and not single_cpu"
47+
extra_apt: "language-pack-it"
48+
# Use the utf8 version as the default, it has no bad side-effect.
49+
lang: "it_IT.utf8"
50+
lc_all: "it_IT.utf8"
51+
# Also install it_IT (its encoding is ISO8859-1) but do not activate it.
52+
# It will be temporarily activated during tests with locale.setlocale
53+
extra_loc: "it_IT"
54+
platform: ubuntu-22.04
55+
- name: "Locale: zh_CN"
56+
env_file: actions-311.yaml
57+
pattern: "not slow and not network and not single_cpu"
58+
extra_apt: "language-pack-zh-hans"
59+
# Use the utf8 version as the default, it has no bad side-effect.
60+
lang: "zh_CN.utf8"
61+
lc_all: "zh_CN.utf8"
62+
# Also install zh_CN (its encoding is gb2312) but do not activate it.
63+
# It will be temporarily activated during tests with locale.setlocale
64+
extra_loc: "zh_CN"
65+
platform: ubuntu-22.04
66+
- name: "Future infer strings"
67+
env_file: actions-312.yaml
68+
pandas_future_infer_string: "1"
69+
platform: ubuntu-22.04
70+
- name: "Future infer strings (without pyarrow)"
71+
env_file: actions-311.yaml
72+
pandas_future_infer_string: "1"
73+
platform: ubuntu-22.04
74+
- name: "Pypy"
75+
env_file: actions-pypy-39.yaml
76+
pattern: "not slow and not network and not single_cpu"
77+
test_args: "--max-worker-restart 0"
78+
platform: ubuntu-22.04
79+
- name: "Numpy Dev"
80+
env_file: actions-311-numpydev.yaml
81+
pattern: "not slow and not network and not single_cpu"
82+
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
83+
platform: ubuntu-22.04
84+
- name: "Pyarrow Nightly"
85+
env_file: actions-311-pyarrownightly.yaml
86+
pattern: "not slow and not network and not single_cpu"
87+
pandas_future_infer_string: "1"
88+
platform: ubuntu-22.04
8989
fail-fast: false
9090
name: ${{ matrix.name || format('{0} {1}', matrix.platform, matrix.env_file) }}
9191
env:
@@ -168,12 +168,12 @@ jobs:
168168
# TODO: Re-enable once Pypy has Pypy 3.10 on conda-forge
169169
if: ${{ matrix.name != 'Pypy' }}
170170

171-
# - name: Test (not single_cpu)
172-
# uses: ./.github/actions/run-tests
173-
# if: ${{ matrix.name != 'Pypy' }}
174-
# env:
175-
# # Set pattern to not single_cpu if not already set
176-
# PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }}
171+
- name: Test (not single_cpu)
172+
uses: ./.github/actions/run-tests
173+
if: ${{ matrix.name != 'Pypy' }}
174+
env:
175+
# Set pattern to not single_cpu if not already set
176+
PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }}
177177

178178
- name: Test (single_cpu)
179179
uses: ./.github/actions/run-tests
@@ -184,7 +184,6 @@ jobs:
184184

185185
macos-windows:
186186
timeout-minutes: 90
187-
if: false
188187
strategy:
189188
matrix:
190189
# Note: Don't use macOS latest since macos 14 appears to be arm64 only
@@ -222,7 +221,6 @@ jobs:
222221

223222
Linux-32-bit:
224223
runs-on: ubuntu-22.04
225-
if: false
226224
container:
227225
image: quay.io/pypa/manylinux2014_i686
228226
options: --platform linux/386
@@ -259,7 +257,6 @@ jobs:
259257

260258
Linux-Musl:
261259
runs-on: ubuntu-22.04
262-
if: false
263260
container:
264261
image: quay.io/pypa/musllinux_1_2_x86_64
265262
steps:
@@ -366,7 +363,6 @@ jobs:
366363
uses: ./.github/actions/run-tests
367364

368365
python-freethreading:
369-
if: false
370366
defaults:
371367
run:
372368
shell: bash -eou pipefail {0}
@@ -410,7 +406,6 @@ jobs:
410406

411407
# NOTE: this job must be kept in sync with the Pyodide build job in wheels.yml
412408
emscripten:
413-
if: false
414409
# Note: the Python version, Emscripten toolchain version are determined
415410
# by the Pyodide version. The appropriate versions can be found in the
416411
# Pyodide repodata.json "info" field, or in the Makefile.envs file:

‎ci/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export PYTHONHASHSEED
88

99
COVERAGE="-s --cov=pandas --cov-report=xml --cov-append --cov-config=pyproject.toml"
1010

11-
PYTEST_CMD="MESONPY_EDITABLE_VERBOSE=1 PYTHONDEVMODE=1 PYTHONWARNDEFAULTENCODING=1 pytest -vv -rfE -n $PYTEST_WORKERS --dist=worksteal $TEST_ARGS $COVERAGE $PYTEST_TARGET"
11+
PYTEST_CMD="MESONPY_EDITABLE_VERBOSE=1 PYTHONDEVMODE=1 PYTHONWARNDEFAULTENCODING=1 pytest -r fE -n $PYTEST_WORKERS --dist=worksteal $TEST_ARGS $COVERAGE $PYTEST_TARGET"
1212

1313
if [[ "$PATTERN" ]]; then
1414
PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\""

0 commit comments

Comments
 (0)