diff --git a/setup.py b/setup.py index cb0b97229df932e34546f04402ff6d1a66b80b9d..49572a0c29ad93e013e3159aa6b50396eab784b2 100644 --- a/setup.py +++ b/setup.py @@ -52,5 +52,6 @@ setup(name=name, 'java = slapos.recipe.java:Recipe', 'kvm = slapos.recipe.kvm:Recipe', 'libcloud = slapos.recipe.libcloud:Recipe', + 'libcloudrequest = slapos.recipe.libcloudrequest:Recipe', ]}, ) diff --git a/slapos/slapos.recipe.libcloudrequest/CHANGES.txt b/slapos/recipe/README.libcloudrequest.txt similarity index 100% rename from slapos/slapos.recipe.libcloudrequest/CHANGES.txt rename to slapos/recipe/README.libcloudrequest.txt diff --git a/slapos/slapos.recipe.libcloudrequest/src/slapos/recipe/libcloudrequest/__init__.py b/slapos/recipe/libcloudrequest.py similarity index 100% rename from slapos/slapos.recipe.libcloudrequest/src/slapos/recipe/libcloudrequest/__init__.py rename to slapos/recipe/libcloudrequest.py diff --git a/slapos/slapos.recipe.libcloudrequest/README.txt b/slapos/slapos.recipe.libcloudrequest/README.txt deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/slapos/slapos.recipe.libcloudrequest/setup.cfg b/slapos/slapos.recipe.libcloudrequest/setup.cfg deleted file mode 100644 index 0c3455bc479bfc7e6771d88e803f423cb3d9e59a..0000000000000000000000000000000000000000 --- a/slapos/slapos.recipe.libcloudrequest/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[egg_info] -tag_build = .dev -tag_svn_revision = 1 diff --git a/slapos/slapos.recipe.libcloudrequest/setup.py b/slapos/slapos.recipe.libcloudrequest/setup.py deleted file mode 100644 index 5ccab2eac44331fa0abc5809fd780e6cd988cbce..0000000000000000000000000000000000000000 --- a/slapos/slapos.recipe.libcloudrequest/setup.py +++ /dev/null @@ -1,28 +0,0 @@ -from setuptools import setup, find_packages - -version = '0.0.3' -name = 'slapos.recipe.libcloudrequest' -long_description = open("README.txt").read() + "\n" + open("CHANGES.txt").read() - -setup(name=name, - version=version, - description="Slapified buildout recipe to request libcloud instance", - long_description=long_description, - classifiers=[ - "Framework :: Buildout :: Recipe", - "Programming Language :: Python", - ], - keywords='slap recipe libcloud reques', - license='GPLv3', - packages=find_packages('src'), - package_dir={'': 'src'}, - namespace_packages=['slapos', 'slapos.recipe'], - include_package_data=True, - install_requires=[ - 'setuptools', - 'slapos.lib.recipe', - 'zc.buildout', - ], - zip_safe=True, - entry_points={'zc.buildout': ['default = %s:Recipe' % name]} - ) diff --git a/slapos/slapos.recipe.libcloudrequest/src/slapos/__init__.py b/slapos/slapos.recipe.libcloudrequest/src/slapos/__init__.py deleted file mode 100644 index 5761d9e13e775450862541d9785977e8b7b6c7b3..0000000000000000000000000000000000000000 --- a/slapos/slapos.recipe.libcloudrequest/src/slapos/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages -try: - __import__('pkg_resources').declare_namespace(__name__) -except ImportError: - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) - diff --git a/slapos/slapos.recipe.libcloudrequest/src/slapos/recipe/__init__.py b/slapos/slapos.recipe.libcloudrequest/src/slapos/recipe/__init__.py deleted file mode 100644 index 5761d9e13e775450862541d9785977e8b7b6c7b3..0000000000000000000000000000000000000000 --- a/slapos/slapos.recipe.libcloudrequest/src/slapos/recipe/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages -try: - __import__('pkg_resources').declare_namespace(__name__) -except ImportError: - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) -