235 Commits

Author SHA1 Message Date
Erwan MATHIEU
285126e65a Remove pywin32 explicit dependency 2024-12-03 10:09:10 +01:00
Erwan MATHIEU
80b7babdea Bump pyinstaller version 2024-12-02 15:35:00 +01:00
Erwan MATHIEU
c245b29fc4 Add hash for setuptools package 2024-11-29 16:46:56 +01:00
Erwan MATHIEU
a1d59b28ac Use proper package name for charon/libcharon 2024-11-29 13:43:08 +01:00
Erwan MATHIEU
55e2967551 Use proper dulcificum version 2024-11-29 10:19:46 +01:00
Erwan MATHIEU
c002ba7afe Bump dulcificum version 2024-11-29 09:56:33 +01:00
Erwan MATHIEU
05aecd77aa Bump pywin32 and pywin32-ctypes 2024-11-28 15:54:13 +01:00
Erwan MATHIEU
8e25302753 Merge remote-tracking branch 'origin/main' into CURA-11622_conan_v2 2024-11-27 17:40:09 +01:00
Remco Burema
2ef1462f82 Update pywin32.
done as part of CURA-11622
2024-11-27 12:40:45 +01:00
Erwan MATHIEU
43a3db9c5d Remove build steps from Conan recipe 2024-11-20 21:36:43 +01:00
Erwan MATHIEU
23b896251f Split dev and installer requirements 2024-11-19 09:22:51 +01:00
Erwan MATHIEU
3910ab0b78 Do not include enterprise resources if not needed 2024-11-14 15:04:39 +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
Jelle Spijker
cf4f5702c5
Use resources from the working branch
revert when merged to `main`

Contribute to CURA-7435
2024-11-08 10:48:33 +01:00
Erwan MATHIEU
94b8728962 Merge remote-tracking branch 'origin/5.9' 2024-11-07 09:44:40 +01:00
HellAholic
dcbd40ca7d Set conan package version 5.9.0-beta.2 2024-11-05 13:05:42 +00: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
a1029d8fe3 Set dev version 5.10 2024-10-22 11:48:10 +02:00
wawanbreton
ef878993b3 Set conan package version 5.9.0-beta.1 2024-10-08 08:11:22 +00:00
wawanbreton
47acfc115a Set conan package version 5.9.0-alpha.1 2024-10-08 08:07:39 +00:00
Erwan MATHIEU
ab96236a8f Fix pyinstaller data generation 2024-09-26 16:38:23 +02:00
Erwan MATHIEU
7e9ca6f35f Set translations sources folders 2024-09-25 10:40:31 +02:00
Erwan MATHIEU
d26c5b74a6 Fix incompatible Python dependencies and files generation 2024-09-24 16:37:15 +02:00
Erwan MATHIEU
e3cb6d4f8c Basically working recipe 2024-09-24 16:08:30 +02:00
Erwan MATHIEU
f0cbd8e802 Restore lost change after an errored merge
This reverts commit 946bf033066e561827da4d00afbc3b680cd7e552.
2024-09-19 11:00:09 +02:00
Remco Burema
7928c241a8 Merge remote-tracking branch 'origin/5.8' 2024-09-18 17:31:27 +02:00
HellAholic
c7a286b33a Set conan package version 5.8.1 2024-08-28 13:16:33 +00:00
Erwan MATHIEU
5a4ce498d4 Remove gradual flow plugin dependency
CURA-12096
2024-08-16 14:57:58 +02:00
Erwan MATHIEU
946bf03306 Revert "Merge branch 'main' into 5.8"
This reverts commit fec7637615fd05fb052848bb1cd569840d650ebd, reversing
changes made to 081b9b543b564ac6c2a840916162a06b289c5d94.
2024-08-13 15:56:01 +02:00
Remco Burema
1edc45f9ae Builds: Unbump dulcificum version. 2024-08-06 16:23:27 +02:00
HellAholic
fcca9ff18f Update conandata.yml 2024-08-05 15:29:28 +02:00
HellAholic
4d7a57822b Bump to 5.9.0-alpha.1 2024-08-05 15:21:07 +02:00
HellAholic
400266affb Set conan package version 5.8.0 2024-08-01 08:02:55 +00:00
Erwan MATHIEU
e7847975d5
Use beta4 version instead
Co-authored-by: HellAholic <alireza.doustdar@gmail.com>
2024-07-12 10:14:51 +02:00
Erwan MATHIEU
30e054b096 Revert "Bump gradual flow plugin version"
This reverts commit a087cbffae5a409419a2b83fca15ecd9b4566519.
2024-07-12 09:57:25 +02:00
Erwan MATHIEU
c7daad8094 Freeze dulcificum version 2024-07-09 10:28:46 +02:00
HellAholic
4c8489860a Set conan package version 5.8.0-beta.1 2024-07-05 07:33:51 +00:00
HellAholic
5c057f4a78 Set conan package version 5.8.0-alpha.1 2024-07-05 07:24:27 +00:00
Erwan MATHIEU
a087cbffae Bump gradual flow plugin version 2024-07-01 13:59:05 +02:00
Erwan MATHIEU
d828396749 Remove indirect conan dependency 2024-07-01 12:04:47 +02:00
Erwan MATHIEU
59771d0ddc Revert "Set dependencies version .."
This reverts commit a4178e8377758a12fa18516589c4db3e277eeb37.
2024-05-30 12:48:03 +02:00
github-actions
a4178e8377 Set dependencies version .. 2024-05-30 10:45:04 +00:00
Jelle Spijker
52e850b847
fix wrong channel 2024-05-13 11:58:58 +02:00
Jelle Spijker
e1603f3efd
Use testing for cura_resources
Contribute to NP-186
2024-05-10 13:30:49 +02:00
Jelle Spijker
52cf75ae99
Don't use conandata
Contribute to NP-186
2024-05-10 11:39:50 +02:00
Jelle Spijker
9e1d6b1537
Addressed code-review comments
Contribute to NP-186
2024-05-10 11:33:55 +02:00
Jelle Spijker
d0da9b72eb
Use correct resource folder
Contribute to NP-186
2024-05-07 11:56:37 +02:00
Jelle Spijker
0942c35c0a
Add cura_resources as dependency and update resource directories
A new dependency 'cura_resources' has been added to the conandata.yml. The handling of 'cura_resources' has been updated, now including specific sections for definitions, extruders, intent, meshes, quality and variants. GitHub Actions workflows and conan scripts have been adjusted accordingly to include these changes.

Contribute to NP-186
2024-05-06 11:40:39 +02:00