From 2f5dede1b4796aa2fdf739cb4a7409fbaf6ec07e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 6 May 2014 15:01:35 -0400 Subject: [PATCH] Add bits and pieces to facilitate pypi packaging --- {client => confluent_client}/bin/confetty | 0 {client => confluent_client}/bin/nodepower | 0 .../confluent/__init__.py | 0 .../confluent/client.py | 0 {client => confluent_client}/requirements.txt | 0 confluent_client/setup.py | 12 ++++++++++ confluent_common/README.txt | 7 ++++++ confluent_common/__init__.py | 0 confluent_common/confluent/tlvdata.py | 2 +- confluent_common/setup.cfg | 19 ++++++++++++++++ confluent_common/setup.py | 10 +++++++++ confluent_server/requirements.txt | 2 ++ confluent_server/setup.cfg | 22 +++++++++++++++++++ confluent_server/setup.py | 12 ++++++++++ 14 files changed, 85 insertions(+), 1 deletion(-) rename {client => confluent_client}/bin/confetty (100%) rename {client => confluent_client}/bin/nodepower (100%) rename {client => confluent_client}/confluent/__init__.py (100%) rename {client => confluent_client}/confluent/client.py (100%) rename {client => confluent_client}/requirements.txt (100%) create mode 100644 confluent_client/setup.py create mode 100644 confluent_common/README.txt delete mode 100644 confluent_common/__init__.py create mode 100644 confluent_common/setup.cfg create mode 100644 confluent_common/setup.py create mode 100644 confluent_server/requirements.txt create mode 100644 confluent_server/setup.cfg create mode 100644 confluent_server/setup.py diff --git a/client/bin/confetty b/confluent_client/bin/confetty similarity index 100% rename from client/bin/confetty rename to confluent_client/bin/confetty diff --git a/client/bin/nodepower b/confluent_client/bin/nodepower similarity index 100% rename from client/bin/nodepower rename to confluent_client/bin/nodepower diff --git a/client/confluent/__init__.py b/confluent_client/confluent/__init__.py similarity index 100% rename from client/confluent/__init__.py rename to confluent_client/confluent/__init__.py diff --git a/client/confluent/client.py b/confluent_client/confluent/client.py similarity index 100% rename from client/confluent/client.py rename to confluent_client/confluent/client.py diff --git a/client/requirements.txt b/confluent_client/requirements.txt similarity index 100% rename from client/requirements.txt rename to confluent_client/requirements.txt diff --git a/confluent_client/setup.py b/confluent_client/setup.py new file mode 100644 index 00000000..ec3e0c42 --- /dev/null +++ b/confluent_client/setup.py @@ -0,0 +1,12 @@ +from setuptools import setup + +setup( + name='confluent_client', + version='0.1.0', + author='Jarrod Johnson', + author_email='jbjohnso@us.ibm.com', + url='http://xcat.sf.net/', + packages=['confluent'], + install_requires=['confluent_common>=0.1.0'], + scripts=['bin/confetty', 'bin/nodepower'], +) diff --git a/confluent_common/README.txt b/confluent_common/README.txt new file mode 100644 index 00000000..93b60e19 --- /dev/null +++ b/confluent_common/README.txt @@ -0,0 +1,7 @@ +================ +confluent_common +================ + +confluent_common are the python modules used by both +confluent_server and confluent_client. Installation +of this without client or server does not make sense. diff --git a/confluent_common/__init__.py b/confluent_common/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/confluent_common/confluent/tlvdata.py b/confluent_common/confluent/tlvdata.py index 0abf0254..e9898094 100644 --- a/confluent_common/confluent/tlvdata.py +++ b/confluent_common/confluent/tlvdata.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import confluent.common.tlv as tlv +import confluent.tlv as tlv import json import struct diff --git a/confluent_common/setup.cfg b/confluent_common/setup.cfg new file mode 100644 index 00000000..de45e04b --- /dev/null +++ b/confluent_common/setup.cfg @@ -0,0 +1,19 @@ +[metadata] +name = confluent_common +summary = Confluent Common Libraries +description-file = + README.txt +author = Jarrod Johnson +author-email = jbjohnso@us.ibm.com +home-page = http://xcat.sf.net/ +classifier = + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python :: 2.6 + Programming Language :: Python :: 2.7 + +[files] +packages = + confluent diff --git a/confluent_common/setup.py b/confluent_common/setup.py new file mode 100644 index 00000000..4b3f33e2 --- /dev/null +++ b/confluent_common/setup.py @@ -0,0 +1,10 @@ +from setuptools import setup + +setup( + name='confluent_common', + version='0.1.0', + author='Jarrod Johnson', + author_email='jbjohnso@us.ibm.com', + url='http://xcat.sf.net/', + packages=['confluent'], + ) diff --git a/confluent_server/requirements.txt b/confluent_server/requirements.txt new file mode 100644 index 00000000..753e5d39 --- /dev/null +++ b/confluent_server/requirements.txt @@ -0,0 +1,2 @@ +confluent_client>=0.1 +pycrypto>=2.6 diff --git a/confluent_server/setup.cfg b/confluent_server/setup.cfg new file mode 100644 index 00000000..c3bf7855 --- /dev/null +++ b/confluent_server/setup.cfg @@ -0,0 +1,22 @@ +[metadata] +name = confluent_server +summary = Confluent systems management daemon +description-file = + README.txt +author = Jarrod Johnson +author-email = jbjohnso@us.ibm.com +home-page = http://xcat.sf.net/ +classifier = + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python :: 2.6 + Programming Language :: Python :: 2.7 + +[files] +packages = + confluent + confluent/interface + confluent/config + diff --git a/confluent_server/setup.py b/confluent_server/setup.py new file mode 100644 index 00000000..b09a1338 --- /dev/null +++ b/confluent_server/setup.py @@ -0,0 +1,12 @@ +from setuptools import setup + +setup( + name='confluent_server', + version='0.1.0', + 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'], + scripts=['bin/confluent'], +)