Basic dev/test setup for separate package subdirectories.

setup.py

@@ -28,88 +28,24 @@ meta = dict(re.findall(r"""__([a-z]+)__ = "([^"]+)""", read_file(init_fn)))
 readme = read_file(os.path.join(here, 'README.rst'))
 changes = read_file(os.path.join(here, 'CHANGES.rst'))
 
-# #358: acme, letsencrypt, letsencrypt_apache, letsencrypt_nginx, etc.
-# shall be distributed separately. Please make sure to keep the
-# dependecy lists up to date: this is being somewhat checked below
-# using an assert statement! Separate lists are helpful for OS package
-# maintainers. and will make the future migration a lot easier.
-acme_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)
-    #'PyOpenSSL',  # version pin would cause mismatch
-    'pytz',
-    'requests',
-    'werkzeug',
-]
-letsencrypt_install_requires = [
-    #'acme',
-    'argparse',
-    'ConfigArgParse',
-    'configobj',
-    #'cryptography>=0.7',  # load_pem_x509_certificate, version pin mismatch
-    'mock<1.1.0',  # py26
-    'parsedatetime',
-    'psutil>=2.1.0',  # net_connections introduced in 2.1.0
-    # https://pyopenssl.readthedocs.org/en/latest/api/crypto.html#OpenSSL.crypto.X509Req.get_extensions
-    'PyOpenSSL>=0.15',
-    'pyrfc3339',
-    'python2-pythondialog>=3.2.2rc1',  # Debian squeeze support, cf. #280
-    'pytz',
-    'zope.component',
-    'zope.interface',
-]
-letsencrypt_apache_install_requires = [
-    #'acme',
-    #'letsencrypt',
-    'mock<1.1.0',  # py26
-    'python-augeas',
-    'zope.component',
-    'zope.interface',
-]
-letsencrypt_nginx_install_requires = [
-    #'acme',
-    #'letsencrypt',
-    'pyparsing>=1.5.5',  # Python3 support; perhaps unnecessary?
-    'mock<1.1.0',  # py26
-    'zope.interface',
-]
-
 install_requires = [
+    'acme',
     'argparse',
-    'cryptography>=0.8',
     'ConfigArgParse',
     'configobj',
+    'cryptography>=0.7',  # load_pem_x509_certificate
     'mock<1.1.0',  # py26
-    'ndg-httpsclient',  # urllib3 InsecurePlatformWarning (#304)
     'parsedatetime',
     'psutil>=2.1.0',  # net_connections introduced in 2.1.0
-    'pyasn1',  # urllib3 InsecurePlatformWarning (#304)
     # https://pyopenssl.readthedocs.org/en/latest/api/crypto.html#OpenSSL.crypto.X509Req.get_extensions
     'PyOpenSSL>=0.15',
-    'pyparsing>=1.5.5',  # Python3 support; perhaps unnecessary?
     'pyrfc3339',
-    'python-augeas',
     'python2-pythondialog>=3.2.2rc1',  # Debian squeeze support, cf. #280
     'pytz',
-    'requests',
-    'werkzeug',
     'zope.component',
     'zope.interface',
 ]
 
-assert set(install_requires) == set.union(*(set(ireq) for ireq in (
-    acme_install_requires,
-    letsencrypt_install_requires,
-    letsencrypt_apache_install_requires,
-    letsencrypt_nginx_install_requires
-))), "*install_requires don't match up!"
-
 dev_extras = [
     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
     'astroid==1.3.5',
@@ -172,7 +108,6 @@ setup(
         'console_scripts': [
             'letsencrypt = letsencrypt.cli:main',
             'letsencrypt-renewer = letsencrypt.renewer:main',
-            'jws = letsencrypt.acme.jose.jws:CLI.run',
         ],
         'letsencrypt.plugins': [
             'manual = letsencrypt.plugins.manual:ManualAuthenticator',
@@ -180,10 +115,6 @@ setup(
             'null = letsencrypt.plugins.null:Installer',
             'standalone = letsencrypt.plugins.standalone.authenticator'
             ':StandaloneAuthenticator',
-
-            # to be moved to separate pypi packages
-            'apache = letsencrypt_apache.configurator:ApacheConfigurator',
-            'nginx = letsencrypt_nginx.configurator:NginxConfigurator',
         ],
     },