Skip to content

Commit 0bb16d0

Browse files
committed
Merge remote-tracking branch 'upstream/main' into tz_localize
2 parents 5e66690 + 7863029 commit 0bb16d0

File tree

100 files changed

+147
-327
lines changed

Some content is hidden

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

100 files changed

+147
-327
lines changed

.github/workflows/code-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
id: setup_python
178178
uses: actions/setup-python@v5
179179
with:
180-
python-version: '3.10'
180+
python-version: '3.11'
181181
cache: 'pip'
182182
cache-dependency-path: 'requirements-dev.txt'
183183

.github/workflows/package-checks.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
id: setup_python
4343
uses: actions/setup-python@v5
4444
with:
45-
python-version: '3.10'
45+
python-version: '3.11'
4646

4747
- name: Pip install with extra
4848
run: |
@@ -51,14 +51,10 @@ jobs:
5151
conda_forge_recipe:
5252
if: ${{ github.event.label.name == 'Build' || contains(github.event.pull_request.labels.*.name, 'Build') || github.event_name == 'push'}}
5353
runs-on: ubuntu-24.04
54-
strategy:
55-
matrix:
56-
python-version: ['3.10', '3.11']
57-
fail-fast: false
58-
name: Test Conda Forge Recipe - Python ${{ matrix.python-version }}
54+
name: Test Conda Forge Recipe
5955
concurrency:
6056
# https://github.community/t/concurrecy-not-work-for-push/183068/7
61-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-conda-forge-recipe-${{ matrix.python-version }}
57+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-conda-forge-recipe
6258
cancel-in-progress: true
6359
steps:
6460
- name: Checkout
@@ -71,7 +67,7 @@ jobs:
7167
with:
7268
environment-name: recipe-test
7369
create-args: >-
74-
python=${{ matrix.python-version }}
70+
python=3.11
7571
boa
7672
conda-verify
7773
cache-downloads: true

.github/workflows/unit-tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727
strategy:
2828
matrix:
2929
platform: [ubuntu-24.04, ubuntu-24.04-arm]
30-
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml, actions-313.yaml]
30+
env_file: [actions-311.yaml, actions-312.yaml, actions-313.yaml]
3131
# Prevent the include jobs from overriding other jobs
3232
pattern: [""]
3333
pandas_future_infer_string: ["1"]
3434
include:
3535
- name: "Downstream Compat"
36-
env_file: actions-311-downstream_compat.yaml
36+
env_file: actions-313-downstream_compat.yaml
3737
pattern: "not slow and not network and not single_cpu"
3838
pytest_target: "pandas/tests/test_downstream.py"
3939
platform: ubuntu-24.04
4040
- name: "Minimum Versions"
41-
env_file: actions-310-minimum_versions.yaml
41+
env_file: actions-311-minimum_versions.yaml
4242
pattern: "not slow and not network and not single_cpu"
4343
platform: ubuntu-24.04
4444
- name: "Freethreading"
@@ -50,7 +50,7 @@ jobs:
5050
pattern: "not slow and not network and not single_cpu"
5151
platform: ubuntu-24.04
5252
- name: "Locale: it_IT"
53-
env_file: actions-311.yaml
53+
env_file: actions-313.yaml
5454
pattern: "not slow and not network and not single_cpu"
5555
extra_apt: "language-pack-it"
5656
# Use the utf8 version as the default, it has no bad side-effect.
@@ -61,7 +61,7 @@ jobs:
6161
extra_loc: "it_IT"
6262
platform: ubuntu-24.04
6363
- name: "Locale: zh_CN"
64-
env_file: actions-311.yaml
64+
env_file: actions-313.yaml
6565
pattern: "not slow and not network and not single_cpu"
6666
extra_apt: "language-pack-zh-hans"
6767
# Use the utf8 version as the default, it has no bad side-effect.
@@ -72,16 +72,16 @@ jobs:
7272
extra_loc: "zh_CN"
7373
platform: ubuntu-24.04
7474
- name: "PANDAS_FUTURE_INFER_STRING=0"
75-
env_file: actions-312.yaml
75+
env_file: actions-313.yaml
7676
pandas_future_infer_string: "0"
7777
platform: ubuntu-24.04
7878
- name: "Numpy Dev"
79-
env_file: actions-311-numpydev.yaml
79+
env_file: actions-313-numpydev.yaml
8080
pattern: "not slow and not network and not single_cpu"
8181
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
8282
platform: ubuntu-24.04
8383
- name: "Pyarrow Nightly"
84-
env_file: actions-311-pyarrownightly.yaml
84+
env_file: actions-313-pyarrownightly.yaml
8585
pattern: "not slow and not network and not single_cpu"
8686
platform: ubuntu-24.04
8787
fail-fast: false
@@ -183,7 +183,7 @@ jobs:
183183
matrix:
184184
# Note: Don't use macOS latest since macos 14 appears to be arm64 only
185185
os: [macos-13, macos-14, windows-latest]
186-
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml, actions-313.yaml]
186+
env_file: [actions-311.yaml, actions-312.yaml, actions-313.yaml]
187187
fail-fast: false
188188
runs-on: ${{ matrix.os }}
189189
name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }}

.github/workflows/wheels.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- [macos-14, macosx_arm64]
102102
- [windows-2022, win_amd64]
103103
- [windows-11-arm, win_arm64]
104-
python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
104+
python: [["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
105105
include:
106106
# Build Pyodide wheels and upload them to Anaconda.org
107107
# NOTE: this job is similar to the one in unit-tests.yml except for the fact
@@ -110,8 +110,6 @@ jobs:
110110
python: ["cp312", "3.12"]
111111
cibw_build_frontend: 'build'
112112
exclude:
113-
- buildplat: [windows-11-arm, win_arm64]
114-
python: ["cp310", "3.10"]
115113
# BackendUnavailable: Cannot import 'mesonpy'
116114
- buildplat: [windows-11-arm, win_arm64]
117115
python: ["cp313t", "3.13"]

.pre-commit-config.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ repos:
4545
hooks:
4646
- id: codespell
4747
types_or: [python, rst, markdown, cython, c]
48-
additional_dependencies: [tomli]
4948
- repo: https://github.com/MarcoGorelli/cython-lint
5049
rev: v0.16.7
5150
hooks:
@@ -77,7 +76,7 @@ repos:
7776
rev: v3.20.0
7877
hooks:
7978
- id: pyupgrade
80-
args: [--py310-plus]
79+
args: [--py311-plus]
8180
- repo: https://github.com/pre-commit/pygrep-hooks
8281
rev: v1.10.0
8382
hooks:
@@ -235,7 +234,7 @@ repos:
235234
entry: python scripts/generate_pip_deps_from_conda.py
236235
files: ^(environment.yml|requirements-dev.txt)$
237236
pass_filenames: false
238-
additional_dependencies: [tomli, pyyaml]
237+
additional_dependencies: [pyyaml]
239238
- id: title-capitalization
240239
name: Validate correct capitalization among titles in documentation
241240
entry: python scripts/validate_rst_title_capitalization.py
@@ -290,7 +289,7 @@ repos:
290289
entry: python -m scripts.validate_min_versions_in_sync
291290
language: python
292291
files: ^(ci/deps/actions-.*-minimum_versions\.yaml|pandas/compat/_optional\.py)$
293-
additional_dependencies: [tomli, pyyaml]
292+
additional_dependencies: [pyyaml]
294293
pass_filenames: false
295294
- id: validate-errors-locations
296295
name: Validate errors locations

asv_bench/asv.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
// The Pythons you'd like to test against. If not provided, defaults
3131
// to the current version of Python used to run `asv`.
32-
"pythons": ["3.10"],
32+
"pythons": ["3.11"],
3333

3434
// The matrix of dependencies to test. Each key is the name of a
3535
// package (in PyPI) and the values are version numbers. An empty

ci/deps/actions-310.yaml

Lines changed: 0 additions & 63 deletions
This file was deleted.

ci/deps/actions-310-minimum_versions.yaml renamed to ci/deps/actions-311-minimum_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: pandas-dev
44
channels:
55
- conda-forge
66
dependencies:
7-
- python=3.10
7+
- python=3.11
88

99
# build dependencies
1010
- versioneer

ci/deps/actions-311-downstream_compat.yaml renamed to ci/deps/actions-313-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: pandas-dev
33
channels:
44
- conda-forge
55
dependencies:
6-
- python=3.11
6+
- python=3.13
77

88
# build dependencies
99
- versioneer

ci/deps/actions-311-numpydev.yaml renamed to ci/deps/actions-313-numpydev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pandas-dev
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.11
5+
- python=3.13
66

77
# build dependencies
88
- versioneer

0 commit comments

Comments
 (0)