Merge slapos.lib.recipe into slapos.recipebox as slapos.recipe.librecipe

setup.py

@@ -28,13 +28,15 @@ setup(name=name,
       packages=find_packages(),
       include_package_data=True,
       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
+        'netaddr', # to manipulate on IP addresses
+        'setuptools', # namespaces
         'slapos.lib.recipe', # makes instantiation recipes simpler
-        'zc.recipe.egg', # allows to generate scripts
+        'slapos.slap', # uses internally
+        'xml_marshaller', # need to communication with slapgrid
+        'zc.buildout', # plays with buildout
+        'zc.recipe.egg', # for scripts generation
         ],
       zip_safe=True,
       entry_points={

slapos/slapos.lib.recipe/CHANGES.txt

-Changes
-=======
-
-1.0 (unreleased)
-----------------

slapos/slapos.lib.recipe/setup.cfg

-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1

slapos/slapos.lib.recipe/setup.py

-from setuptools import setup, find_packages
-
-version = '1.0'
-name = 'slapos.lib.recipe'
-long_description = open("README.txt").read() + "\n" + \
-    open("CHANGES.txt").read()
-
-setup(name=name,
-      version=version,
-      description="Library, helpers and superclass for SlapOS zc.buildout recipes",
-      long_description=long_description,
-      classifiers=[
-          "Framework :: Buildout",
-          "Programming Language :: Python",
-        ],
-      keywords='slap librecipe',
-      license='GPLv3',
-      namespace_packages=['slapos'],
-      packages=find_packages('src'),
-      package_dir={'': 'src'},
-      include_package_data=True,
-      install_requires=[
-        'netaddr', # to manipulate on IP addresses
-        'setuptools', # namespaces
-        'slapos.slap', # uses internally
-        'zc.buildout', # plays with buildout
-        'zc.recipe.egg', # for scripts generation
-        ],
-      zip_safe=True,
-    )

slapos/slapos.lib.recipe/src/slapos/__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/slapos.lib.recipe/src/slapos/lib/__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/slapos.lib.recipe/src/slapos/lib/recipe/__init__.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################