Skip to content

Commit e40d74c

Browse files
authored
Merge branch 'main' into fix/arm64-docker-build
2 parents ce99f81 + 8cf2e43 commit e40d74c

File tree

74 files changed

+836
-359
lines changed

Some content is hidden

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

74 files changed

+836
-359
lines changed

.github/workflows/broken-linkcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
fetch-depth: 0
2323

.github/workflows/code-checks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
with:
3838
fetch-depth: 0
3939

@@ -114,7 +114,7 @@ jobs:
114114

115115
steps:
116116
- name: Checkout
117-
uses: actions/checkout@v4
117+
uses: actions/checkout@v5
118118
with:
119119
fetch-depth: 0
120120

@@ -148,7 +148,7 @@ jobs:
148148
run: docker image prune -f
149149

150150
- name: Checkout
151-
uses: actions/checkout@v4
151+
uses: actions/checkout@v5
152152
with:
153153
fetch-depth: 0
154154

@@ -169,7 +169,7 @@ jobs:
169169

170170
steps:
171171
- name: Checkout
172-
uses: actions/checkout@v4
172+
uses: actions/checkout@v5
173173
with:
174174
fetch-depth: 0
175175

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- python
2828

2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
- uses: github/codeql-action/init@v3
3232
with:
3333
languages: ${{ matrix.language }}

.github/workflows/comment-commands.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v5
5353
with:
5454
fetch-depth: 0
5555

.github/workflows/docbuild-and-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4040
with:
4141
fetch-depth: 0
4242

.github/workflows/package-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v5
3838
with:
3939
fetch-depth: 0
4040

@@ -58,7 +58,7 @@ jobs:
5858
cancel-in-progress: true
5959
steps:
6060
- name: Checkout
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v5
6262
with:
6363
fetch-depth: 0
6464

.github/workflows/unit-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139

140140
steps:
141141
- name: Checkout
142-
uses: actions/checkout@v4
142+
uses: actions/checkout@v5
143143
with:
144144
fetch-depth: 0
145145

@@ -199,7 +199,7 @@ jobs:
199199

200200
steps:
201201
- name: Checkout
202-
uses: actions/checkout@v4
202+
uses: actions/checkout@v5
203203
with:
204204
fetch-depth: 0
205205

@@ -338,7 +338,7 @@ jobs:
338338
PYTEST_TARGET: pandas
339339

340340
steps:
341-
- uses: actions/checkout@v4
341+
- uses: actions/checkout@v5
342342
with:
343343
fetch-depth: 0
344344

@@ -375,7 +375,7 @@ jobs:
375375
cancel-in-progress: true
376376
steps:
377377
- name: Checkout pandas Repo
378-
uses: actions/checkout@v4
378+
uses: actions/checkout@v5
379379
with:
380380
fetch-depth: 0
381381

.github/workflows/wheels.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
sdist_file: ${{ steps.save-path.outputs.sdist_name }}
4949
steps:
5050
- name: Checkout pandas
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v5
5252
with:
5353
fetch-depth: 0
5454

@@ -119,7 +119,7 @@ jobs:
119119
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
120120
steps:
121121
- name: Checkout pandas
122-
uses: actions/checkout@v4
122+
uses: actions/checkout@v5
123123
with:
124124
fetch-depth: 0
125125

@@ -137,7 +137,7 @@ jobs:
137137
# removes unnecessary files from the release
138138
- name: Download sdist (not macOS)
139139
#if: ${{ matrix.buildplat[1] != 'macosx_*' }}
140-
uses: actions/download-artifact@v4
140+
uses: actions/download-artifact@v5
141141
with:
142142
name: sdist
143143
path: ./dist
@@ -160,7 +160,7 @@ jobs:
160160
run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
161161

162162
- name: Build wheels
163-
uses: pypa/[email protected].3
163+
uses: pypa/[email protected].4
164164
with:
165165
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
166166
env:

doc/source/reference/general_functions.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Top-level evaluation
7171
.. autosummary::
7272
:toctree: api/
7373

74+
col
7475
eval
7576

7677
Datetime formats

doc/source/user_guide/dsintro.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,12 @@ a function of one argument to be evaluated on the DataFrame being assigned to.
553553
554554
iris.assign(sepal_ratio=lambda x: (x["SepalWidth"] / x["SepalLength"])).head()
555555
556+
or, using :meth:`pandas.col`:
557+
558+
.. ipython:: python
559+
560+
iris.assign(sepal_ratio=pd.col("SepalWidth") / pd.col("SepalLength")).head()
561+
556562
:meth:`~pandas.DataFrame.assign` **always** returns a copy of the data, leaving the original
557563
DataFrame untouched.
558564

0 commit comments

Comments
 (0)