setup.py: Update trove classifiers

Also modernize some of the formatting and layout.  Update pypiezo
dependency to point to most recent version.

diff --git a/setup.py b/setup.py
index fd76adc2f1c7ac888deb64a9169283b3391d489c..3b3abb1bf8bc3c70f3b77bb85b98d5413ce0d7fc 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -16,19 +16,6 @@
 
 "calibcant: tools for thermally calibrating AFM cantilevers"
 
-package_name = 'calibcant'
-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
-"""
-
 from distutils.core import setup
 from os import walk, listdir
 import os.path
@@ -36,7 +23,9 @@ import os.path
 from calibcant import __version__
 
 
-def find_packages(root='calibcant'):
+package_name = 'calibcant'
+
+def find_packages(root=package_name):
     packages = []
     prefix = '.'+os.path.sep
     for dirpath,dirnames,filenames in walk(root):
@@ -53,15 +42,28 @@ setup(name=package_name,
       version=__version__,
       maintainer='W. Trevor King',
       maintainer_email='wking@tremily.us',
-      url='http://blog.tremily.us/posts/%s/' % package_name,
-      download_url='http://git.tremily.us/?p=calibcant.git;a=snapshot;h={};sf=tgz'.format(__version__),
-      license='GNU General Public License (GPL)',
+      url='http://blog.tremily.us/posts/{}/'.format(package_name),
+      download_url='http://git.tremily.us/?p={}.git;a=snapshot;h={};sf=tgz'.format(package_name, __version__),
+      license='GNU General Public License v3 (GPLv3)',
       platforms=['all'],
       description=__doc__,
       long_description=open('README', 'r').read(),
-      classifiers=filter(None, classifiers.split('\n')),
+      classifiers=[
+        'Development Status :: 2 - Pre-Alpha',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+        'Operating System :: POSIX',
+        'Operating System :: Unix',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Scientific/Engineering',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        ],
       packages=packages,
       scripts=scripts,
-      provides=['calibcant (%s)' % __version__],
-      requires=['pypiezo (>= 0.5)'],
+      provides=['{} ({})'.format(package_name, __version__)],
+      requires=['pypiezo (>= 0.7)'],
       )