Skip to content

Commit 6aaecb5

Browse files
keep CI without pyarrow and with option disabled
1 parent ff442af commit 6aaecb5

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/unit-tests.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
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: [""]
33-
pandas_future_infer_string: ["0"]
33+
pandas_future_infer_string: ["1"]
3434
include:
3535
- name: "Downstream Compat"
3636
env_file: actions-311-downstream_compat.yaml
@@ -45,6 +45,10 @@ jobs:
4545
env_file: actions-313-freethreading.yaml
4646
pattern: "not slow and not network and not single_cpu"
4747
platform: ubuntu-24.04
48+
- name: "Without PyArrow"
49+
env_file: actions-312.yaml
50+
pattern: "not slow and not network and not single_cpu"
51+
platform: ubuntu-24.04
4852
- name: "Locale: it_IT"
4953
env_file: actions-311.yaml
5054
pattern: "not slow and not network and not single_cpu"
@@ -67,13 +71,9 @@ jobs:
6771
# It will be temporarily activated during tests with locale.setlocale
6872
extra_loc: "zh_CN"
6973
platform: ubuntu-24.04
70-
- name: "Future infer strings"
74+
- name: "Past no infer strings"
7175
env_file: actions-312.yaml
72-
pandas_future_infer_string: "1"
73-
platform: ubuntu-24.04
74-
- name: "Future infer strings (without pyarrow)"
75-
env_file: actions-311.yaml
76-
pandas_future_infer_string: "1"
76+
pandas_future_infer_string: "0"
7777
platform: ubuntu-24.04
7878
- name: "Pypy"
7979
env_file: actions-pypy-39.yaml
@@ -88,7 +88,6 @@ jobs:
8888
- name: "Pyarrow Nightly"
8989
env_file: actions-311-pyarrownightly.yaml
9090
pattern: "not slow and not network and not single_cpu"
91-
pandas_future_infer_string: "1"
9291
platform: ubuntu-24.04
9392
fail-fast: false
9493
name: ${{ matrix.name || format('{0} {1}', matrix.platform, matrix.env_file) }}
@@ -103,7 +102,7 @@ jobs:
103102
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
104103
# Clipboard tests
105104
QT_QPA_PLATFORM: offscreen
106-
REMOVE_PYARROW: ${{ matrix.name == 'Future infer strings (without pyarrow)' && '1' || '0' }}
105+
REMOVE_PYARROW: ${{ matrix.name == 'Without PyArrow' && '1' || '0' }}
107106
concurrency:
108107
# https://github.community/t/concurrecy-not-work-for-push/183068/7
109108
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_future_infer_string }}-${{ matrix.platform }}

pandas/core/config_init.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ def register_converter_cb(key: str) -> None:
880880
with cf.config_prefix("future"):
881881
cf.register_option(
882882
"infer_string",
883-
True,
883+
False if os.environ.get("PANDAS_FUTURE_INFER_STRING", "1") == "0" else True,
884884
"Whether to infer sequence of str objects as pyarrow string "
885885
"dtype, which will be the default in pandas 3.0 "
886886
"(at which point this option will be deprecated).",

0 commit comments

Comments
 (0)