lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 12:26:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Update Conan to 1.29.0

Browse Source 
Change-Id: I52d8a0255efcc7b4b139ec5050cf3d59003f12a9
This commit is contained in:
Konstantin Tokarev
2020-09-14 14:10:39 +03:00
parent dc6760d6ac
commit 91b764f76f
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/windows/conan.ps1
View File

@@ -37,7 +37,7 @@
$scriptsPath = "C:\Python36\Scripts" $scriptsPath = "C:\Python36\Scripts"
Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt" 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 # Use Qt Project repository by default
Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force"

42
coin/provisioning/common/windows/conan_requirements.txt
View File

@@ -1,33 +1,33 @@
# Generated for conan==1.22.2 # Generated for conan==1.29.0
appdirs==1.4.3 appdirs==1.4.4
bottle==0.12.18 bottle==0.12.18
certifi==2019.11.28 certifi==2020.6.20
chardet==3.0.4 chardet==3.0.4
colorama==0.4.3 colorama==0.4.3
conan==1.22.2 conan==1.29.0
deprecation==2.0.7 deprecation==2.0.7
distlib==0.3.0 distlib==0.3.1
distro==1.1.0 distro==1.5.0
fasteners==0.15 fasteners==0.15
filelock==3.0.12 filelock==3.0.12
future==0.18.2 future==0.18.2
idna==2.9 idna==2.10
importlib-metadata==1.5.0 importlib-metadata==1.7.0
Jinja2==2.11.1 Jinja2==2.11.2
MarkupSafe==1.1.1 MarkupSafe==1.1.1
monotonic==1.5 monotonic==1.5
node-semver==0.6.1 node-semver==0.6.1
packaging==20.1 packaging==20.4
patch-ng==1.17.2 patch-ng==1.17.4
pluginbase==0.7 pluginbase==1.0.0
Pygments==2.5.2 Pygments==2.7.0
PyJWT==1.7.1 PyJWT==1.7.1
pyparsing==2.4.6 pyparsing==2.4.7
python-dateutil==2.8.1 python-dateutil==2.8.1
PyYAML==5.3 PyYAML==5.3.1
requests==2.23.0 requests==2.24.0
six==1.14.0 six==1.15.0
tqdm==4.43.0 tqdm==4.49.0
urllib3==1.25.8 urllib3==1.25.10
virtualenv==20.0.4 virtualenv==20.0.31
zipp==2.2.0 zipp==3.1.0