summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2020-04-30 19:27:51 -0400
committerNed Batchelder <ned@nedbatchelder.com>2020-04-30 20:55:32 -0400
commit2de1c8f03fea7d234092508622ed84b7d03a079d (patch)
tree29c8bf8e74b890231b4a46e76984d79bedd86763
parent444e596a93de3e1864f92b0e7d532d0131bab56f (diff)
downloadpython-coveragepy-git-2de1c8f03fea7d234092508622ed84b7d03a079d.tar.gz
Appveyor should use the same version of pip as everything else
-rw-r--r--appveyor.yml6
-rw-r--r--requirements/dev.pip3
-rw-r--r--requirements/pip.pip5
-rw-r--r--tox.ini2
4 files changed, 9 insertions, 7 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 76e21dad..35c670a1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -131,11 +131,9 @@ install:
# Check that we have the expected version and architecture for Python
- "python -c \"import struct, sys; print('{}\\n{}-bit'.format(sys.version, struct.calcsize('P') * 8))\""
- # Upgrade to the latest version of pip to avoid it displaying warnings
+ # Upgrade to the right version of pip to avoid it displaying warnings
# about it being out of date.
- - "python -m pip install --disable-pip-version-check --upgrade pip"
- # And upgrade virtualenv to get the latest pip inside .tox virtualenvs.
- - "python -m pip install --disable-pip-version-check --upgrade virtualenv"
+ - "python -m pip install --disable-pip-version-check -r requirements/pip.pip"
# Install requirements.
- "%CMD_IN_ENV% pip install -r requirements/ci.pip"
diff --git a/requirements/dev.pip b/requirements/dev.pip
index a11729cd..33e03027 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -4,8 +4,7 @@
# Requirements for doing local development work on coverage.py.
# https://requires.io/github/nedbat/coveragepy/requirements/
-pip==20.0.2
-virtualenv==16.7.9
+-r pip.pip
pluggy==0.13.1
diff --git a/requirements/pip.pip b/requirements/pip.pip
new file mode 100644
index 00000000..71c7f213
--- /dev/null
+++ b/requirements/pip.pip
@@ -0,0 +1,5 @@
+# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
+# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
+
+pip==20.0.2
+virtualenv==16.7.9
diff --git a/tox.ini b/tox.ini
index 57c4d4bc..fbdc2132 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,8 +14,8 @@ extras =
deps =
# Check here for what might be out of date:
# https://requires.io/github/nedbat/coveragepy/requirements/
+ -r requirements/pip.pip
-r requirements/pytest.pip
- pip==20.0.2
setuptools==41.4.0
# gevent 1.3 causes a failure: https://github.com/nedbat/coveragepy/issues/663
py{27,35,36}: gevent==1.2.2