GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-04 10:56:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,332 Commits 295 Branches 268 Tags
Commit Graph

57 Commits

Author SHA1 Message Date
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
j.spijker@ultimaker.com
253e61cd4e Don't use collect all on PyQt6 
Contributes to CURA-9365
 2022-07-01 17:10:15 +02:00
j.spijker@ultimaker.com
ffd66445d8 Collect all of numpy-stl 
Contributes to CURA-9365
 2022-07-01 09:25:22 +02:00
j.spijker@ultimaker.com
724f2ab079 Create tcl and tk paths 
Needed by the dist

Contributes to CURA-9365
 2022-06-30 15:37:24 +02:00
j.spijker@ultimaker.com
a2da68d806 Updated mapping of pyinstaller metadata 
Contributes to CURA-9365
 2022-06-30 14:49:07 +02:00
j.spijker@ultimaker.com
a62e5ec1ad Use package for cura as well 
Still need to fix the mappings and hidden imports

Contributes to CURA-9365
 2022-06-30 12:11:00 +02:00
j.spijker@ultimaker.com
eae13942f3 Add PyQt6 to hidden imports 
Contributes to CURA-9365
 2022-06-29 16:15:55 +02:00
j.spijker@ultimaker.com
f745ab7fbc Add PyQt6 sip to hidden_imports 
Contributes to CURA-9365
 2022-06-29 15:52:43 +02:00
j.spijker@ultimaker.com
a2413f4a69 Use correct UM qml path 
Contributes to CURA-9365
 2022-06-29 15:51:14 +02:00
j.spijker@ultimaker.com
ff3a422890 Fixed mapping for pyinstaller from source install 
Some paths in dependencies were moved around due to the new deploy functionality
this should fix it.

Contributes to CURA-9365
 2022-06-29 15:12:51 +02:00
Jelle Spijker
fab8598a05 Add numpy-stl to hidden-imports 
Fixes #10696

Contributes to CURA-9365
 2022-06-26 11:18:53 +02:00
j.spijker@ultimaker.com
5f6d59c63d
Only build Arcus, Savitar and pynest2d shared 
Contributes to CURA-9365
 2022-06-25 18:40:27 +02:00
j.spijker@ultimaker.com
30135072de Compile cpython dependencies statically 
Contributes to CURA-9365
 2022-06-23 12:58:09 +02:00
j.spijker@ultimaker.com
6fff497183 Use latest fdm_materials and cura_binary_data 
Contributes to CURA-9365
 2022-06-23 09:25:45 +02:00
j.spijker@ultimaker.com
2781725cea Use latest alias 
Contributes to CURA-9365
 2022-06-22 19:18:04 +02:00
j.spijker@ultimaker.com
f7c361f61e use mpdecimal 2.5.0 
The Python recipe has some problems with version 2.5.1

fff8ccc29b/recipes/cpython/all/conanfile.py (L187)

Contributes to CURA-9365
 2022-06-22 17:15:14 +02:00
j.spijker@ultimaker.com
95c1a03cb5 pin fm_materials and cura_binary_data 
Contributes to CURA-9365
 2022-06-22 14:24:27 +02:00
j.spijker@ultimaker.com
cc814afaa3 don't use prereleasenumber 
Contributes to CURA-9365
 2022-06-22 13:21:40 +02:00
j.spijker@ultimaker.com
803858c4e9 Cheating with Arcus 
Contributes to CURA-9365
 2022-06-22 11:04:12 +02:00
j.spijker@ultimaker.com
ee87a2e3a4 use umbase 0.1.1 or higher 
Contributes to CURA-9365
 2022-06-22 09:28:52 +02:00
j.spijker@ultimaker.com
d275ad37f8 Remove user and channel 
Even though we had to patch these recipes, the user/channel
shouldn't be necesary any more because of the order in which
our remotes are defined in the conan-config repo. It will
first look into our own remotes, before going over to
conan-center-index.

Once the packages upstream are fixed for us, then we can use
the conan-center-index packages again, without changing the
code.

Contributes to CURA-9365
 2022-06-21 07:52:27 +02:00
j.spijker@ultimaker.com
a31124673b Compile libffi and mpdecimal statically on Windows 
Contributes to CURA-9365
 2022-06-19 19:08:24 +02:00
j.spijker@ultimaker.com
0fb8d62825 Use patched recipes for cpython, mpdecimal, tk, tcl 
Once upstream recipes are fixed these can be removed again.
export the changes for now
```
# Export patched conan-center-index recipes, I will open PR's for all of those
git clone https://github.com/jellespijker/conan-center-index.git
pushd .
cd conan-center-index

git checkout fix_tcl_recipe_env_info
conan export recipes/tcl/all tcl/8.6.10@ultimaker/testing

git checkout fix_tk_recipe_env_info
conan export recipes/tk/all tk/8.6.10@ultimaker/testing

git checkout fix_mpdecimale_recipe_not_use_msys
conan export recipes/mpdecimal/2.5.x mpdecimal/2.5.1@ultimaker/testing

git checkout add_3_10_4_version_cpython
conan export recipes/cpython/all cpython/3.10.4@ultimaker/testing
```

Contributes to CURA-9365
 2022-06-19 14:59:36 +02:00
j.spijker@ultimaker.com
74bd183869 Use cpython 3.10.4 
See branch in fork conan-center-index
https://github.com/jellespijker/conan-center-index/tree/add_3_10_4_version_cpython

Contributes to CURA-9365
 2022-06-19 14:03:16 +02:00
j.spijker@ultimaker.com
ac6f939db3 Use Conan CPython package 
Now all our deps are compiled with the same flags.
This should help to make it more agnostic over the
systems.

Contributes to CURA-9365
 2022-06-18 16:44:07 +02:00
j.spijker@ultimaker.com
0713960482 Fixed couple of mistakes in conandata 
Contributes to CURA-9365
 2022-06-18 11:51:41 +02:00
j.spijker@ultimaker.com
eb8e119e5c Using node-semver to validate version in conandata 
Still not sure if this is the best approach.

Contributes to CURA-9365
 2022-06-18 00:29:15 +02:00
j.spijker@ultimaker.com
aaed543a22 Add entrypoint info to conandata 
With the new PyCharmRunEnv generate conan
should automatically create a pycahrm run
target, setting the paths correctly.

Usage as: `conan instal ....... -g PyCharmRunEnv`

Contributes to CURA-9365
 2022-06-17 18:12:22 +02:00
j.spijker@ultimaker.com
8d03f0c665 Use Cura source folder for pyinstaller 
Contributes to CURA-9365
 2022-06-17 07:33:08 +02:00