Skip to content

Commit 3c5e782

Browse files
authored
Merge branch 'pandas-dev:main' into enhence_Styler_bar_test
2 parents 2a7905e + 0d853e7 commit 3c5e782

File tree

72 files changed

+1131
-906
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1131
-906
lines changed

.circleci/setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ if pip show pandas 1>/dev/null; then
5555
fi
5656

5757
echo "Install pandas"
58-
python -m pip install --no-build-isolation -ve .
58+
python -m pip install --no-build-isolation -ve . --config-settings=setup-args="--werror"
5959

6060
echo "done"

.github/actions/build_pandas/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ runs:
2525
- name: Build Pandas
2626
run: |
2727
if [[ ${{ inputs.editable }} == "true" ]]; then
28-
pip install -e . --no-build-isolation -v --no-deps
28+
pip install -e . --no-build-isolation -v --no-deps \
29+
--config-settings=setup-args="--werror"
2930
else
30-
pip install . --no-build-isolation -v --no-deps
31+
pip install . --no-build-isolation -v --no-deps \
32+
--config-settings=setup-args="--werror"
3133
fi
3234
shell: bash -el {0}

.github/workflows/unit-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ jobs:
254254
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
255255
python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
256256
python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
257-
python -m pip install --no-cache-dir --no-build-isolation -e .
257+
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
258258
python -m pip list --no-cache-dir
259259
export PANDAS_CI=1
260260
python -m pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml
@@ -292,7 +292,7 @@ jobs:
292292
. ~/virtualenvs/pandas-dev/bin/activate
293293
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
294294
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
295-
python -m pip install --no-cache-dir --no-build-isolation -e .
295+
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
296296
python -m pip list --no-cache-dir
297297
298298
- name: Run Tests
@@ -365,7 +365,7 @@ jobs:
365365
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
366366
python -m pip install versioneer[toml]
367367
python -m pip install python-dateutil pytz tzdata cython hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov
368-
python -m pip install -ve . --no-build-isolation --no-index --no-deps
368+
python -m pip install -ve . --no-build-isolation --no-index --no-deps --config-settings=setup-args="--werror"
369369
python -m pip list
370370
371371
- name: Run Tests

doc/source/user_guide/io.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,9 +1490,9 @@ rows will skip the intervening rows.
14901490

14911491
.. ipython:: python
14921492
1493-
from pandas._testing import makeCustomDataframe as mkdf
1494-
1495-
df = mkdf(5, 3, r_idx_nlevels=2, c_idx_nlevels=4)
1493+
mi_idx = pd.MultiIndex.from_arrays([[1, 2, 3, 4], list("abcd")], names=list("ab"))
1494+
mi_col = pd.MultiIndex.from_arrays([[1, 2], list("ab")], names=list("cd"))
1495+
df = pd.DataFrame(np.ones((4, 2)), index=mi_idx, columns=mi_col)
14961496
df.to_csv("mi.csv")
14971497
print(open("mi.csv").read())
14981498
pd.read_csv("mi.csv", header=[0, 1, 2, 3], index_col=[0, 1])

doc/source/whatsnew/v0.12.0.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ IO enhancements
250250

251251
.. ipython:: python
252252
253-
from pandas._testing import makeCustomDataframe as mkdf
254-
255-
df = mkdf(5, 3, r_idx_nlevels=2, c_idx_nlevels=4)
253+
mi_idx = pd.MultiIndex.from_arrays([[1, 2, 3, 4], list("abcd")], names=list("ab"))
254+
mi_col = pd.MultiIndex.from_arrays([[1, 2], list("ab")], names=list("cd"))
255+
df = pd.DataFrame(np.ones((4, 2)), index=mi_idx, columns=mi_col)
256256
df.to_csv("mi.csv")
257257
print(open("mi.csv").read())
258258
pd.read_csv("mi.csv", header=[0, 1, 2, 3], index_col=[0, 1])

doc/source/whatsnew/v2.1.4.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ including other versions of pandas.
1313

1414
Fixed regressions
1515
~~~~~~~~~~~~~~~~~
16-
-
16+
- Fixed regression when trying to read a pickled pandas :class:`DataFrame` from pandas 1.3 (:issue:`55137`)
1717
-
1818

1919
.. ---------------------------------------------------------------------------
@@ -22,13 +22,15 @@ Fixed regressions
2222
Bug fixes
2323
~~~~~~~~~
2424
- Bug in :class:`Series` constructor raising DeprecationWarning when ``index`` is a list of :class:`Series` (:issue:`55228`)
25+
- Bug in :class:`Series` when trying to cast date-like string inputs to :class:`ArrowDtype` of ``pyarrow.timestamp`` (:issue:`56266`)
2526
- Bug in :meth:`Index.__getitem__` returning wrong result for Arrow dtypes and negative stepsize (:issue:`55832`)
2627
- Fixed bug in :func:`to_numeric` converting to extension dtype for ``string[pyarrow_numpy]`` dtype (:issue:`56179`)
27-
- Fixed bug in :meth:`.DataFrameGroupBy.min()` and :meth:`.DataFrameGroupBy.max()` not preserving extension dtype for empty object (:issue:`55619`)
28+
- Fixed bug in :meth:`.DataFrameGroupBy.min` and :meth:`.DataFrameGroupBy.max` not preserving extension dtype for empty object (:issue:`55619`)
2829
- Fixed bug in :meth:`DataFrame.__setitem__` casting :class:`Index` with object-dtype to PyArrow backed strings when ``infer_string`` option is set (:issue:`55638`)
2930
- Fixed bug in :meth:`DataFrame.to_hdf` raising when columns have ``StringDtype`` (:issue:`55088`)
3031
- Fixed bug in :meth:`Index.insert` casting object-dtype to PyArrow backed strings when ``infer_string`` option is set (:issue:`55638`)
3132
- Fixed bug in :meth:`Series.mode` not keeping object dtype when ``infer_string`` is set (:issue:`56183`)
33+
- Fixed bug in :meth:`Series.str.split` and :meth:`Series.str.rsplit` when ``pat=None`` for :class:`ArrowDtype` with ``pyarrow.string`` (:issue:`56271`)
3234
- Fixed bug in :meth:`Series.str.translate` losing object dtype when string option is set (:issue:`56152`)
3335

3436
.. ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)