Skip to content

Commit befa0a0

Browse files
author
Sylvain MARIE
committed
Merge branch 'main' of https://github.com/pandas-dev/pandas into feature/46319_locale_strftime_period
� Conflicts: � .github/workflows/posix.yml
2 parents 236a2a0 + d2aa44f commit befa0a0

File tree

97 files changed

+1778
-782
lines changed

Some content is hidden

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

97 files changed

+1778
-782
lines changed

‎.github/actions/build_pandas/action.yml

+2-2
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

+2-2
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

+5-5
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

+2-2
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

+14-14
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,7 +151,7 @@ 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
@@ -162,7 +162,7 @@ jobs:
162162
runs-on: ubuntu-latest
163163
defaults:
164164
run:
165-
shell: bash -l {0}
165+
shell: bash -el {0}
166166

167167
concurrency:
168168
# https://github.community/t/concurrecy-not-work-for-push/183068/7
@@ -174,7 +174,7 @@ jobs:
174174
run: docker image prune -f
175175

176176
- name: Checkout
177-
uses: actions/checkout@v2
177+
uses: actions/checkout@v3
178178
with:
179179
fetch-depth: 0
180180

‎.github/workflows/comment_bot.yml

+3-3
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

+2-2
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

+21-22
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:
@@ -30,14 +30,15 @@ jobs:
3030
# even if tests are skipped/xfailed
3131
pyarrow_version: ["5", "7"]
3232
include:
33-
- env_file: actions-38-downstream_compat.yaml
33+
- name: "Downstream Compat"
34+
env_file: actions-38-downstream_compat.yaml
3435
pattern: "not slow and not network and not single_cpu"
3536
pytest_target: "pandas/tests/test_downstream.py"
36-
name: "Downstream Compat"
37-
- env_file: actions-38-minimum_versions.yaml
37+
- name: "Minimum Versions"
38+
env_file: actions-38-minimum_versions.yaml
3839
pattern: "not slow and not network and not single_cpu"
39-
name: "Minimum Versions"
40-
- env_file: actions-38.yaml
40+
- name: "Locale: it_IT.utf8"
41+
env_file: actions-38.yaml
4142
pattern: "not slow and not network and not single_cpu"
4243
extra_apt: "language-pack-it"
4344
# Use the utf8 version as the default, it has no bad side-effect.
@@ -46,8 +47,8 @@ jobs:
4647
# Also install it_IT (its encoding is ISO8859-1) but do not activate it.
4748
# It will be temporarily activated during tests with locale.setlocale
4849
extra_loc: "it_IT"
49-
name: "Locale: it_IT"
50-
- env_file: actions-38.yaml
50+
- name: "Locale: zh_CN.utf8"
51+
env_file: actions-38.yaml
5152
pattern: "not slow and not network and not single_cpu"
5253
extra_apt: "language-pack-zh-hans"
5354
# Use the utf8 version as the default, it has no bad side-effect.
@@ -56,20 +57,19 @@ jobs:
5657
# Also install zh_CN (its encoding is gb2312) but do not activate it.
5758
# It will be temporarily activated during tests with locale.setlocale
5859
extra_loc: "zh_CN"
59-
name: "Locale: zh_CN"
60-
- env_file: actions-38.yaml
60+
- name: "Data Manager"
61+
env_file: actions-38.yaml
6162
pattern: "not slow and not network and not single_cpu"
6263
pandas_data_manager: "array"
63-
name: "Data Manager"
64-
- env_file: actions-pypy-38.yaml
64+
- name: "Pypy"
65+
env_file: actions-pypy-38.yaml
6566
pattern: "not slow and not network and not single_cpu"
6667
test_args: "--max-worker-restart 0"
67-
name: "Pypy"
68-
- env_file: actions-310-numpydev.yaml
68+
- name: "Numpy Dev"
69+
env_file: actions-310-numpydev.yaml
6970
pattern: "not slow and not network and not single_cpu"
7071
pandas_testing_mode: "deprecate"
7172
test_args: "-W error"
72-
name: "Numpy Dev"
7373
fail-fast: false
7474
name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }}
7575
env:
@@ -130,12 +130,12 @@ jobs:
130130

131131
steps:
132132
- name: Checkout
133-
uses: actions/checkout@v2
133+
uses: actions/checkout@v3
134134
with:
135135
fetch-depth: 0
136136

137137
- name: Cache conda
138-
uses: actions/cache@v2
138+
uses: actions/cache@v3
139139
env:
140140
CACHE_NUMBER: 0
141141
with:
@@ -153,7 +153,7 @@ jobs:
153153
sudo locale-gen ${{ env.EXTRA_LOC }}
154154
if: ${{ env.EXTRA_LOC != '' }}
155155

156-
- uses: conda-incubator/setup-miniconda@v2
156+
- uses: conda-incubator/setup-miniconda@v2.1.1
157157
with:
158158
mamba-version: "*"
159159
channels: conda-forge
@@ -168,16 +168,15 @@ jobs:
168168
if: ${{ matrix.pyarrow_version }}
169169

170170
- name: Setup PyPy
171-
uses: actions/setup-python@v2
171+
uses: actions/setup-python@v3
172172
with:
173173
python-version: "pypy-3.8"
174174
if: ${{ env.IS_PYPY == 'true' }}
175175

176176
- name: Setup PyPy dependencies
177-
shell: bash
178177
run: |
179178
# TODO: re-enable cov, its slowing the tests down though
180-
pip install Cython numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31.0 pytest-asyncio hypothesis>=5.5.3
179+
pip install Cython numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31.0 pytest-asyncio>=0.17 hypothesis>=5.5.3
181180
if: ${{ env.IS_PYPY == 'true' }}
182181

183182
- name: Build Pandas
@@ -193,7 +192,7 @@ jobs:
193192
run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
194193

195194
- name: Publish test results
196-
uses: actions/upload-artifact@v2
195+
uses: actions/upload-artifact@v3
197196
with:
198197
name: Test results
199198
path: test-data.xml

‎.github/workflows/python-dev.yml

+5-5
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

0 commit comments

Comments
 (0)