Skip to content

Commit 1bdd1cd

Browse files
authored
Merge branch 'main' into python-db-dtypes-pandas-issue28
2 parents 8876b9a + 9757d1f commit 1bdd1cd

Some content is hidden

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

42 files changed

+343
-85
lines changed

ci/deps/actions-310.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies:
1919
- pytz
2020

2121
# optional dependencies
22+
- aiobotocore<2.0.0
2223
- beautifulsoup4
2324
- blosc
2425
- bottleneck
@@ -43,7 +44,7 @@ dependencies:
4344
- pyreadstat
4445
- python-snappy
4546
- pyxlsb
46-
- s3fs
47+
- s3fs>=2021.05.0
4748
- scipy
4849
- sqlalchemy
4950
- tabulate

ci/deps/actions-38-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies:
4444
- pytables
4545
- python-snappy
4646
- pyxlsb
47-
- s3fs
47+
- s3fs>=2021.05.0
4848
- scipy
4949
- sqlalchemy
5050
- tabulate

ci/deps/actions-38.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies:
1919
- pytz
2020

2121
# optional dependencies
22+
- aiobotocore<2.0.0
2223
- beautifulsoup4
2324
- blosc
2425
- bottleneck
@@ -43,7 +44,7 @@ dependencies:
4344
- pytables
4445
- python-snappy
4546
- pyxlsb
46-
- s3fs
47+
- s3fs>=2021.05.0
4748
- scipy
4849
- sqlalchemy
4950
- tabulate

ci/deps/actions-39.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies:
1919
- pytz
2020

2121
# optional dependencies
22+
- aiobotocore<2.0.0
2223
- beautifulsoup4
2324
- blosc
2425
- bottleneck
@@ -43,7 +44,7 @@ dependencies:
4344
- pytables
4445
- python-snappy
4546
- pyxlsb
46-
- s3fs
47+
- s3fs>=2021.05.0
4748
- scipy
4849
- sqlalchemy
4950
- tabulate

ci/deps/circle-38-arm64.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies:
1919
- pytz
2020

2121
# optional dependencies
22+
- aiobotocore<2.0.0
2223
- beautifulsoup4
2324
- blosc
2425
- bottleneck
@@ -44,7 +45,7 @@ dependencies:
4445
- pytables
4546
- python-snappy
4647
- pyxlsb
47-
- s3fs
48+
- s3fs>=2021.05.0
4849
- scipy
4950
- sqlalchemy
5051
- tabulate

doc/source/development/contributing_codebase.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,11 @@ pandas uses `mypy <http://mypy-lang.org>`_ and `pyright <https://github.com/micr
265265

266266
.. code-block:: shell
267267
268-
pre-commit run --hook-stage manual --all-files
268+
# the following might fail if the installed pandas version does not correspond to your local git version
269+
pre-commit run --hook-stage manual --all-files
270+
271+
# if the above fails due to stubtest
272+
SKIP=stubtest pre-commit run --hook-stage manual --all-files
269273
270274
in your activated python environment. A recent version of ``numpy`` (>=1.22.0) is required for type validation.
271275

doc/source/getting_started/intro_tutorials/05_add_columns.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
</ul>
3131
</div>
3232

33-
How to create new columns derived from existing columns?
34-
--------------------------------------------------------
33+
How to create new columns derived from existing columns
34+
-------------------------------------------------------
3535

3636
.. image:: ../../_static/schemas/05_newcolumn_1.svg
3737
:align: center

doc/source/getting_started/intro_tutorials/06_calculate_statistics.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
</ul>
3131
</div>
3232

33-
How to calculate summary statistics?
34-
------------------------------------
33+
How to calculate summary statistics
34+
-----------------------------------
3535

3636
Aggregating statistics
3737
~~~~~~~~~~~~~~~~~~~~~~

doc/source/getting_started/intro_tutorials/07_reshape_table_layout.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ measurement.
8484
</ul>
8585
</div>
8686

87-
How to reshape the layout of tables?
88-
------------------------------------
87+
How to reshape the layout of tables
88+
-----------------------------------
8989

9090
Sort table rows
9191
~~~~~~~~~~~~~~~

doc/source/getting_started/intro_tutorials/08_combine_dataframes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ Westminster* in respectively Paris, Antwerp and London.
8888
</div>
8989

9090

91-
How to combine data from multiple tables?
92-
-----------------------------------------
91+
How to combine data from multiple tables
92+
----------------------------------------
9393

9494
Concatenating objects
9595
~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)