Skip to content

Commit d3eddb1

Browse files
committed
Use batch (something weird going on with that powershell) and make the virtualenv pin a minimum requirement.
1 parent 32435d8 commit d3eddb1

File tree

2 files changed

+15
-21
lines changed

2 files changed

+15
-21
lines changed

appveyor.yml

+7-11
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,16 @@ init:
1515
- ps: echo $env:TOXENV
1616
- ps: ls C:\Python*
1717
install:
18-
- ps: |
19-
if ($env:TOXENV -notmatch 'pypy') {
18+
- |
19+
IF "%TOXENV:~0,4%" == "pypy" (
2020
choco install --no-progress python.pypy
21-
$env:PATH = "C:\tools\pypy\pypy;$env:PATH"
22-
pypy --version
23-
}
24-
25-
# Upgrade virtualenv for e.g. more-itertools to be handled properly.
26-
# Pin it to work around https://github.com/tox-dev/tox/issues/1389.
27-
- C:\Python35\python -m pip install -U virtualenv==16.5.0
28-
- C:\Python35\python -m pip install tox
21+
C:\tools\pypy\pypy --version
22+
)
23+
- C:\Python37\python -m pip install -U "virtualenv>=16.5.0"
24+
- C:\Python37\python -m pip install tox
2925

3026
test_script:
31-
- C:\Python35\python -m tox
27+
- C:\Python37\python -m tox
3228

3329
on_failure:
3430
- ps: dir "env:"

ci/templates/appveyor.yml

+8-10
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@ init:
1414
- ps: echo $env:TOXENV
1515
- ps: ls C:\Python*
1616
install:
17-
# install pypy using choco (redirect to a file and write to console in case
18-
# choco install returns non-zero, because choco install python.pypy is too
19-
# noisy)
20-
- choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
21-
- set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy
22-
- echo PyPy installed
23-
- pypy --version
24-
25-
- C:\Python35\python -m pip install tox
17+
- |
18+
IF "%TOXENV:~0,4%" == "pypy" (
19+
choco install --no-progress python.pypy
20+
C:\tools\pypy\pypy --version
21+
)
22+
- C:\Python37\python -m pip install -U "virtualenv>=16.5.0"
23+
- C:\Python37\python -m pip install tox
2624

2725
test_script:
28-
- C:\Python35\python -m tox
26+
- C:\Python37\python -m tox
2927

3028
on_failure:
3129
- ps: dir "env:"

0 commit comments

Comments
 (0)