You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by ra...@apache.org on 2016/10/30 11:27:06 UTC
incubator-ariatosca git commit: CFY-4 fixed py2.6-incompatible usages
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-3-api-for-creating-workflows e721ba61b -> f493fe8c4
CFY-4 fixed py2.6-incompatible usages
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/f493fe8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f493fe8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f493fe8c
Branch: refs/heads/ARIA-3-api-for-creating-workflows
Commit: f493fe8c4eeb8e14d113ae281da10147f22d088f
Parents: e721ba6
Author: Ran Ziv <ra...@gigaspaces.com>
Authored: Sun Oct 30 13:27:02 2016 +0200
Committer: Ran Ziv <ra...@gigaspaces.com>
Committed: Sun Oct 30 13:27:02 2016 +0200
----------------------------------------------------------------------
aria/tools/lru_cache.py | 6 +++++-
setup.py | 5 +++++
tests/workflows/api/test_task_graph.py | 24 ++++++++++++------------
3 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f493fe8c/aria/tools/lru_cache.py
----------------------------------------------------------------------
diff --git a/aria/tools/lru_cache.py b/aria/tools/lru_cache.py
index 5863376..bb39b90 100755
--- a/aria/tools/lru_cache.py
+++ b/aria/tools/lru_cache.py
@@ -21,7 +21,11 @@ Function lru_cache implementation for python 2.7
from time import time
from functools import partial, wraps
from itertools import imap
-from collections import OrderedDict
+
+try:
+ from collections import OrderedDict
+except ImportError:
+ from ordereddict import OrderedDict
class _LRUCache(object):
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f493fe8c/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 811810b..d2c60bb 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,11 @@ try:
except ImportError:
install_requires.append('importlib')
+try:
+ from collections import OrderedDict
+except ImportError:
+ install_requires.append('ordereddict==1.1')
+
setup(
name=_PACKAGE_NAME,
version=version,
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f493fe8c/tests/workflows/api/test_task_graph.py
----------------------------------------------------------------------
diff --git a/tests/workflows/api/test_task_graph.py b/tests/workflows/api/test_task_graph.py
index 63d1c7c..efa1e9a 100644
--- a/tests/workflows/api/test_task_graph.py
+++ b/tests/workflows/api/test_task_graph.py
@@ -117,7 +117,7 @@ class TestTaskGraphGraphTraversal(object):
graph.add_task(task)
graph.add_task(other_task)
tasks = [t for t in graph.tasks]
- assert set(tasks) == {task, other_task}
+ assert set(tasks) == set([task, other_task])
def test_get_task_dependents(self, graph):
task = MockTask()
@@ -136,7 +136,7 @@ class TestTaskGraphGraphTraversal(object):
dependent_tasks = list(graph.get_task_dependents(task))
# transitively_dependent_task not expected to appear in the result
- assert set(dependent_tasks) == {dependent_task_1, dependent_task_2}
+ assert set(dependent_tasks) == set([dependent_task_1, dependent_task_2])
def test_get_task_empty_dependents(self, graph):
task = MockTask()
@@ -170,7 +170,7 @@ class TestTaskGraphGraphTraversal(object):
dependency_tasks = list(graph.get_task_dependencies(task))
# transitively_dependency_task not expected to appear in the result
- assert set(dependency_tasks) == {dependency_task_1, dependency_task_2}
+ assert set(dependency_tasks) == set([dependency_task_1, dependency_task_2])
def test_get_task_empty_dependencies(self, graph):
task = MockTask()
@@ -283,7 +283,7 @@ class TestTaskGraphDependencies(object):
remove_result = graph.remove_dependency(task, dependency_task)
assert remove_result is False
tasks = [t for t in graph.tasks]
- assert set(tasks) == {task, dependency_task}
+ assert set(tasks) == set([task, dependency_task])
def test_remove_dependency_nonexistent_dependent(self, graph):
task = MockTask()
@@ -309,8 +309,8 @@ class TestTaskGraphArrangements(object):
graph_tasks = [t for t in graph.tasks]
assert set(graph_tasks) == set(tasks)
assert len(list(graph.get_task_dependencies(tasks[0]))) == 0
- assert set(graph.get_task_dependencies(tasks[1])) == {tasks[0]}
- assert set(graph.get_task_dependencies(tasks[2])) == {tasks[1]}
+ assert set(graph.get_task_dependencies(tasks[1])) == set([tasks[0]])
+ assert set(graph.get_task_dependencies(tasks[2])) == set([tasks[1]])
def test_sequence_with_some_tasks_and_dependencies_already_in_graph(self, graph):
tasks = [MockTask(), MockTask(), MockTask()]
@@ -323,8 +323,8 @@ class TestTaskGraphArrangements(object):
graph_tasks = [t for t in graph.tasks]
assert set(graph_tasks) == set(tasks)
assert len(list(graph.get_task_dependencies(tasks[0]))) == 0
- assert set(graph.get_task_dependencies(tasks[1])) == {tasks[0]}
- assert set(graph.get_task_dependencies(tasks[2])) == {tasks[1]}
+ assert set(graph.get_task_dependencies(tasks[1])) == set([tasks[0]])
+ assert set(graph.get_task_dependencies(tasks[2])) == set([tasks[1]])
def test_sequence_with_nested_sequence(self, graph):
tasks = [MockTask() for _ in xrange(5)]
@@ -348,9 +348,9 @@ class TestTaskGraphArrangements(object):
assert len(list(graph.get_task_dependencies(tasks[0]))) == 0
# rest of the tasks (except last) should have a single dependency - the first task
for i in xrange(1, 4):
- assert set(graph.get_task_dependencies(tasks[i])) == {tasks[0]}
+ assert set(graph.get_task_dependencies(tasks[i])) == set([tasks[0]])
# last task should have have a dependency on all tasks except for the first one
- assert set(graph.get_task_dependencies(tasks[4])) == {tasks[1], tasks[2], tasks[3]}
+ assert set(graph.get_task_dependencies(tasks[4])) == set([tasks[1], tasks[2], tasks[3]])
def test_parallel(self, graph):
tasks = [MockTask(), MockTask(), MockTask()]
@@ -382,8 +382,8 @@ class TestTaskGraphArrangements(object):
# tasks[2] and tasks[3] should each have a single dependency; the rest should have none
assert len(list(graph.get_task_dependencies(tasks[0]))) == 0
assert len(list(graph.get_task_dependencies(tasks[1]))) == 0
- assert set(graph.get_task_dependencies(tasks[2])) == {tasks[1]}
- assert set(graph.get_task_dependencies(tasks[3])) == {tasks[2]}
+ assert set(graph.get_task_dependencies(tasks[2])) == set([tasks[1]])
+ assert set(graph.get_task_dependencies(tasks[3])) == set([tasks[2]])
assert len(list(graph.get_task_dependencies(tasks[4]))) == 0
def test_parallel_with_nested_parallel(self, graph):