From d5dcb215187b52a911dd7ebfaf71d0269098f743 Mon Sep 17 00:00:00 2001 From: godofredoc <54371434+godofredoc@users.noreply.github.com> Date: Tue, 21 Jan 2020 11:16:59 -0800 Subject: [PATCH] Add .vpython dependencies to migrate run_tests.py to vpython. (#15161) vpython is used to provide a hermetic environment for python scripts. Dependencies are provided using cipd and take advantage of the caching tools provided by luci services. --- testing/.vpython | 55 +++++++++++++++++++++++++++++++++++++++++++++++ testing/.vpython3 | 23 ++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 testing/.vpython create mode 100644 testing/.vpython3 diff --git a/testing/.vpython b/testing/.vpython new file mode 100644 index 0000000000000..ace42d55ce023 --- /dev/null +++ b/testing/.vpython @@ -0,0 +1,55 @@ +python_version: "2.7" + +# Used by: +# auth.py +# gerrit_util.py +# git_cl.py +# my_activity.py +# TODO(crbug.com/1002153): Add ninjalog_uploader.py +wheel: < + name: "infra/python/wheels/httplib2-py2_py3" + version: "version:0.10.3" +> + +# Used by: +# my_activity.py +wheel: < + name: "infra/python/wheels/python-dateutil-py2_py3" + version: "version:2.7.3" +> +wheel: < + name: "infra/python/wheels/six-py2_py3" + version: "version:1.10.0" +> + +# Used by: +# tests/auth_test.py +# tests/detect_host_arch_test.py +# tests/gclient_scm_test.py +# tests/gclient_test.py +# tests/gclient_utils_test.py +# tests/gerrit_util_test.py +# tests/git_cl_test.py +# tests/git_drover_test.py +# tests/git_footers_test.py +# tests/metrics_test.py +# tests/presubmit_unittest.py +# tests/scm_unittest.py +# tests/subprocess2_test.py +# tests/watchlists_unittest.py +wheel: < + name: "infra/python/wheels/mock-py2_py3" + version: "version:2.0.0" +> +wheel < + name: "infra/python/wheels/funcsigs-py2_py3" + version: "version:1.0.2" +> +wheel: < + name: "infra/python/wheels/pbr-py2_py3" + version: "version:3.0.0" +> +wheel: < + name: "infra/python/wheels/six-py2_py3" + version: "version:1.10.0" +> diff --git a/testing/.vpython3 b/testing/.vpython3 new file mode 100644 index 0000000000000..a04639e6b16c8 --- /dev/null +++ b/testing/.vpython3 @@ -0,0 +1,23 @@ +python_version: "3.8" + +# Used by: +# auth.py +# gerrit_util.py +# git_cl.py +# my_activity.py +# TODO(crbug.com/1002153): Add ninjalog_uploader.py +wheel: < + name: "infra/python/wheels/httplib2-py3" + version: "version:0.13.1" +> + +# Used by: +# my_activity.py +wheel: < + name: "infra/python/wheels/python-dateutil-py2_py3" + version: "version:2.7.3" +> +wheel: < + name: "infra/python/wheels/six-py2_py3" + version: "version:1.10.0" +>