diff options
Diffstat (limited to 'buildscripts')
45 files changed, 49 insertions, 50 deletions
diff --git a/buildscripts/aws_ec2.py b/buildscripts/aws_ec2.py index 251b1b7a1b1..13ed0ea41fc 100755 --- a/buildscripts/aws_ec2.py +++ b/buildscripts/aws_ec2.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """AWS EC2 instance launcher and controller.""" diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py index d3bf34df2f8..232c2e1e296 100644 --- a/buildscripts/burn_in_tests.py +++ b/buildscripts/burn_in_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Command line utility for determining what jstests have been added or modified.""" diff --git a/buildscripts/bypass_compile_and_fetch_binaries.py b/buildscripts/bypass_compile_and_fetch_binaries.py index addf335e162..f7d01ed761d 100755 --- a/buildscripts/bypass_compile_and_fetch_binaries.py +++ b/buildscripts/bypass_compile_and_fetch_binaries.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Bypass compile and fetch binaries.""" diff --git a/buildscripts/clang_format.py b/buildscripts/clang_format.py index b1fee3b0239..59183d8df2b 100755 --- a/buildscripts/clang_format.py +++ b/buildscripts/clang_format.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Clang format script that provides the following. 1. Ability to grab binaries where possible from LLVM. diff --git a/buildscripts/collect_resource_info.py b/buildscripts/collect_resource_info.py index 697179bcc8f..e93a4b17634 100755 --- a/buildscripts/collect_resource_info.py +++ b/buildscripts/collect_resource_info.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Collect system resource information on processes running in Evergreen on a given interval.""" diff --git a/buildscripts/combine_reports.py b/buildscripts/combine_reports.py index 8245b3afb8f..686014d7308 100755 --- a/buildscripts/combine_reports.py +++ b/buildscripts/combine_reports.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Combine JSON report files used in Evergreen.""" diff --git a/buildscripts/cpplint.py b/buildscripts/cpplint.py index d567a417e45..84b888ecf74 100755 --- a/buildscripts/cpplint.py +++ b/buildscripts/cpplint.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2009 Google Inc. All rights reserved. # diff --git a/buildscripts/errorcodes.py b/buildscripts/errorcodes.py index 6faeffca589..82324c04113 100755 --- a/buildscripts/errorcodes.py +++ b/buildscripts/errorcodes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Produce a report of all assertions in the MongoDB server codebase. Parses .cpp files for assertions and verifies assertion codes are distinct. @@ -24,7 +24,7 @@ from buildscripts import utils # pylint: disable=wrong-import-position try: import regex as re except ImportError: - print("*** Run 'pip2 install --user regex' to speed up error code checking") + print("*** Run 'pip3 install --user regex' to speed up error code checking") import re # type: ignore ASSERT_NAMES = ["uassert", "massert", "fassert", "fassertFailed"] diff --git a/buildscripts/eslint.py b/buildscripts/eslint.py index aa962331c39..38fbb5a50fd 100755 --- a/buildscripts/eslint.py +++ b/buildscripts/eslint.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ESLint module. Will download a prebuilt ESLint binary if necessary (i.e. it isn't installed, isn't in the current diff --git a/buildscripts/evergreen_gen_fuzzer_tests.py b/buildscripts/evergreen_gen_fuzzer_tests.py index 0937cff7659..2c48de541d5 100755 --- a/buildscripts/evergreen_gen_fuzzer_tests.py +++ b/buildscripts/evergreen_gen_fuzzer_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Generate fuzzer tests to run in evergreen in parallel.""" diff --git a/buildscripts/evergreen_generate_resmoke_tasks.py b/buildscripts/evergreen_generate_resmoke_tasks.py index 2e33ef665eb..61583c4c1c9 100755 --- a/buildscripts/evergreen_generate_resmoke_tasks.py +++ b/buildscripts/evergreen_generate_resmoke_tasks.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Resmoke Test Suite Generator. diff --git a/buildscripts/evergreen_resmoke_job_count.py b/buildscripts/evergreen_resmoke_job_count.py index bf6d99bba9d..01213eb0869 100644 --- a/buildscripts/evergreen_resmoke_job_count.py +++ b/buildscripts/evergreen_resmoke_job_count.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Determine the number of resmoke jobs to run.""" import argparse diff --git a/buildscripts/evergreen_run_tests.py b/buildscripts/evergreen_run_tests.py index d42c4423a67..861970f63db 100755 --- a/buildscripts/evergreen_run_tests.py +++ b/buildscripts/evergreen_run_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Command line utility for executing MongoDB tests in Evergreen.""" import collections diff --git a/buildscripts/evergreen_task_tags.py b/buildscripts/evergreen_task_tags.py index 8144f048e51..d1aecb8d8a2 100755 --- a/buildscripts/evergreen_task_tags.py +++ b/buildscripts/evergreen_task_tags.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Script to gather information about how tags are used in evergreen tasks.""" from __future__ import absolute_import diff --git a/buildscripts/evergreen_task_timeout.py b/buildscripts/evergreen_task_timeout.py index f69760dbbb1..84c8d65f0bd 100644 --- a/buildscripts/evergreen_task_timeout.py +++ b/buildscripts/evergreen_task_timeout.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Determine the timeout value a task should use in evergreen.""" import argparse diff --git a/buildscripts/fetch_test_lifecycle.py b/buildscripts/fetch_test_lifecycle.py index 4b8f65c74de..1b07201e944 100755 --- a/buildscripts/fetch_test_lifecycle.py +++ b/buildscripts/fetch_test_lifecycle.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Retrieve the etc/test_lifecycle.yml tag file from the metadata repository. This is performed for the current repository. diff --git a/buildscripts/generate-pip-constraints.sh b/buildscripts/generate-pip-constraints.sh index c00532724a7..1144a270773 100755 --- a/buildscripts/generate-pip-constraints.sh +++ b/buildscripts/generate-pip-constraints.sh @@ -14,8 +14,8 @@ USAGE: -h, --help Show this message -o CON_FILE Write constraints.txt to CON_FILE -This command passes all unrecognized arguments to two pip invocations, -one for a python2 virtual environment and one for a python3 virtual environment. +This command passes all unrecognized arguments to the pip invocation. + It then forms a unified multi-version constraints file at constraints.txt in its working directory. This script's working directory currently defaults to '${DEFAULT_WORKING_DIR}'. diff --git a/buildscripts/generate_compile_expansions.py b/buildscripts/generate_compile_expansions.py index 09cbb3f7934..4df93a2e9cd 100755 --- a/buildscripts/generate_compile_expansions.py +++ b/buildscripts/generate_compile_expansions.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Generate the compile expansions file used by Evergreen as part of the push/release process. diff --git a/buildscripts/generate_compile_expansions_shared_cache.py b/buildscripts/generate_compile_expansions_shared_cache.py index 58c7f8b2fcf..1542eaafcdb 100755 --- a/buildscripts/generate_compile_expansions_shared_cache.py +++ b/buildscripts/generate_compile_expansions_shared_cache.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Generate the compile expansions file used by Evergreen as part of the push/release process. diff --git a/buildscripts/hang_analyzer.py b/buildscripts/hang_analyzer.py index 586024a11a1..05997c5a0f4 100755 --- a/buildscripts/hang_analyzer.py +++ b/buildscripts/hang_analyzer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Hang Analyzer module. A prototype hang analyzer for Evergreen integration to help investigate test timeouts diff --git a/buildscripts/idl/idlc.py b/buildscripts/idl/idlc.py index 2a98df124f8..c5833d1b346 100644 --- a/buildscripts/idl/idlc.py +++ b/buildscripts/idl/idlc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # # Copyright (C) 2018-present MongoDB, Inc. # diff --git a/buildscripts/idl/run_tests.py b/buildscripts/idl/run_tests.py index ab9e3e8930e..af91a816ba9 100644 --- a/buildscripts/idl/run_tests.py +++ b/buildscripts/idl/run_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # # Copyright (C) 2018-present MongoDB, Inc. # diff --git a/buildscripts/idl/tests/test_binder.py b/buildscripts/idl/tests/test_binder.py index ff65948d68a..3e7210e9202 100644 --- a/buildscripts/idl/tests/test_binder.py +++ b/buildscripts/idl/tests/test_binder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2018-present MongoDB, Inc. # diff --git a/buildscripts/idl/tests/test_generator.py b/buildscripts/idl/tests/test_generator.py index 393c9d7754d..77235cec196 100644 --- a/buildscripts/idl/tests/test_generator.py +++ b/buildscripts/idl/tests/test_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2018-present MongoDB, Inc. # diff --git a/buildscripts/idl/tests/test_import.py b/buildscripts/idl/tests/test_import.py index 89026dd9162..dc0f05206a0 100644 --- a/buildscripts/idl/tests/test_import.py +++ b/buildscripts/idl/tests/test_import.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2018-present MongoDB, Inc. # diff --git a/buildscripts/idl/tests/test_parser.py b/buildscripts/idl/tests/test_parser.py index b1531cc12b8..d204d88d440 100644 --- a/buildscripts/idl/tests/test_parser.py +++ b/buildscripts/idl/tests/test_parser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2018-present MongoDB, Inc. # diff --git a/buildscripts/linter/runner.py b/buildscripts/linter/runner.py index af2a83de62d..de8ae2a5852 100644 --- a/buildscripts/linter/runner.py +++ b/buildscripts/linter/runner.py @@ -72,7 +72,7 @@ def _find_linter(linter, config_dict): python_dir = os.path.dirname(sys.executable) if sys.platform == "win32": # On Windows, these scripts are installed in %PYTHONDIR%\scripts like - # 'C:\Python27\scripts', and have .exe extensions. + # 'C:\Python37\scripts', and have .exe extensions. python_dir = os.path.join(python_dir, "scripts") cmd_str = os.path.join(python_dir, linter.cmd_name) @@ -132,12 +132,11 @@ def find_linters(linter_list, config_dict): Could not find the correct version of linter '%s', expected '%s'. Check your PATH environment variable or re-run with --verbose for more information. -To fix, install the needed python modules for both Python 2.7, and Python 3.x: - sudo pip2 install -r etc/pip/lint-requirements.txt +To fix, install the needed python modules for Python 3.x: sudo pip3 install -r etc/pip/lint-requirements.txt These commands are typically available via packages with names like python-pip, -python2-pip, and python3-pip. See your OS documentation for help. +or python3-pip. See your OS documentation for help. """, linter.cmd_name, linter.required_version) return None diff --git a/buildscripts/make_archive.py b/buildscripts/make_archive.py index ad0fa9e93ae..ef8d5856fa2 100755 --- a/buildscripts/make_archive.py +++ b/buildscripts/make_archive.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Helper script for constructing an archive (zip or tar) from a list of files. The output format (tar, tgz, zip) is determined from the file name, unless the user specifies diff --git a/buildscripts/mobile/adb_monitor.py b/buildscripts/mobile/adb_monitor.py index 1f7c350f309..ac6b1042e22 100644 --- a/buildscripts/mobile/adb_monitor.py +++ b/buildscripts/mobile/adb_monitor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ADB utilities to collect adb samples from a locally connected Android device.""" import distutils.spawn # pylint: disable=no-name-in-module diff --git a/buildscripts/mobile/benchrun_embedded_setup_android.py b/buildscripts/mobile/benchrun_embedded_setup_android.py index 94a08077f93..005a10729da 100644 --- a/buildscripts/mobile/benchrun_embedded_setup_android.py +++ b/buildscripts/mobile/benchrun_embedded_setup_android.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Setup an Android device to run the benchrun_embedded test suite.""" import glob diff --git a/buildscripts/mongosymb.py b/buildscripts/mongosymb.py index cfd6c4f3fbd..3224f88824f 100755 --- a/buildscripts/mongosymb.py +++ b/buildscripts/mongosymb.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Script and library for symbolizing MongoDB stack traces. To use as a script, paste the JSON object on the line after ----- BEGIN BACKTRACE ----- into the diff --git a/buildscripts/packager.py b/buildscripts/packager.py index ee2d62dc11d..f5f16c11bbb 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Packager module. This program makes Debian and RPM repositories for MongoDB, by diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index acc7524ed7d..8fcf8c01055 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Packager Enterprise module.""" # This program makes Debian and RPM repositories for MongoDB, by diff --git a/buildscripts/promote_silent_failures.py b/buildscripts/promote_silent_failures.py index b089e0901f9..d8d45872685 100644 --- a/buildscripts/promote_silent_failures.py +++ b/buildscripts/promote_silent_failures.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Convert silent test failures into non-silent failures. Any test files with at least 2 executions in the report.json file that have a "silentfail" status, diff --git a/buildscripts/pylinters.py b/buildscripts/pylinters.py index 80629ea84d8..5d44b001563 100755 --- a/buildscripts/pylinters.py +++ b/buildscripts/pylinters.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 """Extensible script to run one or more Python Linters across a subset of files in parallel.""" import argparse diff --git a/buildscripts/remote_operations.py b/buildscripts/remote_operations.py index 29b1ae778df..d52db75b482 100755 --- a/buildscripts/remote_operations.py +++ b/buildscripts/remote_operations.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Remote access utilities, via ssh & scp.""" import optparse diff --git a/buildscripts/resmoke.py b/buildscripts/resmoke.py index 25ab3c88ab1..db33d8b95eb 100755 --- a/buildscripts/resmoke.py +++ b/buildscripts/resmoke.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Command line utility for executing MongoDB tests of all kinds.""" import os.path diff --git a/buildscripts/scons.py b/buildscripts/scons.py index fec884ce91f..14802f1d7ae 100755 --- a/buildscripts/scons.py +++ b/buildscripts/scons.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Scons module.""" import os diff --git a/buildscripts/setup_multiversion_mongodb.py b/buildscripts/setup_multiversion_mongodb.py index 82abbe7574a..bad860184bd 100755 --- a/buildscripts/setup_multiversion_mongodb.py +++ b/buildscripts/setup_multiversion_mongodb.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Install multiple versions of MongoDB on a machine.""" import contextlib diff --git a/buildscripts/tests/resmokelib/testing/hooks/test_combine_benchmark_results.py b/buildscripts/tests/resmokelib/testing/hooks/test_combine_benchmark_results.py index 2dfd063337e..26695b8d186 100755 --- a/buildscripts/tests/resmokelib/testing/hooks/test_combine_benchmark_results.py +++ b/buildscripts/tests/resmokelib/testing/hooks/test_combine_benchmark_results.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Unit tests for the resmokelib.testing.hooks.combine_benchmark_results module.""" import datetime diff --git a/buildscripts/tests/resmokelib/testing/hooks/test_combine_benchrun_embedded_results.py b/buildscripts/tests/resmokelib/testing/hooks/test_combine_benchrun_embedded_results.py index a28419a1fc1..89386e9f94b 100755 --- a/buildscripts/tests/resmokelib/testing/hooks/test_combine_benchrun_embedded_results.py +++ b/buildscripts/tests/resmokelib/testing/hooks/test_combine_benchrun_embedded_results.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Unit tests for the resmokelib.testing.hooks.combine_benchrun_embedded_results module.""" import datetime diff --git a/buildscripts/tests/test_remote_operations.py b/buildscripts/tests/test_remote_operations.py index 696faca8def..98eb7e611e4 100755 --- a/buildscripts/tests/test_remote_operations.py +++ b/buildscripts/tests/test_remote_operations.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Unit test for buildscripts/remote_operations.py. Note - Tests require sshd to be enabled on localhost with paswordless login diff --git a/buildscripts/update_test_lifecycle.py b/buildscripts/update_test_lifecycle.py index 4f8d102a736..ea9b4d05bf2 100755 --- a/buildscripts/update_test_lifecycle.py +++ b/buildscripts/update_test_lifecycle.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Test Failures module. Update etc/test_lifecycle.yml to tag unreliable tests based on historic failure rates. diff --git a/buildscripts/utils.py b/buildscripts/utils.py index 57d3f5da3a2..e70b7a98553 100644 --- a/buildscripts/utils.py +++ b/buildscripts/utils.py @@ -139,7 +139,7 @@ def find_python(min_version=(3, 7)): pass version = re.compile(r"[Pp]ython ([\d\.]+)", re.MULTILINE) - binaries = ("python27", "python2.7", "python26", "python2.6", "python25", "python2.5", "python") + binaries = ("python37", "python3.7", "python36", "python3.6", "python35", "python3.5", "python") for binary in binaries: try: out, err = subprocess.Popen([binary, "-V"], stdout=subprocess.PIPE, diff --git a/buildscripts/yaml_key_value.py b/buildscripts/yaml_key_value.py index 848e1daffd9..2a03de84328 100755 --- a/buildscripts/yaml_key_value.py +++ b/buildscripts/yaml_key_value.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Utility to return YAML value from key in YAML file.""" import optparse |