Skip to content

Commit 2de1c8f

Browse files
committed
Appveyor should use the same version of pip as everything else
1 parent 444e596 commit 2de1c8f

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

appveyor.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,9 @@ install:
131131
# Check that we have the expected version and architecture for Python
132132
- "python -c \"import struct, sys; print('{}\\n{}-bit'.format(sys.version, struct.calcsize('P') * 8))\""
133133

134-
# Upgrade to the latest version of pip to avoid it displaying warnings
134+
# Upgrade to the right version of pip to avoid it displaying warnings
135135
# about it being out of date.
136-
- "python -m pip install --disable-pip-version-check --upgrade pip"
137-
# And upgrade virtualenv to get the latest pip inside .tox virtualenvs.
138-
- "python -m pip install --disable-pip-version-check --upgrade virtualenv"
136+
- "python -m pip install --disable-pip-version-check -r requirements/pip.pip"
139137

140138
# Install requirements.
141139
- "%CMD_IN_ENV% pip install -r requirements/ci.pip"

requirements/dev.pip

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
# Requirements for doing local development work on coverage.py.
55
# https://requires.io/github/nedbat/coveragepy/requirements/
66

7-
pip==20.0.2
8-
virtualenv==16.7.9
7+
-r pip.pip
98

109
pluggy==0.13.1
1110

requirements/pip.pip

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
2+
# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
3+
4+
pip==20.0.2
5+
virtualenv==16.7.9

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ extras =
1414
deps =
1515
# Check here for what might be out of date:
1616
# https://requires.io/github/nedbat/coveragepy/requirements/
17+
-r requirements/pip.pip
1718
-r requirements/pytest.pip
18-
pip==20.0.2
1919
setuptools==41.4.0
2020
# gevent 1.3 causes a failure: https://github.com/nedbat/coveragepy/issues/663
2121
py{27,35,36}: gevent==1.2.2

0 commit comments

Comments
 (0)