Skip to content

Commit 3c50078

Browse files
committed
Merge branch 'main' into 37715-remove-mypy-ignore-VI
2 parents e55b3ee + ddff84a commit 3c50078

File tree

241 files changed

+2915
-3338
lines changed

Some content is hidden

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

241 files changed

+2915
-3338
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -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/workflows/sdist.yml

-94
This file was deleted.

.github/workflows/unit-tests.yml

+43
Original file line numberDiff line numberDiff line change
@@ -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="[email protected]" 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

+4-1
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:

.pre-commit-config.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ repos:
2626
language: python
2727
require_serial: true
2828
types_or: [python, pyi]
29-
additional_dependencies: [black==23.1.0]
29+
additional_dependencies: [black==23.3.0]
3030
- repo: https://github.com/charliermarsh/ruff-pre-commit
31-
rev: v0.0.259
31+
rev: v0.0.264
3232
hooks:
3333
- id: ruff
3434
args: [--exit-non-zero-on-fix]
@@ -40,13 +40,13 @@ repos:
4040
pass_filenames: true
4141
require_serial: false
4242
- repo: https://github.com/codespell-project/codespell
43-
rev: v2.2.2
43+
rev: v2.2.4
4444
hooks:
4545
- id: codespell
4646
types_or: [python, rst, markdown, cython, c]
4747
additional_dependencies: [tomli]
4848
- repo: https://github.com/MarcoGorelli/cython-lint
49-
rev: v0.12.5
49+
rev: v0.15.0
5050
hooks:
5151
- id: cython-lint
5252
- id: double-quote-cython-strings
@@ -104,7 +104,7 @@ repos:
104104
hooks:
105105
- id: isort
106106
- repo: https://github.com/asottile/pyupgrade
107-
rev: v3.3.1
107+
rev: v3.3.2
108108
hooks:
109109
- id: pyupgrade
110110
args: [--py38-plus]

LICENSES/OTHER

-18
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

asv_bench/asv.conf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
// The Pythons you'd like to test against. If not provided, defaults
3131
// to the current version of Python used to run `asv`.
32-
"pythons": ["3.8"],
32+
"pythons": ["3.10"],
3333

3434
// The matrix of dependencies to test. Each key is the name of a
3535
// package (in PyPI) and the values are version numbers. An empty

asv_bench/benchmarks/dtypes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525

2626
class Dtypes:
27-
params = _dtypes + list(map(lambda dt: dt.name, _dtypes))
27+
params = _dtypes + [dt.name for dt in _dtypes]
2828
param_names = ["dtype"]
2929

3030
def time_pandas_dtype(self, dtype):

ci/code_checks.sh

-4
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)