Cleanup setup.py.

diff --git a/setup.py b/setup.py
index aa0bbb421eb07211e4948bcfaf42365a84e68f24..2d6c79226f2148cb01e89e3493ff327a829b59c2 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -18,50 +18,38 @@
 "Tools for controlling piezoelectric actuators."
 
 from distutils.core import setup
-from os import walk
 import os.path
 
 from pypiezo import __version__
 
 
 package_name = 'pypiezo'
-classifiers = """\
-Development Status :: 2 - Pre-Alpha
-Intended Audience :: Developers
-Intended Audience :: Science/Research
-Operating System :: POSIX
-Operating System :: Unix
-License :: OSI Approved :: GNU General Public License (GPL)
-Programming Language :: Python
-Topic :: Scientific/Engineering
-Topic :: Software Development :: Libraries :: Python Modules
-"""
-
-def find_packages(root='pypiezo'):
-    packages = []
-    prefix = '.'+os.path.sep
-    for dirpath,dirnames,filenames in walk(root):
-        if '__init__.py' in filenames:
-            if dirpath.startswith(prefix):
-                dirpath = dirpath[len(prefix):]
-            packages.append(dirpath.replace(os.path.sep, '.'))
-    return packages
-
+base_url = 'http://physics.drexel.edu/~wking'
 _this_dir = os.path.dirname(__file__)
-packages = find_packages()
 
 setup(name=package_name,
       version=__version__,
       maintainer='W. Trevor King',
       maintainer_email='wking@drexel.edu',
-      url='http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/%s/' % package_name,
-      download_url='http://www.physics.drexel.edu/~wking/code/python/%s-%s.tar.gz' % (package_name, __version__),
+      url='{}/unfolding-disasters/posts/{}/'.format(base_url, package_name),
+      download_url='{}/code/python/%s-%s.tar.gz'.foramt(
+        base_url, package_name, __version__),
       license='GNU General Public License (GPL)',
       platforms=['all'],
       description=__doc__,
       long_description=open(os.path.join(_this_dir, 'README'), 'r').read(),
-      classifiers=filter(None, classifiers.split('\n')),
-      packages=packages,
-      provides=['pypiezo (%s)' % __version__],
+      classifiers=[
+        'Development Status :: 2 - Pre-Alpha',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'Operating System :: POSIX',
+        'Operating System :: Unix',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        ],
+      packages=[package_name],
+      provides=['{} ({})'.format(package_name, __version__)],
       requires=['pycomedi (>= 0.3)'],
       )