Skip to content

Commit b24a218

Browse files
authored
Merge branch 'main' into resample-long
2 parents d7f45ca + 8661548 commit b24a218

Some content is hidden

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

53 files changed

+1289
-566
lines changed

ci/code_checks.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
266266
pandas.api.types.is_integer \
267267
pandas.api.types.pandas_dtype \
268268
pandas.read_clipboard \
269+
pandas.ExcelFile \
269270
pandas.ExcelFile.parse \
270271
pandas.DataFrame.to_html \
271272
pandas.io.formats.style.Styler.to_html \
@@ -578,9 +579,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
578579
MSG='Partially validate docstrings (EX02)' ; echo $MSG
579580
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=EX02 --ignore_functions \
580581
pandas.DataFrame.plot.line \
581-
pandas.Index.factorize \
582582
pandas.Period.strftime \
583-
pandas.Series.factorize \
584583
pandas.Series.floordiv \
585584
pandas.Series.plot.line \
586585
pandas.Series.rfloordiv \
@@ -608,7 +607,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
608607
pandas.api.types.is_unsigned_integer_dtype \
609608
pandas.core.groupby.DataFrameGroupBy.take \
610609
pandas.core.groupby.SeriesGroupBy.take \
611-
pandas.factorize \
612610
pandas.io.formats.style.Styler.concat \
613611
pandas.io.formats.style.Styler.export \
614612
pandas.io.formats.style.Styler.set_td_classes \

ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies:
4848
- pyxlsb
4949
- s3fs>=2021.08.0
5050
- scipy
51-
- sqlalchemy<1.4.46
51+
- sqlalchemy
5252
- tabulate
5353
- tzdata>=2022a
5454
- xarray

ci/deps/actions-311.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24.0
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies
@@ -48,7 +48,7 @@ dependencies:
4848
- pyxlsb
4949
- s3fs>=2021.08.0
5050
- scipy
51-
- sqlalchemy<1.4.46
51+
- sqlalchemy
5252
- tabulate
5353
- tzdata>=2022a
5454
- xarray

ci/deps/actions-38-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies:
4848
- pyxlsb
4949
- s3fs>=2021.08.0
5050
- scipy
51-
- sqlalchemy<1.4.46
51+
- sqlalchemy
5252
- tabulate
5353
- xarray
5454
- xlrd

ci/deps/actions-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies:
4848
- pyxlsb
4949
- s3fs>=2021.08.0
5050
- scipy
51-
- sqlalchemy<1.4.46
51+
- sqlalchemy
5252
- tabulate
5353
- xarray
5454
- xlrd

ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies:
4848
- pyxlsb
4949
- s3fs>=2021.08.0
5050
- scipy
51-
- sqlalchemy<1.4.46
51+
- sqlalchemy
5252
- tabulate
5353
- tzdata>=2022a
5454
- xarray

ci/deps/circle-38-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies:
4949
- pyxlsb
5050
- s3fs>=2021.08.0
5151
- scipy
52-
- sqlalchemy<1.4.46
52+
- sqlalchemy
5353
- tabulate
5454
- xarray
5555
- xlrd

doc/source/reference/indexing.rst

+3
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ MultiIndex components
299299
MultiIndex.reorder_levels
300300
MultiIndex.remove_unused_levels
301301
MultiIndex.drop
302+
MultiIndex.copy
303+
MultiIndex.append
304+
MultiIndex.truncate
302305

303306
MultiIndex selecting
304307
~~~~~~~~~~~~~~~~~~~~

doc/source/reference/io.rst

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ Excel
4040

4141
read_excel
4242
DataFrame.to_excel
43+
ExcelFile
44+
ExcelFile.book
45+
ExcelFile.sheet_names
4346
ExcelFile.parse
4447

4548
.. currentmodule:: pandas.io.formats.style

doc/source/user_guide/io.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -5868,15 +5868,15 @@ If you have an SQLAlchemy description of your database you can express where con
58685868
sa.Column("Col_3", sa.Boolean),
58695869
)
58705870
5871-
pd.read_sql(sa.select([data_table]).where(data_table.c.Col_3 is True), engine)
5871+
pd.read_sql(sa.select(data_table).where(data_table.c.Col_3 is True), engine)
58725872
58735873
You can combine SQLAlchemy expressions with parameters passed to :func:`read_sql` using :func:`sqlalchemy.bindparam`
58745874

58755875
.. ipython:: python
58765876
58775877
import datetime as dt
58785878
5879-
expr = sa.select([data_table]).where(data_table.c.Date > sa.bindparam("date"))
5879+
expr = sa.select(data_table).where(data_table.c.Date > sa.bindparam("date"))
58805880
pd.read_sql(expr, engine, params={"date": dt.datetime(2010, 10, 18)})
58815881
58825882

0 commit comments

Comments
 (0)