diff --git a/README.rst b/README.rst index e9606d0809ba7c73ff69b52320bc9a5144bea250..723cd1033f6eb286f2cd247a848a70ea32365c51 100644 --- a/README.rst +++ b/README.rst @@ -3,19 +3,19 @@ .. Thu 30 Jan 08:46:53 2014 CET .. image:: http://img.shields.io/badge/docs-stable-yellow.png - :target: http://pythonhosted.org/bob.buildout/index.html + :target: http://pythonhosted.org/xbob.buildout/index.html .. image:: http://img.shields.io/badge/docs-latest-orange.png - :target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.buildout/master/index.html -.. image:: https://travis-ci.org/bioidiap/bob.buildout.svg?branch=master + :target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/xbob.buildout/master/index.html +.. image:: https://travis-ci.org/bioidiap/bob.buildout.svg?branch=1.0 :target: https://travis-ci.org/bioidiap/bob.buildout .. image:: https://coveralls.io/repos/bioidiap/bob.buildout/badge.png :target: https://coveralls.io/r/bioidiap/bob.buildout -.. image:: https://img.shields.io/badge/github-master-0000c0.png - :target: https://github.com/bioidiap/bob.buildout/tree/master -.. image:: http://img.shields.io/pypi/v/bob.buildout.png - :target: https://pypi.python.org/pypi/bob.buildout -.. image:: http://img.shields.io/pypi/dm/bob.buildout.png - :target: https://pypi.python.org/pypi/bob.buildout +.. image:: https://img.shields.io/badge/github-1.0-0000c0.png + :target: https://github.com/bioidiap/bob.buildout/tree/1.0 +.. image:: http://img.shields.io/pypi/v/xbob.buildout.png + :target: https://pypi.python.org/pypi/xbob.buildout +.. image:: http://img.shields.io/pypi/dm/xbob.buildout.png + :target: https://pypi.python.org/pypi/xbob.buildout =================================== Buildout Recipes for Bob Packages @@ -39,7 +39,7 @@ This extension allows you to compile C/C++ extensions that depend on each other using a buildout. It assures that eggs living in both ``develop-eggs`` and ``eggs`` are on your path before building the packages in the ``develop`` section. By using this extension you can drop the use of the local recipe -``bob.buildout:develop``, which should be considered deprecated. +``xbob.buildout:develop``, which should be considered deprecated. Supported Options ================= @@ -130,7 +130,7 @@ package scripts To use this recipe, you just have to simply do:: [scripts] - recipe = bob.buildout:scripts + recipe = xbob.buildout:scripts Common Supported Options ======================== diff --git a/buildout.cfg b/buildout.cfg index a34f8efc186c0e4451fd0b8e2e8113bf8a5f7435..b33ad90540d61107459922499ce914e55b9a79d0 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -5,9 +5,9 @@ [buildout] parts = scripts develop = . -eggs = bob.buildout +eggs = xbob.buildout newest = false [scripts] -recipe = bob.buildout:scripts +recipe = xbob.buildout:scripts diff --git a/setup.py b/setup.py index 1f8da50f0708ba78a1d1464930339c46ee7ad442..2abee553f924ffa311e79495d1375b6ed9cd21b1 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ from setuptools import setup, find_packages version = open("version.txt").read().rstrip() setup( - name='bob.buildout', + name='xbob.buildout', version=version, description="zc.buildout recipes to perform a variety of tasks required by Bob satellite packages", keywords=['buildout', 'sphinx', 'nose', 'recipe', 'eggs', 'bob'], @@ -26,24 +26,24 @@ setup( zip_safe=False, namespace_packages = [ - 'bob', + 'xbob', ], entry_points = { 'zc.buildout': [ - 'develop = bob.buildout.develop:Recipe', - 'scripts = bob.buildout.scripts:Recipe', - 'python = bob.buildout.scripts:PythonInterpreter', - 'gdb-python = bob.buildout.scripts:GdbPythonInterpreter', - 'ipython = bob.buildout.scripts:IPythonInterpreter', - 'pylint = bob.buildout.scripts:PyLint', - 'nose = bob.buildout.scripts:NoseTests', - 'coverage = bob.buildout.scripts:Coverage', - 'sphinx = bob.buildout.scripts:Sphinx', - 'egg.scripts = bob.buildout.scripts:UserScripts', + 'develop = xbob.buildout.develop:Recipe', + 'scripts = xbob.buildout.scripts:Recipe', + 'python = xbob.buildout.scripts:PythonInterpreter', + 'gdb-python = xbob.buildout.scripts:GdbPythonInterpreter', + 'ipython = xbob.buildout.scripts:IPythonInterpreter', + 'pylint = xbob.buildout.scripts:PyLint', + 'nose = xbob.buildout.scripts:NoseTests', + 'coverage = xbob.buildout.scripts:Coverage', + 'sphinx = xbob.buildout.scripts:Sphinx', + 'egg.scripts = xbob.buildout.scripts:UserScripts', ], 'zc.buildout.extension': [ - 'extension = bob.buildout.extension:extension', + 'extension = xbob.buildout.extension:extension', ], }, diff --git a/version.txt b/version.txt index 0ac9c2deea58aac769c1c554458c3c8bc8e982ff..3eefcb9dd5b38e2c1dc061052455dd97bcd51e6c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.3b0 \ No newline at end of file +1.0.0 diff --git a/bob/__init__.py b/xbob/__init__.py similarity index 100% rename from bob/__init__.py rename to xbob/__init__.py diff --git a/bob/buildout/__init__.py b/xbob/buildout/__init__.py similarity index 100% rename from bob/buildout/__init__.py rename to xbob/buildout/__init__.py diff --git a/bob/buildout/develop.py b/xbob/buildout/develop.py similarity index 94% rename from bob/buildout/develop.py rename to xbob/buildout/develop.py index 4ba0f1a4c5d14bf96e051ec5bda4d721b899fc48..9a4184e61e3bb58d1522f540955755cabb5fa6ed 100644 --- a/bob/buildout/develop.py +++ b/xbob/buildout/develop.py @@ -27,7 +27,7 @@ class Recipe(object): self.logger = logging.getLogger(self.name) self.buildout = buildout - self.logger.warn("this recipe is **deprecated**, use bob.buildout as your first extension instead (before any other)") + #self.logger.warn("this recipe is **deprecated**, use bob.buildout as your first extension instead (before any other)") # finds the setup script or use the default self.setup = os.path.join(buildout['buildout']['directory'], @@ -46,7 +46,7 @@ class Recipe(object): # the eggs we need to **build** this package eggs = tools.parse_list(options.get('eggs', '')) required_eggs = [ - 'bob.extension', # basic extension building using pkg-config + Bob + #'bob.extension', # basic extension building using pkg-config + Bob ] eggs += required_eggs eggs = tools.uniq(eggs) diff --git a/bob/buildout/envwrapper.py b/xbob/buildout/envwrapper.py similarity index 100% rename from bob/buildout/envwrapper.py rename to xbob/buildout/envwrapper.py diff --git a/bob/buildout/extension.py b/xbob/buildout/extension.py similarity index 100% rename from bob/buildout/extension.py rename to xbob/buildout/extension.py diff --git a/bob/buildout/gdbpy.py b/xbob/buildout/gdbpy.py similarity index 100% rename from bob/buildout/gdbpy.py rename to xbob/buildout/gdbpy.py diff --git a/bob/buildout/python.py b/xbob/buildout/python.py similarity index 100% rename from bob/buildout/python.py rename to xbob/buildout/python.py diff --git a/bob/buildout/script.py b/xbob/buildout/script.py similarity index 100% rename from bob/buildout/script.py rename to xbob/buildout/script.py diff --git a/bob/buildout/scripts.py b/xbob/buildout/scripts.py similarity index 100% rename from bob/buildout/scripts.py rename to xbob/buildout/scripts.py diff --git a/bob/buildout/test_envwrapper.py b/xbob/buildout/test_envwrapper.py similarity index 100% rename from bob/buildout/test_envwrapper.py rename to xbob/buildout/test_envwrapper.py diff --git a/bob/buildout/tools.py b/xbob/buildout/tools.py similarity index 100% rename from bob/buildout/tools.py rename to xbob/buildout/tools.py