Skip to content

Commit 23252d0

Browse files
lithomas1lithomas1
committed
Revert "debug ci"
This reverts commit 2a1226b.
1 parent 2a1226b commit 23252d0

File tree

3 files changed

+64
-66
lines changed

3 files changed

+64
-66
lines changed

‎.github/workflows/unit-tests.yml‎

Lines changed: 63 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -26,77 +26,76 @@ jobs:
2626
timeout-minutes: 180
2727
strategy:
2828
matrix:
29-
env_file: []#[actions-39.yaml, actions-310.yaml, actions-311.yaml, actions-312.yaml]
29+
env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml, actions-312.yaml]
3030
# Prevent the include jobs from overriding other jobs
3131
pattern: [""]
3232
include:
33-
# - name: "Downstream Compat"
34-
# env_file: actions-311-downstream_compat.yaml
35-
# pattern: "not slow and not network and not single_cpu"
36-
# pytest_target: "pandas/tests/test_downstream.py"
33+
- name: "Downstream Compat"
34+
env_file: actions-311-downstream_compat.yaml
35+
pattern: "not slow and not network and not single_cpu"
36+
pytest_target: "pandas/tests/test_downstream.py"
3737
- name: "Minimum Versions"
3838
env_file: actions-39-minimum_versions.yaml
3939
pattern: "not slow and not network and not single_cpu"
40-
pytest_target: "pandas/tests/dtypes/test_common.py"
4140
- name: "Locale: it_IT"
42-
# env_file: actions-311.yaml
43-
# pattern: "not slow and not network and not single_cpu"
44-
# extra_apt: "language-pack-it"
45-
# # Use the utf8 version as the default, it has no bad side-effect.
46-
# lang: "it_IT.utf8"
47-
# lc_all: "it_IT.utf8"
48-
# # Also install it_IT (its encoding is ISO8859-1) but do not activate it.
49-
# # It will be temporarily activated during tests with locale.setlocale
50-
# extra_loc: "it_IT"
51-
# - name: "Locale: zh_CN"
52-
# env_file: actions-311.yaml
53-
# pattern: "not slow and not network and not single_cpu"
54-
# extra_apt: "language-pack-zh-hans"
55-
# # Use the utf8 version as the default, it has no bad side-effect.
56-
# lang: "zh_CN.utf8"
57-
# lc_all: "zh_CN.utf8"
58-
# # Also install zh_CN (its encoding is gb2312) but do not activate it.
59-
# # It will be temporarily activated during tests with locale.setlocale
60-
# extra_loc: "zh_CN"
61-
# - name: "Copy-on-Write 3.9"
62-
# env_file: actions-39.yaml
63-
# pattern: "not slow and not network and not single_cpu"
64-
# pandas_copy_on_write: "1"
65-
# - name: "Copy-on-Write 3.10"
66-
# env_file: actions-310.yaml
67-
# pattern: "not slow and not network and not single_cpu"
68-
# pandas_copy_on_write: "1"
69-
# - name: "Copy-on-Write 3.11"
70-
# env_file: actions-311.yaml
71-
# pattern: "not slow and not network and not single_cpu"
72-
# pandas_copy_on_write: "1"
73-
# - name: "Copy-on-Write 3.12"
74-
# env_file: actions-312.yaml
75-
# pattern: "not slow and not network and not single_cpu"
76-
# pandas_copy_on_write: "1"
77-
# - name: "Copy-on-Write 3.11 (warnings)"
78-
# env_file: actions-311.yaml
79-
# pattern: "not slow and not network and not single_cpu"
80-
# pandas_copy_on_write: "warn"
81-
# - name: "Copy-on-Write 3.10 (warnings)"
82-
# env_file: actions-310.yaml
83-
# pattern: "not slow and not network and not single_cpu"
84-
# pandas_copy_on_write: "warn"
85-
# - name: "Copy-on-Write 3.9 (warnings)"
86-
# env_file: actions-39.yaml
87-
# pattern: "not slow and not network and not single_cpu"
88-
# pandas_copy_on_write: "warn"
89-
# - name: "Pypy"
90-
# env_file: actions-pypy-39.yaml
91-
# pattern: "not slow and not network and not single_cpu"
92-
# test_args: "--max-worker-restart 0"
93-
# - name: "Numpy Dev"
94-
# env_file: actions-311-numpydev.yaml
95-
# pattern: "not slow and not network and not single_cpu"
96-
# test_args: "-W error::DeprecationWarning -W error::FutureWarning"
97-
# - name: "Pyarrow Nightly"
98-
# env_file: actions-311-pyarrownightly.yaml
99-
# pattern: "not slow and not network and not single_cpu"
41+
env_file: actions-311.yaml
42+
pattern: "not slow and not network and not single_cpu"
43+
extra_apt: "language-pack-it"
44+
# Use the utf8 version as the default, it has no bad side-effect.
45+
lang: "it_IT.utf8"
46+
lc_all: "it_IT.utf8"
47+
# Also install it_IT (its encoding is ISO8859-1) but do not activate it.
48+
# It will be temporarily activated during tests with locale.setlocale
49+
extra_loc: "it_IT"
50+
- name: "Locale: zh_CN"
51+
env_file: actions-311.yaml
52+
pattern: "not slow and not network and not single_cpu"
53+
extra_apt: "language-pack-zh-hans"
54+
# Use the utf8 version as the default, it has no bad side-effect.
55+
lang: "zh_CN.utf8"
56+
lc_all: "zh_CN.utf8"
57+
# Also install zh_CN (its encoding is gb2312) but do not activate it.
58+
# It will be temporarily activated during tests with locale.setlocale
59+
extra_loc: "zh_CN"
60+
- name: "Copy-on-Write 3.9"
61+
env_file: actions-39.yaml
62+
pattern: "not slow and not network and not single_cpu"
63+
pandas_copy_on_write: "1"
64+
- name: "Copy-on-Write 3.10"
65+
env_file: actions-310.yaml
66+
pattern: "not slow and not network and not single_cpu"
67+
pandas_copy_on_write: "1"
68+
- name: "Copy-on-Write 3.11"
69+
env_file: actions-311.yaml
70+
pattern: "not slow and not network and not single_cpu"
71+
pandas_copy_on_write: "1"
72+
- name: "Copy-on-Write 3.12"
73+
env_file: actions-312.yaml
74+
pattern: "not slow and not network and not single_cpu"
75+
pandas_copy_on_write: "1"
76+
- name: "Copy-on-Write 3.11 (warnings)"
77+
env_file: actions-311.yaml
78+
pattern: "not slow and not network and not single_cpu"
79+
pandas_copy_on_write: "warn"
80+
- name: "Copy-on-Write 3.10 (warnings)"
81+
env_file: actions-310.yaml
82+
pattern: "not slow and not network and not single_cpu"
83+
pandas_copy_on_write: "warn"
84+
- name: "Copy-on-Write 3.9 (warnings)"
85+
env_file: actions-39.yaml
86+
pattern: "not slow and not network and not single_cpu"
87+
pandas_copy_on_write: "warn"
88+
- name: "Pypy"
89+
env_file: actions-pypy-39.yaml
90+
pattern: "not slow and not network and not single_cpu"
91+
test_args: "--max-worker-restart 0"
92+
- name: "Numpy Dev"
93+
env_file: actions-311-numpydev.yaml
94+
pattern: "not slow and not network and not single_cpu"
95+
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
96+
- name: "Pyarrow Nightly"
97+
env_file: actions-311-pyarrownightly.yaml
98+
pattern: "not slow and not network and not single_cpu"
10099
fail-fast: false
101100
name: ${{ matrix.name || format('ubuntu-latest {0}', matrix.env_file) }}
102101
env:

‎ci/run_tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ echo PYTHONHASHSEED=$PYTHONHASHSEED
1111
COVERAGE="-s --cov=pandas --cov-report=xml --cov-append --cov-config=pyproject.toml"
1212

1313
# TODO: Support NEP 50 and remove NPY_PROMOTION_STATE
14-
PYTEST_CMD="NPY_PROMOTION_STATE=legacy MESONPY_EDITABLE_VERBOSE=1 PYTHONDEVMODE=1 PYTHONWARNDEFAULTENCODING=1 pytest -v -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"
14+
PYTEST_CMD="NPY_PROMOTION_STATE=legacy MESONPY_EDITABLE_VERBOSE=1 PYTHONDEVMODE=1 PYTHONWARNDEFAULTENCODING=1 pytest -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"
1515

1616
if [[ "$PATTERN" ]]; then
1717
PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\""

‎pandas/core/dtypes/common.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,6 @@ def _is_dtype(arr_or_dtype, condition) -> bool:
13841384
dtype = _get_dtype(arr_or_dtype)
13851385
except (TypeError, ValueError):
13861386
return False
1387-
print(dtype)
13881387
return condition(dtype)
13891388

13901389

0 commit comments

Comments
 (0)