Skip to content

Commit b392f32

Browse files
Merge branch 'main' into raise-on-parse-int-overflow
2 parents 0439322 + a5cbd1e commit b392f32

File tree

711 files changed

+16621
-19212
lines changed

Some content is hidden

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

711 files changed

+16621
-19212
lines changed

.devcontainer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
// You can edit these settings after create using File > Preferences > Settings > Remote.
1010
"settings": {
1111
"terminal.integrated.shell.linux": "/bin/bash",
12-
"python.condaPath": "/opt/conda/bin/conda",
13-
"python.pythonPath": "/opt/conda/bin/python",
12+
"python.pythonPath": "/usr/local/bin/python",
1413
"python.formatting.provider": "black",
1514
"python.linting.enabled": true,
1615
"python.linting.flake8Enabled": true,

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

Lines changed: 1 addition & 1 deletion
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/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
21+
sed -i"" -e "s/ - pyarrow<10/ - 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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 1.5.x
8-
- 1.4.x
98
pull_request:
109
branches:
1110
- main
1211
- 1.5.x
13-
- 1.4.x
1412
paths-ignore:
1513
- "doc/**"
1614

@@ -19,7 +17,7 @@ permissions:
1917

2018
jobs:
2119
pytest:
22-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2321
steps:
2422
- name: Checkout
2523
uses: actions/checkout@v3
@@ -40,7 +38,8 @@ jobs:
4038
/opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
4139
. ~/virtualenvs/pandas-dev/bin/activate && \
4240
python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
43-
pip install cython numpy python-dateutil pytz pytest pytest-xdist pytest-asyncio>=0.17 hypothesis && \
41+
python -m pip install versioneer[toml] && \
42+
python -m pip install cython numpy python-dateutil pytz pytest pytest-xdist pytest-asyncio>=0.17 hypothesis && \
4443
python setup.py build_ext -q -j1 && \
4544
python -m pip install --no-build-isolation --no-use-pep517 -e . && \
4645
python -m pip list && \

.github/workflows/assign.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
permissions:
1212
issues: write
1313
pull-requests: write
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1515
steps:
1616
- if: github.event.comment.body == 'take'
1717
run: |

.github/workflows/asv-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: "Run benchmarks"
2222
# TODO: Support more benchmarking options later, against different branches, against self, etc
2323
if: startsWith(github.event.comment.body, '@github-actions benchmark')
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-22.04
2525
defaults:
2626
run:
2727
shell: bash -el {0}

.github/workflows/autoupdate-pre-commit-config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
pull-requests: write # for technote-space/create-pr-action to create a PR
1616
if: github.repository_owner == 'pandas-dev'
1717
name: Autoupdate pre-commit config
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-22.04
1919
steps:
2020
- name: Set up Python
21-
uses: actions/setup-python@v3
21+
uses: actions/setup-python@v4
2222
- name: Cache multiple paths
2323
uses: actions/cache@v3
2424
with:

.github/workflows/code-checks.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 1.5.x
8-
- 1.4.x
98
pull_request:
109
branches:
1110
- main
1211
- 1.5.x
13-
- 1.4.x
1412

1513
env:
1614
ENV_FILE: environment.yml
@@ -22,7 +20,7 @@ permissions:
2220
jobs:
2321
pre_commit:
2422
name: pre-commit
25-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-22.04
2624
concurrency:
2725
# https://github.community/t/concurrecy-not-work-for-push/183068/7
2826
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-pre-commit
@@ -32,16 +30,18 @@ jobs:
3230
uses: actions/checkout@v3
3331

3432
- name: Install Python
35-
uses: actions/setup-python@v3
33+
uses: actions/setup-python@v4
3634
with:
37-
python-version: '3.9.7'
35+
python-version: '3.9'
3836

3937
- name: Run pre-commit
4038
uses: pre-commit/[email protected]
39+
with:
40+
extra_args: --verbose --all-files
4141

42-
typing_and_docstring_validation:
43-
name: Docstring and typing validation
44-
runs-on: ubuntu-latest
42+
docstring_typing_manual_hooks:
43+
name: Docstring validation, typing, and other manual pre-commit hooks
44+
runs-on: ubuntu-22.04
4545
defaults:
4646
run:
4747
shell: bash -el {0}
@@ -81,17 +81,21 @@ jobs:
8181
run: ci/code_checks.sh docstrings
8282
if: ${{ steps.build.outcome == 'success' && always() }}
8383

84+
- name: Run check of documentation notebooks
85+
run: ci/code_checks.sh notebooks
86+
if: ${{ steps.build.outcome == 'success' && always() }}
87+
8488
- name: Use existing environment for type checking
8589
run: |
8690
echo $PATH >> $GITHUB_PATH
8791
echo "PYTHONHOME=$PYTHONHOME" >> $GITHUB_ENV
8892
echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
8993
if: ${{ steps.build.outcome == 'success' && always() }}
9094

91-
- name: Typing
95+
- name: Typing + pylint
9296
uses: pre-commit/[email protected]
9397
with:
94-
extra_args: --hook-stage manual --all-files
98+
extra_args: --verbose --hook-stage manual --all-files
9599
if: ${{ steps.build.outcome == 'success' && always() }}
96100

97101
- name: Run docstring validation script tests
@@ -100,7 +104,7 @@ jobs:
100104

101105
asv-benchmarks:
102106
name: ASV Benchmarks
103-
runs-on: ubuntu-latest
107+
runs-on: ubuntu-22.04
104108
defaults:
105109
run:
106110
shell: bash -el {0}
@@ -131,7 +135,7 @@ jobs:
131135
132136
build_docker_dev_environment:
133137
name: Build Docker Dev Environment
134-
runs-on: ubuntu-latest
138+
runs-on: ubuntu-22.04
135139
defaults:
136140
run:
137141
shell: bash -el {0}
@@ -154,11 +158,11 @@ jobs:
154158
run: docker build --pull --no-cache --tag pandas-dev-env .
155159

156160
- name: Show environment
157-
run: docker run -w /home/pandas pandas-dev-env mamba run -n pandas-dev python -c "import pandas as pd; print(pd.show_versions())"
161+
run: docker run --rm pandas-dev-env python -c "import pandas as pd; print(pd.show_versions())"
158162

159163
requirements-dev-text-installable:
160164
name: Test install requirements-dev.txt
161-
runs-on: ubuntu-latest
165+
runs-on: ubuntu-22.04
162166

163167
concurrency:
164168
# https://github.community/t/concurrecy-not-work-for-push/183068/7
@@ -173,7 +177,7 @@ jobs:
173177

174178
- name: Setup Python
175179
id: setup_python
176-
uses: actions/setup-python@v3
180+
uses: actions/setup-python@v4
177181
with:
178182
python-version: '3.8'
179183
cache: 'pip'

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010

1111
jobs:
1212
analyze:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-22.04
1414
permissions:
1515
actions: read
1616
contents: read

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ on:
55
branches:
66
- main
77
- 1.5.x
8-
- 1.4.x
98
tags:
109
- '*'
1110
pull_request:
1211
branches:
1312
- main
1413
- 1.5.x
15-
- 1.4.x
1614

1715
env:
1816
ENV_FILE: environment.yml
@@ -24,7 +22,7 @@ permissions:
2422
jobs:
2523
web_and_docs:
2624
name: Doc Build and Upload
27-
runs-on: ubuntu-latest
25+
runs-on: ubuntu-22.04
2826

2927
concurrency:
3028
# https://github.community/t/concurrecy-not-work-for-push/183068/7
@@ -56,32 +54,27 @@ jobs:
5654
- name: Build documentation zip
5755
run: doc/make.py zip_html
5856

59-
- name: Build the interactive terminal
60-
run: |
61-
cd web/interactive_terminal
62-
jupyter lite build
63-
6457
- name: Install ssh key
6558
run: |
6659
mkdir -m 700 -p ~/.ssh
6760
echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
6861
chmod 600 ~/.ssh/id_rsa
69-
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
62+
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFjYkJBk7sos+r7yATODogQc3jUdW1aascGpyOD4bohj8dWjzwLJv/OJ/fyOQ5lmj81WKDk67tGtqNJYGL9acII=" > ~/.ssh/known_hosts
7063
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
7164

7265
- name: Copy cheatsheets into site directory
7366
run: cp doc/cheatsheet/Pandas_Cheat_Sheet* web/build/
7467

7568
- name: Upload web
76-
run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
69+
run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' web/build/ web@${{ secrets.server_ip }}:/var/www/html
7770
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
7871

7972
- name: Upload dev docs
80-
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
73+
run: rsync -az --delete doc/build/html/ web@${{ secrets.server_ip }}:/var/www/html/pandas-docs/dev
8174
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
8275

8376
- name: Upload prod docs
84-
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/version/${GITHUB_REF_NAME:1}
77+
run: rsync -az --delete doc/build/html/ web@${{ secrets.server_ip }}:/var/www/html/pandas-docs/version/${GITHUB_REF_NAME:1}
8578
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
8679

8780
- name: Move docs into site directory

.github/workflows/macos-windows.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 1.5.x
8-
- 1.4.x
98
pull_request:
109
branches:
1110
- main
1211
- 1.5.x
13-
- 1.4.x
1412
paths-ignore:
1513
- "doc/**"
1614

0 commit comments

Comments
 (0)