Cleanup: Fix flake8 E722 do not use bare except

[ppu.git] / setup.py

diff --git a/setup.py b/setup.py
index e12e821d0fbefe8c1e84bcfe3d486d70a2f60b3e..98d3d0df15af62cf7642b02e2f2e85528ef6cfcc 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,29 +1,26 @@
 #!/usr/bin/env python
 
-import sys
+from imp import load_source
+from os.path import abspath, dirname, join
 
 try:
     from setuptools import setup
-    is_setuptools = True
 except ImportError:
     from distutils.core import setup
-    is_setuptools = False
 
-kw = {}
-if is_setuptools:
-    if (sys.version_info[:2] == (2, 6)):
-        kw['install_requires'].append('argparse')
+versionpath = join(abspath(dirname(__file__)), "ppu", "__version__.py")
+load_source("ppu_version", versionpath)
+from ppu_version import __version__  # noqa: ignore flake8 E402
 
 setup(name='ppu',
-      version='0.3.2',
+      version=__version__,
       description='Broytman Portable Python Utilities',
       long_description=open('README.rst', 'rU').read(),
       author='Oleg Broytman',
       author_email='phd@phdru.name',
       url='http://phdru.name/Software/Python/ppu/',
       license='GPL',
-      platforms=['any'],
-      keywords=[''],
+      platforms='Any',
       classifiers=[
           'Development Status :: 4 - Beta',
           'Environment :: Console',
@@ -32,7 +29,6 @@ setup(name='ppu',
           'License :: OSI Approved :: GNU General Public License (GPL)',
           'Operating System :: OS Independent',
           'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.6',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.3',
@@ -40,8 +36,9 @@ setup(name='ppu',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
       ],
+      packages=['ppu'],
       scripts=[
           'scripts/cmp.py', 'scripts/remove-old-files.py', 'scripts/rm.py',
+          'scripts/which.py',
       ],
-      **kw
       )