Skip to content

Module Structure + Licensing + Manifest#171

Merged
jmwright merged 16 commits intoCadQuery:masterfrom
PhoneDroid:Update-Licensing
Feb 3, 2026
Merged

Module Structure + Licensing + Manifest#171
jmwright merged 16 commits intoCadQuery:masterfrom
PhoneDroid:Update-Licensing

Conversation

@PhoneDroid
Copy link
Contributor

@PhoneDroid PhoneDroid commented Feb 1, 2026

  • Updated license file
  • Added SPDX annotations
  • Removed Python 2 annotation
  • Restructured to module
  • Added pyproject setup
  • Added PySide wrapper
  • Updated manifest
  • Defined API

@PhoneDroid PhoneDroid marked this pull request as draft February 1, 2026 01:36
@PhoneDroid
Copy link
Contributor Author

Not ready, the global variable isn't accessible.

@PhoneDroid
Copy link
Contributor Author

@jmwright Had to define an API - which should
be done anyways - for it to access the content.

@PhoneDroid PhoneDroid marked this pull request as ready for review February 1, 2026 16:26
@jmwright
Copy link
Member

jmwright commented Feb 1, 2026

@PhoneDroid If I try to install this addon from your branch in FreeCAD 1.0.2 (Flatpak) on Debian 13, I get the following error, which I remember from when I first updated this workbench. I think this may have been the cause of my weird installation method.

Screenshot from 2026-02-01 16-47-34

@PhoneDroid
Copy link
Contributor Author

@jmwright Right, that likely comes from them not being on the allow list, I'll check if they can be added.

@jmwright
Copy link
Member

jmwright commented Feb 2, 2026

@PhoneDroid I know it's a strange capitalization convention, but we have actually always used CadQuery rather than CADQuery as you have it in the license headers.

@PhoneDroid
Copy link
Contributor Author

@jmwright I see, I'll update it later then.

@jmwright
Copy link
Member

jmwright commented Feb 3, 2026

@PhoneDroid Would you like me to do the text replace and push it to your branch (assuming you allowed that when you opened the PR)?

@PhoneDroid
Copy link
Contributor Author

@jmwright No thanks, I'll do that myself :3

Just gotta remember

@PhoneDroid
Copy link
Contributor Author

@jmwright
I think I had created the PR with the wrong branch,
cherry picked stuff, I believe it should be fine now.

@jmwright
Copy link
Member

jmwright commented Feb 3, 2026

@PhoneDroid Thanks!

I have looked this over and am ready to merge when you feel it is finished.

@PhoneDroid
Copy link
Contributor Author

@jmwright Sure, go ahead.
Afterwards I'd recommend bumping the version / creating a new release.

Hopefully later on we can get your dependencies auto-installed as well~

@jmwright jmwright merged commit 4e5b4c2 into CadQuery:master Feb 3, 2026
@jmwright
Copy link
Member

jmwright commented Feb 3, 2026

Thanks for the contribution @PhoneDroid !

@PhoneDroid PhoneDroid deleted the Update-Licensing branch February 3, 2026 21:07
@jmwright
Copy link
Member

jmwright commented Feb 3, 2026

New release here: https://github.com/CadQuery/cadquery-freecad-workbench/releases/tag/v2.2.0

CadQuery is up to 2.6.2 now and uses cadquery-ocp 7.8.1.1, and CadQuery 2.7 is getting close-ish to release. At some point we will want to bump those versions up, but some testing will be required to make sure it does not break anything. I think I've had issues with the cadquery-ocp wheel messing with the FreeCAD environment before, but that might not be relevant anymore with the way FreeCAD 1.x handles environments.

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