From c6e4c7dea1020a69ce64fc4b99f88d186fc07f69 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Tue, 1 Sep 2015 19:57:41 +0000
Subject: [PATCH] setup.py: update/fix deps.

---
 acme/setup.py              |  3 +--
 letsencrypt-nginx/setup.py |  3 ++-
 setup.py                   |  1 +
 tools/deps.sh              | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100755 tools/deps.sh

diff --git a/acme/setup.py b/acme/setup.py
index 6d8208414..4cf215b40 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -5,16 +5,15 @@ from setuptools import find_packages
 
 
 install_requires = [
-    'argparse',
     # load_pem_private/public_key (>=0.6)
     # rsa_recover_prime_factors (>=0.8)
     'cryptography>=0.8',
     'mock<1.1.0',  # py26
-    'pyrfc3339',
     'ndg-httpsclient',  # urllib3 InsecurePlatformWarning (#304)
     'pyasn1',  # urllib3 InsecurePlatformWarning (#304)
     # Connection.set_tlsext_host_name (>=0.13), X509Req.get_extensions (>=0.15)
     'PyOpenSSL>=0.15',
+    'pyrfc3339',
     'pytz',
     'requests',
     'six',
diff --git a/letsencrypt-nginx/setup.py b/letsencrypt-nginx/setup.py
index 92b974974..4a7123528 100644
--- a/letsencrypt-nginx/setup.py
+++ b/letsencrypt-nginx/setup.py
@@ -5,8 +5,9 @@ from setuptools import find_packages
 install_requires = [
     'acme',
     'letsencrypt',
-    'pyparsing>=1.5.5',  # Python3 support; perhaps unnecessary?
     'mock<1.1.0',  # py26
+    'PyOpenSSL',
+    'pyparsing>=1.5.5',  # Python3 support; perhaps unnecessary?
     'zope.interface',
 ]
 
diff --git a/setup.py b/setup.py
index f816c6c56..a07f70593 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,7 @@ install_requires = [
     'pyrfc3339',
     'python2-pythondialog>=3.2.2rc1',  # Debian squeeze support, cf. #280
     'pytz',
+    'requests',
     'zope.component',
     'zope.interface',
 ]
diff --git a/tools/deps.sh b/tools/deps.sh
new file mode 100755
index 000000000..28bfdaff5
--- /dev/null
+++ b/tools/deps.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Find all Python imports.
+#
+#  ./deps.sh letsencrypt
+#  ./deps.sh acme
+#  ./deps.sh letsencrypt-apache
+#  ...
+#
+# Manually compare the output with deps in setup.py.
+
+git grep -h -E '^(import|from.*import)' $1/ | \
+    awk '{print $2}' | \
+    grep -vE "^$1" | \
+    sort -u