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

Bump flatpak base image #77

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Bump flatpak base image #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
987dd31
Bump flatpak base image for test.
freakboy3742 Apr 29, 2024
6e9267a
More legacy removals.
freakboy3742 Apr 30, 2024
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
51 changes: 1 addition & 50 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,57 +66,9 @@ system_runtime_requires = [
"libcanberra-gtk3-module",
]

[tool.briefcase.app.testbed.linux.appimage]
manylinux = "manylinux_2_28"
requires = [
'--no-binary', ':all:',
]

system_requires = [
# Needed to compile pycairo wheel
"cairo-gobject-devel",
# Needed to compile PyGObject wheel
"gobject-introspection-devel",
# Needed to provide GTK
"gtk3-devel",
# Dependencies that GTK looks for at runtime, that need to be
# in the build environment to be picked up by linuxdeploy
"libcanberra-gtk3",
"PackageKit-gtk3-module",
"gvfs-client",
# Needed to compile Pillow
"libjpeg-devel",
# Needed to compile Cryptography
"openssl-devel",
]

linuxdeploy_plugins = [
'DEPLOY_GTK_VERSION=3 gtk',
]

dockerfile_extra_content = """
# Install Rust (required for cryptography)
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
# Set up compilers (required for numpy)
ENV CXX="g++ -pthread"
ENV AR=ar
# Add a symlink for python->python3 (needed for pandas)
# Pandas *requires* that the Python binary be called `python`, not `python3`.
# However, Python-standalone *only* provides `python3`, and at runtime, we
# only need `python3`. We can't (easily) reconfigure the Meson build for Pandas,
# so we put a symlink in `brutus`'s bin path.
RUN mkdir -p /home/brutus/bin
RUN ln -si /app/Testbed.AppDir/usr/python/bin/python3 /home/brutus/bin/python
# Set the path to include all the things we've installed.
ENV PATH="/home/brutus/bin:/home/brutus/.cargo/bin:${PATH}"
"""

# support_package = "../Python-linux-support/dist/Python-3.10-linux-x86_64-support.custom.tar.gz"
# template = "../../templates/briefcase-linux-appimage-template"

[tool.briefcase.app.testbed.linux.flatpak]
flatpak_runtime = "org.gnome.Platform"
flatpak_runtime_version = "44"
flatpak_runtime_version = "45"
flatpak_sdk = "org.gnome.Sdk"

# template = "../../templates/briefcase-linux-flatpak-template"
Expand Down Expand Up @@ -145,7 +97,6 @@ requires = [

[tool.briefcase.app.testbed.android]
requires = [
"rubicon-java",
# Android doesn't provide the zoneinfo TZ database; use the Python provided one
"tzdata",
]
Expand Down
3 changes: 0 additions & 3 deletions tests/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def test_stdlib_modules():
"termios",
"unicodedata",
# Scheduled for deprecation
"_crypt",
"audioop",
]

Expand All @@ -110,7 +109,6 @@ def test_stdlib_modules():
# Modules that do not exist on Android
if hasattr(sys, "getandroidapilevel"):
all_modules.remove("grp")
all_modules.remove("_crypt")

# Modules that do not exist on iOS
if sys.platform == "ios":
Expand All @@ -121,7 +119,6 @@ def test_stdlib_modules():

# Modules that do not exist on Windows
if sys.platform == "win32":
all_modules.remove("_crypt")
all_modules.remove("_posixsubprocess")
all_modules.remove("fcntl")
all_modules.remove("grp")
Expand Down
Loading