diff --git a/ci/order-crates-for-publishing.py b/ci/order-crates-for-publishing.py index d077ee060c..b28e8848e7 100755 --- a/ci/order-crates-for-publishing.py +++ b/ci/order-crates-for-publishing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3 # # This script figures the order in which workspace crates must be published to # crates.io. Along the way it also ensures there are no circular dependencies @@ -42,24 +42,26 @@ def get_packages(): sys.exit(1) # Order dependencies + deleted_dependencies = [] sorted_dependency_graph = [] max_iterations = pow(len(dependency_graph),2) - while dependency_graph: + while len(deleted_dependencies) < len(dependency_graph): if max_iterations == 0: # One day be more helpful and find the actual cycle for the user... sys.exit('Error: Circular dependency suspected between these packages: \n {}\n'.format('\n '.join(dependency_graph.keys()))) max_iterations -= 1 + for package, dependencies in dependency_graph.items(): for dependency in dependencies: if dependency in dependency_graph: break else: - del dependency_graph[package] + deleted_dependencies.append(package) sorted_dependency_graph.append((package, manifest_path[package])) return sorted_dependency_graph for package, manifest in get_packages(): - print os.path.relpath(manifest) + print(os.path.relpath(manifest)) diff --git a/system-test/testnet-automation-json-parser.py b/system-test/testnet-automation-json-parser.py index 6f8fa9d266..16c80dd818 100755 --- a/system-test/testnet-automation-json-parser.py +++ b/system-test/testnet-automation-json-parser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys, json data=json.load(sys.stdin) @@ -6,8 +6,8 @@ data=json.load(sys.stdin) if 'results' in data: for result in data['results']: if 'series' in result: - print result['series'][0]['columns'][1].encode() + ': ' + str(result['series'][0]['values'][0][1]) + print(result['series'][0]['columns'][1].encode() + ': ' + str(result['series'][0]['values'][0][1])) else: - print "An expected result from CURL request is missing" + print("An expected result from CURL request is missing") else: - print "No results returned from CURL request" + print("No results returned from CURL request")