235 Commits

Author SHA1 Message Date
Remco Burema
bc4d57348c Version has been bumped a while ago.
Needed to test CURA-12469 (and I suppose it doesn't hurt for anything else that needs the internal data).
2025-03-19 16:27:31 +01:00
Erwan MATHIEU
2bfb2fd6ad Merge remote-tracking branch 'origin/5.10' 2025-03-19 10:14:09 +01:00
HellAholic
05e8b4283b Set conan package version 5.10.0 2025-03-17 16:37:46 +00:00
Erwan MATHIEU
b67769b238 Fix dependency version 2025-02-26 16:29:16 +01:00
Erwan MATHIEU
0f8fe06059 Bump version to 5.11 2025-02-26 16:11:21 +01:00
Erwan MATHIEU
2f2a93b9d0 Add unit test for single-line statement
CURA-12386
2025-02-26 15:02:22 +01:00
Erwan MATHIEU
6833a38999 Apply new package name for for release 2025-02-26 10:56:43 +01:00
wawanbreton
de1b9c9dba Set conan package version 5.10.0-beta.1 2025-02-26 09:02:42 +00:00
wawanbreton
ca911cabe0 Set conan package version 5.10.0-alpha.2 2025-02-21 14:26:39 +00:00
Erwan MATHIEU
79aa11602c Restore package without user and channel 2025-02-21 14:42:54 +01:00
HellAholic
2aec40b740 set channel to 5.10 2025-02-21 13:52:01 +01:00
HellAholic
ed3ac34f8f add user & channel 2025-02-21 13:43:35 +01:00
wawanbreton
e47c621799 Set conan package version 5.10.0-alpha.1 2025-02-21 10:42:11 +00:00
HellAholic
e367581587
revert back to testing 2025-02-21 10:25:05 +01:00
Erwan MATHIEU
fedf5a4794 Restore unnecessarily changed indentation
CURA-7435
2025-02-21 08:05:27 +01:00
Erwan MATHIEU
399d622eeb Merge remote-tracking branch 'origin/main' into CURA-7435_3DConnexion 2025-02-20 15:20:48 +01:00
Erwan MATHIEU
d0560b9a83 Move pynavlib to collect_all instead of hiddenimports
CURA-12407
2025-02-19 15:54:16 +01:00
Erwan MATHIEU
5eec594f49 Add pynavlib explicitely to pyinstaller
CURA-12407
2025-02-19 08:59:17 +01:00
Erwan MATHIEU
eaeaa0d2b2 Gather and display details licenses for extra dependencies
CURA-12400
Some of the dependencies we use are not directly accessible via pip or conan, so add a field for manually registered dependencies
2025-02-17 15:34:38 +01:00
HellAholic
0d5b57e261
Merge branch 'main' into CURA-7435_3DConnexion 2025-02-13 11:36:06 +01:00
Erwan MATHIEU
b2e86ca185 Bump patch version to reflect Conan upgrade
CURA-12390
2025-02-11 14:43:35 +01:00
Erwan MATHIEU
b338a370c0 Install pynavlib only on Windows and Mac
CURA-12404
Because it is not available on Linux
2025-02-07 15:09:00 +01:00
Erwan MATHIEU
eb5c5a1ad9 Merge remote-tracking branch 'origin/main' into CURA-12261-3dconnectionmouse 2025-02-06 12:57:24 +01:00
c.lamboo
c72cb23466 Update pynavlib dependency
CURA-12261
2025-01-31 10:46:54 +01:00
HellAholic
150a267bb7
switch from branch to stable in conandata for dulcificum 2025-01-29 14:05:14 +01:00
c.lamboo
983d0a43c3 combine hashes for pynavlib dependency
CURA-12261
2025-01-24 14:18:18 +01:00
c.lamboo
b282712299 Fix syntax error in pynavlib dependency
CURA-12261
2025-01-24 14:09:05 +01:00
c.lamboo
6c9b33f6a7 Fix syntax error in pynavlib dependency
CURA-12261
2025-01-24 13:49:07 +01:00
c.lamboo
539e627365 Move pynavlib dependency to any_os section
CURA-12261
2025-01-24 13:45:09 +01:00
c.lamboo
7eb9b15dc7 Pin cura package version
CURA-12261
2025-01-24 13:24:57 +01:00
c.lamboo
7a962216fb Merging CURA-7435_3DConnexionII 2025-01-24 13:20:41 +01:00
Erwan MATHIEU
66402ff93c Use single extruder when exporting for Replicator+
CURA-12313
2025-01-09 09:19:41 +01:00
Erwan MATHIEU
ddb5aee056 Use private data from internal conan-user 2024-12-13 20:43:19 +01:00
Erwan MATHIEU
cd49eb3bff Use proper user for private data 2024-12-13 17:27:05 +01:00
Erwan MATHIEU
50470758b2 Use proper private materials data 2024-12-13 13:33:31 +01:00
Remco Burema
cca70d83da Install: Fix MacOs; Previous Windows fixes caused Mac build to fail.
part of CURA-11622
2024-12-11 16:17:18 +01:00
Remco Burema
bec87b88dd (installer) Unwanted files are in there, try if it can start without.
part of CURA-11622
2024-12-11 10:20:49 +01:00
Remco Burema
cc93e8c866 Prune included binaries.
Hopefully get rid of Qt Quick 3D (as opposed to Qt Quick).

part of CURA-11622
2024-12-10 19:58:56 +01:00
Remco Burema
55f59b7971 Better rid of 'forbidden modules' and related folders.
part of CURA-11622
2024-12-10 17:30:27 +01:00
Remco Burema
5e59458893 More needed PyQt for Windows?
part of CURA-11622
2024-12-10 16:35:28 +01:00
Remco Burema
89287f829d (win-install) That pulled in too much pyqt, try more fine-grained.
part of CURA-11622
2024-12-10 14:33:16 +01:00
Remco Burema
e2c3dd62ce Try to fix that not all pyqt dynamic libs are in the win-install.
part of CURA-11622
2024-12-10 13:16:29 +01:00
Remco Burema
23cc0b4d01 Hopefully all of the hidden imports are OK now for keyring.
part of CURA-11622
2024-12-10 08:27:43 +01:00
Remco Burema
c6a2ccec1e Remove duplicated keychain entry.
part of CURA-11622
2024-12-10 08:27:11 +01:00
Remco Burema
6445cb0546 (Win installer) PyInstaller missed this module, supposedly adding it as a hidden import helps.
part of CURA-11622
2024-12-05 20:13:17 +01:00
Erwan MATHIEU
41526bfe70 Prepare for merge
CURA-11622
2024-12-04 15:01:15 +01:00
Erwan MATHIEU
e2487377cc Remove QtNetwork-Auth unused dependency 2024-12-03 16:21:12 +01:00
Erwan MATHIEU
67924d2e37 Bump dependencies versions 2024-12-03 12:50:33 +01:00
Erwan MATHIEU
00f599aac2 Add hashes for dependencies of keyring 2024-12-03 10:37:50 +01:00
Erwan MATHIEU
23edcccfb1 Restore pywin32-ctypes and bump keyring version 2024-12-03 10:25:08 +01:00