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

Change subject: Revert "Cleanup .appveyor.yml file" ......................................................................

Revert "Cleanup .appveyor.yml file"

This reverts commit c8c8e32ae1e85c6c3c1ffb18d2a46bb1942f2152. We need the installer for 2.7.2 and 3.4.0, otherwise appveyor falls back to Python 2.7.14 for those versions.

Bug: T191188 Change-Id: Ib39aa22fc60da0c8061518db0d7b7c8cf42aea78 --- M .appveyor.yml 1 file changed, 15 insertions(+), 1 deletion(-)

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

diff --git a/.appveyor.yml b/.appveyor.yml index d50e536..2755449 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,6 +2,12 @@ environment:

global: + APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appvey..." + + # 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 intepreter + # See: http://stackoverflow.com/a/13751649/163740 + CMD_IN_ENV: "cmd /E:ON /V:ON /C .\appveyor\run_with_env.cmd"

PYWIKIBOT2_DIR: "%appdata%\Pywikibot" PYWIKIBOT2_USER_CONFIG: "%appdata%\Pywikibot\user-config.py" @@ -67,6 +73,14 @@

install: - git submodule update --init + # Download the Appveyor Python build accessories into subdirectory .\appveyor + - mkdir appveyor + - ps: $wc = new-object net.webclient + - ps: $run = $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'run_with_env.cmd') + - ps: $run | Out-File -Encoding ascii -FilePath appveyor\run_with_env.cmd + + # This is needed for Python versions not installed on Appveyor build machines + - ps: if (-not(Test-Path($env:PYTHON))) { iex $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'install.ps1') } - pip install virtualenv - virtualenv env - env\Scripts\activate.bat @@ -84,7 +98,7 @@ - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT2_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')"

- set PYSETUP_TEST_NO_UI=1 - - coverage run setup.py test + - "%CMD_IN_ENV% coverage run setup.py test"

on_failure: - codecov