Merge branch 'main' into depr-unit

Author: jbrockmendel

.github/workflows/broken-linkcheck.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
  cleanup:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
  if: github.repository_owner == 'pandas-dev'
  permissions:
  actions: write

.github/workflows/cache-cleanup-daily.yml

@@ -6,7 +6,8 @@ on:
 
 jobs:
  cleanup:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
+ if: github.repository_owner == 'pandas-dev'
  steps:
  - name: Clean Cache
  run: |

.github/workflows/cache-cleanup.yml

@@ -9,15 +9,6 @@ permissions:
  pull-requests: write
 
 jobs:
- issue_assign:
- runs-on: ubuntu-24.04
- if: (!github.event.issue.pull_request) && github.event.comment.body == 'take'
- concurrency:
- group: ${{ github.actor }}-issue-assign
- steps:
- - run: |
- echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"
- curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"assignees": ["${{ github.event.comment.user.login }}"]}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/assignees
  preview_docs:
  runs-on: ubuntu-24.04
  if: github.event.issue.pull_request && github.event.comment.body == '/preview'
@@ -28,64 +19,3 @@ jobs:
  with:
  previewer-server: "https://pandas.pydata.org/preview"
  artifact-job: "Doc Build and Upload"
- asv_run:
- runs-on: ubuntu-24.04
- # TODO: Support more benchmarking options later, against different branches, against self, etc
- if: github.event.issue.pull_request && startsWith(github.event.comment.body, '@github-actions benchmark')
- defaults:
- run:
- shell: bash -el {0}
- env:
- ENV_FILE: environment.yml
- COMMENT: ${{github.event.comment.body}}
-
- concurrency:
- # Set concurrency to prevent abuse(full runs are ~5.5 hours !!!)
- # each user can only run one concurrent benchmark bot at a time
- # We don't cancel in progress jobs, but if you want to benchmark multiple PRs, you're gonna have
- # to wait
- group: ${{ github.actor }}-asv
- cancel-in-progress: false
-
- steps:
- - name: Checkout
- uses: actions/checkout@v5
- with:
- fetch-depth: 0
-
- # Although asv sets up its own env, deps are still needed
- # during discovery process
- - name: Set up Conda
- uses: ./.github/actions/setup-conda
-
- - name: Run benchmarks
- id: bench
- continue-on-error: true # asv will exit code 1 for regressions
- run: |
- # extracting the regex, see https://stackoverflow.com/a/36798723
- REGEX=$(echo "$COMMENT" | sed -n "s/^.*-b\s*\(\S*\).*$/\1/p")
- cd asv_bench
- asv check -E existing
- git remote add upstream https://github.com/pandas-dev/pandas.git
- git fetch upstream
- asv machine --yes
- asv continuous -f 1.1 -b $REGEX upstream/main HEAD
- echo 'BENCH_OUTPUT<<EOF' >> $GITHUB_ENV
- asv compare -f 1.1 upstream/main HEAD >> $GITHUB_ENV
- echo 'EOF' >> $GITHUB_ENV
- echo "REGEX=$REGEX" >> $GITHUB_ENV
-
- - uses: actions/github-script@v8
- env:
- BENCH_OUTPUT: ${{env.BENCH_OUTPUT}}
- REGEX: ${{env.REGEX}}
- with:
- script: |
- const ENV_VARS = process.env
- const run_url = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`
- github.rest.issues.createComment({
- issue_number: context.issue.number,
- owner: context.repo.owner,
- repo: context.repo.repo,
- body: '\nBenchmarks completed. View runner logs here.' + run_url + '\nRegex used: '+ 'regex ' + ENV_VARS["REGEX"] + '\n' + ENV_VARS["BENCH_OUTPUT"]
- })

.github/workflows/comment-commands.yml

@@ -182,7 +182,7 @@ jobs:
  strategy:
  matrix:
  # Note: Don't use macOS latest since macos 14 appears to be arm64 only
- os: [macos-13, macos-14, windows-latest]
+ os: [macos-13, macos-14, windows-2025]
  env_file: [actions-311.yaml, actions-312.yaml, actions-313.yaml]
  fail-fast: false
  runs-on: ${{ matrix.os }}
@@ -322,7 +322,7 @@ jobs:
  fail-fast: false
  matrix:
  # Separate out macOS 13 and 14, since macOS 14 is arm64 only
- os: [ubuntu-24.04, macOS-13, macOS-14, windows-latest]
+ os: [ubuntu-24.04, macOS-13, macOS-14, windows-2025]
 
  timeout-minutes: 90
 

.github/workflows/unit-tests.yml

@@ -229,7 +229,7 @@ jobs:
  - build_sdist
  - build_wheels
 
- runs-on: ubuntu-latest
+ runs-on: ubuntu-24.04
 
  environment:
  name: pypi
@@ -243,6 +243,8 @@ jobs:
  with:
  path: dist # everything lands in ./dist/**
 
+ # TODO: This step can be probably be achieved by actions/download-artifact@v5
+ # by specifying merge-multiple: true, and a glob pattern
  - name: Collect files
  run: |
  mkdir -p upload

.github/workflows/wheels.yml

@@ -36,16 +36,14 @@ and `good first issue
 <https://github.com/pandas-dev/pandas/issues?q=is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22+no%3Aassignee>`_
 are typically good for newer contributors.
 
-Once you've found an interesting issue, it's a good idea to assign the issue to yourself,
-so nobody else duplicates the work on it. On the Github issue, a comment with the exact
-text ``take`` to automatically assign you the issue
-(this will take seconds and may require refreshing the page to see it).
+Once you've found an interesting issue, leave a comment with your intention
+to start working on it. If somebody else has
+already commented on issue but they have shown a lack of activity in the issue
+or a pull request in the past 2-3 weeks, you may take it over.
 
 If for whatever reason you are not able to continue working with the issue, please
-unassign it, so other people know it's available again. You can check the list of
-assigned issues, since people may not be working in them anymore. If you want to work on one
-that is assigned, feel free to kindly ask the current assignee if you can take it
-(please allow at least a week of inactivity before considering work in the issue discontinued).
+leave a comment on an issue, so other people know it's available again. You can check the list of
+assigned issues, since people may not be working in them anymore.
 
 We have several :ref:`contributor community <community>` communication channels, which you are
 welcome to join, and ask questions as you figure things out. Among them are regular meetings for

doc/source/development/contributing.rst

@@ -949,6 +949,7 @@ Datetimelike
 - Bug in :class:`Timestamp` constructor failing to raise when given a ``np.datetime64`` object with non-standard unit (:issue:`25611`)
 - Bug in :func:`date_range` where the last valid timestamp would sometimes not be produced (:issue:`56134`)
 - Bug in :func:`date_range` where using a negative frequency value would not include all points between the start and end values (:issue:`56147`)
+- Bug in :func:`to_datetime` where passing an ``lxml.etree._ElementUnicodeResult`` together with ``format`` raised ``TypeError``. Now subclasses of ``str`` are handled. (:issue:`60933`)
 - Bug in :func:`tseries.api.guess_datetime_format` would fail to infer time format when "%Y" == "%H%M" (:issue:`57452`)
 - Bug in :func:`tseries.frequencies.to_offset` would fail to parse frequency strings starting with "LWOM" (:issue:`59218`)
 - Bug in :meth:`DataFrame.fillna` raising an ``AssertionError`` instead of ``OutOfBoundsDatetime`` when filling a ``datetime64[ns]`` column with an out-of-bounds timestamp. Now correctly raises ``OutOfBoundsDatetime``. (:issue:`61208`)
@@ -973,6 +974,7 @@ Datetimelike
 - Bug in constructing arrays with a timezone-aware :class:`ArrowDtype` from timezone-naive datetime objects incorrectly treating those as UTC times instead of wall times like :class:`DatetimeTZDtype` (:issue:`61775`)
 - Bug in setting scalar values with mismatched resolution into arrays with non-nanosecond ``datetime64``, ``timedelta64`` or :class:`DatetimeTZDtype` incorrectly truncating those scalars (:issue:`56410`)
 
+
 Timedelta
 ^^^^^^^^^
 - Accuracy improvement in :meth:`Timedelta.to_pytimedelta` to round microseconds consistently for large nanosecond based Timedelta (:issue:`57841`)

doc/source/whatsnew/v3.0.0.rst

@@ -405,6 +405,11 @@ def array_strptime(
  if len(val) == 0 or val in nat_strings:
  iresult[i] = NPY_NAT
  continue
+ elif type(val) is not str:
+ # GH#60933: normalize string subclasses
+ # (e.g. lxml.etree._ElementUnicodeResult). The downstream Cython
+ # path expects an exact `str`, so ensure we pass a plain str
+ val = str(val)
  elif checknull_with_nat_and_na(val):
  iresult[i] = NPY_NAT
  continue

pandas/_libs/tslibs/strptime.pyx

@@ -902,7 +902,7 @@ def _cmp_method(self, other, op) -> ArrowExtensionArray:
  boxed = self._box_pa(other)
  except pa.lib.ArrowInvalid:
  # e.g. GH#60228 [1, "b"] we have to operate pointwise
- res_values = [op(x, y) for x, y in zip(self, other)]
+ res_values = [op(x, y) for x, y in zip(self, other, strict=True)]
  result = pa.array(res_values, type=pa.bool_(), from_pandas=True)
  else:
  rtype = boxed.type
@@ -2758,7 +2758,7 @@ def _str_extract(self, pat: str, flags: int = 0, expand: bool = True):
  if expand:
  return {
  col: self._from_pyarrow_array(pc.struct_field(result, [i]))
- for col, i in zip(groups, range(result.type.num_fields))
+ for col, i in zip(groups, range(result.type.num_fields), strict=True)
  }
  else:
  return type(self)(pc.struct_field(result, [0]))