Skip to content

Commit b107913

Browse files
committed
Merge branch 'main' into api-cast_pointwise_result
2 parents 08a135f + 2547ff3 commit b107913

File tree

7 files changed

+24
-9
lines changed

7 files changed

+24
-9
lines changed

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
# installing wheel here because micromamba step was skipped
190190
if: matrix.buildplat[1] == 'win_arm64'
191191
shell: bash -el {0}
192-
run: python -m pip install wheel
192+
run: python -m pip install wheel anaconda-client
193193

194194
- name: Validate wheel RECORD
195195
shell: bash -el {0}

pandas/io/formats/style_render.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
Sequence,
77
)
88
from functools import partial
9+
import pathlib
910
import re
1011
from typing import (
1112
TYPE_CHECKING,
@@ -70,7 +71,9 @@ class StylerRenderer:
7071
Base class to process rendering a Styler with a specified jinja2 template.
7172
"""
7273

73-
loader = jinja2.PackageLoader("pandas", "io/formats/templates")
74+
this_dir = pathlib.Path(__file__).parent.resolve()
75+
template_dir = this_dir / "templates"
76+
loader = jinja2.FileSystemLoader(template_dir)
7477
env = jinja2.Environment(loader=loader, trim_blocks=True)
7578
template_html = env.get_template("html.tpl")
7679
template_html_table = env.get_template("html_table.tpl")

pandas/io/parquet.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,12 @@ def to_parquet(
464464
465465
.. versionadded:: 2.1.0
466466
467-
kwargs
468-
Additional keyword arguments passed to the engine.
467+
**kwargs
468+
Additional keyword arguments passed to the engine:
469+
470+
* For ``engine="pyarrow"``: passed to :func:`pyarrow.parquet.write_table`
471+
or :func:`pyarrow.parquet.write_to_dataset` (when using partition_cols)
472+
* For ``engine="fastparquet"``: passed to :func:`fastparquet.write`
469473
470474
Returns
471475
-------
@@ -585,7 +589,11 @@ def read_parquet(
585589
.. versionadded:: 3.0.0
586590
587591
**kwargs
588-
Any additional kwargs are passed to the engine.
592+
Additional keyword arguments passed to the engine:
593+
594+
* For ``engine="pyarrow"``: passed to :func:`pyarrow.parquet.read_table`
595+
* For ``engine="fastparquet"``: passed to
596+
:meth:`fastparquet.ParquetFile.to_pandas`
589597
590598
Returns
591599
-------

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import pathlib
12
from textwrap import (
23
dedent,
34
indent,
@@ -18,7 +19,9 @@
1819

1920
@pytest.fixture
2021
def env():
21-
loader = jinja2.PackageLoader("pandas", "io/formats/templates")
22+
project_dir = pathlib.Path(__file__).parent.parent.parent.parent.parent.resolve()
23+
template_dir = project_dir / "io" / "formats" / "templates"
24+
loader = jinja2.FileSystemLoader(template_dir)
2225
env = jinja2.Environment(loader=loader, trim_blocks=True)
2326
return env
2427

pandas/tests/tseries/holiday/test_holiday.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ class TestHolidayCalendar(AbstractHolidayCalendar):
340340
tm.assert_index_equal(date_interval_high, expected_results)
341341

342342

343-
def test_holidays_with_timezone_specified_but_no_occurences():
343+
def test_holidays_with_timezone_specified_but_no_occurrences():
344344
# GH 54580
345345
# _apply_rule() in holiday.py was silently dropping timezones if you passed it
346346
# an empty list of holiday dates that had timezone information

pandas/tests/tslibs/test_parsing.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ def test_hypothesis_delimited_date(
402402
request.applymarker(
403403
pytest.mark.xfail(
404404
reason="parse_datetime_string cannot reliably tell whether "
405-
"e.g. %m.%Y is a float or a date"
405+
"e.g. %m.%Y is a float or a date",
406+
strict=False,
406407
)
407408
)
408409
date_string = test_datetime.strftime(date_format.replace(" ", delimiter))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- Created: 23 December 2022
44
- Status: Implemented
5-
- Discussion: [#39584](https://github.com/pandas-dev/pandas/pull/50402)
5+
- Discussion: [#50424](https://github.com/pandas-dev/pandas/pull/50424)
66
- 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))
77
- Revision: 1
88

0 commit comments

Comments
 (0)