From 6f5d37fc21fa01f3272f851d97d13c4e045f27a6 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 31 Oct 2015 12:17:02 +0000
Subject: [PATCH] requirements.txt: rename to py26reqs.txt and remove it from
 deps where possible.

When people see requirements.txt they tend to `pip install -r`
straight way
(c.f. https://github.com/letsencrypt/letsencrypt/issues/1252). It's
only necessary for Python2.6.
---
 Dockerfile                       | 2 +-
 Dockerfile-dev                   | 4 ++--
 MANIFEST.in                      | 2 +-
 bootstrap/README                 | 4 ++--
 bootstrap/dev/venv.sh            | 2 +-
 requirements.txt => py26reqs.txt | 0
 tox.ini                          | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename requirements.txt => py26reqs.txt (100%)

diff --git a/Dockerfile b/Dockerfile
index b9ea168de..d7aca784b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ COPY letsencrypt-apache /opt/letsencrypt/src/letsencrypt-apache/
 COPY letsencrypt-nginx /opt/letsencrypt/src/letsencrypt-nginx/
 
 
-# requirements.txt not installed!
+# py26reqs.txt not installed!
 RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv && \
     /opt/letsencrypt/venv/bin/pip install \
     -e /opt/letsencrypt/src/acme \
diff --git a/Dockerfile-dev b/Dockerfile-dev
index daa8e9af0..028366b2c 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -32,7 +32,8 @@ RUN /opt/letsencrypt/src/ubuntu.sh && \
 # the above is not likely to change, so by putting it further up the
 # Dockerfile we make sure we cache as much as possible
 
-COPY setup.py README.rst CHANGES.rst MANIFEST.in requirements.txt DISCLAIMER linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/
+# py26reqs.txt not installed!
+COPY setup.py README.rst CHANGES.rst MANIFEST.in DISCLAIMER linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/
 
 # all above files are necessary for setup.py, however, package source
 # code directory has to be copied separately to a subdirectory...
@@ -52,7 +53,6 @@ COPY tests /opt/letsencrypt/src/tests/
 
 RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv && \
     /opt/letsencrypt/venv/bin/pip install \
-    -r /opt/letsencrypt/src/requirements.txt \
     -e /opt/letsencrypt/src/acme \
     -e /opt/letsencrypt/src \
     -e /opt/letsencrypt/src/letsencrypt-apache \
diff --git a/MANIFEST.in b/MANIFEST.in
index fa0d16e0d..5d5b0bed4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include requirements.txt
+include py26reqs.txt
 include README.rst
 include CHANGES.rst
 include CONTRIBUTING.md
diff --git a/bootstrap/README b/bootstrap/README
index 6a04ac0ba..89fd8b6ba 100644
--- a/bootstrap/README
+++ b/bootstrap/README
@@ -2,6 +2,6 @@ This directory contains scripts that install necessary OS-specific
 prerequisite dependencies (see docs/using.rst).
 
 General dependencies:
-- git-core: requirements.txt git+https://*
+- git-core: py26reqs.txt git+https://*
 - ca-certificates: communication with demo ACMO server at
-  https://www.letsencrypt-demo.org, requirements.txt git+https://*
+  https://www.letsencrypt-demo.org, py26reqs.txt git+https://*
diff --git a/bootstrap/dev/venv.sh b/bootstrap/dev/venv.sh
index d6cf95bb5..2bd32a89b 100755
--- a/bootstrap/dev/venv.sh
+++ b/bootstrap/dev/venv.sh
@@ -4,7 +4,7 @@
 export VENV_ARGS="--python python2"
 
 ./bootstrap/dev/_venv_common.sh \
-  -r requirements.txt \
+  -r py26reqs.txt \
   -e acme[testing] \
   -e .[dev,docs,testing] \
   -e letsencrypt-apache \
diff --git a/requirements.txt b/py26reqs.txt
similarity index 100%
rename from requirements.txt
rename to py26reqs.txt
diff --git a/tox.ini b/tox.ini
index 8ea3e518f..9988d8d1f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ envlist = py26,py27,py33,py34,cover,lint
 commands =
     pip install -e acme[testing]
     nosetests -v acme
-    pip install -r requirements.txt -e .[testing]
+    pip install -r py26reqs.txt -e .[testing]
     nosetests -v letsencrypt
     pip install -e letsencrypt-apache
     nosetests -v letsencrypt_apache
@@ -44,7 +44,7 @@ commands =
 [testenv:cover]
 basepython = python2.7
 commands =
-    pip install -r requirements.txt -e acme -e .[testing] -e letsencrypt-apache -e letsencrypt-nginx -e letshelp-letsencrypt
+    pip install -e acme -e .[testing] -e letsencrypt-apache -e letsencrypt-nginx -e letshelp-letsencrypt
     ./tox.cover.sh
 
 [testenv:lint]
@@ -54,7 +54,7 @@ basepython = python2.7
 # duplicate code checking; if one of the commands fails, others will
 # continue, but tox return code will reflect previous error
 commands =
-    pip install -r requirements.txt -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
+    pip install -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
     ./pep8.travis.sh
     pylint --rcfile=.pylintrc letsencrypt
     pylint --rcfile=.pylintrc acme/acme