Skip to content

Commit beaaad5

Browse files
committed
Merge branch 'main' into rip-setup-py
2 parents 02cb726 + ae8db2a commit beaaad5

84 files changed

Lines changed: 548 additions & 343 deletions

File tree

Some content is hidden

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

.ci/install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ python3 -m pip install olefile
3131
python3 -m pip install -U pytest
3232
python3 -m pip install -U pytest-cov
3333
python3 -m pip install -U pytest-timeout
34-
python3 -m pip install pyroma
3534
# optional test dependencies, only install if there's a binary package.
3635
python3 -m pip install --only-binary=:all: numpy || true
3736
python3 -m pip install --only-binary=:all: pyarrow || true

.ci/requirements-mypy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mypy==1.20.2
1+
mypy==2.1.0
22
arro3-compute
33
arro3-core
44
IceSpringPySideStubs-PyQt6

.github/workflows/macos-install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ python3 -m pip install olefile
1212
python3 -m pip install -U pytest
1313
python3 -m pip install -U pytest-cov
1414
python3 -m pip install -U pytest-timeout
15-
python3 -m pip install pyroma
1615
# optional test dependencies, only install if there's a binary package.
1716
python3 -m pip install --only-binary=:all: numpy || true
1817
python3 -m pip install --only-binary=:all: pyarrow || true

.github/workflows/wheels.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ jobs:
125125
CIBW_ARCHS: ${{ matrix.cibw_arch }}
126126
CIBW_BUILD: ${{ matrix.build }}
127127
CIBW_ENABLE: cpython-prerelease pypy
128+
CIBW_ENVIRONMENT_PASS_LINUX: FORCE_COLOR
128129
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
129130

130131
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -201,7 +202,7 @@ jobs:
201202
-v {project}:C:\pillow
202203
-v C:\cibw:C:\cibw
203204
-v %CD%\..\venv-test:%CD%\..\venv-test
204-
-e CI -e GITHUB_ACTIONS
205+
-e CI -e GITHUB_ACTIONS -e FORCE_COLOR
205206
mcr.microsoft.com/windows/servercore:ltsc2022
206207
powershell C:\pillow\.github\workflows\wheels-test.ps1 %CD%\..\venv-test'
207208
shell: bash

.pre-commit-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ repos:
8686
hooks:
8787
- id: tox-ini-fmt
8888

89+
- repo: https://github.com/regebro/pyroma
90+
rev: 5.0.1
91+
hooks:
92+
- id: pyroma
93+
additional_dependencies: [check-manifest]
94+
stages: [manual]
95+
8996
- repo: meta
9097
hooks:
9198
- id: check-hooks-apply

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ release-test:
8181
python3 -m pytest Tests
8282
python3 -m pip install .
8383
python3 -m pytest -qq
84-
python3 -m check_manifest
85-
python3 -m pyroma .
8684
$(MAKE) readme
8785

8886
.PHONY: sdist
Binary file not shown.
Binary file not shown.
Binary file not shown.
131 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)