Skip to content

Commit

Permalink
Merge pull request #2917 from freakboy3742/testbed-pillow
Browse files Browse the repository at this point in the history
Bump Pillow dependency for testbed.
  • Loading branch information
mhsmith authored Oct 17, 2024
2 parents 261e356 + 9400208 commit 659868f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 15 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ jobs:
# the system Python version to become inconsistent from run to run.
- backend: "linux-x11"
platform: "linux"
runs-on: "ubuntu-22.04"
runs-on: "ubuntu-24.04"
# The package list should be the same as in tutorial-0.rst, and the BeeWare
# tutorial, plus blackbox to provide a window manager. We need a window
# manager that is reasonably lightweight, honors full screen mode, and
Expand Down Expand Up @@ -320,11 +320,7 @@ jobs:
uses: actions/setup-python@v5.2.0
if: matrix.setup-python
with:
# We're not using Python 3.11 yet, because:
# * The testbed's ProxyEventLoop has some problems with it
# (https://github.com/beeware/toga/issues/1982).
# * It doesn't have an Android build of Pillow yet.
python-version: "3.10"
python-version: "3.12"

- name: Install Dependencies
env:
Expand Down
1 change: 1 addition & 0 deletions changes/2883.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The testbed app can now be run on *any* supported Python version.
6 changes: 0 additions & 6 deletions docs/how-to/contribute/code.rst
Original file line number Diff line number Diff line change
Expand Up @@ -672,12 +672,6 @@ test mode:
(venv) C:\...>cd testbed
(venv) C:\...>briefcase dev --test
.. note::

To test iOS and Android, you *must* use Python 3.10. The testbed app uses a number
of binary packages, and the specific combination of versions that are used are
currently only available for Python 3.10.

This will display a Toga app window, which will flash as it performs all the GUI
tests. You'll then see a coverage report for the code that has been executed.

Expand Down
4 changes: 1 addition & 3 deletions testbed/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[project]
name = "testbed"
version = "0.0.1"
# This *should* be a consistent version, but we need to support 3.12 for Wayland testing, and 3.10 for iOS and Android.
# requires-python = "~=3.10.0"

[project.optional-dependencies]
test = [
Expand All @@ -12,7 +10,7 @@ test = [
# sys.platform == 'linux' as there's no dependency identifier
# that can target Android exclusively until 3.13 lands.
"fonttools==4.54.1 ; sys.platform == 'linux'",
"pillow==9.2.0",
"pillow==11.0.0",
"pytest==8.3.3",
"pytest-asyncio==0.24.0",
]
Expand Down

0 comments on commit 659868f

Please sign in to comment.