415 Commits

Author SHA1 Message Date
Erwan MATHIEU
ddb5aee056 Use private data from internal conan-user 2024-12-13 20:43:19 +01:00
Erwan MATHIEU
86e799e565 Use fdm_materials_private when appropriate 2024-12-13 20:21:17 +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
55f59b7971 Better rid of 'forbidden modules' and related folders.
part of CURA-11622
2024-12-10 17:30:27 +01:00
Erwan MATHIEU
10633d4ffa Remove now-useless script generation 2024-12-04 15:10:13 +01:00
Erwan MATHIEU
8d332f5bcc Revert CPython to 3.12.2
Unfortunately, 3.12.7 doesn't build on Windows yet
2024-12-02 10:31:27 +01:00
Erwan MATHIEU
f59e19f061 Update python version 2024-11-29 09:02:32 +01:00
Erwan MATHIEU
0d5d0fe846 Rename tmp Python file to a more explicit name 2024-11-28 14:33:16 +01:00
Erwan MATHIEU
8e25302753 Merge remote-tracking branch 'origin/main' into CURA-11622_conan_v2 2024-11-27 17:40:09 +01:00
Erwan MATHIEU
70f01f2a1b Merge remote-tracking branch 'refs/remotes/origin/CURA-11622_conan_v2' into CURA-11622_conan_v2 2024-11-27 14:43:05 +01:00
Erwan MATHIEU
af22593326 Remove version limit 2024-11-27 14:42:57 +01:00
Remco Burema
b7a5b2fd62 (win build) make it work locally again
part if CURA-11622
2024-11-27 12:40:45 +01:00
Erwan MATHIEU
0000ba334c Use gettext tools in path (experimental) 2024-11-27 11:17:13 +01:00
Remco Burema
9002e010cf Fix syntax of thrown errors.
done as part of CURA-11622
2024-11-26 15:06:48 +01:00
Erwan MATHIEU
b9a915024e Always build binary translations files at build time 2024-11-26 08:34:42 +01:00
Erwan MATHIEU
50b13cdd77 Cleanup code 2024-11-22 10:56:41 +01:00
Erwan MATHIEU
b8fd3d7ab0 Remove pyinstaller spec generation at generate() time 2024-11-21 11:15:31 +01:00
Erwan MATHIEU
f2343e98ce Remove dead code 2024-11-21 10:50:28 +01:00
Erwan MATHIEU
43a3db9c5d Remove build steps from Conan recipe 2024-11-20 21:36:43 +01:00
Erwan MATHIEU
5e204ab242 Use virtual python env to get dependencies 2024-11-19 09:23:09 +01:00
Erwan MATHIEU
e044d94144 Use virtual env for dependencies 2024-11-18 14:04:22 +01:00
Erwan MATHIEU
6a7cfca0a5 Revert "Change the way we get Python installs"
This reverts commit fc8581709525802dc441ceff639b026ab1fd6922.
2024-11-18 13:58:19 +01:00
Erwan MATHIEU
fc85817095 Change the way we get Python installs 2024-11-15 15:28:43 +01:00
Erwan MATHIEU
656573e905 User proper environment to get dependencies list 2024-11-15 14:12:30 +01:00
Erwan MATHIEU
806fedef61 An other desperate attempt to get the proper env 2024-11-15 12:15:41 +01:00
Erwan MATHIEU
ebe701899d Use Python virtual env to get dependencies 2024-11-15 12:06:53 +01:00
Erwan MATHIEU
35e52efcfa Change environment to gater Python dependencies 2024-11-15 11:55:43 +01:00
Erwan MATHIEU
0e363202ed Remove specific PYTHONPATH 2024-11-15 11:39:01 +01:00
Erwan MATHIEU
cd48c7cb9d Add debug information for python dependencies generation 2024-11-15 11:33:42 +01:00
Erwan MATHIEU
f50676a18c Fix pyinstaller file generation in some cases 2024-11-14 15:46:54 +01:00
Erwan MATHIEU
3910ab0b78 Do not include enterprise resources if not needed 2024-11-14 15:04:39 +01:00
Erwan MATHIEU
85cd142266 Add explicit errors on missing package information 2024-11-14 14:55:28 +01:00
Erwan MATHIEU
8bd69ecc3d Store versions script in deploy folder 2024-11-14 14:29:07 +01:00
Erwan MATHIEU
bec1ff1243 Fix pyinstaller resources deployment 2024-11-14 13:59:27 +01:00
Erwan MATHIEU
4fedf332a0 Raise exceptions on critical errors 2024-11-13 16:22:18 +01:00
Erwan MATHIEU
85644b621e Remove debug print 2024-11-13 13:33:15 +01:00
Erwan MATHIEU
b78143546c Add more debug printed information 2024-11-13 10:25:04 +01:00
Erwan MATHIEU
440b51c189 Add debug information to try and fix build 2024-11-13 09:20:21 +01:00
Erwan MATHIEU
9a1e384f9a Fix deploy step 2024-11-12 15:45:57 +01:00
Remco Burema
86f12f62f7 Build: Some files may have already been removed.
Symlinks for example?

part of CURA-12229
2024-10-30 17:02:42 +01:00
Remco Burema
cd2e4220f0 Build: Don't remove dir with os.remove use rmdir instead.
part of CURA-12229
2024-10-30 15:49:02 +01:00
Remco Burema
2aed655c8b Build: Really try to make sure unwanted binaries are gone.
part of CURA-12229
2024-10-30 15:07:00 +01:00
Remco Burema
cf836c29cb Build: Outright remove the unwanted binaries, just to be sure.
This is needed on Windows at the moment, which doesn't actually parse that file, but does execute the method.

part of CURA-12229
2024-10-30 08:45:58 +01:00
Remco Burema
e0f0e9407b Build: Filter didn't work because the filename was in a tuple.
part of CURA-12229
2024-10-29 16:14:19 +01:00
Remco Burema
2d9e7a347f Build: Fix inverted filter condition for libraries.
Noticed that we _only_ kept the libraries we _didn't_ want, instead of the inverse :-p

part of CURA-12229
2024-10-29 13:49:24 +01:00
Remco Burema
52824c4872 Build: Make pseudo-code into something that should work for all OS's.
part of CURA-12229
2024-10-29 13:18:04 +01:00
Jelle Spijker
5dd6700031 Refactor binaries filtering and update dependencies
Introduce a mechanism to filter blacklisted binaries from the build configuration and update the conandata.yml with a new blacklist section. Additionally, remove unnecessary dependencies from requirements.txt, particularly entries for PyQt6-NetworkAuth and related packages.

Contribute to CURA-12229
2024-10-23 17:08:15 +02:00
Erwan MATHIEU
ab96236a8f Fix pyinstaller data generation 2024-09-26 16:38:23 +02:00
Erwan MATHIEU
cee46ae1ea Rename devtools option to pyinstaller 2024-09-26 12:58:35 +02:00
Erwan MATHIEU
3199437403 Remove now useless attribute 2024-09-25 16:52:51 +02:00