Install conan from pip instead of exe

This allows us to get it working on 32-bit Windows.

Also renamed conan.ps1 and python.ps1 to get proper provisioning order.

Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Konstantin Tokarev
2016-11-16 16:32:17 +03:00
parent f910b2bbf9
commit f8e075a679
10 changed files with 10 additions and 14 deletions

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\python.ps1"
. "$PSScriptRoot\..\common\02-python.ps1"