Refactored setup.py and tests to be more compact and work together. Fixes #100.

Author: palewire

.gitignore

@@ -1,5 +1,5 @@
 .tox/
-scratch.py
+tests/scratch.py
 _sources/*
 sphinx/*
 doctrees/*

.travis.yml

@@ -1,16 +1,14 @@
 language: python
 python:
-- '2.6'
 - '2.7'
-- '3.2'
 - '3.3'
 - '3.4'
 install:
 - pip install -r requirements.txt
 script:
  - pep8 documentcloud
  - pyflakes documentcloud
- - coverage run test.py
+ - coverage run setup test
 after_success:
   - coveralls
 env:

setup.py

@@ -1,96 +1,27 @@
-"""
-Tricks lifted from Django's own setup.py and django_debug_toolbar.
+from setuptools import setup
 
-Still not sure why the templates install with this particular config
-and not with some of the others I tried.
-"""
-
-from distutils.core import setup
-from setuptools import setup, find_packages
-from distutils.command.install_data import install_data
-from distutils.command.install import INSTALL_SCHEMES
-import os
-import sys
-
-class osx_install_data(install_data):
-    # On MacOS, the platform-specific lib dir is /System/Library/Framework/Python/.../
-    # which is wrong. Python 2.5 supplied with MacOS 10.5 has an Apple-specific fix
-    # for this in distutils.command.install_data#306. It fixes install_lib but not
-    # install_data, which is why we roll our own install_data class.
-
-    def finalize_options(self):
-        # By the time finalize_options is called, install.install_lib is set to the
-        # fixed directory, so we set the installdir to install_lib. The
-        # install_data class uses ('install_data', 'install_dir') instead.
-        self.set_undefined_options('install', ('install_lib', 'install_dir'))
-        install_data.finalize_options(self)
-
-if sys.platform == "darwin":
-    cmdclasses = {'install_data': osx_install_data}
-else:
-    cmdclasses = {'install_data': install_data}
-
-def fullsplit(path, result=None):
-    """
-    Split a pathname into components (the opposite of os.path.join) in a
-    platform-neutral way.
-    """
-    if result is None:
-        result = []
-    head, tail = os.path.split(path)
-    if head == '':
-        return [tail] + result
-    if head == path:
-        return result
-    return fullsplit(head, [tail] + result)
-
-# Tell distutils to put the data_files in platform-specific installation
-# locations. See here for an explanation:
-# http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
-for scheme in INSTALL_SCHEMES.values():
-    scheme['data'] = scheme['purelib']
-
-# Compile the list of packages available, because distutils doesn't have
-# an easy way to do this.
-packages, data_files = [], []
-root_dir = os.path.dirname(__file__)
-if root_dir != '':
-    os.chdir(root_dir)
-
-django_dir = 'documentcloud'
-
-for dirpath, dirnames, filenames in os.walk(django_dir):
-    # Ignore dirnames that start with '.'
-    for i, dirname in enumerate(dirnames):
-        if dirname.startswith('.'): del dirnames[i]
-    if '__init__.py' in filenames:
-        packages.append('.'.join(fullsplit(dirpath)))
-    elif filenames:
-        data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
-
-# Small hack for working with bdist_wininst.
-# See http://mail.python.org/pipermail/distutils-sig/2004-August/004134.html
-if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
-    for file_info in data_files:
-        file_info[0] = '\\PURELIB\\%s' % file_info[0]
-
-dependencies = [
-    'python-dateutil>=2.1',
-    'simplejson>=3.3.1',
-    'six>=1.4.1',
-    'rfc3987',
-]
 
 setup(
-      name='python-documentcloud',
-      version='1.0.1',
-      description='A simple Python wrapper for the DocumentCloud API',
-      author='Ben Welsh',
-      author_email='ben.welsh@gmail.com',
-      url='http://datadesk.github.com/python-documentcloud/',
-      packages=packages,
-      cmdclass = cmdclasses,
-      data_files=data_files,
-      include_package_data=True,
-      install_requires=dependencies,
+    name='python-documentcloud',
+    version='1.0.1',
+    description='A simple Python wrapper for the DocumentCloud API',
+    author='Ben Welsh',
+    author_email='ben.welsh@gmail.com',
+    url='http://datadesk.github.com/python-documentcloud/',
+    license="MIT",
+    packages=("documentcloud",),
+    test_suite = "tests.test_all",
+    include_package_data=True,
+    install_requires=(
+        'python-dateutil>=2.1',
+        'simplejson>=3.3.1',
+        'six>=1.4.1',
+        'rfc3987',
+    ),
+    classifiers=(
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+    ),
 )