Removes py26reqs.txt and git dependency
diff --git a/Dockerfile b/Dockerfile
index 02aa0f0d737..da01106040b 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 b89411c90c2..3c5b539663b 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 a82c7dd8c77..a6f9ae2b648 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 89fd8b6ba8c..d917809036a 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: py26reqs.txt git+https://*
 - ca-certificates: communication with demo ACMO server at
-  https://www.letsencrypt-demo.org, py26reqs.txt git+https://*
+  https://www.letsencrypt-demo.org
diff --git a/bootstrap/_arch_common.sh b/bootstrap/_arch_common.sh
index f66067ffb90..2b512792f63 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 4c6b91a3349..d8b03075cf2 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 a718db7ffe7..f49dc00f056 100755
--- a/bootstrap/_gentoo_common.sh
+++ b/bootstrap/_gentoo_common.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PACKAGES="dev-vcs/git
+PACKAGES="
   dev-lang/python:2.7
   dev-python/virtualenv
   dev-util/dialog
diff --git a/bootstrap/_rpm_common.sh b/bootstrap/_rpm_common.sh
index 411d7bd9207..92b54b720a1 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 46f9d693bf4..efeebe4f817 100755
--- a/bootstrap/_suse_common.sh
+++ b/bootstrap/_suse_common.sh
@@ -2,7 +2,7 @@
 
 # SLE12 don't have python-virtualenv
 
-zypper -nq in -l git-core \
+zypper -nq in -l \
   python \
   python-devel \
   python-virtualenv \
diff --git a/bootstrap/dev/venv.sh b/bootstrap/dev/venv.sh
index 2bd32a89b11..11ab417dda9 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/freebsd.sh b/bootstrap/freebsd.sh
index 180ee21b4c4..4482c35cd91 100755
--- a/bootstrap/freebsd.sh
+++ b/bootstrap/freebsd.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -xe
 
 pkg install -Ay \
-  git \
   python \
   py27-virtualenv \
   augeas \
diff --git a/bootstrap/venv.sh b/bootstrap/venv.sh
index ff1a50c6cc4..5042178d9e0 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 44c71883c7a..9721a79dd48 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 a94b22c0c8f..00000000000
--- 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/setup.py b/setup.py
index 40c6ac16ce6..40749bf2a5c 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,6 @@ def read_file(filename, encoding='utf8'):
 
 install_requires = [
     'acme=={0}'.format(version),
-    'ConfigArgParse',
     'configobj',
     'cryptography>=0.7',  # load_pem_x509_certificate
     'parsedatetime',
@@ -53,10 +52,14 @@ def read_file(filename, encoding='utf8'):
     install_requires.extend([
         # only some distros recognize stdlib argparse as already satisfying
         'argparse',
+        'ConfigArgParse>=0.10.0',  # python2.6 support, upstream #17
         'mock<1.1.0',
     ])
 else:
-    install_requires.append('mock')
+    install_requires.extend([
+        'ConfigArgParse',
+        'mock',
+    ])
 
 dev_extras = [
     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
diff --git a/tox.ini b/tox.ini
index d1fafe20f2f..1abe1cf39a8 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

Supercedes #1661.
