From e8b2b9baca9d4ad8d5d4d21028e29e8a862d3503 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 18 Apr 2022 12:53:55 +1000 Subject: [PATCH 1/3] Use python3 --- .github/workflows/test-windows.yml | 4 ++-- winbuild/build.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 6ed8bb0c5ae..30e262eebc6 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -43,8 +43,8 @@ jobs: - name: Print build system information run: python .github/workflows/system-info.py - - name: python -m pip install wheel pytest pytest-cov pytest-timeout defusedxml - run: python -m pip install wheel pytest pytest-cov pytest-timeout defusedxml + - name: python3 -m pip install wheel pytest pytest-cov pytest-timeout defusedxml + run: python3 -m pip install wheel pytest pytest-cov pytest-timeout defusedxml - name: Install dependencies id: install diff --git a/winbuild/build.rst b/winbuild/build.rst index 661c5a5ecea..6e496b9cb2a 100644 --- a/winbuild/build.rst +++ b/winbuild/build.rst @@ -91,7 +91,7 @@ Some binary dependencies (e.g. ``fribidi.dll``) will be stored in the ``winbuild\build\bin`` directory; this directory should be added to ``PATH`` before running tests. -Build and install Pillow, then run ``python -m pytest Tests`` +Build and install Pillow, then run ``python3 -m pytest Tests`` from the root Pillow directory. Example From 232df4734e22d9373274e1c500b5f7d9fb4d4381 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 18 Apr 2022 12:28:41 +1000 Subject: [PATCH 2/3] Tests directory does not need to be specified --- winbuild/build.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winbuild/build.rst b/winbuild/build.rst index 6e496b9cb2a..992fda58bfc 100644 --- a/winbuild/build.rst +++ b/winbuild/build.rst @@ -91,8 +91,8 @@ Some binary dependencies (e.g. ``fribidi.dll``) will be stored in the ``winbuild\build\bin`` directory; this directory should be added to ``PATH`` before running tests. -Build and install Pillow, then run ``python3 -m pytest Tests`` -from the root Pillow directory. +Build and install Pillow, then run ``python3 -m pytest`` from the root Pillow +directory. Example ------- From 23560348c1ae359f94de2703d74ddaf58050ac87 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Mon, 18 Apr 2022 14:37:00 +1000 Subject: [PATCH 3/3] Use python3 in build system information Co-authored-by: Hugo van Kemenade --- .github/workflows/test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 30e262eebc6..f18a6041b4b 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -41,7 +41,7 @@ jobs: cache-dependency-path: ".github/workflows/test-windows.yml" - name: Print build system information - run: python .github/workflows/system-info.py + run: python3 .github/workflows/system-info.py - name: python3 -m pip install wheel pytest pytest-cov pytest-timeout defusedxml run: python3 -m pip install wheel pytest pytest-cov pytest-timeout defusedxml