From 3e872627d8dd5c8406ca6d5c3964ed295c7e1f60 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Tue, 2 Jul 2019 10:02:00 -0700
Subject: [PATCH] Pin/upgrade virtualenv in our tests (#7211)

* Update virtualenv to the latest version.

* Use venv from pip and pin more packages.

* Pin codecov.

* update appveyor config

* Write the path separator backwards.

* s/pip_install.py install/pip_install.py

* Prefix tools\\pip_install.py with python exe.

* Upgrade py to fix AppVeyor failures.

* add back comment

* Update virtualenv with CERTBOT_NO_PIN.

* Pass -U to upgrade tox and deps.

* Upgrade virtualenv.
---
 .travis.yml               | 8 ++++++--
 appveyor.yml              | 3 ++-
 tools/dev_constraints.txt | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 66ef5ebb1..86a475ca8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -257,7 +257,6 @@ addons:
   apt:
     packages:  # Keep in sync with letsencrypt-auto-source/pieces/bootstrappers/deb_common.sh and Boulder.
     - python-dev
-    - python-virtualenv
     - gcc
     - libaugeas0
     - libssl-dev
@@ -267,7 +266,12 @@ addons:
     - nginx-light
     - openssl
 
-install: "$(command -v pip || command -v pip3) install codecov tox"
+# tools/pip_install.py is used to pin packages to a known working version
+# except in tests where the environment variable CERTBOT_NO_PIN is set.
+# virtualenv is listed here explicitly to make sure it is upgraded when
+# CERTBOT_NO_PIN is set to work around failures we've seen when using an older
+# version of virtualenv.
+install: "tools/pip_install.py -U codecov tox virtualenv"
 script: tox
 
 after_success: '[ "$TOXENV" == "py27-cover" ] && codecov -F linux'
diff --git a/appveyor.yml b/appveyor.yml
index ed3e87c6c..3d58847f8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,7 +27,8 @@ install:
   # Upgrade pip to avoid warnings
   - "python -m pip install --upgrade pip"
   # Ready to install tox and coverage
-  - "pip install tox codecov"
+  # tools/pip_install.py is used to pin packages to a known working version.
+  - "python tools\\pip_install.py tox codecov"
 
 build: off
 
diff --git a/tools/dev_constraints.txt b/tools/dev_constraints.txt
index cc0e54185..90b4775c1 100644
--- a/tools/dev_constraints.txt
+++ b/tools/dev_constraints.txt
@@ -13,6 +13,7 @@ backports.shutil-get-terminal-size==1.0.0
 boto3==1.9.36
 botocore==1.12.36
 cloudflare==1.5.1
+codecov==2.0.15
 configparser==3.7.4
 coverage==4.4.2
 decorator==4.1.2
@@ -47,7 +48,7 @@ pkginfo==1.4.2
 pluggy==0.5.2
 prompt-toolkit==1.0.15
 ptyprocess==0.5.2
-py==1.4.34
+py==1.8.0
 pyasn1==0.1.9
 pyasn1-modules==0.0.10
 Pygments==2.2.0
@@ -81,6 +82,6 @@ twine==1.11.0
 typed-ast==1.1.0
 typing==3.6.4
 uritemplate==0.6
-virtualenv==15.1.0
+virtualenv==16.6.1
 wcwidth==0.1.7
 wrapt==1.11.1