From 9e33187deb3ec43c77546e0c9b5ad5367063e43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 26 May 2011 19:19:38 +0200
Subject: [PATCH] Merge erp5.recipe.testnode into slapos.recipebox:erp5testnode

Also drop extras because of https://bugs.launchpad.net/zc.buildout/+bug/85604
---
 setup.py                                      | 14 ++++---
 slapos/erp5.recipe.testnode/CHANGES.txt       |  6 ---
 slapos/erp5.recipe.testnode/MANIFEST.in       |  2 -
 slapos/erp5.recipe.testnode/setup.py          | 40 -------------------
 .../erp5.recipe.testnode/src/erp5/__init__.py |  6 ---
 .../src/erp5/recipe/__init__.py               |  6 ---
 .../README.erp5testnode.txt}                  |  0
 .../erp5testnode}/SlapOSControler.py          |  0
 .../erp5testnode}/Updater.py                  |  0
 .../erp5testnode}/__init__.py                 |  0
 .../erp5testnode}/template/slapos.cfg.in      |  0
 .../erp5testnode}/testnode.py                 |  0
 12 files changed, 8 insertions(+), 66 deletions(-)
 delete mode 100644 slapos/erp5.recipe.testnode/CHANGES.txt
 delete mode 100644 slapos/erp5.recipe.testnode/MANIFEST.in
 delete mode 100644 slapos/erp5.recipe.testnode/setup.py
 delete mode 100644 slapos/erp5.recipe.testnode/src/erp5/__init__.py
 delete mode 100644 slapos/erp5.recipe.testnode/src/erp5/recipe/__init__.py
 rename slapos/{erp5.recipe.testnode/README.txt => recipe/README.erp5testnode.txt} (100%)
 rename slapos/{erp5.recipe.testnode/src/erp5/recipe/testnode => recipe/erp5testnode}/SlapOSControler.py (100%)
 rename slapos/{erp5.recipe.testnode/src/erp5/recipe/testnode => recipe/erp5testnode}/Updater.py (100%)
 rename slapos/{erp5.recipe.testnode/src/erp5/recipe/testnode => recipe/erp5testnode}/__init__.py (100%)
 rename slapos/{erp5.recipe.testnode/src/erp5/recipe/testnode => recipe/erp5testnode}/template/slapos.cfg.in (100%)
 rename slapos/{erp5.recipe.testnode/src/erp5/recipe/testnode => recipe/erp5testnode}/testnode.py (100%)

diff --git a/setup.py b/setup.py
index 385b0650b..fc3715986 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,8 @@ for f in glob.glob(os.path.join('slapos', 'recipe', 'README.*.txt')):
   long_description += subname + '\n' + '=' * len(subname) + '\n\n' \
     + open(f).read() + '\n'
 
-extras_require = {
-  'build': [],
-  'buildcmmi': [],
-}
-
+# extras_requires are not used because of
+#   https://bugs.launchpad.net/zc.buildout/+bug/85604
 setup(name=name,
       version=version,
       description="Box full of slapos recipes.",
@@ -33,12 +30,17 @@ setup(name=name,
       install_requires=[
         'setuptools', # for namespace and internal usage
         'zc.buildout', # needed to play internally
+        'PyXML', # for full blown python interpreter
+        'lxml', # for full blown python interpreter
+        'xml_marshaller', # need to communication with slapgrid
+        'slapos.lib.recipe', # makes instantiation recipes simpler
+        'zc.recipe.egg', # allows to generate scripts
         ],
       zip_safe=True,
       entry_points={
         'zc.buildout': [
           'build = slapos.recipe.build:Script',
           'buildcmmi = slapos.recipe.build:Cmmi',
+          'erp5testnode = slapos.recipe.erp5testnode:Recipe',
       ]},
-      extras_require=extras_require,
     )
diff --git a/slapos/erp5.recipe.testnode/CHANGES.txt b/slapos/erp5.recipe.testnode/CHANGES.txt
deleted file mode 100644
index 2e56a7559..000000000
--- a/slapos/erp5.recipe.testnode/CHANGES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Changelog
-=========
-
-1.0 (unreleased)
-----------------
-
diff --git a/slapos/erp5.recipe.testnode/MANIFEST.in b/slapos/erp5.recipe.testnode/MANIFEST.in
deleted file mode 100644
index 7036e1a25..000000000
--- a/slapos/erp5.recipe.testnode/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include CHANGES.txt
-recursive-include src/erp5/recipe/testnode *.in
diff --git a/slapos/erp5.recipe.testnode/setup.py b/slapos/erp5.recipe.testnode/setup.py
deleted file mode 100644
index 6b63ddd63..000000000
--- a/slapos/erp5.recipe.testnode/setup.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from setuptools import setup, find_packages
-
-name = "erp5.recipe.testnode"
-version = '1.0.23'
-
-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 create an testnode instance",
-    long_description=long_description,
-    license = "GPLv3",
-    keywords = "buildout erp5 test",
-    classifiers=[
-        "Framework :: Buildout :: Recipe",
-        "Programming Language :: Python",
-    ],
-    packages = find_packages('src'),
-    package_dir = {'': 'src'},
-    include_package_data=True,
-    install_requires = [
-      'setuptools',
-      'slapos.lib.recipe',
-      'xml_marshaller',
-      'zc.buildout',
-      'zc.recipe.egg',
-      # below are requirements to provide full blown python interpreter
-      'lxml',
-      'PyXML',
-      ],
-    namespace_packages = ['erp5', 'erp5.recipe'],
-    entry_points = {'zc.buildout': ['default = %s:Recipe' % name]},
-    )
diff --git a/slapos/erp5.recipe.testnode/src/erp5/__init__.py b/slapos/erp5.recipe.testnode/src/erp5/__init__.py
deleted file mode 100644
index f48ad1052..000000000
--- a/slapos/erp5.recipe.testnode/src/erp5/__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/erp5.recipe.testnode/src/erp5/recipe/__init__.py b/slapos/erp5.recipe.testnode/src/erp5/recipe/__init__.py
deleted file mode 100644
index f48ad1052..000000000
--- a/slapos/erp5.recipe.testnode/src/erp5/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__)
diff --git a/slapos/erp5.recipe.testnode/README.txt b/slapos/recipe/README.erp5testnode.txt
similarity index 100%
rename from slapos/erp5.recipe.testnode/README.txt
rename to slapos/recipe/README.erp5testnode.txt
diff --git a/slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/SlapOSControler.py b/slapos/recipe/erp5testnode/SlapOSControler.py
similarity index 100%
rename from slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/SlapOSControler.py
rename to slapos/recipe/erp5testnode/SlapOSControler.py
diff --git a/slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/Updater.py b/slapos/recipe/erp5testnode/Updater.py
similarity index 100%
rename from slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/Updater.py
rename to slapos/recipe/erp5testnode/Updater.py
diff --git a/slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/__init__.py b/slapos/recipe/erp5testnode/__init__.py
similarity index 100%
rename from slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/__init__.py
rename to slapos/recipe/erp5testnode/__init__.py
diff --git a/slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/template/slapos.cfg.in b/slapos/recipe/erp5testnode/template/slapos.cfg.in
similarity index 100%
rename from slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/template/slapos.cfg.in
rename to slapos/recipe/erp5testnode/template/slapos.cfg.in
diff --git a/slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/testnode.py b/slapos/recipe/erp5testnode/testnode.py
similarity index 100%
rename from slapos/erp5.recipe.testnode/src/erp5/recipe/testnode/testnode.py
rename to slapos/recipe/erp5testnode/testnode.py
-- 
2.30.9