From f66ff5272d4ccc7b57a3572d0d0f599681e1524c Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 15 Oct 2024 17:45:05 -0400 Subject: [PATCH] Bump pillow, use non-dev 3.13 --- .github/workflows/lint-and-build.yml | 6 +++--- scripts/requirements.txt | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint-and-build.yml b/.github/workflows/lint-and-build.yml index dc178942..0ca3caff 100644 --- a/.github/workflows/lint-and-build.yml +++ b/.github/workflows/lint-and-build.yml @@ -46,7 +46,7 @@ jobs: # Ruff is version and platform sensible matrix: os: [windows-latest, ubuntu-22.04] - python-version: ["3.11", "3.12", "3.13-dev"] + python-version: ["3.11", "3.12", "3.13"] steps: - name: Checkout ${{ github.repository }}/${{ github.ref }} uses: actions/checkout@v4 @@ -66,7 +66,7 @@ jobs: # Pyright is version and platform sensible matrix: os: [windows-latest, ubuntu-22.04] - python-version: ["3.11", "3.12", "3.13-dev"] + python-version: ["3.11", "3.12", "3.13"] steps: - name: Checkout ${{ github.repository }}/${{ github.ref }} uses: actions/checkout@v4 @@ -99,7 +99,7 @@ jobs: # Only the Python version we plan on shipping matters. matrix: os: [windows-latest, ubuntu-22.04] - python-version: ["3.12", "3.13-dev"] + python-version: ["3.12", "3.13"] include: - os: ubuntu-22.04 python-version: "3.11" # I had some Qt Wayland issues on 3.12 for ubuntu-22.04 iirc. TODO: test it diff --git a/scripts/requirements.txt b/scripts/requirements.txt index 8bfd3327..5ee2066f 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -42,6 +42,5 @@ typed-D3DShot[numpy]>=1.0.1 ; sys_platform == 'win32' # # Linux-only dependencies PyScreeze ; sys_platform == 'linux' -# pillow>=11.0 ; sys_platform == 'linux' # Python 3.13 support # Necessary for PyScreeze. For unknown reasons it's not pulled in on CI -git+https://github.com/python-pillow/Pillow.git ; sys_platform == 'linux' +pillow>=11.0 ; sys_platform == 'linux' # Python 3.13 support # Necessary for PyScreeze. For unknown reasons it's not pulled in on CI python-xlib ; sys_platform == 'linux'