log_error/log_warn: fix stack and format traceback

[mirror_ifupdown2.git] / setup.py

diff --git a/setup.py b/setup.py
index c3d61b3f6915ac152ae3b68162655869309c69f2..6b41a4525bc734358295478f48187907b43ce449 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import sys
@@ -7,14 +7,13 @@ from setuptools import setup
 from setuptools import find_packages
 
 INSTALL_REQUIRES = [
-    'argcomplete',
-    'ipaddr',
 ]
 
 DATA_FILES = [
     ('/etc/default/', ['etc/default/networking']),
     ('/etc/network/ifupdown2/', ['etc/network/ifupdown2/addons.conf']),
     ('/etc/network/ifupdown2/', ['etc/network/ifupdown2/ifupdown2.conf']),
+    ('/usr/share/ifupdown2/sbin/', ['ifupdown2/sbin/start-networking'])
 ]
 
 SCRIPTS = []
@@ -25,13 +24,12 @@ ENTRY_POINTS = {}
 def build_deb_package():
     try:
         return sys.argv[sys.argv.index('--root') + 1].endswith('/debian/ifupdown2')
-    except:
-        return False
+    except Exception:
+        pass
+    return False
 
 
-if build_deb_package():
-    DATA_FILES.append(('/usr/share/ifupdown2/sbin/', ['ifupdown2/sbin/start-networking']))
-else:
+if not build_deb_package():
     ENTRY_POINTS = {
         'console_scripts': [
             'ifup = ifupdown2.__main__:main',
@@ -42,8 +40,8 @@ else:
     }
 
 setup(
-    author='Roopa Prabhu',
-    author_email='roopa@cumulusnetworks.com',
+    author='Julien Fortin',
+    author_email='julien@cumulusnetworks.com',
     maintainer='Julien Fortin',
     maintainer_email='julien@cumulusnetworks.com',
     classifiers=[
@@ -53,8 +51,7 @@ setup(
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
         'Natural Language :: English',
         'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
         'Topic :: System :: Networking',
         'Topic :: System :: Systems Administration'
     ],
@@ -65,7 +62,7 @@ setup(
     name='ifupdown2',
     packages=find_packages(),
     url='https://github.com/CumulusNetworks/ifupdown2',
-    version='1.2.9',
+    version='3.0.0',
     data_files=DATA_FILES,
     setup_requires=['setuptools'],
     scripts=SCRIPTS,