Merge remote-tracking branch 'upstream/main' into cow-chained-detection-py314

Author: jorisvandenbossche

.github/workflows/code-checks.yml

@@ -177,7 +177,7 @@ jobs:
         id: setup_python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
           cache: 'pip'
           cache-dependency-path: 'requirements-dev.txt'
 

.github/workflows/package-checks.yml

@@ -42,7 +42,7 @@ jobs:
         id: setup_python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Pip install with extra
         run: |
@@ -51,14 +51,10 @@ jobs:
   conda_forge_recipe:
     if: ${{ github.event.label.name == 'Build' || contains(github.event.pull_request.labels.*.name, 'Build') || github.event_name == 'push'}}
     runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        python-version: ['3.10', '3.11']
-      fail-fast: false
-    name: Test Conda Forge Recipe - Python ${{ matrix.python-version }}
+    name: Test Conda Forge Recipe
     concurrency:
       # https://github.community/t/concurrecy-not-work-for-push/183068/7
-      group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-conda-forge-recipe-${{ matrix.python-version }}
+      group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-conda-forge-recipe
       cancel-in-progress: true
     steps:
       - name: Checkout
@@ -71,7 +67,7 @@ jobs:
         with:
           environment-name: recipe-test
           create-args: >-
-            python=${{ matrix.python-version }}
+            python=3.11
             boa
             conda-verify
           cache-downloads: true

.github/workflows/unit-tests.yml

@@ -27,18 +27,18 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-24.04, ubuntu-24.04-arm]
-        env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml, actions-313.yaml]
+        env_file: [actions-311.yaml, actions-312.yaml, actions-313.yaml]
         # Prevent the include jobs from overriding other jobs
         pattern: [""]
         pandas_future_infer_string: ["1"]
         include:
           - name: "Downstream Compat"
-            env_file: actions-311-downstream_compat.yaml
+            env_file: actions-313-downstream_compat.yaml
             pattern: "not slow and not network and not single_cpu"
             pytest_target: "pandas/tests/test_downstream.py"
             platform: ubuntu-24.04
           - name: "Minimum Versions"
-            env_file: actions-310-minimum_versions.yaml
+            env_file: actions-311-minimum_versions.yaml
             pattern: "not slow and not network and not single_cpu"
             platform: ubuntu-24.04
           - name: "Freethreading"
@@ -50,7 +50,7 @@ jobs:
             pattern: "not slow and not network and not single_cpu"
             platform: ubuntu-24.04
           - name: "Locale: it_IT"
-            env_file: actions-311.yaml
+            env_file: actions-313.yaml
             pattern: "not slow and not network and not single_cpu"
             extra_apt: "language-pack-it"
             # Use the utf8 version as the default, it has no bad side-effect.
@@ -61,7 +61,7 @@ jobs:
             extra_loc: "it_IT"
             platform: ubuntu-24.04
           - name: "Locale: zh_CN"
-            env_file: actions-311.yaml
+            env_file: actions-313.yaml
             pattern: "not slow and not network and not single_cpu"
             extra_apt: "language-pack-zh-hans"
             # Use the utf8 version as the default, it has no bad side-effect.
@@ -72,16 +72,16 @@ jobs:
             extra_loc: "zh_CN"
             platform: ubuntu-24.04
           - name: "PANDAS_FUTURE_INFER_STRING=0"
-            env_file: actions-312.yaml
+            env_file: actions-313.yaml
             pandas_future_infer_string: "0"
             platform: ubuntu-24.04
           - name: "Numpy Dev"
-            env_file: actions-311-numpydev.yaml
+            env_file: actions-313-numpydev.yaml
             pattern: "not slow and not network and not single_cpu"
             test_args: "-W error::DeprecationWarning -W error::FutureWarning"
             platform: ubuntu-24.04
           - name: "Pyarrow Nightly"
-            env_file: actions-311-pyarrownightly.yaml
+            env_file: actions-313-pyarrownightly.yaml
             pattern: "not slow and not network and not single_cpu"
             platform: ubuntu-24.04
       fail-fast: false
@@ -183,7 +183,7 @@ jobs:
       matrix:
         # Note: Don't use macOS latest since macos 14 appears to be arm64 only
         os: [macos-13, macos-14, windows-latest]
-        env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml, actions-313.yaml]
+        env_file: [actions-311.yaml, actions-312.yaml, actions-313.yaml]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }}

.github/workflows/wheels.yml

@@ -101,7 +101,7 @@ jobs:
         - [macos-14, macosx_arm64]
         - [windows-2022, win_amd64]
         - [windows-11-arm, win_arm64]
-        python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
+        python: [["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
         include:
         # Build Pyodide wheels and upload them to Anaconda.org
         # NOTE: this job is similar to the one in unit-tests.yml except for the fact
@@ -110,8 +110,6 @@ jobs:
           python: ["cp312", "3.12"]
           cibw_build_frontend: 'build'
         exclude:
-          - buildplat: [windows-11-arm, win_arm64]
-            python: ["cp310", "3.10"]
         # BackendUnavailable: Cannot import 'mesonpy'
           - buildplat: [windows-11-arm, win_arm64]
             python: ["cp313t", "3.13"]

.pre-commit-config.yaml

@@ -45,7 +45,6 @@ repos:
     hooks:
     -   id: codespell
         types_or: [python, rst, markdown, cython, c]
-        additional_dependencies: [tomli]
 -   repo: https://github.com/MarcoGorelli/cython-lint
     rev: v0.16.7
     hooks:
@@ -77,7 +76,7 @@ repos:
     rev: v3.20.0
     hooks:
     -   id: pyupgrade
-        args: [--py310-plus]
+        args: [--py311-plus]
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:
@@ -235,7 +234,7 @@ repos:
         entry: python scripts/generate_pip_deps_from_conda.py
         files: ^(environment.yml|requirements-dev.txt)$
         pass_filenames: false
-        additional_dependencies: [tomli, pyyaml]
+        additional_dependencies: [pyyaml]
     -   id: title-capitalization
         name: Validate correct capitalization among titles in documentation
         entry: python scripts/validate_rst_title_capitalization.py
@@ -290,7 +289,7 @@ repos:
         entry: python -m scripts.validate_min_versions_in_sync
         language: python
         files: ^(ci/deps/actions-.*-minimum_versions\.yaml|pandas/compat/_optional\.py)$
-        additional_dependencies: [tomli, pyyaml]
+        additional_dependencies: [pyyaml]
         pass_filenames: false
     -   id: validate-errors-locations
         name: Validate errors locations

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10.8
+FROM python:3.11.13
 WORKDIR /home/pandas
 
 RUN apt-get update && \

asv_bench/asv.conf.json

@@ -29,7 +29,7 @@
 
     // The Pythons you'd like to test against.  If not provided, defaults
     // to the current version of Python used to run `asv`.
-    "pythons": ["3.10"],
+    "pythons": ["3.11"],
 
     // The matrix of dependencies to test.  Each key is the name of a
     // package (in PyPI) and the values are version numbers.  An empty

ci/code_checks.sh

@@ -163,6 +163,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
         -i "pandas.tseries.offsets.DateOffset.is_on_offset GL08" \
         -i "pandas.tseries.offsets.DateOffset.n GL08" \
         -i "pandas.tseries.offsets.DateOffset.normalize GL08" \
+        -i "pandas.tseries.offsets.Day.freqstr SA01" \
         -i "pandas.tseries.offsets.Day.is_on_offset GL08" \
         -i "pandas.tseries.offsets.Day.n GL08" \
         -i "pandas.tseries.offsets.Day.normalize GL08" \

ci/deps/actions-310.yaml

@@ -4,7 +4,7 @@ name: pandas-dev
 channels:
   - conda-forge
 dependencies:
-  - python=3.10
+  - python=3.11
 
   # build dependencies
   - versioneer
@@ -25,6 +25,8 @@ dependencies:
   - numpy=1.26.0
 
   # optional dependencies
+  - adbc-driver-postgresql=1.2.0
+  - adbc-driver-sqlite=1.2.0
   - beautifulsoup4=4.12.3
   - bottleneck=1.3.6
   - fastparquet=2024.2.0
@@ -40,7 +42,7 @@ dependencies:
   - odfpy=1.4.1
   - qtpy=2.3.0
   - openpyxl=3.1.2
-  - psycopg2=2.9.6
+  - psycopg2=2.9.9
   - pyarrow=12.0.1
   - pyiceberg=0.7.1
   - pymysql=1.1.0
@@ -60,6 +62,4 @@ dependencies:
   - zstandard=0.22.0
 
   - pip:
-    - adbc-driver-postgresql==0.10.0
-    - adbc-driver-sqlite==0.8.0
     - tzdata==2023.3