Provisioning: update Conan and Conan packages to latest versions

qtwebkit · Feb 21, 2020 · bc89d2a · bc89d2a
1 parent adefc7e
commit bc89d2a
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 22 deletions.
diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1
@@ -36,7 +36,7 @@
 
 $scriptsPath = "C:\Python36\Scripts"
 
-Run-Executable "$scriptsPath\pip3.exe" "install --upgrade conan==1.17.0"
+Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt"
 Write-Output "Conan = 1.17.0" >> ~\versions.txt
 
 # Use Qt Project repository by default

diff --git a/coin/provisioning/common/windows/conan_requirements.txt b/coin/provisioning/common/windows/conan_requirements.txt
@@ -0,0 +1,33 @@
+# Generated for conan==1.22.2
+appdirs==1.4.3
+bottle==0.12.18
+certifi==2019.11.28
+chardet==3.0.4
+colorama==0.4.3
+conan==1.22.2
+deprecation==2.0.7
+distlib==0.3.0
+distro==1.1.0
+fasteners==0.15
+filelock==3.0.12
+future==0.18.2
+idna==2.9
+importlib-metadata==1.5.0
+Jinja2==2.11.1
+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
+PyJWT==1.7.1
+pyparsing==2.4.6
+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
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
@@ -1,8 +1,8 @@
 [requires]
-icu/64.2@qtproject/stable
-libxml2/2.9.9@qtproject/stable
-libxslt/1.1.33@qtproject/stable
-libjpeg-turbo/2.0.2@qtproject/stable
+icu/65.1@qtproject/stable
+libxml2/2.9.10@qtproject/stable
+libxslt/1.1.34@qtproject/stable
+libjpeg-turbo/2.0.3@qtproject/stable
 
 [generators]
 cmake
@@ -22,8 +22,8 @@ libxslt:shared=True
 libjpeg-turbo:shared=False
 
 [imports]
-lib, icudt64.dll -> ./bin
-lib, icuin64.dll -> ./bin
-lib, icuuc64.dll -> ./bin
+bin, icudt65.dll -> ./bin
+bin, icuin65.dll -> ./bin
+bin, icuuc65.dll -> ./bin
 bin, libxml2.dll -> ./bin
 bin, libxslt.dll -> ./bin
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
@@ -1,8 +1,8 @@
 [requires]
-icu/64.2@qtproject/stable
-libxml2/2.9.9@qtproject/stable
-libxslt/1.1.33@qtproject/stable
-libjpeg-turbo/2.0.2@qtproject/stable
+icu/65.1@qtproject/stable
+libxml2/2.9.10@qtproject/stable
+libxslt/1.1.34@qtproject/stable
+libjpeg-turbo/2.0.3@qtproject/stable
 
 [generators]
 cmake
@@ -22,9 +22,9 @@ libxslt:shared=True
 libjpeg-turbo:shared=False
 
 [imports]
-lib, icudt64.dll -> ./bin
-lib, icuin64.dll -> ./bin
-lib, icuuc64.dll -> ./bin
+bin, icudt65.dll -> ./bin
+bin, icuin65.dll -> ./bin
+bin, icuuc65.dll -> ./bin
 bin, libxml2.dll -> ./bin
 bin, libxslt.dll -> ./bin
 bin, libxml2-2.dll -> ./bin

diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
@@ -1,8 +1,8 @@
 [requires]
-icu/64.2@qtproject/stable
-libxml2/2.9.9@qtproject/stable
-libxslt/1.1.33@qtproject/stable
-libjpeg-turbo/2.0.2@qtproject/stable
+icu/65.1@qtproject/stable
+libxml2/2.9.10@qtproject/stable
+libxslt/1.1.34@qtproject/stable
+libjpeg-turbo/2.0.3@qtproject/stable
 zlib/1.2.11@qtproject/stable
 
 [generators]
@@ -25,8 +25,8 @@ libjpeg-turbo:shared=False
 zlib:shared=False
 
 [imports]
-lib, icudt64.dll -> ./bin
-lib, icuin64.dll -> ./bin
-lib, icuuc64.dll -> ./bin
+bin, icudt65.dll -> ./bin
+bin, icuin65.dll -> ./bin
+bin, icuuc65.dll -> ./bin
 bin, libxml2-2.dll -> ./bin
 bin, libxslt-1.dll -> ./bin