From 7d10c80e8949af6091a8ea6cc53e44177567a5dd Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Fri, 27 Aug 2021 01:06:31 +0000 Subject: [PATCH] Add PYTHON_VERSION_COMPATIBILITY to gsutil recipe module Bug: 1227140 Change-Id: I81ae117146980f7dca60653f88500289d130c022 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3120084 Commit-Queue: Gavin Mak Reviewed-by: Anthony Polito --- recipes/README.recipes.md | 14 +++++++------- recipes/recipe_modules/gsutil/__init__.py | 2 ++ recipes/recipe_modules/gsutil/examples/full.py | 2 ++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 0c5a93639..39817593a 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -11,7 +11,7 @@ * [git](#recipe_modules-git) * [git_cl](#recipe_modules-git_cl) (Python3 ✅) * [gitiles](#recipe_modules-gitiles) (Python3 ✅) - * [gsutil](#recipe_modules-gsutil) + * [gsutil](#recipe_modules-gsutil) (Python3 ✅) * [osx_sdk](#recipe_modules-osx_sdk) (Python3 ✅) — The `osx_sdk` module provides safe functions to access a semi-hermetic XCode installation. * [presubmit](#recipe_modules-presubmit) (Python3 ✅) * [tryserver](#recipe_modules-tryserver) @@ -34,7 +34,7 @@ * [git_cl:examples/full](#recipes-git_cl_examples_full) (Python3 ✅) * [gitiles:examples/full](#recipes-gitiles_examples_full) (Python3 ✅) * [gitiles:tests/parse_repo_url](#recipes-gitiles_tests_parse_repo_url) (Python3 ✅) - * [gsutil:examples/full](#recipes-gsutil_examples_full) + * [gsutil:examples/full](#recipes-gsutil_examples_full) (Python3 ✅) * [osx_sdk:examples/full](#recipes-osx_sdk_examples_full) (Python3 ✅) * [presubmit:examples/full](#recipes-presubmit_examples_full) (Python3 ✅) * [presubmit:tests/execute](#recipes-presubmit_tests_execute) (Python3 ✅) @@ -713,9 +713,9 @@ Returns a list of refs in the remote repository. Generates a Gitiles repo URL. See also parse_repo_url. ### *recipe_modules* / [gsutil](/recipes/recipe_modules/gsutil) -[DEPS](/recipes/recipe_modules/gsutil/__init__.py#1): [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/python][recipe_engine/recipe_modules/python] +[DEPS](/recipes/recipe_modules/gsutil/__init__.py#3): [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/python][recipe_engine/recipe_modules/python] -PYTHON_VERSION_COMPATIBILITY: PY2 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [GSUtilApi](/recipes/recipe_modules/gsutil/api.py#9)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -1169,11 +1169,11 @@ PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/recipes/recipe_modules/gitiles/tests/parse_repo_url.py#14)(api):** ### *recipes* / [gsutil:examples/full](/recipes/recipe_modules/gsutil/examples/full.py) -[DEPS](/recipes/recipe_modules/gsutil/examples/full.py#5): [gsutil](#recipe_modules-gsutil), [recipe\_engine/path][recipe_engine/recipe_modules/path] +[DEPS](/recipes/recipe_modules/gsutil/examples/full.py#7): [gsutil](#recipe_modules-gsutil), [recipe\_engine/path][recipe_engine/recipe_modules/path] -PYTHON_VERSION_COMPATIBILITY: PY2 +PYTHON_VERSION_COMPATIBILITY: PY2+3 -— **def [RunSteps](/recipes/recipe_modules/gsutil/examples/full.py#11)(api):** +— **def [RunSteps](/recipes/recipe_modules/gsutil/examples/full.py#13)(api):** Move things around in a loop! ### *recipes* / [osx\_sdk:examples/full](/recipes/recipe_modules/osx_sdk/examples/full.py) diff --git a/recipes/recipe_modules/gsutil/__init__.py b/recipes/recipe_modules/gsutil/__init__.py index 240b08c67..fe5840f4d 100644 --- a/recipes/recipe_modules/gsutil/__init__.py +++ b/recipes/recipe_modules/gsutil/__init__.py @@ -1,3 +1,5 @@ +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'recipe_engine/path', 'recipe_engine/python', diff --git a/recipes/recipe_modules/gsutil/examples/full.py b/recipes/recipe_modules/gsutil/examples/full.py index 558b36e20..501775034 100644 --- a/recipes/recipe_modules/gsutil/examples/full.py +++ b/recipes/recipe_modules/gsutil/examples/full.py @@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'gsutil', 'recipe_engine/path',