Merge remote-tracking branch 'github/letsencrypt/master' into mock-2.6

setup.py

@@ -24,13 +24,14 @@ here = os.path.abspath(os.path.dirname(__file__))
 
 # read version number (and other metadata) from package init
 init_fn = os.path.join(here, 'letsencrypt', '__init__.py')
-meta = dict(re.findall(r"""__([a-z]+)__ = "([^"]+)""", read_file(init_fn)))
+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'))
+version = meta['version']
 
 install_requires = [
-    'acme',
+    'acme=={0}'.format(version),
     'ConfigArgParse',
     'configobj',
     'cryptography>=0.7',  # load_pem_x509_certificate
@@ -60,6 +61,8 @@ dev_extras = [
     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
     'astroid==1.3.5',
     'pylint==1.4.2',  # upstream #248
+    'twine',
+    'wheel',
 ]
 
 docs_extras = [
@@ -79,13 +82,15 @@ testing_extras = [
 
 setup(
     name='letsencrypt',
-    version=meta['version'],
-    description="Let's Encrypt",
+    version=version,
+    description="Let's Encrypt client",
     long_description=readme,  # later: + '\n\n' + changes
+    url='https://github.com/letsencrypt/letsencrypt',
     author="Let's Encrypt Project",
+    author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
-    url='https://letsencrypt.org',
     classifiers=[
+        'Development Status :: 3 - Alpha',
         'Environment :: Console',
         'Environment :: Console :: Curses',
         'Intended Audience :: System Administrators',
@@ -103,6 +108,8 @@ setup(
     ],
 
     packages=find_packages(exclude=['docs', 'examples', 'tests', 'venv']),
+    include_package_data=True,
+
     install_requires=install_requires,
     extras_require={
         'dev': dev_extras,
@@ -127,7 +134,4 @@ setup(
             ':StandaloneAuthenticator',
         ],
     },
-
-    zip_safe=False,  # letsencrypt/tests/test_util.py is a symlink!
-    include_package_data=True,
 )