Merge erp5.recipe.testnode into slapos.recipebox:erp5testnode

Also drop extras because of https://bugs.launchpad.net/zc.buildout/+bug/85604

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,
     )

slapos/erp5.recipe.testnode/CHANGES.txt

-Changelog
-=========
-
-1.0 (unreleased)
-----------------
-

slapos/erp5.recipe.testnode/MANIFEST.in

-include CHANGES.txt
-recursive-include src/erp5/recipe/testnode *.in

slapos/erp5.recipe.testnode/setup.py

-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]},
-    )

slapos/erp5.recipe.testnode/src/erp5/__init__.py

-# 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__)

slapos/erp5.recipe.testnode/src/erp5/recipe/__init__.py

-# 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__)