PyPI moved

This commit is contained in:
2Shirt 2018-04-16 09:42:03 -06:00
parent d7111b0e41
commit d893a80f03
2 changed files with 4 additions and 4 deletions

View file

@ -96,7 +96,7 @@ if ($MyInvocation.InvocationName -ne ".") {
DownloadFile -Path $Path -Name "python64.zip" -Url $Url
# Python: psutil
$DownloadPage = "https://pypi.python.org/pypi/psutil"
$DownloadPage = "https://pypi.org/project/psutil/"
$RegEx = "href=.*-cp36-cp36m-win32.whl"
$Url = FindDynamicUrl $DownloadPage $RegEx
DownloadFile -Path $Path -Name "psutil32.whl" -Url $Url
@ -107,7 +107,7 @@ if ($MyInvocation.InvocationName -ne ".") {
# Python: requests & dependancies
$RegEx = "href=.*.py3-none-any.whl"
foreach ($Module in @("chardet", "certifi", "idna", "urllib3", "requests")) {
$DownloadPage = "https://pypi.python.org/pypi/$Module"
$DownloadPage = "https://pypi.org/project/$Module/"
$Name = "$Module.whl"
$Url = FindDynamicUrl -SourcePage $DownloadPage -RegEx $RegEx
DownloadFile -Path $Path -Name $Name -Url $Url

View file

@ -164,11 +164,11 @@ if ($MyInvocation.InvocationName -ne ".") {
# Python: psutil
@(
"psutil64.whl",
(FindDynamicUrl "https://pypi.python.org/pypi/psutil" "href=.*-cp36-cp36m-win_amd64.whl")
(FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp36-cp36m-win_amd64.whl")
),
@(
"psutil32.whl",
(FindDynamicUrl "https://pypi.python.org/pypi/psutil" "href=.*-cp36-cp36m-win32.whl")
(FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp36-cp36m-win32.whl")
),
# Q-Dir
@("qdir64.zip", "https://www.softwareok.com/Download/Q-Dir_Portable_x64.zip"),