~thopiekar/ultimaker/+git/libCharon:4.10

Last commit made on 2021-04-16
Get this branch:
git clone -b 4.10 https://git.launchpad.net/~thopiekar/ultimaker/+git/libCharon

Branch merges

Branch information

Recent commits

3ce7b18... by t-men <email address hidden>

Merge pull request #31 from Ultimaker/EXP_parallel_ci

Removed custom prepare_environment step in CI, in preperation for par…

4cd4535... by Tiemen Joustra <email address hidden>

Removed custom prepare_environment step in CI, in preperation for paralellel CIing

833d30e... by Coen Schalkwijk <email address hidden>

Merge pull request #30 from Ultimaker/MISP-1266_fix_licensing

Misp 1266 fix licensing

827a77d... by Remco Wendt <email address hidden>

MISP-1266: Remove incorrect license identifiers

142e42b... by Shigeru Yamada <email address hidden>

Merge pull request #27 from Ultimaker/cura_osx_build_aws

Use exact Python version when identifying the interpreter so that macOS build on AWS will use updated Cura Python version

21c4161... by Evangelos Trantos <email address hidden>

Use exact Python version when identifying the interpreter

The Python version that Cura is currently using is v3.5.7. However, all updated servers have now system Python versions installed by default, which are newer than that.
As a result, during CMake's configuration step the system Python is found first (since it's located in /usr/bin or /usr/local/bin) and, thus, the step results in error.
Using an exact version of Python and setting that variable during the configuration step is the most ideal solution for this issue.

c34738d... by Chris ter Beke <email address hidden>

Merge pull request #26 from Ultimaker/MISP-reinstate-setup-script-for-cura

Reinstate setup.py so cura can install it as a python package

dc0b8ae... by Bryan Foley <email address hidden>

Reinstate setup.py so cura can install the it as a python package

3a94906... by Bryan Foley <email address hidden>

Merge pull request #25 from Ultimaker/prime-jedi

Prime jedi conversion

0c566ff... by Bryan Foley <email address hidden>

Added a small comment on the target value of cyclomatic complexity