jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/566238 )

Change subject: [bugfix, tests] Fix Python 3.5.0 AppVeyor installation
......................................................................

[bugfix, tests] Fix Python 3.5.0 AppVeyor installation

Python 3.5.0 silently fails to install because of a conflict with
Python 3.5.4 preinstalled by default. Use fork of the project to fix
the issues until fixed upstream.

Change-Id: I144a769e5621001ed037226f02f2dc8da47c78fc
---
M .appveyor.yml
1 file changed, 2 insertions(+), 10 deletions(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.appveyor.yml b/.appveyor.yml
index 7e2b432..fd2275b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,7 +1,7 @@
 clone_depth: 50
 environment:

-  APPVEYOR_PYTHON_URL: 
"https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appveyor/";
+  APPVEYOR_PYTHON_URL: 
"https://raw.githubusercontent.com/dvorapa/python-appveyor-demo/master/appveyor/";

   # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
   # /E:ON and /V:ON options are not enabled in the batch script interpreter
@@ -85,15 +85,7 @@
   # This is needed for Python versions not installed on Appveyor build machines
   - ps: |
       if (-not(Test-Path($env:PYTHON))) {
-        if ($env:PYTHON_VERSION -eq "2.7.4") {
-          iex $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'install.ps1')
-        } else {
-          $logPath = "C:\Python350-x64.log"
-          if (-not(Test-Path -Path $logPath -PathType leaf)) { ni $logPath 
-type file }
-          $exePath = "$env:TEMP\python-3.5.0-amd64.exe"
-          (New-Object 
Net.WebClient).DownloadFile('https://www.python.org/ftp/python/3.5.0/python-3.5.0-amd64.exe',
 $exePath)
-          cmd /c start /wait $exePath /quiet TargetDir=C:\Python350-x64 
Shortcuts=0 Include_launcher=0 InstallLauncherAllUsers=0
-        }
+        iex $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'install.ps1')
       }
   - pip install virtualenv
   - virtualenv env

--
To view, visit https://gerrit.wikimedia.org/r/566238
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.wikimedia.org/r/settings

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I144a769e5621001ed037226f02f2dc8da47c78fc
Gerrit-Change-Number: 566238
Gerrit-PatchSet: 3
Gerrit-Owner: Dvorapa <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot (75)
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits

Reply via email to