85 Commits

Author SHA1 Message Date
Joey de l'Arago
12ec61be1d Fix translations missing from build...maybe? 2023-02-22 17:39:11 +01:00
jspijker
64ecc2118d Set the correct curaengine version for 5.3.0-beta.1 2023-02-22 12:41:29 +01:00
jspijker
8dfaca3752 Set the correct requirements for 5.3.0-beta.1 2023-02-22 12:15:17 +01:00
jspijker
a632d154eb Move beta as first entry 2023-01-31 12:42:37 +01:00
jspijker
c261253f8a Add 5.3.0 and 5.3.0-beta to conandata
Contributes to CURA-10209
2023-01-30 12:28:10 +01:00
jspijker
d75291e3a9 Clean-up
Contributes to CURA-10072
2022-12-30 13:42:01 +01:00
jspijker
4830479b63 Also map plugins folder in conandata.yml 2022-11-10 11:34:46 +01:00
c.lamboo
f803279a43 Merge branch '5.2'
# Conflicts:
#	conandata.yml
2022-11-04 14:00:40 +01:00
jelle spijker
6860c6777c Update conandata for the 5.2.1 release
Fix translation:
- Italian (mea culpa)
- Chinese (我们很抱歉)
2022-10-19 15:52:29 +02:00
jelle spijker
1f5336805c Add 5.3.0-alpha entry 2022-10-17 16:29:06 +02:00
Jelle Spijker
7faf2f63da Remove 5.3.0-alpha from the conandata
When the `conan install . ` command is run without a version specifier it would take the dependencies for 5.3.0-alpha
on the 5.2 branch.
2022-10-11 15:05:46 +02:00
jelle Spijker
ca90ac7787 Fix adding all shared libs managed by Conan to pyinstaller
Closes #13422

Contributes to CURA-9711
2022-10-05 10:47:34 +02:00
jspijker
73c8bf5c66 Merge branch '5.2' into CURA-9711_libspdlog_missing 2022-10-05 10:22:37 +02:00
jspijker
4cdf4e607d update conandata.yml 2022-10-04 16:38:01 +02:00
Joey de l'Arago
1287dffe22 Add fmt binaries to list.
CURA-9711
2022-10-04 15:45:37 +02:00
Casper Lamboo
bef3eb8703
Update conandata.yml 2022-10-04 15:27:41 +02:00
Casper Lamboo
566cbba111
Update conandata.yml 2022-10-04 15:23:58 +02:00
Joey de l'Arago
ccea542280 Add spdlog to binaries list.
Add warning for missing binary

Update pattern matching for binaries glob in bin paths. It will now match .so.X files that it would not before.

CURA-9711
2022-10-04 14:40:13 +02:00
Joey de l'Arago
6da52b1d59
Update conandata.yml 2022-09-30 15:50:35 +02:00
Joey de l'Arago
b7ef313375
Update conandata.yml 2022-09-30 13:19:47 +02:00
Joey de l'Arago
959e4bfadd
Update conandata.yml 2022-09-30 11:07:10 +02:00
Joey de l'Arago
ff9fb445e0
Update conandata.yml 2022-09-30 10:54:52 +02:00
Joey de l'Arago
94d80ef712
Update conandata.yml 2022-09-30 10:35:50 +02:00
Joey de l'Arago
c482cbddf3 Update conandata.yml 2022-09-30 10:33:06 +02:00
Joey de l'Arago
5eccf57c51
Update conandata.yml 2022-09-30 10:05:15 +02:00
Joey de l'Arago
f769216340
Update conandata.yml 2022-09-30 09:23:51 +02:00
Joey de l'Arago
cbadf50f4d
Add beta version 2022-09-29 12:57:10 +02:00
Remco Burema
31e1577347 Revert "Should be able to run a build for VnV (testing)."
This reverts commit 827ef072bd1a40b6d59a6e3f576950c6f9bfebee.
2022-09-23 14:01:55 +02:00
Remco Burema
827ef072bd Should be able to run a build for VnV (testing). 2022-09-23 13:28:13 +02:00
jelle Spijker
59d9bfde99 Use umbase 0.1.7
This will now set the version by default if not
defined at the cmd line to the first entry in the
conandata.yml
2022-09-06 11:33:18 +02:00
j.spijker@ultimaker.com
d92fd3d1e3 Make internal resources requirements
Contributes to CURA-9528
2022-08-12 16:38:17 +02:00
j.spijker@ultimaker.com
c5acaa768b Moved pycharm_targets to conandata
Added individual tests. Still not everything

Contributes to CURA-8827
2022-08-11 18:01:45 +02:00
j.spijker@ultimaker.com
de9d432398 Use new pysavitar as package
Contributes to CURA-8828, CURA-8829 and CURA-8831
2022-08-02 15:47:17 +02:00
j.spijker@ultimaker.com
76b2984426 Use new pynest2d package
Contributes to CURA-8828, CURA-8829 and CURA-8831
2022-08-02 12:56:25 +02:00
j.spijker@ultimaker.com
a7b1052b27 Use the latest pyarcus dependency
Since we split of Arcus and pyArcus into separate repo's

Contributes to CURA-8824 and CURA-8831
2022-08-01 16:11:51 +02:00
j.spijker@ultimaker.com
89042f9dd4 Fix failing trimesh 2022-07-27 12:50:30 +02:00
j.spijker@ultimaker.com
118dab7cf0 Clean-up 5.1.0-beta from conandata
Contributes to CURA-9365
2022-07-19 16:50:50 +02:00
j.spijker@ultimaker.com
c8ce7bcb9d Use latest for stable channel
Contributes to CURA-9365
2022-07-19 10:44:56 +02:00
j.spijker@ultimaker.com
8f87744cd5 Pinned arcus, savitar and pynest2d to release
Contributes to CURA-9365
2022-07-19 09:04:06 +02:00
j.spijker@ultimaker.com
49161aa4be Add cura_8665 entry to conandata
Contributes to CURA-9459
2022-07-15 13:23:15 +02:00
Jelle Spijker
c731ac7dfe Merge branch '5.1' into CURA-9459_standard_default_install_path
# Conflicts:
#	conandata.yml
2022-07-15 10:33:04 +02:00
j.spijker@ultimaker.com
73e7ba4046 Remove 5.1.0-beta from workflow
Contributes to CURA-9365
2022-07-15 10:13:51 +02:00
j.spijker@ultimaker.com
dbc62492e7 Use latest for beta
Contributes to CURA-9365
2022-07-15 08:00:19 +02:00
j.spijker@ultimaker.com
3edd748c50 Use reqs for 5.1.0-beta
Contributes to CURA-9365

(cherry picked from commit 12eb5f15d16ebc908938644d221a2cae5d3c39a2)
2022-07-15 07:59:19 +02:00
j.spijker@ultimaker.com
310fb48f87 Add specific branch req
Contributes to CURA-9365
2022-07-15 07:58:48 +02:00
j.spijker@ultimaker.com
b9b13b0d69 Use reqs for 5.1.0-beta
Contributes to CURA-9365

(cherry picked from commit 12eb5f15d16ebc908938644d221a2cae5d3c39a2)
2022-07-15 07:57:07 +02:00
j.spijker@ultimaker.com
8f1ad7e6b4
Use umbase 0.1.4
Contributes to CURA-9365
2022-07-14 18:21:55 +02:00
j.spijker@ultimaker.com
913d9b8ed7 Add serial to the hidden imports
Should fix USB printing not working
2022-07-11 15:41:15 +02:00
j.spijker@ultimaker.com
3cb58c6554 Updated conandata to run from main
Note: This will work correctly when all the requirements
are also merged

Contributes to CURA-9365
2022-07-08 12:05:07 +02:00
Jelle Spijker
1ddc6c6260
Revert "Don't use collect all on PyQt6"
This reverts commit 253e61cd4e0f40c69e5a58f561ae9d5dd9e0a11f.
2022-07-02 00:55:18 +02:00