Skip to content

Commit 3c039a2

Browse files
committed
Merge remote-tracking branch 'upstream/main' into ref/index_equiv
2 parents 7ad0f5d + 04424b0 commit 3c039a2

File tree

184 files changed

+2629
-2333
lines changed

Some content is hidden

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

184 files changed

+2629
-2333
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
5555
. ~/virtualenvs/pandas-dev/bin/activate
5656
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
57-
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
57+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
5858
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
5959
python -m pip list --no-cache-dir
6060
export PANDAS_CI=1

.github/workflows/unit-tests.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ jobs:
227227
. ~/virtualenvs/pandas-dev/bin/activate
228228
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
229229
python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
230-
python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
230+
python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
231231
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
232232
python -m pip list --no-cache-dir
233233
export PANDAS_CI=1
@@ -265,7 +265,7 @@ jobs:
265265
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
266266
. ~/virtualenvs/pandas-dev/bin/activate
267267
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
268-
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
268+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
269269
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
270270
python -m pip list --no-cache-dir
271271
@@ -339,7 +339,7 @@ jobs:
339339
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
340340
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
341341
python -m pip install versioneer[toml]
342-
python -m pip install python-dateutil pytz tzdata cython hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov
342+
python -m pip install python-dateutil pytz tzdata cython hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
343343
python -m pip install -ve . --no-build-isolation --no-index --no-deps --config-settings=setup-args="--werror"
344344
python -m pip list
345345
@@ -382,15 +382,14 @@ jobs:
382382
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
383383
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy cython
384384
python -m pip install versioneer[toml]
385-
python -m pip install python-dateutil pytz tzdata hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov
385+
python -m pip install python-dateutil pytz tzdata hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
386386
python -m pip install -ve . --no-build-isolation --no-index --no-deps --config-settings=setup-args="--werror"
387387
python -m pip list
388388
389389
- name: Run Tests
390390
uses: ./.github/actions/run-tests
391-
env:
392-
PYTHON_GIL: 0
393391

392+
# NOTE: this job must be kept in sync with the Pyodide build job in wheels.yml
394393
emscripten:
395394
# Note: the Python version, Emscripten toolchain version are determined
396395
# by the Pyodide version. The appropriate versions can be found in the

.github/workflows/wheels.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,13 @@ jobs:
100100
- [windows-2022, win_amd64]
101101
# TODO: support PyPy?
102102
python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"]]
103+
104+
# Build Pyodide wheels and upload them to Anaconda.org
105+
# NOTE: this job is similar to the one in unit-tests.yml except for the fact
106+
# that it uses cibuildwheel instead of a standard Pyodide xbuildenv setup.
107+
include:
108+
- buildplat: [ubuntu-22.04, pyodide_wasm32]
109+
python: ["cp312", "3.12"]
103110
env:
104111
IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
105112
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
@@ -140,12 +147,13 @@ jobs:
140147
run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
141148

142149
- name: Build wheels
143-
uses: pypa/[email protected].1
150+
uses: pypa/[email protected].2
144151
with:
145152
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
146153
env:
147154
CIBW_PRERELEASE_PYTHONS: True
148155
CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
156+
CIBW_PLATFORM: ${{ matrix.buildplat[1] == 'pyodide_wasm32' && 'pyodide' || 'auto' }}
149157

150158
- name: Set up Python
151159
uses: mamba-org/setup-micromamba@v1
@@ -170,7 +178,7 @@ jobs:
170178
shell: pwsh
171179
run: |
172180
$TST_CMD = @"
173-
python -m pip install hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0;
181+
python -m pip install hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0;
174182
python -m pip install `$(Get-Item pandas\wheelhouse\*.whl);
175183
python -c `'import pandas as pd; pd.test(extra_args=[`\"--no-strict-data-files`\", `\"-m not clipboard and not single_cpu and not slow and not network and not db`\"])`';
176184
"@

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ci:
1919
skip: [pyright, mypy]
2020
repos:
2121
- repo: https://github.com/astral-sh/ruff-pre-commit
22-
rev: v0.4.7
22+
rev: v0.5.0
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -73,7 +73,7 @@ repos:
7373
hooks:
7474
- id: isort
7575
- repo: https://github.com/asottile/pyupgrade
76-
rev: v3.15.2
76+
rev: v3.16.0
7777
hooks:
7878
- id: pyupgrade
7979
args: [--py310-plus]
@@ -93,7 +93,7 @@ repos:
9393
- id: sphinx-lint
9494
args: ["--enable", "all", "--disable", "line-too-long"]
9595
- repo: https://github.com/pre-commit/mirrors-clang-format
96-
rev: v18.1.5
96+
rev: v18.1.8
9797
hooks:
9898
- id: clang-format
9999
files: ^pandas/_libs/src|^pandas/_libs/include

asv_bench/benchmarks/indexing.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -546,24 +546,17 @@ def time_chained_indexing(self, mode):
546546

547547

548548
class Block:
549-
params = [
550-
(True, "True"),
551-
(np.array(True), "np.array(True)"),
552-
]
553-
554-
def setup(self, true_value, mode):
549+
def setup(self):
555550
self.df = DataFrame(
556551
False,
557552
columns=np.arange(500).astype(str),
558553
index=date_range("2010-01-01", "2011-01-01"),
559554
)
560555

561-
self.true_value = true_value
562-
563-
def time_test(self, true_value, mode):
556+
def time_test(self):
564557
start = datetime(2010, 5, 1)
565558
end = datetime(2010, 9, 1)
566-
self.df.loc[start:end, :] = true_value
559+
self.df.loc[start:end, :] = True
567560

568561

569562
from .pandas_vb_common import setup # noqa: F401 isort:skip

ci/code_checks.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,8 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7070
--format=actions \
7171
-i ES01 `# For now it is ok if docstrings are missing the extended summary` \
7272
-i "pandas.Series.dt PR01" `# Accessors are implemented as classes, but we do not document the Parameters section` \
73-
-i "pandas.DataFrame.max RT03" \
74-
-i "pandas.DataFrame.mean RT03" \
75-
-i "pandas.DataFrame.median RT03" \
76-
-i "pandas.DataFrame.min RT03" \
77-
-i "pandas.DataFrame.plot PR02" \
78-
-i "pandas.Grouper PR02" \
7973
-i "pandas.MultiIndex.append PR07,SA01" \
8074
-i "pandas.MultiIndex.copy PR07,RT03,SA01" \
81-
-i "pandas.MultiIndex.drop PR07,RT03,SA01" \
8275
-i "pandas.MultiIndex.get_level_values SA01" \
8376
-i "pandas.MultiIndex.get_loc PR07" \
8477
-i "pandas.MultiIndex.get_loc_level PR07" \
@@ -95,7 +88,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
9588
-i "pandas.Period.freq GL08" \
9689
-i "pandas.Period.freqstr SA01" \
9790
-i "pandas.Period.month SA01" \
98-
-i "pandas.Period.now SA01" \
9991
-i "pandas.Period.ordinal GL08" \
10092
-i "pandas.Period.strftime PR01,SA01" \
10193
-i "pandas.Period.to_timestamp SA01" \
@@ -161,13 +153,11 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
161153
-i "pandas.Series.lt SA01" \
162154
-i "pandas.Series.ne SA01" \
163155
-i "pandas.Series.pad PR01,SA01" \
164-
-i "pandas.Series.plot PR02" \
165156
-i "pandas.Series.pop SA01" \
166157
-i "pandas.Series.prod RT03" \
167158
-i "pandas.Series.product RT03" \
168159
-i "pandas.Series.reorder_levels RT03,SA01" \
169160
-i "pandas.Series.sem PR01,RT03,SA01" \
170-
-i "pandas.Series.skew RT03,SA01" \
171161
-i "pandas.Series.sparse PR01,SA01" \
172162
-i "pandas.Series.sparse.density SA01" \
173163
-i "pandas.Series.sparse.fill_value SA01" \
@@ -205,8 +195,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
205195
-i "pandas.Series.str.wrap RT03,SA01" \
206196
-i "pandas.Series.str.zfill RT03" \
207197
-i "pandas.Series.struct.dtypes SA01" \
208-
-i "pandas.Series.to_dict SA01" \
209-
-i "pandas.Series.to_frame SA01" \
210198
-i "pandas.Series.to_markdown SA01" \
211199
-i "pandas.Series.update PR07,SA01" \
212200
-i "pandas.Timedelta.asm8 SA01" \
@@ -244,13 +232,11 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
244232
-i "pandas.Timestamp.month_name SA01" \
245233
-i "pandas.Timestamp.nanosecond GL08" \
246234
-i "pandas.Timestamp.normalize SA01" \
247-
-i "pandas.Timestamp.now SA01" \
248235
-i "pandas.Timestamp.quarter SA01" \
249236
-i "pandas.Timestamp.replace PR07,SA01" \
250237
-i "pandas.Timestamp.resolution PR02" \
251238
-i "pandas.Timestamp.second GL08" \
252239
-i "pandas.Timestamp.strptime PR01,SA01" \
253-
-i "pandas.Timestamp.time SA01" \
254240
-i "pandas.Timestamp.timestamp SA01" \
255241
-i "pandas.Timestamp.timetuple SA01" \
256242
-i "pandas.Timestamp.timetz SA01" \
@@ -317,11 +303,9 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
317303
-i "pandas.api.types.is_period_dtype SA01" \
318304
-i "pandas.api.types.is_re PR07,SA01" \
319305
-i "pandas.api.types.is_re_compilable PR07,SA01" \
320-
-i "pandas.api.types.is_signed_integer_dtype SA01" \
321306
-i "pandas.api.types.is_sparse SA01" \
322307
-i "pandas.api.types.is_string_dtype SA01" \
323308
-i "pandas.api.types.is_timedelta64_ns_dtype SA01" \
324-
-i "pandas.api.types.is_unsigned_integer_dtype SA01" \
325309
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
326310
-i "pandas.api.types.union_categoricals RT03,SA01" \
327311
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \

ci/deps/actions-310-minimum_versions.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ dependencies:
1515
# test dependencies
1616
- pytest>=7.3.2
1717
- pytest-cov
18-
- pytest-xdist>=2.2.0
19-
- pytest-localserver>=0.7.1
20-
- pytest-qt>=4.2.0
18+
- pytest-xdist>=3.4.0
19+
- pytest-localserver>=0.8.1
20+
- pytest-qt>=4.4.0
2121
- boto3
2222

2323
# required dependencies
@@ -32,7 +32,7 @@ dependencies:
3232
- fastparquet=2023.10.0
3333
- fsspec=2022.11.0
3434
- html5lib=1.1
35-
- hypothesis=6.46.1
35+
- hypothesis=6.84.0
3636
- gcsfs=2022.11.0
3737
- jinja2=3.1.2
3838
- lxml=4.9.2

ci/deps/actions-310.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ dependencies:
1313
# test dependencies
1414
- pytest>=7.3.2
1515
- pytest-cov
16-
- pytest-xdist>=2.2.0
17-
- pytest-qt>=4.2.0
16+
- pytest-xdist>=3.4.0
17+
- pytest-localserver>=0.8.1
18+
- pytest-qt>=4.4.0
1819
- boto3
1920

2021
# required dependencies
@@ -29,7 +30,7 @@ dependencies:
2930
- fastparquet>=2023.10.0
3031
- fsspec>=2022.11.0
3132
- html5lib>=1.1
32-
- hypothesis>=6.46.1
33+
- hypothesis>=6.84.0
3334
- gcsfs>=2022.11.0
3435
- jinja2>=3.1.2
3536
- lxml>=4.9.2
@@ -60,4 +61,3 @@ dependencies:
6061
- adbc-driver-postgresql>=0.10.0
6162
- adbc-driver-sqlite>=0.8.0
6263
- tzdata>=2022.7
63-
- pytest-localserver>=0.7.1

ci/deps/actions-311-downstream_compat.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ dependencies:
1414
# test dependencies
1515
- pytest>=7.3.2
1616
- pytest-cov
17-
- pytest-xdist>=2.2.0
18-
- pytest-localserver>=0.7.1
19-
- pytest-qt>=4.2.0
17+
- pytest-xdist>=3.4.0
18+
- pytest-localserver>=0.8.1
19+
- pytest-qt>=4.4.0
2020
- boto3
2121

2222
# required dependencies
@@ -31,7 +31,7 @@ dependencies:
3131
- fastparquet>=2023.10.0
3232
- fsspec>=2022.11.0
3333
- html5lib>=1.1
34-
- hypothesis>=6.46.1
34+
- hypothesis>=6.84.0
3535
- gcsfs>=2022.11.0
3636
- jinja2>=3.1.2
3737
- lxml>=4.9.2

ci/deps/actions-311-numpydev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencies:
1313
# test dependencies
1414
- pytest>=7.3.2
1515
- pytest-cov
16-
- pytest-xdist>=2.2.0
17-
- hypothesis>=6.46.1
16+
- pytest-xdist>=3.4.0
17+
- hypothesis>=6.84.0
1818

1919
# pandas dependencies
2020
- python-dateutil

0 commit comments

Comments
 (0)