From 42a4a97a4833fa61307ccd6c23578539f7cf4ce5 Mon Sep 17 00:00:00 2001
From: Siddharth Ravikumar <sravik@bgsu.edu>
Date: Mon, 21 Dec 2015 21:52:43 -0500
Subject: overhauled setup.py

---
 ChangeLog |  4 ++++
 setup.py  | 42 ++++++++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29e2f6a..6901fa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-21 Siddharth Ravikumar <sravik@bgsu.edu>
+
+	* setup.py: overhauled it.
+
 2015-12-21 Siddharth Ravikumar <sravik@bgsu.edu>
 
 	* combox/events.py (NodeDirMonitor.on_moved): Now uses
diff --git a/setup.py b/setup.py
index cf52290..cd3f0ab 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#    Copyright (C) 2014 Combox author(s). See AUTHORS.
+#    Copyright (C) 2015 Combox author(s). See AUTHORS.
 #
 #    This file is part of Combox.
 #
@@ -16,27 +16,45 @@
 #   along with Combox (see COPYING).  If not, see
 #   <http://www.gnu.org/licenses/>.
 
+from setuptools import setup, find_packages
+
+from combox.file import read_file
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
 
 config = {
+    'name': 'combox',
     'description': 'Splits encrypted files between online file storage providers',
-    'author': 'Siddharth Ravikumar',
+    'long_description': read_file('README.rst'),
+    'version': '0.1.3',
+    'platforms': ['GNU/Linux', 'OS X'],
+    'license': 'GNU General Public License version 3 or later',
     'url': 'https://ricketyspace.net/combox/',
     'download_url': 'git://ricketyspace.net/combox.git',
-    'license': 'GNU General Public License v3.0 or later',
+    'author': 'Siddharth Ravikumar',
     'author_email': 'sravik@bgsu.edu',
-    'version': '0.1.3',
-    'install_requires': ['nose', 'watchdog', 'PyYAML', 'pycrypto',
+    'install_requires': ['watchdog', 'PyYAML', 'pycrypto',
                          'simplejson', 'pickledb'],
-    'packages': ['combox'],
+    'tests_require': ['nose'],
+    'test_suite': 'nose.collector',
+    'packages': find_packages(exclude=['tests']),
     'entry_points': {
         'console_scripts': ['combox = combox.cbox:main']
     },
-    'name': 'combox'
-    }
+    'classifiers': [
+        'Development Status :: 3 - Alpha',
+        'Environment :: Console',
+        'Environment :: MacOS X',
+        'Intended Audience :: End Users/Desktop',
+        'License :: DFSG approved',
+        'License :: OSI Approved',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+        'Operating System :: MacOS :: MacOS X',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 2 :: Only',
+        'Topic :: System :: Archiving :: Backup',
+        'Topic :: Utilities',
+        ]
+}
 
 setup(**config)
-- 
cgit v1.2.3