2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2438770e2cfb/
Changeset: 2438770e2cfb
Branch: next-stable
User: jmchilton
Date: 2014-08-04 16:15:57
Summary: Python 2.6 compat fix for 591f036.
Affected #: 1 file
diff -r 4aa37815f1fba179ac45c0a67eaffc319905cf0e -r 2438770e2cfbf804acc0d5c7b2f3d6e491f30695 lib/galaxy/util/topsort.py
--- a/lib/galaxy/util/topsort.py
+++ b/lib/galaxy/util/topsort.py
@@ -36,7 +36,7 @@
many methods to help analyze and break the cycles. This requires
a good deal more code than topsort itself!
"""
-from collections import OrderedDict
+from galaxy.util.odict import odict as OrderedDict
from exceptions import Exception
https://bitbucket.org/galaxy/galaxy-central/commits/cd82587fb36e/
Changeset: cd82587fb36e
User: jmchilton
Date: 2014-08-04 16:16:13
Summary: Merge next-stable.
Affected #: 1 file
diff -r 120b7b9c1c73e5577f874674e9773b17784c0d52 -r cd82587fb36ecbc802931edad29372f69cee7108 lib/galaxy/util/topsort.py
--- a/lib/galaxy/util/topsort.py
+++ b/lib/galaxy/util/topsort.py
@@ -36,7 +36,7 @@
many methods to help analyze and break the cycles. This requires
a good deal more code than topsort itself!
"""
-from collections import OrderedDict
+from galaxy.util.odict import odict as OrderedDict
from exceptions import Exception
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/120b7b9c1c73/
Changeset: 120b7b9c1c73
User: jmchilton
Date: 2014-08-04 15:38:05
Summary: Cleanup test case in e7ba2469bca0cb7a1d5a8d754885537dc683d490.
Affected #: 1 file
diff -r cde36ab1fe9934579d1fc03c7538853b0f533708 -r 120b7b9c1c73e5577f874674e9773b17784c0d52 test/api/test_workflows.py
--- a/test/api/test_workflows.py
+++ b/test/api/test_workflows.py
@@ -109,11 +109,12 @@
# Run this index stability test with following command:
# ./run_tests.sh test/api/test_workflows.py:WorkflowsApiTestCase.test_workflow_stability
from pkg_resources import resource_string
+ num_tests = 1
for workflow_file in [ "test_workflow_topoambigouity.ga", "test_workflow_topoambigouity_auto_laidout.ga" ]:
workflow_str = resource_string( __name__, workflow_file )
workflow = self.workflow_populator.load_workflow( "test1", content=workflow_str )
last_step_map = self._step_map( workflow )
- for i in range(10):
+ for i in range(num_tests):
uploaded_workflow_id = self.workflow_populator.create_workflow( workflow )
download_response = self._get( "workflows/%s/download" % uploaded_workflow_id )
downloaded_workflow = download_response.json()
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.