From 9bccf29ed4dfd54f6bd533943c7c0eb9fe1ac8b7 Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Thu, 26 Aug 2021 21:39:18 +0000 Subject: [PATCH] Add PYTHON_VERSION_COMPATIBILITY to windows_sdk recipe module Bug: 1227140 Change-Id: I5415adaa030984a4dc034851a6f21d86e53209f0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3116499 Commit-Queue: Gavin Mak Reviewed-by: Josip Sokcevic --- recipes/README.recipes.md | 14 +++++++------- recipes/recipe_modules/windows_sdk/__init__.py | 2 ++ .../recipe_modules/windows_sdk/examples/full.py | 2 ++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 785c2270b..b94259a0a 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -15,7 +15,7 @@ * [osx_sdk](#recipe_modules-osx_sdk) — The `osx_sdk` module provides safe functions to access a semi-hermetic XCode installation. * [presubmit](#recipe_modules-presubmit) * [tryserver](#recipe_modules-tryserver) - * [windows_sdk](#recipe_modules-windows_sdk) — The `windows_sdk` module provides safe functions to access a hermetic Microsoft Visual Studio installation. + * [windows_sdk](#recipe_modules-windows_sdk) (Python3 ✅) — The `windows_sdk` module provides safe functions to access a hermetic Microsoft Visual Studio installation. **[Recipes](#Recipes)** * [bot_update:examples/full](#recipes-bot_update_examples_full) (Python3 ✅) @@ -43,7 +43,7 @@ * [tryserver:tests/gerrit_change_fetch_ref_timeout](#recipes-tryserver_tests_gerrit_change_fetch_ref_timeout) * [tryserver:tests/gerrit_change_owner](#recipes-tryserver_tests_gerrit_change_owner) * [tryserver:tests/gerrit_change_target_ref](#recipes-tryserver_tests_gerrit_change_target_ref) - * [windows_sdk:examples/full](#recipes-windows_sdk_examples_full) + * [windows_sdk:examples/full](#recipes-windows_sdk_examples_full) (Python3 ✅) ## Recipe Modules ### *recipe_modules* / [bot\_update](/recipes/recipe_modules/bot_update) @@ -1019,9 +1019,9 @@ timeout.   **@property**
— **def [valid\_footers](/recipes/recipe_modules/tryserver/api.py#47)(self):** ### *recipe_modules* / [windows\_sdk](/recipes/recipe_modules/windows_sdk) -[DEPS](/recipes/recipe_modules/windows_sdk/__init__.py#5): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/recipes/recipe_modules/windows_sdk/__init__.py#7): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/step][recipe_engine/recipe_modules/step] -PYTHON_VERSION_COMPATIBILITY: PY2 +PYTHON_VERSION_COMPATIBILITY: PY2+3 The `windows_sdk` module provides safe functions to access a hermetic Microsoft Visual Studio installation. @@ -1234,11 +1234,11 @@ PYTHON_VERSION_COMPATIBILITY: PY2 — **def [RunSteps](/recipes/recipe_modules/tryserver/tests/gerrit_change_target_ref.py#16)(api):** ### *recipes* / [windows\_sdk:examples/full](/recipes/recipe_modules/windows_sdk/examples/full.py) -[DEPS](/recipes/recipe_modules/windows_sdk/examples/full.py#5): [windows\_sdk](#recipe_modules-windows_sdk), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/recipes/recipe_modules/windows_sdk/examples/full.py#7): [windows\_sdk](#recipe_modules-windows_sdk), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] -PYTHON_VERSION_COMPATIBILITY: PY2 +PYTHON_VERSION_COMPATIBILITY: PY2+3 -— **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):** +— **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#15)(api):** [recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/07fdd8ab1c9345dfc30e20a224d4934c17ff804b/README.recipes.md#recipe_modules-assertions [recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/07fdd8ab1c9345dfc30e20a224d4934c17ff804b/README.recipes.md#recipe_modules-buildbucket diff --git a/recipes/recipe_modules/windows_sdk/__init__.py b/recipes/recipe_modules/windows_sdk/__init__.py index 0953aa517..d5a79dd17 100644 --- a/recipes/recipe_modules/windows_sdk/__init__.py +++ b/recipes/recipe_modules/windows_sdk/__init__.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 = [ 'recipe_engine/cipd', 'recipe_engine/context', diff --git a/recipes/recipe_modules/windows_sdk/examples/full.py b/recipes/recipe_modules/windows_sdk/examples/full.py index 3326e324f..64648f20e 100644 --- a/recipes/recipe_modules/windows_sdk/examples/full.py +++ b/recipes/recipe_modules/windows_sdk/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 = [ 'windows_sdk', 'recipe_engine/platform',