diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 015a450f8b7affd3c9630df0af54e466e310fa49..a458e52d99a099f588afec1fe160231b1eb79f4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,29 +28,14 @@ Python 2.7: reports: junit: test/pytest.xml -Python 3.6: +Python 3: script: - - py_version=3.6 + - py_version=3 - EXTRA_INSTALL=numpy - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - - python3.6 - - gfortran - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.7: - script: - - py_version=3.7 - - EXTRA_INSTALL=numpy - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - - ". ./build-and-test-py-project.sh" - tags: - - python3.7 + - python3 - gfortran except: - tags @@ -64,7 +49,7 @@ Documentation: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh - ". ./build-docs.sh" tags: - - python3.5 + - python3 only: - master @@ -73,6 +58,6 @@ Flake8: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh - ". ./prepare-and-run-flake8.sh dagrt test" tags: - - python3.5 + - python3 except: - tags diff --git a/dagrt/language.py b/dagrt/language.py index a5d3ca88f6d01033e1f09285a62d3bf34b578a73..71769ead1450b5a64802a1dfddc46911c68caa18 100644 --- a/dagrt/language.py +++ b/dagrt/language.py @@ -154,26 +154,26 @@ Code Creation # {{{ utilities def _stringify_statements(roots, id_to_stmt, prefix=""): - lines = [] + lines = [] - printed_stmt_ids = set() + printed_stmt_ids = set() - def print_stmt(stmt): - if stmt.id in printed_stmt_ids: - return - printed_stmt_ids.add(stmt.id) + def print_stmt(stmt): + if stmt.id in printed_stmt_ids: + return + printed_stmt_ids.add(stmt.id) - for dep_id in stmt.depends_on: - print_stmt(id_to_stmt[dep_id]) + for dep_id in stmt.depends_on: + print_stmt(id_to_stmt[dep_id]) - lines.append( - "%s{%s} %s" % ( - prefix, stmt.id, str(stmt).replace("\n", "\n "))) + lines.append( + "%s{%s} %s" % ( + prefix, stmt.id, str(stmt).replace("\n", "\n "))) - for root_stmt in roots: - print_stmt(root_stmt) + for root_stmt in roots: + print_stmt(root_stmt) - return lines + return lines # }}}