From 47fcacf14ef099940e59c803e3a3170c495a0910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 26 May 2011 20:10:27 +0200 Subject: [PATCH] Merge slapos.recipe.template as slapos.recipebox:template --- setup.py | 2 ++ .../README.txt => recipe/README.template.txt} | 0 .../__init__.py => recipe/template.py} | 0 slapos/slapos.recipe.template/CHANGES.txt | 4 --- slapos/slapos.recipe.template/MANIFEST.in | 1 - slapos/slapos.recipe.template/setup.cfg | 3 -- slapos/slapos.recipe.template/setup.py | 29 ------------------- .../src/slapos/__init__.py | 7 ----- .../src/slapos/recipe/__init__.py | 7 ----- 9 files changed, 2 insertions(+), 51 deletions(-) rename slapos/{slapos.recipe.template/README.txt => recipe/README.template.txt} (100%) rename slapos/{slapos.recipe.template/src/slapos/recipe/template/__init__.py => recipe/template.py} (100%) delete mode 100644 slapos/slapos.recipe.template/CHANGES.txt delete mode 100644 slapos/slapos.recipe.template/MANIFEST.in delete mode 100644 slapos/slapos.recipe.template/setup.cfg delete mode 100644 slapos/slapos.recipe.template/setup.py delete mode 100644 slapos/slapos.recipe.template/src/slapos/__init__.py delete mode 100644 slapos/slapos.recipe.template/src/slapos/recipe/__init__.py diff --git a/setup.py b/setup.py index e4af0f7d2..e5b1e7a9a 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,7 @@ setup(name=name, install_requires=[ 'PyXML', # for full blown python interpreter 'Zope2', # some recipes like to play with zope + 'collective.recipe.template', # needed by template recipe 'lxml', # for full blown python interpreter 'netaddr', # to manipulate on IP addresses 'setuptools', # namespaces @@ -59,5 +60,6 @@ setup(name=name, 'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed', 'siptester = slapos.recipe.siptester:SipTesterRecipe', 'slaprunner = slapos.recipe.slaprunner:Recipe', + 'template = slapos.recipe.template:Recipe', ]}, ) diff --git a/slapos/slapos.recipe.template/README.txt b/slapos/recipe/README.template.txt similarity index 100% rename from slapos/slapos.recipe.template/README.txt rename to slapos/recipe/README.template.txt diff --git a/slapos/slapos.recipe.template/src/slapos/recipe/template/__init__.py b/slapos/recipe/template.py similarity index 100% rename from slapos/slapos.recipe.template/src/slapos/recipe/template/__init__.py rename to slapos/recipe/template.py diff --git a/slapos/slapos.recipe.template/CHANGES.txt b/slapos/slapos.recipe.template/CHANGES.txt deleted file mode 100644 index 8a64d92fd..000000000 --- a/slapos/slapos.recipe.template/CHANGES.txt +++ /dev/null @@ -1,4 +0,0 @@ -1.0 (unreleased) ----------------- - - - initial release [艁ukasz Nowak] diff --git a/slapos/slapos.recipe.template/MANIFEST.in b/slapos/slapos.recipe.template/MANIFEST.in deleted file mode 100644 index 1a2a20568..000000000 --- a/slapos/slapos.recipe.template/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -include CHANGES.txt diff --git a/slapos/slapos.recipe.template/setup.cfg b/slapos/slapos.recipe.template/setup.cfg deleted file mode 100644 index 0c3455bc4..000000000 --- a/slapos/slapos.recipe.template/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[egg_info] -tag_build = .dev -tag_svn_revision = 1 diff --git a/slapos/slapos.recipe.template/setup.py b/slapos/slapos.recipe.template/setup.py deleted file mode 100644 index d58c8b05a..000000000 --- a/slapos/slapos.recipe.template/setup.py +++ /dev/null @@ -1,29 +0,0 @@ -from setuptools import setup, find_packages - -version = '1.0' -name = 'slapos.recipe.template' -long_description = open("README.txt").read() + "\n" + \ - open("CHANGES.txt").read() - -setup(name=name, - version=version, - description="collective.recipe.template with network input support", - long_description=long_description, - classifiers=[ - "Framework :: Buildout :: Recipe", - "Programming Language :: Python", - ], - keywords='slapos download', - license='GPLv3', - namespace_packages=['slapos'], - packages=find_packages('src'), - package_dir={'': 'src'}, - include_package_data=True, - install_requires=[ - 'collective.recipe.template', # used for real run - 'setuptools', # for namespace - 'zc.buildout', # needed to play internally - ], - entry_points={'zc.buildout': ['default = %s:Recipe' % name]}, - zip_safe=True, - ) diff --git a/slapos/slapos.recipe.template/src/slapos/__init__.py b/slapos/slapos.recipe.template/src/slapos/__init__.py deleted file mode 100644 index 5761d9e13..000000000 --- a/slapos/slapos.recipe.template/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.template/src/slapos/recipe/__init__.py b/slapos/slapos.recipe.template/src/slapos/recipe/__init__.py deleted file mode 100644 index 5761d9e13..000000000 --- a/slapos/slapos.recipe.template/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__) - -- 2.30.9