Merge pull request sigmavirus24#556 from sigmavirus24/truly-optional-extras

itsmemattchung · itsmemattchung · commit 52dd5db99421 · 2016-01-28T07:24:20.000Z
Fix up setup.* files for impending release
diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,8 @@
 [wheel]
 universal = 1
+
+[metadata]
+requires-dist=
+    pyOpenSSL>=0.13; python_version<="2.7"
+    ndg-httpsclient; python_version<="2.7"
+    pyasn1; python_version<="2.7"
diff --git a/setup.py b/setup.py
@@ -68,7 +68,7 @@ def run_tests(self):
                  "(http://developer.github.com/v3)"),
     long_description="\n\n".join([open("README.rst").read(),
                                   open("LATEST_VERSION_NOTES.rst").read()]),
-    license=open('LICENSE').read(),
+    license='3-clause BSD',
     author="Ian Cordasco",
     author_email="graffatcolmingov@gmail.com",
     url="https://github3py.readthedocs.org",
@@ -77,6 +77,7 @@ def run_tests(self):
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved',
+        'License :: OSI Approved :: BSD License',
         'Intended Audience :: Developers',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
@@ -89,7 +90,7 @@ def run_tests(self):
     ],
     extras_require={
         'test': kwargs['tests_require'],
-        ';python_version<="2.7"': SNI_requirements,
+        'sni': SNI_requirements,
     },
     cmdclass={'test': PyTest},
     **kwargs
