Skip to content

Commit 5ce62dc

Browse files
authored
Merge branch 'main' into autofilter-feature
2 parents 72562b4 + 893c784 commit 5ce62dc

File tree

37 files changed

+455
-358
lines changed

37 files changed

+455
-358
lines changed

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,7 @@ jobs:
320320
strategy:
321321
fail-fast: false
322322
matrix:
323-
# Separate out macOS 13 and 14, since macOS 14 is arm64 only
324-
os: [ubuntu-24.04, macOS-13, macOS-14, windows-2025]
323+
os: [ubuntu-24.04, macos-15-intel, macos-15, windows-2025]
325324

326325
timeout-minutes: 90
327326

doc/source/user_guide/io.rst

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,6 @@ compression : {``'infer'``, ``'gzip'``, ``'bz2'``, ``'zip'``, ``'xz'``, ``'zstd'
303303
As an example, the following could be passed for faster compression and to
304304
create a reproducible gzip archive:
305305
``compression={'method': 'gzip', 'compresslevel': 1, 'mtime': 1}``.
306-
307-
.. versionchanged:: 1.2.0 Previous versions forwarded dict entries for 'gzip' to ``gzip.open``.
308306
thousands : str, default ``None``
309307
Thousands separator.
310308
decimal : str, default ``'.'``
@@ -1472,7 +1470,7 @@ rather than reading the entire file into memory, such as the following:
14721470
table
14731471
14741472
1475-
By specifying a ``chunksize`` to ``read_csv``, the return
1473+
By specifying a ``chunksize`` to :func:`read_csv` as a context manager, the return
14761474
value will be an iterable object of type ``TextFileReader``:
14771475

14781476
.. ipython:: python
@@ -1482,10 +1480,6 @@ value will be an iterable object of type ``TextFileReader``:
14821480
for chunk in reader:
14831481
print(chunk)
14841482
1485-
.. versionchanged:: 1.2
1486-
1487-
``read_csv/json/sas`` return a context-manager when iterating through a file.
1488-
14891483
Specifying ``iterator=True`` will also return the ``TextFileReader`` object:
14901484

14911485
.. ipython:: python

doc/source/user_guide/migration-3-strings.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ through the ``str`` accessor will work the same:
115115
class. The dtype can be constructed as ``pd.StringDtype(na_value=np.nan)``,
116116
but for general usage we recommend to use the shorter ``"str"`` alias.
117117

118+
.. _string_migration_guide-differences:
119+
118120
Overview of behavior differences and how to address them
119121
---------------------------------------------------------
120122

0 commit comments

Comments
 (0)