From 6c7aaf8bc323cbe0b9dfcb48d0cbf9e8489d1139 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 6 May 2014 16:45:51 -0400 Subject: [PATCH] Refine packaging issues --- confluent_common/setup.py | 1 + confluent_server/confluent/core.py | 2 +- confluent_server/confluent/plugins/__init__.py | 0 .../confluent/plugins/configuration/__init__.py | 0 .../plugins/configuration/attributes.py | 0 .../confluent/plugins/hardwaremanagement/__init__.py | 0 .../{ => confluent}/plugins/hardwaremanagement/ipmi.py | 0 confluent_server/setup.py | 10 +++++++--- 8 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 confluent_server/confluent/plugins/__init__.py create mode 100644 confluent_server/confluent/plugins/configuration/__init__.py rename confluent_server/{ => confluent}/plugins/configuration/attributes.py (100%) create mode 100644 confluent_server/confluent/plugins/hardwaremanagement/__init__.py rename confluent_server/{ => confluent}/plugins/hardwaremanagement/ipmi.py (100%) diff --git a/confluent_common/setup.py b/confluent_common/setup.py index 4b3f33e2..dbaabb69 100644 --- a/confluent_common/setup.py +++ b/confluent_common/setup.py @@ -5,6 +5,7 @@ setup( version='0.1.0', author='Jarrod Johnson', author_email='jbjohnso@us.ibm.com', + description='common content for confluent client and server', url='http://xcat.sf.net/', packages=['confluent'], ) diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py index 84bbfa24..8a057912 100644 --- a/confluent_server/confluent/core.py +++ b/confluent_server/confluent/core.py @@ -52,7 +52,7 @@ def nested_lookup(nestdict, key): def load_plugins(): # To know our plugins directory, we get the parent path of 'bin' path = os.path.dirname(os.path.realpath(__file__)) - plugintop = os.path.realpath(os.path.join(path, '..', 'plugins')) + plugintop = os.path.realpath(os.path.join(path, 'plugins')) plugins = set() for plugindir in os.listdir(plugintop): plugindir = os.path.join(plugintop, plugindir) diff --git a/confluent_server/confluent/plugins/__init__.py b/confluent_server/confluent/plugins/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/confluent_server/confluent/plugins/configuration/__init__.py b/confluent_server/confluent/plugins/configuration/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/confluent_server/plugins/configuration/attributes.py b/confluent_server/confluent/plugins/configuration/attributes.py similarity index 100% rename from confluent_server/plugins/configuration/attributes.py rename to confluent_server/confluent/plugins/configuration/attributes.py diff --git a/confluent_server/confluent/plugins/hardwaremanagement/__init__.py b/confluent_server/confluent/plugins/hardwaremanagement/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/confluent_server/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py similarity index 100% rename from confluent_server/plugins/hardwaremanagement/ipmi.py rename to confluent_server/confluent/plugins/hardwaremanagement/ipmi.py diff --git a/confluent_server/setup.py b/confluent_server/setup.py index b09a1338..b182de0a 100644 --- a/confluent_server/setup.py +++ b/confluent_server/setup.py @@ -2,11 +2,15 @@ from setuptools import setup setup( name='confluent_server', - version='0.1.0', + version='0.1.1', author='Jarrod Johnson', author_email='jbjohnso@us.ibm.com', url='http://xcat.sf.net/', - packages=['confluent', 'confluent/config', 'confluent/interface'], - install_requires=['pycrypto>=2.6', 'confluent_client>=0.1.0'], + description='confluent systems management server', + packages=['confluent', 'confluent/config', 'confluent/interface', + 'confluent/plugins/hardwaremanagement/', + 'confluent/plugins/configuration/'], + install_requires=['pycrypto>=2.6', 'confluent_client>=0.1.0', 'eventlet', + 'pyghmi>=0.6.0'], scripts=['bin/confluent'], )