From e268e718a0e16f8e3e51da2c98012d7fb1b7390a Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Wed, 2 Dec 2015 16:04:38 +0200
Subject: [PATCH] Remove py26reqs.txt

ConfigArgParse 0.10 from PyPI supports Python 2.6, so there's no more
need to install a fixed version directly from a git branch.
---
 Dockerfile            | 1 -
 Dockerfile-dev        | 1 -
 MANIFEST.in           | 1 -
 bootstrap/README      | 4 ++--
 bootstrap/dev/venv.sh | 1 -
 bootstrap/venv.sh     | 2 +-
 letsencrypt-auto      | 4 +---
 py26reqs.txt          | 2 --
 tox.ini               | 2 +-
 9 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 py26reqs.txt

diff --git a/Dockerfile b/Dockerfile
index 02aa0f0d7..da0110604 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,7 +49,6 @@ COPY letsencrypt-apache /opt/letsencrypt/src/letsencrypt-apache/
 COPY letsencrypt-nginx /opt/letsencrypt/src/letsencrypt-nginx/
 
 
-# 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 b89411c90..3c5b53966 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -32,7 +32,6 @@ 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
 
-# py26reqs.txt not installed!
 COPY setup.py README.rst CHANGES.rst MANIFEST.in 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
diff --git a/MANIFEST.in b/MANIFEST.in
index a82c7dd8c..a6f9ae2b6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,3 @@
-include py26reqs.txt
 include README.rst
 include CHANGES.rst
 include CONTRIBUTING.md
diff --git a/bootstrap/README b/bootstrap/README
index 89fd8b6ba..d8d9f6939 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: py26reqs.txt git+https://*
+- git-core: git+https://*
 - ca-certificates: communication with demo ACMO server at
-  https://www.letsencrypt-demo.org, py26reqs.txt git+https://*
+  https://www.letsencrypt-demo.org, git+https://*
diff --git a/bootstrap/dev/venv.sh b/bootstrap/dev/venv.sh
index 2bd32a89b..11ab417dd 100755
--- a/bootstrap/dev/venv.sh
+++ b/bootstrap/dev/venv.sh
@@ -4,7 +4,6 @@
 export VENV_ARGS="--python python2"
 
 ./bootstrap/dev/_venv_common.sh \
-  -r py26reqs.txt \
   -e acme[testing] \
   -e .[dev,docs,testing] \
   -e letsencrypt-apache \
diff --git a/bootstrap/venv.sh b/bootstrap/venv.sh
index ff1a50c6c..5042178d9 100755
--- a/bootstrap/venv.sh
+++ b/bootstrap/venv.sh
@@ -20,7 +20,7 @@ fi
 pip install -U setuptools
 pip install -U pip
 
-pip install -U -r py26reqs.txt letsencrypt letsencrypt-apache # letsencrypt-nginx
+pip install -U letsencrypt letsencrypt-apache # letsencrypt-nginx
 
 echo
 echo "Congratulations, Let's Encrypt has been successfully installed/updated!"
diff --git a/letsencrypt-auto b/letsencrypt-auto
index c88028b72..e8d4adf9a 100755
--- a/letsencrypt-auto
+++ b/letsencrypt-auto
@@ -175,7 +175,7 @@ if [ "$VERBOSE" = 1 ]  ; then
   echo
   $VENV_BIN/pip install -U setuptools
   $VENV_BIN/pip install -U pip
-  $VENV_BIN/pip install -r "$LEA_PATH"/py26reqs.txt -U letsencrypt letsencrypt-apache
+  $VENV_BIN/pip install -U letsencrypt letsencrypt-apache
   # nginx is buggy / disabled for now, but upgrade it if the user has
   # installed it manually
   if $VENV_BIN/pip freeze | grep -q letsencrypt-nginx ; then
@@ -187,8 +187,6 @@ else
   $VENV_BIN/pip install -U pip > /dev/null
   printf .
   # nginx is buggy / disabled for now...
-  $VENV_BIN/pip install -r "$LEA_PATH"/py26reqs.txt > /dev/null
-  printf .
   $VENV_BIN/pip install -U letsencrypt > /dev/null
   printf .
   $VENV_BIN/pip install -U letsencrypt-apache > /dev/null
diff --git a/py26reqs.txt b/py26reqs.txt
deleted file mode 100644
index a94b22c0c..000000000
--- a/py26reqs.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://github.com/bw2/ConfigArgParse/issues/17
-git+https://github.com/kuba/ConfigArgParse.git@python2.6-0.9.3#egg=ConfigArgParse
diff --git a/tox.ini b/tox.ini
index d1fafe20f..1abe1cf39 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ envlist = py26,py27,py33,py34,py35,cover,lint
 commands =
     pip install -e acme[testing]
     nosetests -v acme
-    pip install -r py26reqs.txt -e .[testing]
+    pip install -e .[testing]
     nosetests -v letsencrypt
     pip install -e letsencrypt-apache
     nosetests -v letsencrypt_apache