Skip to content

Commit 400bb22

Browse files
Merge branch 'main' into datetimenearbounds
2 parents 8b9c050 + a063af0 commit 400bb22

File tree

593 files changed

+17666
-9846
lines changed

Some content is hidden

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

593 files changed

+17666
-9846
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ body:
1717
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
1818
required: true
1919
- label: >
20-
I have confirmed this bug exists on the main branch of pandas.
20+
I have confirmed this bug exists on the
21+
[main branch](https://pandas.pydata.org/docs/dev/getting_started/install.html#installing-the-development-version-of-pandas)
22+
of pandas.
2123
- type: textarea
2224
id: example
2325
attributes:

.github/actions/setup-conda/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
- name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }}
1919
run: |
2020
grep -q ' - pyarrow' ${{ inputs.environment-file }}
21-
sed -i"" -e "s/ - pyarrow<10/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
21+
sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
2222
cat ${{ inputs.environment-file }}
2323
shell: bash
2424
if: ${{ inputs.pyarrow-version }}

.github/workflows/32-bit-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
. ~/virtualenvs/pandas-dev/bin/activate && \
4040
python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
4141
python -m pip install versioneer[toml] && \
42-
python -m pip install cython numpy python-dateutil pytz pytest pytest-xdist pytest-asyncio>=0.17 hypothesis && \
42+
python -m pip install cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.34.2 && \
4343
python setup.py build_ext -q -j1 && \
4444
python -m pip install --no-build-isolation --no-use-pep517 -e . && \
4545
python -m pip list && \

.github/workflows/code-checks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
with:
4040
extra_args: --verbose --all-files
4141

42-
docstring_typing_pylint:
43-
name: Docstring validation, typing, and pylint
42+
docstring_typing_manual_hooks:
43+
name: Docstring validation, typing, and other manual pre-commit hooks
4444
runs-on: ubuntu-22.04
4545
defaults:
4646
run:

.github/workflows/codeql.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ concurrency:
88
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
99
cancel-in-progress: true
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
analyze:
1316
runs-on: ubuntu-22.04

.github/workflows/docbuild-and-upload.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
env:
1616
ENV_FILE: environment.yml
1717
PANDAS_CI: 1
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1819

1920
permissions:
2021
contents: read

.github/workflows/macos-windows.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ env:
1616
PANDAS_CI: 1
1717
PYTEST_TARGET: pandas
1818
PATTERN: "not slow and not db and not network and not single_cpu"
19+
ERROR_ON_WARNINGS: "1"
1920

2021

2122
permissions:
@@ -30,7 +31,7 @@ jobs:
3031
strategy:
3132
matrix:
3233
os: [macos-latest, windows-latest]
33-
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
34+
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml]
3435
fail-fast: false
3536
runs-on: ${{ matrix.os }}
3637
name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }}
@@ -52,7 +53,7 @@ jobs:
5253
uses: ./.github/actions/setup-conda
5354
with:
5455
environment-file: ci/deps/${{ matrix.env_file }}
55-
pyarrow-version: ${{ matrix.os == 'macos-latest' && '6' || '' }}
56+
pyarrow-version: ${{ matrix.os == 'macos-latest' && '9' || '' }}
5657

5758
- name: Build Pandas
5859
uses: ./.github/actions/build_pandas

.github/workflows/python-dev.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ name: Python Dev
2323
on:
2424
push:
2525
branches:
26-
- main
27-
- 1.5.x
26+
# - main
27+
# - 1.5.x
28+
- None
2829
pull_request:
2930
branches:
30-
- main
31-
- 1.5.x
31+
# - main
32+
# - 1.5.x
33+
- None
3234
paths-ignore:
3335
- "doc/**"
3436

@@ -73,10 +75,10 @@ jobs:
7375
run: |
7476
python --version
7577
python -m pip install --upgrade pip setuptools wheel
76-
python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
78+
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
7779
python -m pip install git+https://github.com/nedbat/coveragepy.git
7880
python -m pip install versioneer[toml]
79-
python -m pip install python-dateutil pytz cython hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17
81+
python -m pip install python-dateutil pytz cython hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17
8082
python -m pip list
8183
8284
# GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs

.github/workflows/scorecards.yml

-54
This file was deleted.

.github/workflows/ubuntu.yml

+24-8
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
timeout-minutes: 180
2828
strategy:
2929
matrix:
30-
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
30+
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml]
3131
pattern: ["not single_cpu", "single_cpu"]
32-
pyarrow_version: ["7", "8", "9"]
32+
pyarrow_version: ["7", "8", "9", "10"]
3333
include:
3434
- name: "Downstream Compat"
3535
env_file: actions-38-downstream_compat.yaml
@@ -38,6 +38,7 @@ jobs:
3838
- name: "Minimum Versions"
3939
env_file: actions-38-minimum_versions.yaml
4040
pattern: "not slow and not network and not single_cpu"
41+
error_on_warnings: "0"
4142
- name: "Locale: it_IT"
4243
env_file: actions-38.yaml
4344
pattern: "not slow and not network and not single_cpu"
@@ -62,33 +63,48 @@ jobs:
6263
env_file: actions-310.yaml
6364
pattern: "not slow and not network and not single_cpu"
6465
pandas_copy_on_write: "1"
66+
error_on_warnings: "0"
6567
- name: "Data Manager"
6668
env_file: actions-38.yaml
6769
pattern: "not slow and not network and not single_cpu"
6870
pandas_data_manager: "array"
71+
error_on_warnings: "0"
6972
- name: "Pypy"
7073
env_file: actions-pypy-38.yaml
7174
pattern: "not slow and not network and not single_cpu"
7275
test_args: "--max-worker-restart 0"
76+
error_on_warnings: "0"
7377
- name: "Numpy Dev"
7478
env_file: actions-310-numpydev.yaml
7579
pattern: "not slow and not network and not single_cpu"
76-
test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
80+
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
81+
error_on_warnings: "0"
7782
exclude:
78-
- env_file: actions-39.yaml
79-
pyarrow_version: "6"
83+
- env_file: actions-38.yaml
84+
pyarrow_version: "7"
85+
- env_file: actions-38.yaml
86+
pyarrow_version: "8"
87+
- env_file: actions-38.yaml
88+
pyarrow_version: "9"
8089
- env_file: actions-39.yaml
8190
pyarrow_version: "7"
82-
- env_file: actions-310.yaml
83-
pyarrow_version: "6"
84-
- env_file: actions-310.yaml
91+
- env_file: actions-39.yaml
92+
pyarrow_version: "8"
93+
- env_file: actions-39.yaml
94+
pyarrow_version: "9"
95+
- env_file: actions-311.yaml
8596
pyarrow_version: "7"
97+
- env_file: actions-311.yaml
98+
pyarrow_version: "8"
99+
- env_file: actions-311.yaml
100+
pyarrow_version: "9"
86101
fail-fast: false
87102
name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }}
88103
env:
89104
ENV_FILE: ci/deps/${{ matrix.env_file }}
90105
PATTERN: ${{ matrix.pattern }}
91106
EXTRA_APT: ${{ matrix.extra_apt || '' }}
107+
ERROR_ON_WARNINGS: ${{ matrix.error_on_warnings || '1' }}
92108
LANG: ${{ matrix.lang || '' }}
93109
LC_ALL: ${{ matrix.lc_all || '' }}
94110
PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }}

.github/workflows/wheels.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ concurrency:
3030
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
3131
cancel-in-progress: true
3232

33+
permissions:
34+
contents: read
35+
3336
jobs:
3437
build_wheels:
3538
name: Build wheel for ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
@@ -165,7 +168,7 @@ jobs:
165168
# (1. Generate sdist 2. Build wheels from sdist)
166169
# This tests the sdists, and saves some build time
167170
python -m pip install dist/*.gz
168-
pip install hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-asyncio>=0.17
171+
pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
169172
cd .. # Not a good idea to test within the src tree
170173
python -c "import pandas; print(pandas.__version__);
171174
pandas.test(extra_args=['-m not clipboard and not single_cpu', '--skip-slow', '--skip-network', '--skip-db', '-n=2']);

0 commit comments

Comments
 (0)