Merge branch 'main' into unpackI16B_I16

python-pillow · May 3, 2023 · 0ab397d · 0ab397d
2 parents ff003bf + fdc6cf3
commit 0ab397d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml
@@ -80,7 +80,7 @@ jobs:
           pushd depends && ./install_extra_test_images.sh && popd
 
       - name: Build Pillow
-        run: CFLAGS="-coverage" python3 -m pip install --global-option="build_ext" .
+        run: SETUPTOOLS_USE_DISTUTILS="stdlib" CFLAGS="-coverage" python3 -m pip install --global-option="build_ext" .
 
       - name: Test Pillow
         run: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -57,7 +57,7 @@ repos:
       - id: sphinx-lint
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.0.0
+    rev: 1.3.0
     hooks:
       - id: tox-ini-fmt
 

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
-minversion = 1.9
-envlist =
+requires =
+    tox>=4.2
+env_list =
     lint
     py{py3, 311, 310, 39, 38}
 
@@ -23,7 +24,7 @@ skip_install = true
 deps =
     check-manifest
     pre-commit
-passenv =
+pass_env =
     PRE_COMMIT_COLOR
 commands =
     pre-commit run --all-files --show-diff-on-failure