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

Migrate to PySide6 #552

Merged
merged 3 commits into from
Oct 13, 2022
Merged

Migrate to PySide6 #552

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
3bb08c7
Migrated to PySide6
abey79 Oct 12, 2022
e5f7a5a
Install mesa on ubuntu runners (missing libEGL.so.1 error)
abey79 Oct 12, 2022
a7c8371
Updated CHANGELOG.md
abey79 Oct 13, 2022
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
6 changes: 6 additions & 0 deletions .github/workflows/python-lint-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ jobs:
poetry run isort --check --diff vpype vpype_cli vpype_viewer tests
poetry run black --check --diff vpype vpype_cli vpype_viewer tests
poetry run mypy
# needed for tests to work on ubuntu (libEGL.so.1)
- name: Install EGL mesa
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update -y -qq
sudo apt-get install -y -qq libegl1-mesa libegl1-mesa-dev
# PYTEST STRATEGY
# macOS is the only runner who has working ModernGL behaviour
# macOS + 3.10 is used for code coverage
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Release date: UNRELEASED

* Added new units (`yd`, `mi`, and `km`) (#541)
* Added `inch` unit as a synonym to `in`, useful for expressions (in which `in` is a reserved keyword) (#541)
* Migrated to PySide6 (from PySide2), which simplifies installation on Apple silicon Macs (#552)

### Bug fixes

Expand Down
129 changes: 79 additions & 50 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.

4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ matplotlib = { version = ">=3.3.2", optional = true }
glcontext = { version = ">=2.3.2", optional = true } # 2.3.2 needed to fix #200
moderngl = { version = ">=5.6.2", optional = true }
Pillow = { version = ">=9.0.1", optional = true }
PySide2 = { version = ">=5.15.2", optional = true }
PySide6 = { version = ">=6.3.2", optional = true }


[tool.poetry.group.dev.dependencies]
Expand Down Expand Up @@ -82,7 +82,7 @@ sphinx-autodoc-typehints= ">=1.18.3"
sphinx-copybutton = ">=0.5.0"

[tool.poetry.extras]
all = ["matplotlib", "glcontext", "moderngl", "Pillow", "PySide2"]
all = ["matplotlib", "glcontext", "moderngl", "Pillow", "PySide6"]

[build-system]
requires = ["poetry-core>=1.0.8"]
Expand Down
Loading