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

Linux Qt binding granurality #127

Merged
merged 11 commits into from
Jul 24, 2024
Merged

Linux Qt binding granurality #127

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e2d967e
Improving the way linux distributions are detected
jakubjezek001 Jul 16, 2024
d73b08c
QT installation exception for rocky8
jakubjezek001 Jul 16, 2024
526abe2
move distro handling to 'install_qtbinding'
iLLiCiTiT Jul 16, 2024
c9586d6
don't set QT_BINDING in centos7 dockerfile
iLLiCiTiT Jul 16, 2024
93fb9d7
Update poetry.lock
jakubjezek001 Jul 16, 2024
9223970
se distro only on linux
iLLiCiTiT Jul 16, 2024
7230ab6
fix hash
iLLiCiTiT Jul 16, 2024
21c67f6
all docker files can have defined different qtbingint via build argument
iLLiCiTiT Jul 16, 2024
6064e8a
be able to tell to use pyside2 when during docker build
iLLiCiTiT Jul 16, 2024
7643148
added docstrings
iLLiCiTiT Jul 16, 2024
ad1ba8c
change rocky8 to pyside2
iLLiCiTiT Jul 16, 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
15 changes: 13 additions & 2 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ semver = "^2.13.0"
QtPy = "^2.3.0"
pywin32 = { version = "301", markers = "sys_platform == 'win32'" }
python3-xlib = { version="*", markers = "sys_platform == 'linux'"}
distro = "^1.9.0"
iLLiCiTiT marked this conversation as resolved.
Show resolved Hide resolved

[tool.poetry.dev-dependencies]
flake8 = "^6.0"
Expand Down Expand Up @@ -97,6 +98,10 @@ version = "6.7.1"
package = "PySide2"
version = "5.15.2"

[ayon.qtbinding.rocky8]
package = "PySide2"
version = "5.15.2"

[tool.pyright]
include = [
"vendor"
Expand Down
7 changes: 7 additions & 0 deletions tools/runtime_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import time
import subprocess
from pathlib import Path
import distro

import toml
import enlighten
Expand Down Expand Up @@ -135,6 +136,12 @@ def main():
runtime_dep_root = repo_root / "vendor"
pyproject = toml.load(repo_root / "pyproject.toml")
platform_name = platform.system().lower()
# special handling for centos7 and rocky8 - we might need to make
# it more universal for other flavours of linux
if platform_name == "linux":
linux_brand = f"{distro.id()}{distro.major_version()}"
if linux_brand in ["centos7", "rocky8"]:
platform_name = linux_brand
install_qtbinding(pyproject, runtime_dep_root, platform_name)
install_runtime_dependencies(pyproject, runtime_dep_root)
end_time = time.time_ns()
Expand Down