Skip to content

Commit 6e1af00

Browse files
authored
Merge branch 'main' into Deprecate_indexing_dates_and_datetime64
2 parents 8b1ab37 + 1fa95a1 commit 6e1af00

File tree

145 files changed

+1888
-1007
lines changed

Some content is hidden

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

145 files changed

+1888
-1007
lines changed

.github/workflows/code-checks.yml

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

176176
- name: Setup Python
177177
id: setup_python
178-
uses: actions/setup-python@v5
178+
uses: actions/setup-python@v6
179179
with:
180180
python-version: '3.11'
181181
cache: 'pip'

.github/workflows/comment-commands.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
echo 'EOF' >> $GITHUB_ENV
7676
echo "REGEX=$REGEX" >> $GITHUB_ENV
7777
78-
- uses: actions/github-script@v7
78+
- uses: actions/github-script@v8
7979
env:
8080
BENCH_OUTPUT: ${{env.BENCH_OUTPUT}}
8181
REGEX: ${{env.REGEX}}

.github/workflows/deprecation-tracking-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
env:
2222
DEPRECATION_TRACKER_ISSUE: 56596
2323
steps:
24-
- uses: actions/github-script@v7
24+
- uses: actions/github-script@v8
2525
id: update-deprecation-issue
2626
with:
2727
script: |

.github/workflows/package-checks.yml

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

4141
- name: Setup Python
4242
id: setup_python
43-
uses: actions/setup-python@v5
43+
uses: actions/setup-python@v6
4444
with:
4545
python-version: '3.11'
4646

.github/workflows/stale-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.repository_owner == 'pandas-dev'
1515
runs-on: ubuntu-24.04
1616
steps:
17-
- uses: actions/stale@v9
17+
- uses: actions/stale@v10
1818
with:
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}
2020
stale-pr-message: "This pull request is stale because it has been open for thirty days with no activity. Please [update](https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#updating-your-pull-request) and respond to this comment if you're still interested in working on this."

.github/workflows/unit-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ jobs:
243243
. ~/virtualenvs/pandas-dev/bin/activate
244244
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
245245
python -m pip install numpy -Csetup-args="-Dallow-noblas=true"
246-
python -m pip install --no-cache-dir versioneer[toml] cython==3.0.10 python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
246+
python -m pip install --no-cache-dir versioneer[toml] cython==3.0.10 python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.116.0
247247
python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror"
248248
python -m pip list --no-cache-dir
249249
PANDAS_CI=1 python -m pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml
@@ -280,7 +280,7 @@ jobs:
280280
/opt/python/cp313-cp313/bin/python -m venv ~/virtualenvs/pandas-dev
281281
. ~/virtualenvs/pandas-dev/bin/activate
282282
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
283-
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
283+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.116.0
284284
python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror"
285285
python -m pip list --no-cache-dir
286286
@@ -343,7 +343,7 @@ jobs:
343343
fetch-depth: 0
344344

345345
- name: Set up Python Dev Version
346-
uses: actions/setup-python@v5
346+
uses: actions/setup-python@v6
347347
with:
348348
python-version: '3.13-dev'
349349

@@ -352,7 +352,7 @@ jobs:
352352
python --version
353353
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
354354
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
355-
python -m pip install versioneer[toml] python-dateutil tzdata cython hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
355+
python -m pip install versioneer[toml] python-dateutil tzdata cython hypothesis>=6.116.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
356356
python -m pip install -ve . --no-build-isolation --no-index --no-deps -Csetup-args="--werror"
357357
python -m pip list
358358
@@ -381,7 +381,7 @@ jobs:
381381

382382
- name: Set up Python for pyodide-build
383383
id: setup-python
384-
uses: actions/setup-python@v5
384+
uses: actions/setup-python@v6
385385
with:
386386
python-version: '3.12'
387387

@@ -399,7 +399,7 @@ jobs:
399399
pyodide build
400400
401401
- name: Set up Node.js
402-
uses: actions/setup-node@v4
402+
uses: actions/setup-node@v5
403403
with:
404404
node-version: '20'
405405

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
fetch-depth: 0
5454

5555
- name: Set up Python
56-
uses: actions/setup-python@v5
56+
uses: actions/setup-python@v6
5757
with:
5858
python-version: '3.11'
5959

.pre-commit-config.yaml

Lines changed: 11 additions & 8 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.12.7
22+
rev: v0.12.11
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -32,7 +32,7 @@ repos:
3232
exclude: ^pandas/tests
3333
args: [--select, "ANN001,ANN2", --fix-only, --exit-non-zero-on-fix]
3434
- id: ruff-format
35-
exclude: ^scripts|^pandas/tests/frame/test_query_eval.py
35+
exclude: ^pandas/tests/frame/test_query_eval.py
3636
- repo: https://github.com/jendrikseipp/vulture
3737
rev: v2.14
3838
hooks:
@@ -51,7 +51,7 @@ repos:
5151
- id: cython-lint
5252
- id: double-quote-cython-strings
5353
- repo: https://github.com/pre-commit/pre-commit-hooks
54-
rev: v5.0.0
54+
rev: v6.0.0
5555
hooks:
5656
- id: check-case-conflict
5757
- id: check-toml
@@ -64,8 +64,6 @@ repos:
6464
args: [--fix=auto]
6565
exclude: ^pandas/tests/io/parser/data/utf16_ex.txt$
6666
- id: fix-byte-order-marker
67-
- id: fix-encoding-pragma
68-
args: [--remove]
6967
- id: trailing-whitespace
7068
args: [--markdown-linebreak-ext=md]
7169
- repo: https://github.com/PyCQA/isort
@@ -94,19 +92,19 @@ repos:
9492
- id: sphinx-lint
9593
args: ["--enable", "all", "--disable", "line-too-long"]
9694
- repo: https://github.com/pre-commit/mirrors-clang-format
97-
rev: v20.1.8
95+
rev: v21.1.0
9896
hooks:
9997
- id: clang-format
10098
files: ^pandas/_libs/src|^pandas/_libs/include
10199
args: [-i]
102100
types_or: [c, c++]
103101
- repo: https://github.com/trim21/pre-commit-mirror-meson
104-
rev: v1.8.3
102+
rev: v1.9.0
105103
hooks:
106104
- id: meson-fmt
107105
args: ['--inplace']
108106
- repo: https://github.com/shellcheck-py/shellcheck-py
109-
rev: v0.10.0.1
107+
rev: v0.11.0.1
110108
hooks:
111109
- id: shellcheck
112110
args: ["--severity=warning"]
@@ -266,6 +264,11 @@ repos:
266264
language: python
267265
entry: python scripts/validate_unwanted_patterns.py --validation-type="nodefault_used_not_only_for_typing"
268266
types: [python]
267+
- id: unwanted-patterns-doesnt-use-pandas-warnings
268+
name: Check that warning classes for deprecations use pandas' warning classes
269+
language: python
270+
entry: python scripts/validate_unwanted_patterns.py --validation-type="doesnt_use_pandas_warnings"
271+
types: [ python ]
269272
- id: no-return-exception
270273
name: Use raise instead of return for exceptions
271274
language: pygrep

asv_bench/benchmarks/strings.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
DataFrame,
99
Index,
1010
Series,
11+
StringDtype,
1112
)
1213
from pandas.arrays import StringArray
1314

@@ -290,10 +291,10 @@ def setup(self):
290291
self.series_arr_nan = np.concatenate([self.series_arr, np.array([NA] * 1000)])
291292

292293
def time_string_array_construction(self):
293-
StringArray(self.series_arr)
294+
StringArray(self.series_arr, dtype=StringDtype())
294295

295296
def time_string_array_with_nan_construction(self):
296-
StringArray(self.series_arr_nan)
297+
StringArray(self.series_arr_nan, dtype=StringDtype())
297298

298299
def peakmem_stringarray_construction(self):
299-
StringArray(self.series_arr)
300+
StringArray(self.series_arr, dtype=StringDtype())

ci/deps/actions-311-minimum_versions.yaml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,38 @@ dependencies:
2828
- adbc-driver-postgresql=1.2.0
2929
- adbc-driver-sqlite=1.2.0
3030
- beautifulsoup4=4.12.3
31-
- bottleneck=1.3.6
32-
- fastparquet=2024.2.0
33-
- fsspec=2023.12.2
31+
- bottleneck=1.4.2
32+
- fastparquet=2024.11.0
33+
- fsspec=2024.10.0
3434
- html5lib=1.1
35-
- hypothesis=6.84.0
36-
- gcsfs=2023.12.2
37-
- jinja2=3.1.3
38-
- lxml=4.9.2
39-
- matplotlib=3.8.3
40-
- numba=0.59.0
41-
- numexpr=2.9.0
35+
- hypothesis=6.116.0
36+
- gcsfs=2024.10.0
37+
- jinja2=3.1.5
38+
- lxml=5.3.0
39+
- matplotlib=3.9.3
40+
- numba=0.60.0
41+
- numexpr=2.10.2
4242
- odfpy=1.4.1
43-
- qtpy=2.3.0
44-
- openpyxl=3.1.2
45-
- psycopg2=2.9.9
46-
- pyarrow=12.0.1
47-
- pyiceberg=0.7.1
48-
- pymysql=1.1.0
43+
- qtpy=2.4.2
44+
- openpyxl=3.1.5
45+
- psycopg2=2.9.10
46+
- pyarrow=13.0.0
47+
- pyiceberg=0.8.1
48+
- pymysql=1.1.1
4949
- pyqt=5.15.9
50-
- pyreadstat=1.2.6
51-
- pytables=3.8.0
52-
- python-calamine=0.1.7
53-
- pytz=2023.4
50+
- pyreadstat=1.2.8
51+
- pytables=3.10.1
52+
- python-calamine=0.3.0
53+
- pytz=2024.2
5454
- pyxlsb=1.0.10
55-
- s3fs=2023.12.2
56-
- scipy=1.12.0
57-
- sqlalchemy=2.0.0
55+
- s3fs=2024.10.0
56+
- scipy=1.14.1
57+
- sqlalchemy=2.0.36
5858
- tabulate=0.9.0
59-
- xarray=2024.1.1
59+
- xarray=2024.10.0
6060
- xlrd=2.0.1
6161
- xlsxwriter=3.2.0
62-
- zstandard=0.22.0
62+
- zstandard=0.23.0
6363

6464
- pip:
6565
- tzdata==2023.3

0 commit comments

Comments
 (0)