From 8f7ef1df4a57fae77c20ead1bd7efb8fba619620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 26 May 2011 20:08:14 +0200
Subject: [PATCH] Merge slapos.recipe.slaprunner as slapos.recipebox:slaprunner

---
 setup.py                                      |  1 +
 .../README.slaprunner.txt}                    |  0
 .../slapos => }/recipe/slaprunner/__init__.py |  0
 .../slapos => }/recipe/slaprunner/execute.py  |  0
 .../recipe/slaprunner/template/slapos.cfg.in  |  0
 slapos/slapos.recipe.slaprunner/CHANGES.txt   |  9 -----
 slapos/slapos.recipe.slaprunner/MANIFEST.in   |  2 --
 slapos/slapos.recipe.slaprunner/setup.py      | 33 -------------------
 .../src/slapos/__init__.py                    |  6 ----
 .../src/slapos/recipe/__init__.py             |  6 ----
 10 files changed, 1 insertion(+), 56 deletions(-)
 rename slapos/{slapos.recipe.slaprunner/README.txt => recipe/README.slaprunner.txt} (100%)
 rename slapos/{slapos.recipe.slaprunner/src/slapos => }/recipe/slaprunner/__init__.py (100%)
 rename slapos/{slapos.recipe.slaprunner/src/slapos => }/recipe/slaprunner/execute.py (100%)
 rename slapos/{slapos.recipe.slaprunner/src/slapos => }/recipe/slaprunner/template/slapos.cfg.in (100%)
 delete mode 100644 slapos/slapos.recipe.slaprunner/CHANGES.txt
 delete mode 100644 slapos/slapos.recipe.slaprunner/MANIFEST.in
 delete mode 100644 slapos/slapos.recipe.slaprunner/setup.py
 delete mode 100644 slapos/slapos.recipe.slaprunner/src/slapos/__init__.py
 delete mode 100644 slapos/slapos.recipe.slaprunner/src/slapos/recipe/__init__.py

diff --git a/setup.py b/setup.py
index 2e90d9280c..e4af0f7d20 100644
--- a/setup.py
+++ b/setup.py
@@ -58,5 +58,6 @@ setup(name=name,
           'proactive = slapos.recipe.proactive:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
+          'slaprunner = slapos.recipe.slaprunner:Recipe',
       ]},
     )
diff --git a/slapos/slapos.recipe.slaprunner/README.txt b/slapos/recipe/README.slaprunner.txt
similarity index 100%
rename from slapos/slapos.recipe.slaprunner/README.txt
rename to slapos/recipe/README.slaprunner.txt
diff --git a/slapos/slapos.recipe.slaprunner/src/slapos/recipe/slaprunner/__init__.py b/slapos/recipe/slaprunner/__init__.py
similarity index 100%
rename from slapos/slapos.recipe.slaprunner/src/slapos/recipe/slaprunner/__init__.py
rename to slapos/recipe/slaprunner/__init__.py
diff --git a/slapos/slapos.recipe.slaprunner/src/slapos/recipe/slaprunner/execute.py b/slapos/recipe/slaprunner/execute.py
similarity index 100%
rename from slapos/slapos.recipe.slaprunner/src/slapos/recipe/slaprunner/execute.py
rename to slapos/recipe/slaprunner/execute.py
diff --git a/slapos/slapos.recipe.slaprunner/src/slapos/recipe/slaprunner/template/slapos.cfg.in b/slapos/recipe/slaprunner/template/slapos.cfg.in
similarity index 100%
rename from slapos/slapos.recipe.slaprunner/src/slapos/recipe/slaprunner/template/slapos.cfg.in
rename to slapos/recipe/slaprunner/template/slapos.cfg.in
diff --git a/slapos/slapos.recipe.slaprunner/CHANGES.txt b/slapos/slapos.recipe.slaprunner/CHANGES.txt
deleted file mode 100644
index 8d57268ced..0000000000
--- a/slapos/slapos.recipe.slaprunner/CHANGES.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Changelog
-=========
-
-1.2 (unreleased)
-----------------
-
-1.1 (2011-04-22)
-----------------
diff --git a/slapos/slapos.recipe.slaprunner/MANIFEST.in b/slapos/slapos.recipe.slaprunner/MANIFEST.in
deleted file mode 100644
index 71ccc0cbd7..0000000000
--- a/slapos/slapos.recipe.slaprunner/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include CHANGES.txt
-recursive-include src/slapos/recipe/slaprunner/ *.in
diff --git a/slapos/slapos.recipe.slaprunner/setup.py b/slapos/slapos.recipe.slaprunner/setup.py
deleted file mode 100644
index 8d6308d81e..0000000000
--- a/slapos/slapos.recipe.slaprunner/setup.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from setuptools import setup, find_packages
-
-name = "slapos.recipe.slaprunner"
-version = '1.2-dev'
-
-
-def read(name):
-  return open(name).read()
-
-long_description = (read('README.txt') + '\n' + read('CHANGES.txt'))
-setup(
-    name=name,
-    version=version,
-    description="ZC Buildout recipe for OSOE SlapOS training",
-    long_description=long_description,
-    license="GPLv3",
-    keywords="buildout slapos recipe runner",
-    classifiers=[
-        "Framework :: Buildout :: Recipe",
-        "Programming Language :: Python",
-    ],
-    packages=find_packages('src'),
-    package_dir={'': 'src'},
-    include_package_data=True,
-    install_requires=[
-      'setuptools',  # for namespacing
-      'slapos.lib.recipe',  # uses internally
-      'zc.recipe.egg',
-      'zc.buildout',  # it is recipe
-      ],
-    namespace_packages=['slapos', 'slapos.recipe'],
-    entry_points={'zc.buildout': ['default = %s:Recipe' % name]},
-    )
diff --git a/slapos/slapos.recipe.slaprunner/src/slapos/__init__.py b/slapos/slapos.recipe.slaprunner/src/slapos/__init__.py
deleted file mode 100644
index 839098485f..0000000000
--- a/slapos/slapos.recipe.slaprunner/src/slapos/__init__.py
+++ /dev/null
@@ -1,6 +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.slaprunner/src/slapos/recipe/__init__.py b/slapos/slapos.recipe.slaprunner/src/slapos/recipe/__init__.py
deleted file mode 100644
index 839098485f..0000000000
--- a/slapos/slapos.recipe.slaprunner/src/slapos/recipe/__init__.py
+++ /dev/null
@@ -1,6 +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