From 5cf68160c2251d0100d0759941025bc4f1350072 Mon Sep 17 00:00:00 2001
From: Toni Saario <toni.saario@qt.io>
Date: Mon, 17 May 2021 13:18:48 +0300
Subject: Update conan on windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is required for the upcoming conan integrations.

Pick-to: 6.2
Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 coin/provisioning/common/windows/conan.ps1         |  8 ++++++
 .../common/windows/conan_requirements.txt          | 33 ----------------------
 2 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 coin/provisioning/common/windows/conan_requirements.txt

diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1
index 1e4f14e1..9b212fdd 100644
--- a/coin/provisioning/common/windows/conan.ps1
+++ b/coin/provisioning/common/windows/conan.ps1
@@ -33,6 +33,14 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
+$scriptsPath = "C:\Python36\Scripts"
+$version = "1.39.0"
+Run-Executable "$scriptsPath\pip3.exe" "install conan==$version"
+Write-Output "Conan = $version" >> ~\versions.txt
+
+# Add conan to path.
+Add-Path $scriptsPath
+
 # This is temporary solution for installing packages provided by Conan until we have fixed Conan setup for this
 
 $url_conan = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conan.zip"
diff --git a/coin/provisioning/common/windows/conan_requirements.txt b/coin/provisioning/common/windows/conan_requirements.txt
deleted file mode 100644
index 078158e8..00000000
--- a/coin/provisioning/common/windows/conan_requirements.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated for conan==1.29.0
-appdirs==1.4.4
-bottle==0.12.18
-certifi==2020.6.20
-chardet==3.0.4
-colorama==0.4.3
-conan==1.29.0
-deprecation==2.0.7
-distlib==0.3.1
-distro==1.5.0
-fasteners==0.15
-filelock==3.0.12
-future==0.18.2
-idna==2.10
-importlib-metadata==1.7.0
-Jinja2==2.11.2
-MarkupSafe==1.1.1
-monotonic==1.5
-node-semver==0.6.1
-packaging==20.4
-patch-ng==1.17.4
-pluginbase==1.0.0
-Pygments==2.7.0
-PyJWT==1.7.1
-pyparsing==2.4.7
-python-dateutil==2.8.1
-PyYAML==5.3.1
-requests==2.24.0
-six==1.15.0
-tqdm==4.49.0
-urllib3==1.25.10
-virtualenv==20.0.31
-zipp==3.1.0
-- 
cgit v1.2.3