Jelle Spijker
7da9f433c4
Always return ps1 on windows
4 years ago
j.spijker@ultimaker.com
89300371e1
Use the correct venv_folder when not in local cache
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
c10fb89ca2
Fix source install
...
If the package not in local cache then the
user_info isn't defined yet
Contributes to CURA-9365
4 years ago
Ghostkeeper
5e79858c2e
Merge branch 'CURA-9177_Fix_CI_CD'
4 years ago
Ghostkeeper
b3574a58aa
Loosen up path check for pip_requirements
...
On Linux and MacOS it's provided with the full path here. This is a simple (albeit overly loose) way to allow that.
Contributes to issue CURA-9365.
4 years ago
Ghostkeeper
5cd446306f
Add pip_requirements_build to venv generator
...
Then it will also install the build-requirements into that virtual environment, such as Pyinstaller.
Contributes to issue CURA-9365.
4 years ago
j.spijker@ultimaker.com
d2e410f897
Add shared libs in site-packages to env PATHs
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
879d5fcdda
Use regular conan script generation
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
533035ec5f
Fixed creating VirtualPythonEnv from remote install
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
67e04d066d
Set scm_to_conandata in config
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
f699b30ff4
Using full_package_mode to determine graph
...
https://docs.conan.io/en/1.45/creating_packages/define_abi_compatibility.html#package-id-mode
Contributes to CURA-9365
4 years ago
Jelle Spijker
0ba9f1a50f
Revert "Use a download cache"
...
This reverts commit 47b097b955 .
4 years ago
j.spijker@ultimaker.com
47b097b955
Use a download cache
...
Should reduce traffic to the server
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
b0553b7b38
Need to fix this virtualenv powershell for Windows
...
for now leave it be.
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
d81809cd32
Add virtualenv powershell for Windows
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
c06ee39be6
run python with the run environment
...
This should allow for using the cpython dependency
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
9e1913b042
Added cura and cura-ce remotes
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
5e1cddd464
Added conan.conf
...
Needed because the Cura remotes requires: revisions_enabled = 1
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
91b9d5f5d0
Use the pathlib module
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
e3eb4d8cfd
Bump up Visual Studio Compiler toolset to v143
...
Need to compile Python
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
0b81e9ad31
Fix openssl not compiling on Windows
...
The powershell variable was set to output ps1 files
Need to check if that still works with all the
current changes. Or if I need another way of
determining the extension to use.
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
f74e045b69
Use the CPython dependency for the VirtualPythonEnv
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
d44fd2e1ff
Fix pycharmrunenv
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
704196f47e
Use um_data function to get entrypoint
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
58bb090838
Use global.conf and remove conan.conf
...
Contributes to CURA-9365
4 years ago
jspijker
d1897a6fc8
Find_package_prefered should no longer be needed
...
This use to be a work around for mixing conan and non-conan build stuff
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
17f3314318
Define default profiles to be used
...
TODO: Check if this compiles correctly on Windows
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
2dba32f499
use default cura profiles
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
7f1a00f08c
Use entrypoint for Pycharm run filename
...
Pycharm keep renaming mine, hopeing this
solves it.
Contributes to CURA-9177_Fix_CI_CD
4 years ago
j.spijker@ultimaker.com
3ffd239a9d
Add a PycharmRunEnv Generator
...
This will generate a Pycharm run target
and use the conan paths
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
cdd2866245
Removed URL of free tier server
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
f6c7a77072
Export variables directly
...
The Paths weren't set when the export was done indirectly.
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
639b8ef9dc
Remove win_bash arg
...
No longer needed, was a remnant of the old path troubles
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
0fc21e82b3
Install wheels and setuptools as base
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
cd24959ffc
Use the correct Env naming scheme depending on OS
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
34c3fb69d1
Use the correct quotes for each OS
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
745d8155b0
Add the activate github jinja template
...
This should allow the activation of a virtual python env on GH
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
0898492dda
Fix the Shell activate script
...
Should be else instead of then 🤦
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
332fa8f5e4
Uniform name for python executable on all three OSes
...
Make sure there executable is named the same on all three OSes
this allows it to be called with `python` simplifying GH Actions
steps. So I don't have to add exceptions based on the OS
in the runner Matrix
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
8a9b5a0e86
Renamed activate_github_actions_env
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
e8ba061446
Construct the GH Action environments for the PythonVirtualEnv
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
4c54ea7d78
Construct the GH Action environments with a Generator
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
85c4936234
Generate the activation scripts
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
0088f7f5d8
Use platform.system to determine if powershell runs
...
Apparently it was a problem referring to `os` and `os_build`
in the jinja template later on, since those values were determined
on the fly as well
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
d2d8c2cca7
Switched quote characters
...
https://cpplang.slack.com/archives/C41CWV9HA/p1654942697502539
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
ff842cba50
Make the VirtulPythonEnv more robust
...
It should now be able to also create a venv with another interpreter.
Provided it is installed next to the current interpreter on the same
base Path.
Trying to make execution of the run commands robust on Windows, till no
avail. It states:
```powershell
----Running------
> C:\'Program Files'\Python310\python.exe -m venv venv
-----------------
'C:\'Program' is not recognized as an internal or external command,
operable program or batch file.
```
But if I run the ` C:\'Program Files'\Python310\python.exe -m venv venv`
in the same shell manually it executes correctly.
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
ee8cb5e43d
Switch order of remotes
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
73971d1abe
Use ultimaker-conan as remote
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
4e77b5694c
Prefer conan-center over our own remote
...
Contributes to CURA-9365
4 years ago
j.spijker@ultimaker.com
4987a3f58c
Work around for Windows needing quotes and other OS not
...
Seems to be a bug in Conan will create a bug report later this week.
Contributes to CURA-9365
4 years ago