Merge branch 'master' of ssh://github.com/letsencrypt/lets-encrypt-preview into renewer

Conflicts:
	letsencrypt/client.py

setup.py

@@ -3,6 +3,7 @@ import os
 import re
 
 from setuptools import setup
+from setuptools import find_packages
 
 # Workaround for http://bugs.python.org/issue8876, see
 # http://bugs.python.org/issue8876#msg208792
@@ -98,23 +99,7 @@ setup(
         'Topic :: Utilities',
     ],
 
-    packages=[
-        'letsencrypt',
-        'letsencrypt.acme',
-        'letsencrypt.acme.jose',
-        'letsencrypt.client',
-        'letsencrypt.client.display',
-        'letsencrypt.client.plugins',
-        'letsencrypt.client.plugins.apache',
-        'letsencrypt.client.plugins.apache.tests',
-        'letsencrypt.client.plugins.nginx',
-        'letsencrypt.client.plugins.nginx.tests',
-        'letsencrypt.client.plugins.standalone',
-        'letsencrypt.client.plugins.standalone.tests',
-        'letsencrypt.client.tests',
-        'letsencrypt.client.tests.display',
-    ],
-
+    packages=find_packages(exclude=['docs', 'examples', 'tests', 'venv']),
     install_requires=install_requires,
     extras_require={
         'dev': dev_extras,
@@ -123,20 +108,22 @@ setup(
     },
 
     tests_require=install_requires,
+    # to test all packages run "python setup.py test -s
+    # {acme,letsencrypt_apache,letsencrypt_nginx}"
     test_suite='letsencrypt',
 
     entry_points={
         'console_scripts': [
-            'letsencrypt = letsencrypt.client.cli:main',
+            'letsencrypt = letsencrypt.cli:main',
             'jws = letsencrypt.acme.jose.jws:CLI.run',
         ],
         'letsencrypt.plugins': [
-            'apache = letsencrypt.client.plugins.apache.configurator'
-            ':ApacheConfigurator',
-            'nginx = letsencrypt.client.plugins.nginx.configurator'
-            ':NginxConfigurator',
-            'standalone = letsencrypt.client.plugins.standalone.authenticator'
+            'standalone = letsencrypt.plugins.standalone.authenticator'
             ':StandaloneAuthenticator',
+
+            # to be moved to separate pypi packages
+            'apache = letsencrypt_apache.configurator:ApacheConfigurator',
+            'nginx = letsencrypt_nginx.configurator:NginxConfigurator',
         ],
     },