Skip to content

Commit 45a31ea

Browse files
natmokvalnatmokval
authored
Merge branch 'pandas-dev:main' into 50040-add-math-mode-formatter-escape=latex
2 parents adedc02 + 05d12b5 commit 45a31ea

File tree

462 files changed

+12360
-6431
lines changed

Some content is hidden

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

462 files changed

+12360
-6431
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 3 additions & 1 deletion
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/workflows/32-bit-linux.yml‎

Lines changed: 1 addition & 1 deletion
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/codeql.yml‎

Lines changed: 3 additions & 0 deletions
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‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ jobs:
4646
- name: Build Pandas
4747
uses: ./.github/actions/build_pandas
4848

49-
- name: Set up maintainers cache
50-
uses: actions/cache@v3
51-
with:
52-
path: maintainers.json
53-
key: maintainers
54-
5549
- name: Build website
5650
run: python web/pandas_web.py web/pandas --target-path=web/build
5751

‎.github/workflows/macos-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +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-
TEST_ARGS: "-W error:::pandas"
19+
ERROR_ON_WARNINGS: "1"
2020

2121

2222
permissions:
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
matrix:
3333
os: [macos-latest, windows-latest]
34-
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]
3535
fail-fast: false
3636
runs-on: ${{ matrix.os }}
3737
name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }}

‎.github/workflows/python-dev.yml‎

Lines changed: 8 additions & 6 deletions
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/ubuntu.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ 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"]
3232
pyarrow_version: ["7", "8", "9", "10"]
3333
include:
@@ -38,7 +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-
test_args: ""
41+
error_on_warnings: "0"
4242
- name: "Locale: it_IT"
4343
env_file: actions-38.yaml
4444
pattern: "not slow and not network and not single_cpu"
@@ -63,20 +63,22 @@ jobs:
6363
env_file: actions-310.yaml
6464
pattern: "not slow and not network and not single_cpu"
6565
pandas_copy_on_write: "1"
66-
test_args: ""
66+
error_on_warnings: "0"
6767
- name: "Data Manager"
6868
env_file: actions-38.yaml
6969
pattern: "not slow and not network and not single_cpu"
7070
pandas_data_manager: "array"
71-
test_args: ""
71+
error_on_warnings: "0"
7272
- name: "Pypy"
7373
env_file: actions-pypy-38.yaml
7474
pattern: "not slow and not network and not single_cpu"
7575
test_args: "--max-worker-restart 0"
76+
error_on_warnings: "0"
7677
- name: "Numpy Dev"
7778
env_file: actions-310-numpydev.yaml
7879
pattern: "not slow and not network and not single_cpu"
79-
test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
80+
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
81+
error_on_warnings: "0"
8082
exclude:
8183
- env_file: actions-38.yaml
8284
pyarrow_version: "7"
@@ -90,17 +92,24 @@ jobs:
9092
pyarrow_version: "8"
9193
- env_file: actions-39.yaml
9294
pyarrow_version: "9"
95+
- env_file: actions-311.yaml
96+
pyarrow_version: "7"
97+
- env_file: actions-311.yaml
98+
pyarrow_version: "8"
99+
- env_file: actions-311.yaml
100+
pyarrow_version: "9"
93101
fail-fast: false
94102
name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }}
95103
env:
96104
ENV_FILE: ci/deps/${{ matrix.env_file }}
97105
PATTERN: ${{ matrix.pattern }}
98106
EXTRA_APT: ${{ matrix.extra_apt || '' }}
107+
ERROR_ON_WARNINGS: ${{ matrix.error_on_warnings || '1' }}
99108
LANG: ${{ matrix.lang || '' }}
100109
LC_ALL: ${{ matrix.lc_all || '' }}
101110
PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }}
102111
PANDAS_COPY_ON_WRITE: ${{ matrix.pandas_copy_on_write || '0' }}
103-
TEST_ARGS: ${{ matrix.test_args || '-W error:::pandas' }}
112+
TEST_ARGS: ${{ matrix.test_args || '' }}
104113
PYTEST_WORKERS: ${{ contains(matrix.pattern, 'not single_cpu') && 'auto' || '1' }}
105114
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
106115
IS_PYPY: ${{ contains(matrix.env_file, 'pypy') }}

‎.github/workflows/wheels.yml‎

Lines changed: 4 additions & 1 deletion
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)