Skip to content

Commit b7c6900

Browse files
authored
Merge branch 'main' into fix_string_formatting
2 parents 1f0e4d8 + 9dbe210 commit b7c6900

File tree

175 files changed

+1532
-2645
lines changed

Some content is hidden

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

175 files changed

+1532
-2645
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
image: ubuntu-2004:2022.04.1
77
resource_class: arm.large
88
environment:
9-
ENV_FILE: ci/deps/circle-38-arm64.yaml
9+
ENV_FILE: ci/deps/circle-39-arm64.yaml
1010
PYTEST_WORKERS: auto
1111
PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow and not db"
1212
PYTEST_TARGET: "pandas"
@@ -92,4 +92,4 @@ workflows:
9292
only: /^v.*/
9393
matrix:
9494
parameters:
95-
cibw-build: ["cp38-manylinux_aarch64", "cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64"]
95+
cibw-build: ["cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64"]

.github/actions/run-tests/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runs:
77
shell: bash -el {0}
88

99
- name: Publish test results
10-
uses: actions/upload-artifact@v2
10+
uses: actions/upload-artifact@v3
1111
with:
1212
name: Test results
1313
path: test-data.xml
@@ -19,7 +19,7 @@ runs:
1919
if: failure()
2020

2121
- name: Upload coverage to Codecov
22-
uses: codecov/codecov-action@v2
22+
uses: codecov/codecov-action@v3
2323
with:
2424
flags: unittests
2525
name: codecov-pandas

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
using: composite
1414
steps:
1515
- name: Install ${{ inputs.environment-file }}
16-
uses: mamba-org/provision-with-micromamba@v12
16+
uses: mamba-org/provision-with-micromamba@v15
1717
with:
1818
environment-file: ${{ inputs.environment-file }}
1919
environment-name: ${{ inputs.environment-name }}

.github/workflows/code-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
id: setup_python
180180
uses: actions/setup-python@v4
181181
with:
182-
python-version: '3.8'
182+
python-version: '3.10'
183183
cache: 'pip'
184184
cache-dependency-path: 'requirements-dev.txt'
185185

.github/workflows/package-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
id: setup_python
3939
uses: actions/setup-python@v4
4040
with:
41-
python-version: '3.8'
41+
python-version: '3.10'
4242

4343
- name: Install required dependencies
4444
run: |

.github/workflows/sdist.yml

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

.github/workflows/unit-tests.yml

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626
timeout-minutes: 180
2727
strategy:
2828
matrix:
29-
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml]
29+
env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml]
3030
# Prevent the include jobs from overriding other jobs
3131
pattern: [""]
3232
include:
3333
- name: "Downstream Compat"
34-
env_file: actions-38-downstream_compat.yaml
34+
env_file: actions-39-downstream_compat.yaml
3535
pattern: "not slow and not network and not single_cpu"
3636
pytest_target: "pandas/tests/test_downstream.py"
3737
- name: "Minimum Versions"
38-
env_file: actions-38-minimum_versions.yaml
38+
env_file: actions-39-minimum_versions.yaml
3939
pattern: "not slow and not network and not single_cpu"
4040
- name: "Locale: it_IT"
41-
env_file: actions-38.yaml
41+
env_file: actions-310.yaml
4242
pattern: "not slow and not network and not single_cpu"
4343
extra_apt: "language-pack-it"
4444
# Use the utf8 version as the default, it has no bad side-effect.
@@ -48,7 +48,7 @@ jobs:
4848
# It will be temporarily activated during tests with locale.setlocale
4949
extra_loc: "it_IT"
5050
- name: "Locale: zh_CN"
51-
env_file: actions-38.yaml
51+
env_file: actions-310.yaml
5252
pattern: "not slow and not network and not single_cpu"
5353
extra_apt: "language-pack-zh-hans"
5454
# Use the utf8 version as the default, it has no bad side-effect.
@@ -62,7 +62,7 @@ jobs:
6262
pattern: "not slow and not network and not single_cpu"
6363
pandas_copy_on_write: "1"
6464
- name: "Pypy"
65-
env_file: actions-pypy-38.yaml
65+
env_file: actions-pypy-39.yaml
6666
pattern: "not slow and not network and not single_cpu"
6767
test_args: "--max-worker-restart 0"
6868
- name: "Numpy Dev"
@@ -173,7 +173,7 @@ jobs:
173173
strategy:
174174
matrix:
175175
os: [macos-latest, windows-latest]
176-
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml]
176+
env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml]
177177
fail-fast: false
178178
runs-on: ${{ matrix.os }}
179179
name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }}
@@ -227,7 +227,7 @@ jobs:
227227
fi
228228
- name: Build environment and Run Tests
229229
run: |
230-
/opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev
230+
/opt/python/cp39-cp39/bin/python -m venv ~/virtualenvs/pandas-dev
231231
. ~/virtualenvs/pandas-dev/bin/activate
232232
python -m pip install --no-cache-dir --no-deps -U pip wheel setuptools
233233
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
@@ -241,6 +241,49 @@ jobs:
241241
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-32bit
242242
cancel-in-progress: true
243243

244+
Linux-Musl:
245+
runs-on: ubuntu-22.04
246+
container:
247+
image: quay.io/pypa/musllinux_1_1_x86_64
248+
steps:
249+
- name: Checkout pandas Repo
250+
# actions/checkout does not work since it requires node
251+
run: |
252+
git config --global --add safe.directory $PWD
253+
254+
if [ $GITHUB_EVENT_NAME != pull_request ]; then
255+
git clone --recursive --branch=$GITHUB_REF_NAME https://github.com/${GITHUB_REPOSITORY}.git $GITHUB_WORKSPACE
256+
git reset --hard $GITHUB_SHA
257+
else
258+
git clone --recursive https://github.com/${GITHUB_REPOSITORY}.git $GITHUB_WORKSPACE
259+
git fetch origin $GITHUB_REF:my_ref_name
260+
git checkout $GITHUB_BASE_REF
261+
git -c user.email="you@example.com" merge --no-commit my_ref_name
262+
fi
263+
- name: Configure System Packages
264+
run: |
265+
apk update
266+
apk add musl-locales
267+
- name: Build environment
268+
run: |
269+
/opt/python/cp39-cp39/bin/python -m venv ~/virtualenvs/pandas-dev
270+
. ~/virtualenvs/pandas-dev/bin/activate
271+
python -m pip install --no-cache-dir --no-deps -U pip wheel setuptools
272+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
273+
python setup.py build_ext -q -j$(nproc)
274+
python -m pip install --no-cache-dir --no-build-isolation --no-use-pep517 -e .
275+
python -m pip list --no-cache-dir
276+
277+
- name: Run Tests
278+
run: |
279+
. ~/virtualenvs/pandas-dev/bin/activate
280+
export PANDAS_CI=1
281+
python -m pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml
282+
concurrency:
283+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
284+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-musl
285+
cancel-in-progress: true
286+
244287
python-dev:
245288
# This job may or may not run depending on the state of the next
246289
# unreleased Python version. DO NOT DELETE IT.

.github/workflows/wheels.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ on:
2323
- cron: "27 3 */1 * *"
2424
push:
2525
pull_request:
26-
types: [labeled, opened, synchronize, reopened]
26+
types: [labeled, opened, synchronize, reopened]
27+
paths-ignore:
28+
- "doc/**"
29+
- "web/**"
2730
workflow_dispatch:
2831

2932
concurrency:
@@ -55,7 +58,7 @@ jobs:
5558
- [windows-2019, win_amd64]
5659
- [windows-2019, win32]
5760
# TODO: support PyPy?
58-
python: [["cp38", "3.8"], ["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"]]# "pp38", "pp39"]
61+
python: [["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"]]# "pp39"]
5962
env:
6063
IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
6164
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
@@ -71,7 +74,7 @@ jobs:
7174
fetch-depth: 0
7275

7376
- name: Build wheels
74-
uses: pypa/cibuildwheel@v2.12.1
77+
uses: pypa/cibuildwheel@v2.12.3
7578
env:
7679
CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
7780

@@ -152,7 +155,7 @@ jobs:
152155
auto-update-conda: true
153156
# Really doesn't matter what version we upload with
154157
# just the version we test with
155-
python-version: '3.8'
158+
python-version: '3.10'
156159
channels: conda-forge
157160
channel-priority: true
158161
# mamba fails to solve, also we really don't need this since we're just installing python

.gitpod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ tasks:
1515
git fetch --tags
1616
python setup.py build_ext --inplace -j 4
1717
echo "🛠 Completed rebuilding Pandas!! 🛠 "
18+
pre-commit install
1819
echo "✨ Pre-build complete! You can close this terminal ✨ "
1920
2021
# --------------------------------------------------------

LICENSES/OTHER

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2626
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2727
POSSIBILITY OF SUCH DAMAGE.
2828

29-
google-api-python-client license
30-
--------------------------------
31-
32-
Copyright (C) 2012 Google Inc.
33-
All rights reserved.
34-
35-
Licensed under the Apache License, Version 2.0 (the "License");
36-
you may not use this file except in compliance with the License.
37-
You may obtain a copy of the License at
38-
39-
http://www.apache.org/licenses/LICENSE-2.0
40-
41-
Unless required by applicable law or agreed to in writing, software
42-
distributed under the License is distributed on an "AS IS" BASIS,
43-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
44-
See the License for the specific language governing permissions and
45-
limitations under the License.
46-
4729
Pyperclip v1.3 license
4830
----------------------
4931

ci/code_checks.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
8585

8686
MSG='Partially validate docstrings (EX01)' ; echo $MSG
8787
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=EX01 --ignore_functions \
88-
pandas.Series.__iter__ \
89-
pandas.Series.keys \
9088
pandas.Series.item \
9189
pandas.Series.pipe \
9290
pandas.Series.mode \
@@ -533,8 +531,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
533531
pandas.api.extensions.ExtensionArray.shape \
534532
pandas.api.extensions.ExtensionArray.tolist \
535533
pandas.DataFrame.columns \
536-
pandas.DataFrame.__iter__ \
537-
pandas.DataFrame.keys \
538534
pandas.DataFrame.iterrows \
539535
pandas.DataFrame.pipe \
540536
pandas.DataFrame.backfill \

0 commit comments

Comments
 (0)