From ec69514eb2be687f751e3a7a18d96e3e29d44c16 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 12 Nov 2016 12:29:40 -0200 Subject: [PATCH] Only install pypy on AppVeyor for "pypy" tox-env --- MANIFEST.in | 1 + appveyor.yml | 10 ++-------- scripts/install-pypy.bat | 6 ++++++ 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 scripts/install-pypy.bat diff --git a/MANIFEST.in b/MANIFEST.in index 24b4cfc9b..c57cbd911 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,6 +10,7 @@ include tox.ini include setup.py recursive-include scripts *.py +recursive-include scripts *.bat include .coveragerc diff --git a/appveyor.yml b/appveyor.yml index b761e0352..7192ec06f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,7 @@ environment: # https://www.appveyor.com/docs/build-configuration#secure-variables matrix: + # note: please use "tox --listenvs" to populate the build matrix below - TOXENV: "linting" - TOXENV: "py26" - TOXENV: "py27" @@ -28,14 +29,7 @@ install: - echo Installed Pythons - dir c:\Python* - # install pypy using choco (redirect to a file and write to console in case - # choco install returns non-zero, because choco install python.pypy is too - # noisy) - # pypy is disabled until #1963 gets fixed - - choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1) - - set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy - - echo PyPy installed - - pypy --version + - if "%TOXENV%" == "pypy" scripts\install-pypy.bat - C:\Python35\python -m pip install tox diff --git a/scripts/install-pypy.bat b/scripts/install-pypy.bat new file mode 100644 index 000000000..8012ea46a --- /dev/null +++ b/scripts/install-pypy.bat @@ -0,0 +1,6 @@ +REM install pypy using choco +REM redirect to a file because choco install python.pypy is too noisy. If the command fails, write output to console +choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1) +set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy +echo PyPy installed +pypy --version