From 505e66b57c88f0bfa3ae0809a672e7f047427301 Mon Sep 17 00:00:00 2001
From: Erik Rose <erik@mozilla.com>
Date: Fri, 5 Feb 2016 18:31:41 -0500
Subject: [PATCH] Move the venv setup scripts to the tools folder.

They were the last things left in the bootstrap folder, and they were lonely.
---
 Vagrantfile                                                 | 2 +-
 bootstrap/dev/README                                        | 1 -
 docs/contributing.rst                                       | 4 ++--
 letsencrypt-auto-source/letsencrypt-auto                    | 2 +-
 letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh | 2 +-
 tests/letstest/scripts/test_apache2.sh                      | 2 +-
 tests/letstest/scripts/test_tox.sh                          | 2 +-
 {bootstrap/dev => tools}/_venv_common.sh                    | 0
 {bootstrap/dev => tools}/venv.sh                            | 0
 {bootstrap/dev => tools}/venv3.sh                           | 0
 10 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 bootstrap/dev/README
 rename {bootstrap/dev => tools}/_venv_common.sh (100%)
 rename {bootstrap/dev => tools}/venv.sh (100%)
 rename {bootstrap/dev => tools}/venv3.sh (100%)

diff --git a/Vagrantfile b/Vagrantfile
index 3b9d4dc3a..678abdf72 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,7 +8,7 @@ VAGRANTFILE_API_VERSION = "2"
 $ubuntu_setup_script = <<SETUP_SCRIPT
 cd /vagrant
 ./letsencrypt-auto-source/letsencrypt-auto --os-packages-only
-./bootstrap/dev/venv.sh
+./tools/venv.sh
 SETUP_SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
diff --git a/bootstrap/dev/README b/bootstrap/dev/README
deleted file mode 100644
index 759496187..000000000
--- a/bootstrap/dev/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains developer setup.
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 329f92461..8a27d565e 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -23,7 +23,7 @@ once:
    git clone https://github.com/letsencrypt/letsencrypt
    cd letsencrypt
    ./letsencrypt-auto-source/letsencrypt-auto --os-packages-only
-   ./bootstrap/dev/venv.sh
+   ./tools/venv.sh
 
 Then in each shell where you're working on the client, do:
 
@@ -300,7 +300,7 @@ Steps:
 
 1. Write your code!
 2. Make sure your environment is set up properly and that you're in your
-   virtualenv. You can do this by running ``./bootstrap/dev/venv.sh``.
+   virtualenv. You can do this by running ``./tools/venv.sh``.
    (this is a **very important** step)
 3. Run ``./pep8.travis.sh`` to do a cursory check of your code style.
    Fix any errors.
diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto
index 64b06048b..c87e4c000 100755
--- a/letsencrypt-auto-source/letsencrypt-auto
+++ b/letsencrypt-auto-source/letsencrypt-auto
@@ -290,7 +290,7 @@ BootstrapArchCommon() {
   #
   # "python-virtualenv" is Python3, but "python2-virtualenv" provides
   # only "virtualenv2" binary, not "virtualenv" necessary in
-  # ./bootstrap/dev/_common_venv.sh
+  # ./tools/_venv_common.sh
 
   deps="
     python2
diff --git a/letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh b/letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh
index ad752634c..90a9d43c4 100755
--- a/letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh
+++ b/letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh
@@ -4,7 +4,7 @@ BootstrapArchCommon() {
   #
   # "python-virtualenv" is Python3, but "python2-virtualenv" provides
   # only "virtualenv2" binary, not "virtualenv" necessary in
-  # ./bootstrap/dev/_common_venv.sh
+  # ./tools/_venv_common.sh
 
   deps="
     python2
diff --git a/tests/letstest/scripts/test_apache2.sh b/tests/letstest/scripts/test_apache2.sh
index 178e3d4e8..940cc36c6 100755
--- a/tests/letstest/scripts/test_apache2.sh
+++ b/tests/letstest/scripts/test_apache2.sh
@@ -44,7 +44,7 @@ if [ $? -ne 0 ] ; then
     exit 1
 fi
 
-bootstrap/dev/venv.sh
+tools/venv.sh
 sudo venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \
                    --renew-by-default --redirect --register-unsafely-without-email \
                    --domain $PUBLIC_HOSTNAME --server $BOULDER_URL
diff --git a/tests/letstest/scripts/test_tox.sh b/tests/letstest/scripts/test_tox.sh
index 98fe9b9ce..4c2eb429e 100755
--- a/tests/letstest/scripts/test_tox.sh
+++ b/tests/letstest/scripts/test_tox.sh
@@ -14,7 +14,7 @@ VENV_BIN=${VENV_PATH}/bin
 "$LEA_PATH/letsencrypt-auto" --os-packages-only
 
 cd letsencrypt
-./bootstrap/dev/venv.sh
+./tools/venv.sh
 PYVER=`python --version 2>&1 | cut -d" " -f 2 | cut -d. -f1,2 | sed 's/\.//'`
 
 if [ $PYVER -eq 26 ] ; then
diff --git a/bootstrap/dev/_venv_common.sh b/tools/_venv_common.sh
similarity index 100%
rename from bootstrap/dev/_venv_common.sh
rename to tools/_venv_common.sh
diff --git a/bootstrap/dev/venv.sh b/tools/venv.sh
similarity index 100%
rename from bootstrap/dev/venv.sh
rename to tools/venv.sh
diff --git a/bootstrap/dev/venv3.sh b/tools/venv3.sh
similarity index 100%
rename from bootstrap/dev/venv3.sh
rename to tools/venv3.sh