Skip to content

Commit c850e08

Browse files
authored
Merge branch 'main' into api_extensions_ExtensionArray
2 parents a986f2c + 81a12dd commit c850e08

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

.circleci/config.yml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- run:
1717
name: Install Environment and Run Tests
1818
shell: /bin/bash -exo pipefail
19+
# https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
1920
command: |
2021
MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-Linux-aarch64.sh"
2122
wget -q $MINI_URL -O Miniforge3.sh
@@ -33,6 +34,7 @@ jobs:
3334
fi
3435
python -m pip install --no-build-isolation -ve . --config-settings=setup-args="--werror"
3536
PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
37+
sudo apt-get update && sudo apt-get install -y libegl1 libopengl0
3638
ci/run_tests.sh
3739
test-linux-musl:
3840
docker:

.github/workflows/code-checks.yml

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ jobs:
5151
# TODO: The doctests have to be run first right now, since the Cython doctests only work
5252
# with pandas installed in non-editable mode
5353
# This can be removed once pytest-cython doesn't require C extensions to be installed inplace
54+
55+
- name: Extra installs
56+
# https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
57+
run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl0
58+
5459
- name: Run doctests
5560
run: cd ci && ./code_checks.sh doctests
5661
if: ${{ steps.build.outcome == 'success' && always() }}

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

+4
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ jobs:
4646
- name: Build Pandas
4747
uses: ./.github/actions/build_pandas
4848

49+
- name: Extra installs
50+
# https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
51+
run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl0
52+
4953
- name: Test website
5054
run: python -m pytest web/
5155

.github/workflows/unit-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ jobs:
134134
fetch-depth: 0
135135

136136
- name: Extra installs
137-
run: sudo apt-get update && sudo apt-get install -y ${{ matrix.extra_apt }}
138-
if: ${{ matrix.extra_apt }}
137+
# https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
138+
run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl0 ${{ matrix.extra_apt || ''}}
139139

140140
- name: Generate extra locales
141141
# These extra locales will be available for locale.setlocale() calls in tests

ci/code_checks.sh

-3
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
165165
-i "pandas.Series.str.center RT03,SA01" \
166166
-i "pandas.Series.str.decode PR07,RT03,SA01" \
167167
-i "pandas.Series.str.encode PR07,RT03,SA01" \
168-
-i "pandas.Series.str.find RT03" \
169168
-i "pandas.Series.str.fullmatch RT03" \
170-
-i "pandas.Series.str.get RT03,SA01" \
171169
-i "pandas.Series.str.index RT03" \
172170
-i "pandas.Series.str.ljust RT03,SA01" \
173171
-i "pandas.Series.str.lower RT03" \
@@ -177,7 +175,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
177175
-i "pandas.Series.str.partition RT03" \
178176
-i "pandas.Series.str.repeat SA01" \
179177
-i "pandas.Series.str.replace SA01" \
180-
-i "pandas.Series.str.rfind RT03" \
181178
-i "pandas.Series.str.rindex RT03" \
182179
-i "pandas.Series.str.rjust RT03,SA01" \
183180
-i "pandas.Series.str.rpartition RT03" \

pandas/core/strings/accessor.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,13 @@ def get(self, i):
10851085
Returns
10861086
-------
10871087
Series or Index
1088+
Series or Index where each value is the extracted element from
1089+
the corresponding input component.
1090+
1091+
See Also
1092+
--------
1093+
Series.str.extract : Extract capture groups in the regex as columns
1094+
in a DataFrame.
10881095
10891096
Examples
10901097
--------
@@ -2971,6 +2978,9 @@ def extractall(self, pat, flags: int = 0) -> DataFrame:
29712978
Returns
29722979
-------
29732980
Series or Index of int.
2981+
A Series (if the input is a Series) or an Index (if the input is an
2982+
Index) of the %(side)s indexes corresponding to the positions where the
2983+
substring is found in each string of the input.
29742984
29752985
See Also
29762986
--------
@@ -2980,9 +2990,9 @@ def extractall(self, pat, flags: int = 0) -> DataFrame:
29802990
--------
29812991
For Series.str.find:
29822992
2983-
>>> ser = pd.Series(["cow_", "duck_", "do_ve"])
2993+
>>> ser = pd.Series(["_cow_", "duck_", "do_v_e"])
29842994
>>> ser.str.find("_")
2985-
0 3
2995+
0 0
29862996
1 4
29872997
2 2
29882998
dtype: int64

0 commit comments

Comments
 (0)