Skip to content

Commit 3a5846f

Browse files
authored
Merge branch 'main' into dependabot/github_actions/pypa/cibuildwheel-2.21.3
2 parents 4ce5587 + 9e10119 commit 3a5846f

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

pandas/_libs/tslibs/timedeltas.pyx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,10 +1864,12 @@ class Timedelta(_Timedelta):
18641864
18651865
Parameters
18661866
----------
1867-
value : Timedelta, timedelta, np.timedelta64, str, or int
1867+
value : Timedelta, timedelta, np.timedelta64, str, int or float
18681868
Input value.
18691869
unit : str, default 'ns'
1870-
Denote the unit of the input, if input is an integer.
1870+
If input is an integer, denote the unit of the input.
1871+
If input is a float, denote the unit of the integer parts.
1872+
The decimal parts with resolution lower than 1 nanosecond are ignored.
18711873
18721874
Possible values:
18731875

pandas/core/frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10823,7 +10823,7 @@ def round(
1082310823
self, decimals: int | dict[IndexLabel, int] | Series = 0, *args, **kwargs
1082410824
) -> DataFrame:
1082510825
"""
10826-
Round a DataFrame to a variable number of decimal places.
10826+
Round numeric columns in a DataFrame to a variable number of decimal places.
1082710827
1082810828
Parameters
1082910829
----------

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Minimum requirements for the build system to execute.
33
# See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
44
requires = [
5-
"meson-python==0.13.1",
6-
"meson==1.2.1",
5+
"meson-python>=0.13.1",
6+
"meson>=1.2.1,<2",
77
"wheel",
88
"Cython~=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json
99
# Force numpy higher than 2.0rc1, so that built wheels are compatible

web/pandas/community/ecosystem.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,17 @@ Console](https://docs.spyder-ide.org/current/panes/ipythonconsole.html), and Spy
239239
render Numpydoc documentation on pandas objects in rich text with Sphinx
240240
both automatically and on-demand.
241241

242+
### [marimo](https://marimo.io)
243+
244+
marimo is a reactive notebook for Python and SQL that enhances productivity when working with dataframes. It provides several features to make data manipulation and visualization more interactive and fun:
245+
246+
1. Rich, interactive displays: marimo can display pandas dataframes in interactive tables or charts with filtering and sorting capabilities.
247+
2. Data selection: Users can select data in tables or pandas-backed plots, and the selections are automatically sent to Python as pandas dataframes.
248+
3. No-code transformations: Users can interactively transform pandas dataframes using a GUI, without writing code. The generated code can be copied and pasted into the notebook.
249+
4. Custom filters: marimo allows the creation of pandas-backed filters using UI elements like sliders and dropdowns.
250+
5. Dataset explorer: marimo automatically discovers and displays all dataframes in the notebook, allowing users to explore and visualize data interactively.
251+
6. SQL integration: marimo allows users to write SQL queries against any pandas dataframes existing in memory.
252+
242253
## API
243254

244255
### [pandas-datareader](https://github.com/pydata/pandas-datareader)

0 commit comments

Comments
 (0)