From 91238f1dcbdfdde10bdd899777028f6a1a06847a Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 10 Apr 2018 16:06:37 -0400 Subject: [PATCH] Clean up pure python packaging Fix __init__.py redundancy, update requirements to current state of affairs. --- confluent_client/confluent/__init__.py | 1 + confluent_server/confluent/__init__.py | 1 - confluent_server/makesetup | 1 - confluent_server/setup.py.tmpl | 3 ++- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 confluent_server/confluent/__init__.py diff --git a/confluent_client/confluent/__init__.py b/confluent_client/confluent/__init__.py index e69de29b..b9851570 100644 --- a/confluent_client/confluent/__init__.py +++ b/confluent_client/confluent/__init__.py @@ -0,0 +1 @@ +__version__ = "1.8.1.dev16.gg7f29d3a" diff --git a/confluent_server/confluent/__init__.py b/confluent_server/confluent/__init__.py deleted file mode 100644 index 07e5b37e..00000000 --- a/confluent_server/confluent/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "1.5.0.dev395.ggacb3a20" diff --git a/confluent_server/makesetup b/confluent_server/makesetup index 26bb712a..2ee30143 100755 --- a/confluent_server/makesetup +++ b/confluent_server/makesetup @@ -6,4 +6,3 @@ if [ "$NUMCOMMITS" != "$VERSION" ]; then fi echo $VERSION > VERSION sed -e "s/#VERSION#/$VERSION/" setup.py.tmpl > setup.py -echo '__version__ = "'$VERSION'"' > confluent/__init__.py diff --git a/confluent_server/setup.py.tmpl b/confluent_server/setup.py.tmpl index 85ecb57e..94b010f0 100644 --- a/confluent_server/setup.py.tmpl +++ b/confluent_server/setup.py.tmpl @@ -17,7 +17,8 @@ setup( 'confluent/plugins/shell/', 'confluent/plugins/configuration/'], install_requires=['paramiko', 'pycrypto>=2.6', 'confluent_client>=0.1.0', 'eventlet', - 'pyghmi>=0.6.5'], + 'dnspython', 'netifaces', 'pyte', 'pysnmp', 'pyparsing', + 'pyghmi>=1.0.44'], scripts=['bin/confluent', 'bin/confluentdbutil'], data_files=[('/etc/init.d', ['sysvinit/confluent']), ('/usr/lib/sysctl.d', ['sysctl/confluent.conf']),