Skip to content

Commit ad1e542

Browse files
SKTT1BertSKTT1Bert
authored
Merge branch 'main' into doc/39845-series-align
2 parents 1f71fde + 9597c03 commit ad1e542

File tree

92 files changed

+1052
-349
lines changed

Some content is hidden

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

92 files changed

+1052
-349
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10.8
1+
FROM python:3.11.13
22
WORKDIR /home/pandas
33

44
RUN apt-get update && \

‎ci/code_checks.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
163163
-i "pandas.tseries.offsets.DateOffset.is_on_offset GL08" \
164164
-i "pandas.tseries.offsets.DateOffset.n GL08" \
165165
-i "pandas.tseries.offsets.DateOffset.normalize GL08" \
166+
-i "pandas.tseries.offsets.Day.freqstr SA01" \
166167
-i "pandas.tseries.offsets.Day.is_on_offset GL08" \
167168
-i "pandas.tseries.offsets.Day.n GL08" \
168169
-i "pandas.tseries.offsets.Day.normalize GL08" \

‎ci/deps/actions-311-minimum_versions.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ dependencies:
2525
- numpy=1.26.0
2626

2727
# optional dependencies
28+
- adbc-driver-postgresql=1.2.0
29+
- adbc-driver-sqlite=1.2.0
2830
- beautifulsoup4=4.12.3
2931
- bottleneck=1.3.6
3032
- fastparquet=2024.2.0
@@ -40,7 +42,7 @@ dependencies:
4042
- odfpy=1.4.1
4143
- qtpy=2.3.0
4244
- openpyxl=3.1.2
43-
- psycopg2=2.9.6
45+
- psycopg2=2.9.9
4446
- pyarrow=12.0.1
4547
- pyiceberg=0.7.1
4648
- pymysql=1.1.0
@@ -60,6 +62,4 @@ dependencies:
6062
- zstandard=0.22.0
6163

6264
- pip:
63-
- adbc-driver-postgresql==0.10.0
64-
- adbc-driver-sqlite==0.8.0
6565
- tzdata==2023.3

‎ci/deps/actions-311.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ dependencies:
2323
- numpy
2424

2525
# optional dependencies
26+
- adbc-driver-postgresql>=1.2.0
27+
- adbc-driver-sqlite>=1.2.0
2628
- beautifulsoup4>=4.12.3
2729
- bottleneck>=1.3.6
2830
- fastparquet>=2024.2.0
@@ -39,7 +41,7 @@ dependencies:
3941
- qtpy>=2.3.0
4042
- pyqt>=5.15.9
4143
- openpyxl>=3.1.2
42-
- psycopg2>=2.9.6
44+
- psycopg2>=2.9.9
4345
- pyarrow>=12.0.1
4446
- pyiceberg>=0.7.1
4547
- pymysql>=1.1.0
@@ -58,5 +60,4 @@ dependencies:
5860
- zstandard>=0.22.0
5961

6062
- pip:
61-
- adbc-driver-postgresql>=0.10.0
62-
- adbc-driver-sqlite>=0.8.0
63+
- tzdata>=2023.3

‎ci/deps/actions-312.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ dependencies:
2323
- numpy
2424

2525
# optional dependencies
26+
- adbc-driver-postgresql>=1.2.0
27+
- adbc-driver-sqlite>=1.2.0
2628
- beautifulsoup4>=4.12.3
2729
- bottleneck>=1.3.6
2830
- fastparquet>=2024.2.0
@@ -39,7 +41,7 @@ dependencies:
3941
- qtpy>=2.3.0
4042
- pyqt>=5.15.9
4143
- openpyxl>=3.1.2
42-
- psycopg2>=2.9.6
44+
- psycopg2>=2.9.9
4345
- pyarrow>=12.0.1
4446
- pyiceberg>=0.7.1
4547
- pymysql>=1.1.0
@@ -58,6 +60,4 @@ dependencies:
5860
- zstandard>=0.22.0
5961

6062
- pip:
61-
- adbc-driver-postgresql>=0.10.0
62-
- adbc-driver-sqlite>=0.8.0
6363
- tzdata>=2023.3

‎ci/deps/actions-313-downstream_compat.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies:
2424
- numpy
2525

2626
# optional dependencies
27+
- adbc-driver-postgresql>=1.2.0
2728
- beautifulsoup4>=4.12.3
2829
- bottleneck>=1.3.6
2930
- fastparquet>=2024.2.0
@@ -39,7 +40,7 @@ dependencies:
3940
- odfpy>=1.4.1
4041
- qtpy>=2.3.0
4142
- openpyxl>=3.1.2
42-
- psycopg2>=2.9.6
43+
- psycopg2>=2.9.9
4344
- pyarrow>=12.0.1
4445
- pyiceberg>=0.7.1
4546
- pymysql>=1.1.0
@@ -70,6 +71,4 @@ dependencies:
7071
- pandas-datareader
7172
- pyyaml
7273
- pip:
73-
- adbc-driver-postgresql>=0.10.0
74-
- adbc-driver-sqlite>=0.8.0
7574
- tzdata>=2023.3

‎ci/deps/actions-313.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ dependencies:
2323
- numpy
2424

2525
# optional dependencies
26+
- adbc-driver-postgresql>=1.2.0
27+
- adbc-driver-sqlite>=1.2.0
2628
- beautifulsoup4>=4.12.3
2729
- blosc>=1.21.3
2830
- bottleneck>=1.3.6
@@ -40,7 +42,7 @@ dependencies:
4042
- qtpy>=2.3.0
4143
- pyqt>=5.15.9
4244
- openpyxl>=3.1.2
43-
- psycopg2>=2.9.6
45+
- psycopg2>=2.9.9
4446
- pyarrow>=12.0.1
4547
- pymysql>=1.1.0
4648
- pyreadstat>=1.2.6
@@ -58,6 +60,4 @@ dependencies:
5860
- zstandard>=0.22.0
5961

6062
- pip:
61-
- adbc-driver-postgresql>=0.10.0
62-
- adbc-driver-sqlite>=0.8.0
6363
- tzdata>=2023.3

‎doc/source/getting_started/install.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,10 @@ Dependency Minimum Versi
290290
`SQLAlchemy <https://github.com/sqlalchemy/sqlalchemy>`__ 2.0.0 postgresql, SQL support for databases other than sqlite
291291
mysql,
292292
sql-other
293-
`psycopg2 <https://github.com/psycopg/psycopg2>`__ 2.9.6 postgresql PostgreSQL engine for sqlalchemy
293+
`psycopg2 <https://github.com/psycopg/psycopg2>`__ 2.9.9 postgresql PostgreSQL engine for sqlalchemy
294294
`pymysql <https://github.com/PyMySQL/PyMySQL>`__ 1.1.0 mysql MySQL engine for sqlalchemy
295-
`adbc-driver-postgresql <https://github.com/apache/arrow-adbc>`__ 0.10.0 postgresql ADBC Driver for PostgreSQL
296-
`adbc-driver-sqlite <https://github.com/apache/arrow-adbc>`__ 0.8.0 sql-other ADBC Driver for SQLite
295+
`adbc-driver-postgresql <https://github.com/apache/arrow-adbc>`__ 1.2.0 postgresql ADBC Driver for PostgreSQL
296+
`adbc-driver-sqlite <https://github.com/apache/arrow-adbc>`__ 1.2.0 sql-other ADBC Driver for SQLite
297297
================================================================== ================== =============== ============================================
298298

299299
Other data sources

‎doc/source/reference/testing.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ Exceptions and warnings
5252
errors.OptionError
5353
errors.OutOfBoundsDatetime
5454
errors.OutOfBoundsTimedelta
55+
errors.PandasChangeWarning
56+
errors.Pandas4Warning
57+
errors.Pandas5Warning
58+
errors.PandasPendingDeprecationWarning
59+
errors.PandasDeprecationWarning
60+
errors.PandasFutureWarning
5561
errors.ParserError
5662
errors.ParserWarning
5763
errors.PerformanceWarning

‎doc/source/user_guide/timedeltas.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ You can construct a ``Timedelta`` scalar through various arguments, including `I
5353
pd.Timedelta("P0DT0H1M0S")
5454
pd.Timedelta("P0DT0H0M0.000000123S")
5555
56-
:ref:`DateOffsets<timeseries.offsets>` (``Day, Hour, Minute, Second, Milli, Micro, Nano``) can also be used in construction.
56+
:ref:`DateOffsets<timeseries.offsets>` (``Hour, Minute, Second, Milli, Micro, Nano``) can also be used in construction.
5757

5858
.. ipython:: python
5959
@@ -63,7 +63,7 @@ Further, operations among the scalars yield another scalar ``Timedelta``.
6363

6464
.. ipython:: python
6565
66-
pd.Timedelta(pd.offsets.Day(2)) + pd.Timedelta(pd.offsets.Second(2)) + pd.Timedelta(
66+
pd.Timedelta(pd.offsets.Hour(48)) + pd.Timedelta(pd.offsets.Second(2)) + pd.Timedelta(
6767
"00:00:00.000123"
6868
)
6969

0 commit comments

Comments
 (0)