Merge remote-tracking branch 'upstream/main' into read-csv-from-directory

Author: fangchenli

.github/workflows/wheels.yml

@@ -189,7 +189,7 @@ jobs:
         # installing wheel here because micromamba step was skipped
         if: matrix.buildplat[1] == 'win_arm64'
         shell: bash -el {0}
-        run: python -m pip install wheel
+        run: python -m pip install wheel anaconda-client
 
       - name: Validate wheel RECORD
         shell: bash -el {0}

pandas/io/formats/style_render.py

@@ -6,6 +6,7 @@
     Sequence,
 )
 from functools import partial
+import pathlib
 import re
 from typing import (
     TYPE_CHECKING,
@@ -70,7 +71,9 @@ class StylerRenderer:
     Base class to process rendering a Styler with a specified jinja2 template.
     """
 
-    loader = jinja2.PackageLoader("pandas", "io/formats/templates")
+    this_dir = pathlib.Path(__file__).parent.resolve()
+    template_dir = this_dir / "templates"
+    loader = jinja2.FileSystemLoader(template_dir)
     env = jinja2.Environment(loader=loader, trim_blocks=True)
     template_html = env.get_template("html.tpl")
     template_html_table = env.get_template("html_table.tpl")

pandas/io/parquet.py

@@ -464,8 +464,12 @@ def to_parquet(
 
         .. versionadded:: 2.1.0
 
-    kwargs
-        Additional keyword arguments passed to the engine.
+    **kwargs
+        Additional keyword arguments passed to the engine:
+
+        * For ``engine="pyarrow"``: passed to :func:`pyarrow.parquet.write_table`
+          or :func:`pyarrow.parquet.write_to_dataset` (when using partition_cols)
+        * For ``engine="fastparquet"``: passed to :func:`fastparquet.write`
 
     Returns
     -------
@@ -585,7 +589,11 @@ def read_parquet(
         .. versionadded:: 3.0.0
 
     **kwargs
-        Any additional kwargs are passed to the engine.
+        Additional keyword arguments passed to the engine:
+
+        * For ``engine="pyarrow"``: passed to :func:`pyarrow.parquet.read_table`
+        * For ``engine="fastparquet"``: passed to
+          :meth:`fastparquet.ParquetFile.to_pandas`
 
     Returns
     -------

pandas/tests/io/formats/style/test_html.py

@@ -1,3 +1,4 @@
+import pathlib
 from textwrap import (
     dedent,
     indent,
@@ -18,7 +19,9 @@
 
 @pytest.fixture
 def env():
-    loader = jinja2.PackageLoader("pandas", "io/formats/templates")
+    project_dir = pathlib.Path(__file__).parent.parent.parent.parent.parent.resolve()
+    template_dir = project_dir / "io" / "formats" / "templates"
+    loader = jinja2.FileSystemLoader(template_dir)
     env = jinja2.Environment(loader=loader, trim_blocks=True)
     return env
 

pandas/tests/tseries/holiday/test_holiday.py

@@ -340,7 +340,7 @@ class TestHolidayCalendar(AbstractHolidayCalendar):
     tm.assert_index_equal(date_interval_high, expected_results)
 
 
-def test_holidays_with_timezone_specified_but_no_occurences():
+def test_holidays_with_timezone_specified_but_no_occurrences():
     # GH 54580
     # _apply_rule() in holiday.py was silently dropping timezones if you passed it
     # an empty list of holiday dates that had timezone information

pandas/tests/tslibs/test_parsing.py

@@ -402,7 +402,8 @@ def test_hypothesis_delimited_date(
         request.applymarker(
             pytest.mark.xfail(
                 reason="parse_datetime_string cannot reliably tell whether "
-                "e.g. %m.%Y is a float or a date"
+                "e.g. %m.%Y is a float or a date",
+                strict=False,
             )
         )
     date_string = test_datetime.strftime(date_format.replace(" ", delimiter))

web/pandas/pdeps/0006-ban-upcasting.md

@@ -2,7 +2,7 @@
 
 - Created: 23 December 2022
 - Status: Implemented
-- Discussion: [#39584](https://github.com/pandas-dev/pandas/pull/50402)
+- Discussion: [#50424](https://github.com/pandas-dev/pandas/pull/50424)
 - Author: [Marco Gorelli](https://github.com/MarcoGorelli) ([original issue](https://github.com/pandas-dev/pandas/issues/39584) by [Joris Van den Bossche](https://github.com/jorisvandenbossche))
 - Revision: 1