Skip to content

Commit 89baca7

Browse files
simonjayhawkinssimonjayhawkins
authored
Backport of CI/Build related PRs on 1.4.x (2) (#46572)
1 parent 749872f commit 89baca7

File tree

11 files changed

+75
-46
lines changed

11 files changed

+75
-46
lines changed

‎.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: 36 additions & 12 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,7 +68,7 @@ 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

@@ -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
@@ -151,8 +151,32 @@ jobs:
151151
if: ${{ steps.build.outcome == 'success' }}
152152

153153
- name: Publish benchmarks artifact
154-
uses: actions/upload-artifact@v2
154+
uses: actions/upload-artifact@v3
155155
with:
156156
name: Benchmarks log
157157
path: asv_bench/benchmarks.log
158158
if: failure()
159+
160+
build_docker_dev_environment:
161+
name: Build Docker Dev Environment
162+
runs-on: ubuntu-latest
163+
defaults:
164+
run:
165+
shell: bash -el {0}
166+
167+
concurrency:
168+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
169+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-build_docker_dev_environment
170+
cancel-in-progress: true
171+
172+
steps:
173+
- name: Clean up dangling images
174+
run: docker image prune -f
175+
176+
- name: Checkout
177+
uses: actions/checkout@v3
178+
with:
179+
fetch-depth: 0
180+
181+
- name: Build image
182+
run: docker build --pull --no-cache --tag pandas-dev-env .

‎.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/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

‎.github/workflows/posix.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
defaults:
2222
run:
23-
shell: bash -l {0}
23+
shell: bash -el {0}
2424
timeout-minutes: 120
2525
strategy:
2626
matrix:
@@ -121,12 +121,12 @@ jobs:
121121

122122
steps:
123123
- name: Checkout
124-
uses: actions/checkout@v2
124+
uses: actions/checkout@v3
125125
with:
126126
fetch-depth: 0
127127

128128
- name: Cache conda
129-
uses: actions/cache@v2
129+
uses: actions/cache@v3
130130
env:
131131
CACHE_NUMBER: 0
132132
with:
@@ -138,7 +138,7 @@ jobs:
138138
# xsel for clipboard tests
139139
run: sudo apt-get update && sudo apt-get install -y libc6-dev-i386 xsel ${{ env.EXTRA_APT }}
140140

141-
- uses: conda-incubator/setup-miniconda@v2
141+
- uses: conda-incubator/setup-miniconda@v2.1.1
142142
with:
143143
mamba-version: "*"
144144
channels: conda-forge
@@ -153,13 +153,12 @@ jobs:
153153
if: ${{ matrix.pyarrow_version }}
154154

155155
- name: Setup PyPy
156-
uses: actions/setup-python@v2
156+
uses: actions/setup-python@v3
157157
with:
158158
python-version: "pypy-3.8"
159159
if: ${{ env.IS_PYPY == 'true' }}
160160

161161
- name: Setup PyPy dependencies
162-
shell: bash
163162
run: |
164163
# TODO: re-enable cov, its slowing the tests down though
165164
pip install Cython numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31.0 pytest-asyncio>=0.17 hypothesis>=5.5.3
@@ -178,7 +177,7 @@ jobs:
178177
run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
179178

180179
- name: Publish test results
181-
uses: actions/upload-artifact@v2
180+
uses: actions/upload-artifact@v3
182181
with:
183182
name: Test results
184183
path: test-data.xml

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ jobs:
4545
cancel-in-progress: true
4646

4747
steps:
48-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v3
4949
with:
5050
fetch-depth: 0
5151

5252
- name: Set up Python Dev Version
53-
uses: actions/setup-python@v2
53+
uses: actions/setup-python@v3
5454
with:
5555
python-version: '3.11-dev'
5656

5757
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
5858
- name: Install dependencies
59-
shell: bash
59+
shell: bash -el {0}
6060
run: |
6161
python -m pip install --upgrade pip "setuptools<60.0.0" wheel
6262
pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
@@ -74,12 +74,12 @@ jobs:
7474
python -c "import pandas; pandas.show_versions();"
7575
7676
- name: Test with pytest
77-
shell: bash
77+
shell: bash -el {0}
7878
run: |
7979
ci/run_tests.sh
8080
8181
- name: Publish test results
82-
uses: actions/upload-artifact@v2
82+
uses: actions/upload-artifact@v3
8383
with:
8484
name: Test results
8585
path: test-data.xml

‎.github/workflows/sdist.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
timeout-minutes: 60
1919
defaults:
2020
run:
21-
shell: bash -l {0}
21+
shell: bash -el {0}
2222

2323
strategy:
2424
fail-fast: false
@@ -30,12 +30,12 @@ jobs:
3030
cancel-in-progress: true
3131

3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v3
3434
with:
3535
fetch-depth: 0
3636

3737
- name: Set up Python
38-
uses: actions/setup-python@v2
38+
uses: actions/setup-python@v3
3939
with:
4040
python-version: ${{ matrix.python-version }}
4141

@@ -52,7 +52,13 @@ jobs:
5252
pip list
5353
python setup.py sdist --formats=gztar
5454
55-
- uses: conda-incubator/setup-miniconda@v2
55+
- name: Upload sdist artifact
56+
uses: actions/upload-artifact@v3
57+
with:
58+
name: ${{matrix.python-version}}-sdist.gz
59+
path: dist/*.gz
60+
61+
- uses: conda-incubator/setup-miniconda@v2.1.1
5662
with:
5763
activate-environment: pandas-sdist
5864
channels: conda-forge

0 commit comments

Comments
 (0)