aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/02-python.ps1
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-12-211-0/+2
| | | | | | | Conflicts: coin/provisioning/common/02-python.ps1 Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
* When installing Python ensure that pip is installed tooKonstantin Tokarev2016-11-181-0/+2
| | | | | | | | | If Python is not deinstalled cleanly (01-windows_removethemall.ps1 just erases installation directory) pip is not bootstrapped by new installation. Fix it by running ensurepip module. Change-Id: I3a7ed87eed30118876d7022eed94b8a571677529 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Install conan from pip instead of exeKonstantin Tokarev2016-11-161-0/+64
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 10:11:08 +0000