Setuptools improvements

setup.cfg

@@ -1,2 +1,50 @@
+[metadata]
+name = coreapi
+url = https://github.com/core-api/python-client
+license = BSD
+description = Python client library for Core API.
+long_description = file:README.md
+long_description_content_type = text/markdown
+author = Tom Christie
+author_email = tom@tomchristie.com
+classifiers =
+    Development Status :: 3 - Alpha
+    Environment :: Web Environment
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Topic :: Internet :: WWW/HTTP
+
+[options]
+include_package_data = True
+setup_requires =
+    setuptools>=38.6.0
+install_requires =
+    coreschema
+    requests
+    itypes
+    uritemplate
+
+[options.entry_points]
+coreapi.codecs =
+    corejson = coreapi.codecs:CoreJSONCodec
+    json = coreapi.codecs:JSONCodec
+    text = coreapi.codecs:TextCodec
+    download = coreapi.codecs:DownloadCodec
+coreapi.transports =
+    http = coreapi.transports:HTTPTransport
+
+[options.packages.find]
+include =
+    coreapi
+
 [wheel]
 universal = 1

setup.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from setuptools import setup
+from setuptools import find_packages, setup
 import re
 import os
-import shutil
 import sys
 
 
@@ -16,31 +15,6 @@ def get_version(package):
     return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
 
 
-def get_packages(package):
-    """
-    Return root package and all sub-packages.
-    """
-    return [dirpath
-            for dirpath, dirnames, filenames in os.walk(package)
-            if os.path.exists(os.path.join(dirpath, '__init__.py'))]
-
-
-def get_package_data(package):
-    """
-    Return all files under the root package, that are not in a
-    package themselves.
-    """
-    walk = [(dirpath.replace(package + os.sep, '', 1), filenames)
-            for dirpath, dirnames, filenames in os.walk(package)
-            if not os.path.exists(os.path.join(dirpath, '__init__.py'))]
-
-    filepaths = []
-    for base, filenames in walk:
-        filepaths.extend([os.path.join(base, filename)
-                          for filename in filenames])
-    return {package: filepaths}
-
-
 version = get_version('coreapi')
 
 
@@ -53,46 +27,5 @@ def get_package_data(package):
 
 
 setup(
-    name='coreapi',
     version=version,
-    url='https://github.com/core-api/python-client',
-    license='BSD',
-    description='Python client library for Core API.',
-    author='Tom Christie',
-    author_email='tom@tomchristie.com',
-    packages=get_packages('coreapi'),
-    package_data=get_package_data('coreapi'),
-    install_requires=[
-        'coreschema',
-        'requests',
-        'itypes',
-        'uritemplate'
-    ],
-    entry_points={
-        'coreapi.codecs': [
-            'corejson=coreapi.codecs:CoreJSONCodec',
-            'json=coreapi.codecs:JSONCodec',
-            'text=coreapi.codecs:TextCodec',
-            'download=coreapi.codecs:DownloadCodec',
-        ],
-        'coreapi.transports': [
-            'http=coreapi.transports:HTTPTransport',
-        ]
-    },
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Topic :: Internet :: WWW/HTTP',
-    ]
 )