From 4c82f61c3173b91a862e8a8f60560a4451d14032 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Mon, 14 Sep 2020 14:10:39 +0300
Subject: Provisioning: Update Conan to 1.29.0

Task-bumber: QTQAINFRA-3916
Change-Id: I52d8a0255efcc7b4b139ec5050cf3d59003f12a9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit f73fa57088ed47d555b6635d11219d57379c9e90)
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
---
 coin/provisioning/common/windows/conan.ps1         |  2 +-
 .../common/windows/conan_requirements.txt          | 42 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'coin/provisioning/common/windows')

diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1
index e7e0de22..8b22ab1d 100644
--- a/coin/provisioning/common/windows/conan.ps1
+++ b/coin/provisioning/common/windows/conan.ps1
@@ -37,7 +37,7 @@
 $scriptsPath = "C:\Python36\Scripts"
 
 Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt"
-Write-Output "Conan = 1.22.2" >> ~\versions.txt
+Write-Output "Conan = 1.29.0" >> ~\versions.txt
 
 # Use Qt Project repository by default
 Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force"
diff --git a/coin/provisioning/common/windows/conan_requirements.txt b/coin/provisioning/common/windows/conan_requirements.txt
index 7097de1e..078158e8 100644
--- a/coin/provisioning/common/windows/conan_requirements.txt
+++ b/coin/provisioning/common/windows/conan_requirements.txt
@@ -1,33 +1,33 @@
-# Generated for conan==1.22.2
-appdirs==1.4.3
+# Generated for conan==1.29.0
+appdirs==1.4.4
 bottle==0.12.18
-certifi==2019.11.28
+certifi==2020.6.20
 chardet==3.0.4
 colorama==0.4.3
-conan==1.22.2
+conan==1.29.0
 deprecation==2.0.7
-distlib==0.3.0
-distro==1.1.0
+distlib==0.3.1
+distro==1.5.0
 fasteners==0.15
 filelock==3.0.12
 future==0.18.2
-idna==2.9
-importlib-metadata==1.5.0
-Jinja2==2.11.1
+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.1
-patch-ng==1.17.2
-pluginbase==0.7
-Pygments==2.5.2
+packaging==20.4
+patch-ng==1.17.4
+pluginbase==1.0.0
+Pygments==2.7.0
 PyJWT==1.7.1
-pyparsing==2.4.6
+pyparsing==2.4.7
 python-dateutil==2.8.1
-PyYAML==5.3
-requests==2.23.0
-six==1.14.0
-tqdm==4.43.0
-urllib3==1.25.8
-virtualenv==20.0.4
-zipp==2.2.0
+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