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 1/7] 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

From afb6d2813a8e3cff7b47203a250042e715b1dc3d Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Thu, 3 Dec 2015 09:55:21 +0200
Subject: [PATCH 2/7] git+https://* is no longer used

---
 bootstrap/README | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bootstrap/README b/bootstrap/README
index d8d9f6939..d91780903 100644
--- a/bootstrap/README
+++ b/bootstrap/README
@@ -2,6 +2,5 @@ This directory contains scripts that install necessary OS-specific
 prerequisite dependencies (see docs/using.rst).
 
 General dependencies:
-- git-core: git+https://*
 - ca-certificates: communication with demo ACMO server at
-  https://www.letsencrypt-demo.org, git+https://*
+  https://www.letsencrypt-demo.org

From 9fbec030a28e1a1cc92d7ea27c251ccdec0a8253 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Thu, 3 Dec 2015 09:58:39 +0200
Subject: [PATCH 3/7] Require ConfigArgParse >= 0.10 for Python 2.6 support

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 40c6ac16c..7c4e49311 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ version = meta['version']
 
 install_requires = [
     'acme=={0}'.format(version),
-    'ConfigArgParse',
+    'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17
     'configobj',
     'cryptography>=0.7',  # load_pem_x509_certificate
     'parsedatetime',

From 51f17115c6f76d0adfa0914e8202854127760f4c Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Thu, 3 Dec 2015 10:22:50 +0200
Subject: [PATCH 4/7] Allow older ConfigArgParse for users of modern Pythons

(I think this is a bad idea because of
https://github.com/pypa/pip/issues/3025, but letsencrypt maintainers
insist, so *shrug*.  Also the same problem exists for the versioned
'mock' dependency, so I'm not introducing a new one here.)
---
 setup.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 7c4e49311..36d354354 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,6 @@ version = meta['version']
 
 install_requires = [
     'acme=={0}'.format(version),
-    'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17
     'configobj',
     'cryptography>=0.7',  # load_pem_x509_certificate
     'parsedatetime',
@@ -54,9 +53,13 @@ if sys.version_info < (2, 7):
         # only some distros recognize stdlib argparse as already satisfying
         'argparse',
         'mock<1.1.0',
+        'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17
     ])
 else:
-    install_requires.append('mock')
+    install_requires.extend([
+        'mock',
+        'ConfigArgParse',
+    ])
 
 dev_extras = [
     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289

From 85dc829d9f3b5e2b69efd6246c1ed5f9845ebc47 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Thu, 3 Dec 2015 10:51:16 +0200
Subject: [PATCH 5/7] Order imports alphabetically

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 36d354354..40749bf2a 100644
--- a/setup.py
+++ b/setup.py
@@ -52,13 +52,13 @@ if sys.version_info < (2, 7):
     install_requires.extend([
         # only some distros recognize stdlib argparse as already satisfying
         'argparse',
-        'mock<1.1.0',
         'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17
+        'mock<1.1.0',
     ])
 else:
     install_requires.extend([
-        'mock',
         'ConfigArgParse',
+        'mock',
     ])
 
 dev_extras = [

From 38821f244b3ce434c1c02a18ba6b8ac7a17af245 Mon Sep 17 00:00:00 2001
From: Brad Warren <bradmw@umich.edu>
Date: Tue, 15 Dec 2015 17:06:58 -0800
Subject: [PATCH 6/7] Remove git as dependency

---
 bootstrap/_arch_common.sh   | 1 -
 bootstrap/_deb_common.sh    | 1 -
 bootstrap/_gentoo_common.sh | 3 +--
 bootstrap/_rpm_common.sh    | 2 --
 bootstrap/_suse_common.sh   | 3 +--
 bootstrap/freebsd.sh        | 1 -
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/bootstrap/_arch_common.sh b/bootstrap/_arch_common.sh
index f66067ffb..2b512792f 100755
--- a/bootstrap/_arch_common.sh
+++ b/bootstrap/_arch_common.sh
@@ -8,7 +8,6 @@
 # ./bootstrap/dev/_common_venv.sh
 
 deps="
-  git
   python2
   python-virtualenv
   gcc
diff --git a/bootstrap/_deb_common.sh b/bootstrap/_deb_common.sh
index 4c6b91a33..d8b03075c 100755
--- a/bootstrap/_deb_common.sh
+++ b/bootstrap/_deb_common.sh
@@ -33,7 +33,6 @@ if apt-cache show python-virtualenv > /dev/null ; then
 fi
 
 apt-get install -y --no-install-recommends \
-  git \
   python \
   python-dev \
   $virtualenv \
diff --git a/bootstrap/_gentoo_common.sh b/bootstrap/_gentoo_common.sh
index a718db7ff..a9bc6acd7 100755
--- a/bootstrap/_gentoo_common.sh
+++ b/bootstrap/_gentoo_common.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-PACKAGES="dev-vcs/git
-  dev-lang/python:2.7
+PACKAGES="dev-lang/python:2.7
   dev-python/virtualenv
   dev-util/dialog
   app-admin/augeas
diff --git a/bootstrap/_rpm_common.sh b/bootstrap/_rpm_common.sh
index b975da444..6edea8eb1 100755
--- a/bootstrap/_rpm_common.sh
+++ b/bootstrap/_rpm_common.sh
@@ -33,9 +33,7 @@ then
   fi
 fi
 
-# "git-core" seems to be an alias for "git" in CentOS 7 (yum search fails)
 if ! $tool install -y \
-       git-core \
        gcc \
        dialog \
        augeas-libs \
diff --git a/bootstrap/_suse_common.sh b/bootstrap/_suse_common.sh
index 46f9d693b..701849e4b 100755
--- a/bootstrap/_suse_common.sh
+++ b/bootstrap/_suse_common.sh
@@ -2,8 +2,7 @@
 
 # SLE12 don't have python-virtualenv
 
-zypper -nq in -l git-core \
-  python \
+zypper -nq in -l python \
   python-devel \
   python-virtualenv \
   gcc \
diff --git a/bootstrap/freebsd.sh b/bootstrap/freebsd.sh
index 180ee21b4..4482c35cd 100755
--- a/bootstrap/freebsd.sh
+++ b/bootstrap/freebsd.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -xe
 
 pkg install -Ay \
-  git \
   python \
   py27-virtualenv \
   augeas \

From eca5e7ae27928a8f2232ca9efb99e095120ab01b Mon Sep 17 00:00:00 2001
From: Brad Warren <bradmw@umich.edu>
Date: Wed, 16 Dec 2015 12:45:15 -0800
Subject: [PATCH 7/7] Put every package on its own line

---
 bootstrap/_gentoo_common.sh | 3 ++-
 bootstrap/_suse_common.sh   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bootstrap/_gentoo_common.sh b/bootstrap/_gentoo_common.sh
index a9bc6acd7..f49dc00f0 100755
--- a/bootstrap/_gentoo_common.sh
+++ b/bootstrap/_gentoo_common.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-PACKAGES="dev-lang/python:2.7
+PACKAGES="
+  dev-lang/python:2.7
   dev-python/virtualenv
   dev-util/dialog
   app-admin/augeas
diff --git a/bootstrap/_suse_common.sh b/bootstrap/_suse_common.sh
index 701849e4b..efeebe4f8 100755
--- a/bootstrap/_suse_common.sh
+++ b/bootstrap/_suse_common.sh
@@ -2,7 +2,8 @@
 
 # SLE12 don't have python-virtualenv
 
-zypper -nq in -l python \
+zypper -nq in -l \
+  python \
   python-devel \
   python-virtualenv \
   gcc \