2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c58bbd79d985/ Changeset: c58bbd79d985 Branch: next-stable User: jmchilton Date: 2014-10-03 01:52:34+00:00 Summary: Elminate invalid jstree examples that are causing doctest failures. Affected #: 1 file diff -r ba59dcfc3db0a95f2e2b906eac1971e31c2db4ee -r c58bbd79d985e28ca224fa5118770d12d24c4455 lib/galaxy/util/jstree.py --- a/lib/galaxy/util/jstree.py +++ b/lib/galaxy/util/jstree.py @@ -113,12 +113,6 @@ kwargs may be standard jsTree options used at all levels in the tree. These will be outputted in the JSON. - Example (basic usage): - >>> import jstree - >>> paths = [jstree.Path("editor/2012-07/31/.classpath", 1), jstree.Path("editor/2012-07/31/.project", 2)] - >>> t1 = jstree.JSTree(paths) - >>> print t1.jsonData() - [{'text': 'editor/2012-07/31/.classpath', 'id': 1, 'li_attr': {'id': 1}}, {'text': 'editor/2012-07/31/.project', 'id': 2, 'li_attr': {'id': 2}}] """ if len(filter(lambda p: not isinstance(p, Path), paths)): raise TypeError( @@ -148,17 +142,6 @@ """ Create a "pretty print" represenation of the tree with customized indentation at each level of the tree. - - Example: - >>> import jstree - >>> paths = [jstree.Path("editor/2012-07/31/.classpath", 1), jstree.Path("editor/2012-07/31/.project", 2)] - >>> print jstree.JSTree(paths).pretty() - / - editor/ - 2012-07/ - 31/ - .classpath - .project """ if root is None: root = self._root @@ -175,18 +158,5 @@ ready for consumption by jsTree. The data is represented as a list of dictionaries, each of which are our internal nodes. - Examples: - >>> import jstree - >>> paths = [jstree.Path("editor/2012-07/31/.classpath", 1), jstree.Path("editor/2012-07/31/.project", 2)] - >>> t = jstree.JSTree(paths) - >>> d = t.jsonData() - >>> print d - [{'data': 'editor', 'children': [{'data': '2012-07', 'children': [{'data': '31', 'children': [{'data': '.classpath', 'metadata': {'id': 1}}, {'data': '.project', 'metadata': {'id': 2}}]}]}]}] - >>> print d[0]['children'][0]['children'][0]['children'][1] - {'data': '.project', 'metadata': {'id': 2}} - >>> print d[0]['children'][0]['children'][0]['children'][1]['data'] - .project - >>> print d[0]['children'][0]['children'][0]['children'][1]['metadata']['id'] - 2 """ return [self._root.children[k].jsonData() for k in sorted(self._root.children)] https://bitbucket.org/galaxy/galaxy-central/commits/0f1e27bee509/ Changeset: 0f1e27bee509 Branch: next-stable User: jmchilton Date: 2014-10-03 01:52:34+00:00 Summary: Fix failing unit tests in lib/galaxy/model/orm/scripts.py. Affected #: 1 file diff -r c58bbd79d985e28ca224fa5118770d12d24c4455 -r 0f1e27bee509294ceb2bd63f07de7c7ef74aa3b6 lib/galaxy/model/orm/scripts.py --- a/lib/galaxy/model/orm/scripts.py +++ b/lib/galaxy/model/orm/scripts.py @@ -78,6 +78,7 @@ """ Read sys.argv and parse out repository of migrations and database url. + >>> from ConfigParser import SafeConfigParser >>> from tempfile import mkdtemp >>> config_dir = mkdtemp() >>> os.makedirs(os.path.join(config_dir, 'config')) @@ -105,7 +106,12 @@ database = 'galaxy' database_defaults = DATABASE[ database ] - config_file = read_config_file_arg( argv, database_defaults.get( 'config_file', DEFAULT_CONFIG_FILE ), database_defaults.get( 'old_config_file' ) ) + default = database_defaults.get( 'config_file', DEFAULT_CONFIG_FILE ) + old_default = database_defaults.get( 'old_config_file' ) + if cwd is not None: + default = os.path.join( cwd, default ) + old_default = os.path.join( cwd, old_default ) + config_file = read_config_file_arg( argv, default, old_default ) repo = database_defaults[ 'repo' ] config_prefix = database_defaults.get( 'config_prefix', DEFAULT_CONFIG_PREFIX ) default_sqlite_file = database_defaults[ 'default_sqlite_file' ] Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.