Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert back to Standalone Python 20230826 #39

Merged
merged 3 commits into from
Oct 24, 2023
Merged

Revert back to Standalone Python 20230826 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb0849e
Revert back to Standalone Python 20230826
rmartin16 Oct 24, 2023
9a3f930
Restore a meaningful CI
rmartin16 Oct 24, 2023
3160384
Merge branch 'main' into revert-python-ver-bump
freakboy3742 Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ jobs:
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
framework: [ "toga", "pyside2", "pyside6", "ppb", "pygame" ]
exclude:
# PyGObject cannot be built using the current version of Standalone Python
# See https://github.com/indygreg/python-build-standalone/issues/194
- python-version: "3.12"
framework: "toga"
# PySide 2 doesn't publish binary wheels that are compatible with Python 3.11+
# and/or Ubuntu 22.04 (and is unlikely to ever do so.)
- python-version: "3.11"
Expand Down
2 changes: 1 addition & 1 deletion tests/apps/verify-pygame/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ description = "A Pygame test app"
icon = "src/verify_pygame/resources/verify-pygame"
sources = ['src/verify_pygame']
requires = [
'pygame~=2.2.0',
'pygame~=2.5',
]

[tool.briefcase.app.verify-pygame.linux]
Expand Down
2 changes: 1 addition & 1 deletion tests/apps/verify-pyside2/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ description = "A PySide2 test app"
icon = "src/verify_pyside2/resources/verify-pyside2"
sources = ['src/verify_pyside2']
requires = [
'pyside2>=5.15.2',
'pyside2~=5.15',
]

[tool.briefcase.app.verify-pyside2.linux]
Expand Down
2 changes: 1 addition & 1 deletion tests/apps/verify-pyside6/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ description = "A PySide6 test app"
icon = "src/verify_pyside6/resources/verify-pyside6"
sources = ['src/verify_pyside6']
requires = [
'pyside6>=6.2.4',
'pyside6~=6.2',
]

[tool.briefcase.app.verify-pyside6.linux]
Expand Down
10 changes: 5 additions & 5 deletions tests/apps/verify-toga/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ bundle = "org.beeware"
version = "0.0.1"
url = "https://beeware.org/"
license = "BSD license"
author = 'Brutus'
author = "Brutus"
author_email = "[email protected]"

[tool.briefcase.app.verify-toga]
formal_name = "Hello Toga"
description = "A Toga test app"
icon = "src/verify_toga/resources/verify-toga"
sources = ['src/verify_toga']
sources = ["src/verify_toga"]
requires = [
]


[tool.briefcase.app.verify-toga.linux]
requires = [
'toga-gtk>=0.3.0.dev38',
"toga-gtk==0.3.1",
"PyGObject==3.44.1",
]

[tool.briefcase.app.verify-toga.linux.appimage]
Expand All @@ -39,6 +39,6 @@ system_requires = [
# "webkit2gtk3",
]
linuxdeploy_plugins = [
'DEPLOY_GTK_VERSION=3 gtk',
"DEPLOY_GTK_VERSION=3 gtk",
]
template = "../../.."
9 changes: 5 additions & 4 deletions {{ cookiecutter.format }}/briefcase.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
app_path = "{{ cookiecutter.formal_name }}.AppDir/usr/app"
app_packages_path = "{{ cookiecutter.formal_name }}.AppDir/usr/app_packages"
support_path = "{{ cookiecutter.formal_name }}.AppDir/usr"
{# using 20230826 until indygreg/python-build-standalone#194 is resolved -#}
{{ {
"3.8": 'support_revision = "3.8.18+20231002"',
"3.9": 'support_revision = "3.9.18+20231002"',
"3.10": 'support_revision = "3.10.13+20231002"',
"3.11": 'support_revision = "3.11.6+20231002"',
"3.8": 'support_revision = "3.8.17+20230826"',
"3.9": 'support_revision = "3.9.18+20230826"',
"3.10": 'support_revision = "3.10.13+20230826"',
"3.11": 'support_revision = "3.11.5+20230826"',
"3.12": 'support_revision = "3.12.0+20231002"',
}.get(cookiecutter.python_version|py_tag, "") }}
# Remove the pieces of the standalone package that we don't need.
Expand Down