Skip to content
Snippets Groups Projects
Commit b6e43e85 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Fix typo; Add new nosetests option

parent 46a4c7fb
No related branches found
No related tags found
No related merge requests found
...@@ -55,7 +55,7 @@ This recipe installs **all** most used scripts and interpreter proxies for your ...@@ -55,7 +55,7 @@ This recipe installs **all** most used scripts and interpreter proxies for your
package. It will look at the ``buildout`` section entry called ``prefixes``, package. It will look at the ``buildout`` section entry called ``prefixes``,
that potentially lists prefixes that should be **prepended** to the default that potentially lists prefixes that should be **prepended** to the default
python environment. In these prefixes, it will look for standard python python environment. In these prefixes, it will look for standard python
directories. If one or more are found found, these paths are **prepended** into directories. If one or more are found, these paths are **prepended** into
the resulting scripts generated by this recipe and eggs will be searched on the resulting scripts generated by this recipe and eggs will be searched on
those locations prioritarily. those locations prioritarily.
...@@ -116,6 +116,11 @@ extra-paths ...@@ -116,6 +116,11 @@ extra-paths
Extra paths to be appended in a generated script. To prepend, using the Extra paths to be appended in a generated script. To prepend, using the
``prefixes`` entry. ``prefixes`` entry.
nose-flags
These are extra flags that are **appended** to the given ``nosetests``
command line, automatically. Use this to preset arguments you like running
all the time like ``-v``, for example.
Sphinx Recipe (Deprecated) Sphinx Recipe (Deprecated)
-------------------------- --------------------------
......
...@@ -7,7 +7,7 @@ from setuptools import setup, find_packages ...@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
setup( setup(
name='xbob.buildout', name='xbob.buildout',
version='0.2.2', version='0.2.3',
description="zc.buildout recipes to perform a variety of tasks required by Bob satellite packages", description="zc.buildout recipes to perform a variety of tasks required by Bob satellite packages",
keywords=['buildout', 'sphinx', 'nose', 'recipe', 'eggs', 'bob'], keywords=['buildout', 'sphinx', 'nose', 'recipe', 'eggs', 'bob'],
url='http://github.com/bioidiap/xbob.buildout', url='http://github.com/bioidiap/xbob.buildout',
......
...@@ -83,6 +83,10 @@ class Recipe(object): ...@@ -83,6 +83,10 @@ class Recipe(object):
nose_options = zc.buildout.buildout.Options(buildout, name + '+nosetests', nose_options = zc.buildout.buildout.Options(buildout, name + '+nosetests',
options.copy()) options.copy())
if nose_options.has_key('interpreter'): del nose_options['interpreter'] if nose_options.has_key('interpreter'): del nose_options['interpreter']
if nose_options.has_key('nose-flags'):
flags = tools.parse_list(nose_options['nose-flags'])
init_code = ['sys.argv.append(%r)' % k for k in flags]
nose_options['initialization'] = '\n'.join(init_code)
nose_options['entry-points'] = 'nosetests=nose:run_exit' nose_options['entry-points'] = 'nosetests=nose:run_exit'
nose_options['scripts'] = 'nosetests' nose_options['scripts'] = 'nosetests'
if 'nose' not in self.eggs: self.eggs.append('nose') if 'nose' not in self.eggs: self.eggs.append('nose')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment