Skip to content

Commit e2645bc

Browse files
theOehrlytheOehrly
committed
merge upstream/main
2 parents 010fe77 + 79fb2de commit e2645bc

File tree

529 files changed

+13068
-7186
lines changed

Some content is hidden

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

529 files changed

+13068
-7186
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ jobs:
88
environment:
99
ENV_FILE: ci/deps/circle-38-arm64.yaml
1010
PYTEST_WORKERS: auto
11-
PATTERN: "not slow and not network and not clipboard and not arm_slow"
11+
PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow and not db"
1212
PYTEST_TARGET: "pandas"
13+
PANDAS_CI: "1"
1314
steps:
1415
- checkout
1516
- run: ci/setup_env.sh

‎.github/actions/build_pandas/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ runs:
88
run: |
99
conda info
1010
conda list
11-
shell: bash -l {0}
11+
shell: bash -el {0}
1212

1313
- name: Build Pandas
1414
run: |
1515
python setup.py build_ext -j 2
1616
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
17-
shell: bash -l {0}
17+
shell: bash -el {0}

‎.github/actions/setup/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ runs:
55
steps:
66
- name: Setting conda path
77
run: echo "${HOME}/miniconda3/bin" >> $GITHUB_PATH
8-
shell: bash -l {0}
8+
shell: bash -el {0}
99

1010
- name: Setup environment and build pandas
1111
run: ci/setup_env.sh
12-
shell: bash -l {0}
12+
shell: bash -el {0}

‎.github/workflows/asv-bot.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
defaults:
1919
run:
20-
shell: bash -l {0}
20+
shell: bash -el {0}
2121

2222
concurrency:
2323
# Set concurrency to prevent abuse(full runs are ~5.5 hours !!!)
@@ -29,19 +29,19 @@ jobs:
2929

3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
3333
with:
3434
fetch-depth: 0
3535

3636
- name: Cache conda
37-
uses: actions/cache@v2
37+
uses: actions/cache@v3
3838
with:
3939
path: ~/conda_pkgs_dir
4040
key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
4141

4242
# Although asv sets up its own env, deps are still needed
4343
# during discovery process
44-
- uses: conda-incubator/setup-miniconda@v2
44+
- uses: conda-incubator/setup-miniconda@v2.1.1
4545
with:
4646
activate-environment: pandas-dev
4747
channel-priority: strict
@@ -65,7 +65,7 @@ jobs:
6565
echo 'EOF' >> $GITHUB_ENV
6666
echo "REGEX=$REGEX" >> $GITHUB_ENV
6767
68-
- uses: actions/github-script@v5
68+
- uses: actions/github-script@v6
6969
env:
7070
BENCH_OUTPUT: ${{env.BENCH_OUTPUT}}
7171
REGEX: ${{env.REGEX}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Set up Python
15-
uses: actions/setup-python@v2
15+
uses: actions/setup-python@v3
1616
- name: Cache multiple paths
17-
uses: actions/cache@v2
17+
uses: actions/cache@v3
1818
with:
1919
path: |
2020
~/.cache/pre-commit

‎.github/workflows/code-checks.yml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
cancel-in-progress: true
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2828

2929
- name: Install Python
30-
uses: actions/setup-python@v2
30+
uses: actions/setup-python@v3
3131
with:
3232
python-version: '3.9.7'
3333

@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040
defaults:
4141
run:
42-
shell: bash -l {0}
42+
shell: bash -el {0}
4343

4444
concurrency:
4545
# https://github.community/t/concurrecy-not-work-for-push/183068/7
@@ -48,17 +48,17 @@ jobs:
4848

4949
steps:
5050
- name: Checkout
51-
uses: actions/checkout@v2
51+
uses: actions/checkout@v3
5252
with:
5353
fetch-depth: 0
5454

5555
- name: Cache conda
56-
uses: actions/cache@v2
56+
uses: actions/cache@v3
5757
with:
5858
path: ~/conda_pkgs_dir
5959
key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
6060

61-
- uses: conda-incubator/setup-miniconda@v2
61+
- uses: conda-incubator/setup-miniconda@v2.1.1
6262
with:
6363
mamba-version: "*"
6464
channels: conda-forge
@@ -68,13 +68,13 @@ jobs:
6868
use-only-tar-bz2: true
6969

7070
- name: Install node.js (for pyright)
71-
uses: actions/setup-node@v2
71+
uses: actions/setup-node@v3
7272
with:
7373
node-version: "16"
7474

7575
- name: Install pyright
7676
# note: keep version in sync with .pre-commit-config.yaml
77-
run: npm install -g [email protected].212
77+
run: npm install -g [email protected].230
7878

7979
- name: Build Pandas
8080
id: build
@@ -105,7 +105,7 @@ jobs:
105105
runs-on: ubuntu-latest
106106
defaults:
107107
run:
108-
shell: bash -l {0}
108+
shell: bash -el {0}
109109

110110
concurrency:
111111
# https://github.community/t/concurrecy-not-work-for-push/183068/7
@@ -114,17 +114,17 @@ jobs:
114114

115115
steps:
116116
- name: Checkout
117-
uses: actions/checkout@v2
117+
uses: actions/checkout@v3
118118
with:
119119
fetch-depth: 0
120120

121121
- name: Cache conda
122-
uses: actions/cache@v2
122+
uses: actions/cache@v3
123123
with:
124124
path: ~/conda_pkgs_dir
125125
key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
126126

127-
- uses: conda-incubator/setup-miniconda@v2
127+
- uses: conda-incubator/setup-miniconda@v2.1.1
128128
with:
129129
mamba-version: "*"
130130
channels: conda-forge
@@ -140,29 +140,19 @@ jobs:
140140
- name: Run ASV benchmarks
141141
run: |
142142
cd asv_bench
143-
asv check -E existing
144-
git remote add upstream https://github.com/pandas-dev/pandas.git
145-
git fetch upstream
146143
asv machine --yes
147-
asv dev | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log
144+
# TODO add `--durations` when we start using asv >= 0.5 (#46598)
145+
asv run --quick --dry-run --python=same | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log
148146
if grep "failed" benchmarks.log > /dev/null ; then
149147
exit 1
150148
fi
151-
if: ${{ steps.build.outcome == 'success' }}
152-
153-
- name: Publish benchmarks artifact
154-
uses: actions/upload-artifact@v2
155-
with:
156-
name: Benchmarks log
157-
path: asv_bench/benchmarks.log
158-
if: failure()
159149
160150
build_docker_dev_environment:
161151
name: Build Docker Dev Environment
162152
runs-on: ubuntu-latest
163153
defaults:
164154
run:
165-
shell: bash -l {0}
155+
shell: bash -el {0}
166156

167157
concurrency:
168158
# https://github.community/t/concurrecy-not-work-for-push/183068/7
@@ -174,7 +164,7 @@ jobs:
174164
run: docker image prune -f
175165

176166
- name: Checkout
177-
uses: actions/checkout@v2
167+
uses: actions/checkout@v3
178168
with:
179169
fetch-depth: 0
180170

‎.github/workflows/comment_bot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ jobs:
1212
if: startsWith(github.event.comment.body, '@github-actions pre-commit')
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- uses: r-lib/actions/pr-fetch@v2
1717
with:
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919
- name: Cache multiple paths
20-
uses: actions/cache@v2
20+
uses: actions/cache@v3
2121
with:
2222
path: |
2323
~/.cache/pre-commit
2424
~/.cache/pip
2525
key: pre-commit-dispatched-${{ runner.os }}-build
26-
- uses: actions/setup-python@v2
26+
- uses: actions/setup-python@v3
2727
with:
2828
python-version: 3.8
2929
- name: Install-pre-commit

‎.github/workflows/datamanger.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030
with:
3131
fetch-depth: 0
3232

@@ -65,7 +65,7 @@ jobs:
6565
run: mv doc/build/html web/build/docs
6666

6767
- name: Save website as an artifact
68-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v3
6969
with:
7070
name: website
7171
path: web/build

0 commit comments

Comments
 (0)