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.

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

Cura 8640 PyQt6 upgrade #40

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Cura 8640 PyQt6 upgrade #40

merged 2 commits into from
Apr 14, 2022

Conversation

jellespijker
Copy link
Member

@jellespijker jellespijker commented Apr 12, 2022

In order to get this to work on our build-system and working for all three OSes we did a shit tons of boy scouting in our cmake. We removed old methods with variables and try to be consisted in a target-based approach. The idea is that we don't patch stuff down the line, but that the install should place everything in the correct path in a uniform way across all of Cura's dependencies.

These changes have been tested for the Cura team and not yet by the Styx team. Since we're merging to 5.0 instead of master I think we can continue with the PR anyway.

Most of the changes had to do with how dependency targets were named and to make sure that external projects weren't downloaded automatically.

Part of

Fixes

Todo

  • Update Readme. But maybe best done in a separate ticket to prioritize with our other work for the 5.0 release
  • We still have use PyQt5 in this dependency, this is the root cause of CURA-9120 UFP files do not contain preview png file. Since we can't expect the Styx team to update to PyQt6 adhoc and on short notice we need find away to support both PyQt5 for Styx and PyQt6 for Cura. I suggest we handle that in CURA-9120

Changed install path on Debian from dist-packages

Contributes to CURA-8640
Will only be present in development environment

Contributes to CURA-8640
@Ghostkeeper
Copy link
Contributor

We'll merge this into 5.0 for our Cura's builds, but we'll make another PR to master since I'm no maintainer of this repository. Once that's done I'll ping the firmware team that maintains libCharon.

@Ghostkeeper Ghostkeeper merged commit e0f2f53 into 5.0 Apr 14, 2022
@Ghostkeeper Ghostkeeper deleted the CURA-8640_PyQt6_upgrade branch April 14, 2022 13:03
@rburema rburema restored the CURA-8640_PyQt6_upgrade branch April 19, 2022 07:17
@rburema rburema deleted the CURA-8640_PyQt6_upgrade branch April 19, 2022 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants