python3: Drop py2 support from most modules
Bug: 465
Change-Id: I404ed5f6fbf3c37280e9286e4c54ce352b206832
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/64081
Reviewed-by: Oliver Newman <olivernewman@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
diff --git a/recipe_modules/build/__init__.py b/recipe_modules/build/__init__.py
index 6f8cd0f..bd8874d 100644
--- a/recipe_modules/build/__init__.py
+++ b/recipe_modules/build/__init__.py
@@ -26,4 +26,4 @@
PROPERTIES = properties.InputProperties
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
diff --git a/recipe_modules/build/tests/full.py b/recipe_modules/build/tests/full.py
index ea7e676..a7a8cd5 100644
--- a/recipe_modules/build/tests/full.py
+++ b/recipe_modules/build/tests/full.py
@@ -22,7 +22,7 @@
'recipe_engine/properties',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api):
diff --git a/recipe_modules/checkout/__init__.py b/recipe_modules/checkout/__init__.py
index b61f7d7..acce2cb 100644
--- a/recipe_modules/checkout/__init__.py
+++ b/recipe_modules/checkout/__init__.py
@@ -33,4 +33,4 @@
PROPERTIES = properties.InputProperties
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
diff --git a/recipe_modules/checkout/tests/git.py b/recipe_modules/checkout/tests/git.py
index ae798c9..33fa4b7 100644
--- a/recipe_modules/checkout/tests/git.py
+++ b/recipe_modules/checkout/tests/git.py
@@ -21,7 +21,7 @@
'recipe_engine/step',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api): # pylint: disable=invalid-name
diff --git a/recipe_modules/checkout/tests/repo.py b/recipe_modules/checkout/tests/repo.py
index 9227b0d..474af70 100644
--- a/recipe_modules/checkout/tests/repo.py
+++ b/recipe_modules/checkout/tests/repo.py
@@ -24,7 +24,7 @@
REPO = 'https://pigweed.googlesource.com/pigweed_name'
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api): # pylint: disable=invalid-name
diff --git a/recipe_modules/checkout/tests/submodule.py b/recipe_modules/checkout/tests/submodule.py
index b187f29..6080c34 100644
--- a/recipe_modules/checkout/tests/submodule.py
+++ b/recipe_modules/checkout/tests/submodule.py
@@ -22,7 +22,7 @@
'recipe_engine/step',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api): # pylint: disable=invalid-name
diff --git a/recipe_modules/cipd_upload/__init__.py b/recipe_modules/cipd_upload/__init__.py
index 68c355f..ed185f0 100644
--- a/recipe_modules/cipd_upload/__init__.py
+++ b/recipe_modules/cipd_upload/__init__.py
@@ -21,4 +21,4 @@
'recipe_engine/platform',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
diff --git a/recipe_modules/cipd_upload/tests/full.py b/recipe_modules/cipd_upload/tests/full.py
index dce81ed..1e72891 100644
--- a/recipe_modules/cipd_upload/tests/full.py
+++ b/recipe_modules/cipd_upload/tests/full.py
@@ -37,7 +37,7 @@
'search_tag_value': Property(kind=str, default='value'),
}
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(
diff --git a/recipe_modules/cq_deps/__init__.py b/recipe_modules/cq_deps/__init__.py
index 7715500..951e16a 100644
--- a/recipe_modules/cq_deps/__init__.py
+++ b/recipe_modules/cq_deps/__init__.py
@@ -25,4 +25,4 @@
PROPERTIES = properties.InputProperties
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
diff --git a/recipe_modules/cq_deps/tests/full.py b/recipe_modules/cq_deps/tests/full.py
index 4db47d6..5fe138c 100644
--- a/recipe_modules/cq_deps/tests/full.py
+++ b/recipe_modules/cq_deps/tests/full.py
@@ -28,7 +28,7 @@
'statuses': Property(kind=List(str), default=('NEW',)),
}
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api, revision, statuses):
diff --git a/recipe_modules/environment/__init__.py b/recipe_modules/environment/__init__.py
index a7a3451..2d32716 100644
--- a/recipe_modules/environment/__init__.py
+++ b/recipe_modules/environment/__init__.py
@@ -31,4 +31,4 @@
PROPERTIES = properties.InputProperties
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
diff --git a/recipe_modules/environment/tests/full.py b/recipe_modules/environment/tests/full.py
index 6f58a7e..3490312 100644
--- a/recipe_modules/environment/tests/full.py
+++ b/recipe_modules/environment/tests/full.py
@@ -23,7 +23,7 @@
'recipe_engine/properties',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api): # pylint: disable=invalid-name
diff --git a/recipe_modules/repo/examples/init_sync_retry.py b/recipe_modules/repo/examples/init_sync_retry.py
index 21da6b5..41a640e 100644
--- a/recipe_modules/repo/examples/init_sync_retry.py
+++ b/recipe_modules/repo/examples/init_sync_retry.py
@@ -12,7 +12,7 @@
'pigweed/repo',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api):
diff --git a/recipe_modules/repo/examples/repo_retry_failure.py b/recipe_modules/repo/examples/repo_retry_failure.py
index ae679e5..ed27a33 100644
--- a/recipe_modules/repo/examples/repo_retry_failure.py
+++ b/recipe_modules/repo/examples/repo_retry_failure.py
@@ -13,7 +13,7 @@
'recipe_engine/path',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api):
diff --git a/recipe_modules/repo/examples/repo_retry_success.py b/recipe_modules/repo/examples/repo_retry_success.py
index d547668..f02a7dc 100644
--- a/recipe_modules/repo/examples/repo_retry_success.py
+++ b/recipe_modules/repo/examples/repo_retry_success.py
@@ -13,7 +13,7 @@
'recipe_engine/path',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api):
diff --git a/recipe_modules/repo/examples/timeout.py b/recipe_modules/repo/examples/timeout.py
index 1ed1adf..5d04deb 100644
--- a/recipe_modules/repo/examples/timeout.py
+++ b/recipe_modules/repo/examples/timeout.py
@@ -18,7 +18,7 @@
'pigweed/repo',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api):
diff --git a/recipe_modules/roll_util/__init__.py b/recipe_modules/roll_util/__init__.py
index 2e941b4..5224563 100644
--- a/recipe_modules/roll_util/__init__.py
+++ b/recipe_modules/roll_util/__init__.py
@@ -26,4 +26,4 @@
PROPERTIES = properties.InputProperties
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
diff --git a/recipe_modules/roll_util/tests/labels.py b/recipe_modules/roll_util/tests/labels.py
index d42b3b1..ff60426 100644
--- a/recipe_modules/roll_util/tests/labels.py
+++ b/recipe_modules/roll_util/tests/labels.py
@@ -20,7 +20,7 @@
'recipe_engine/step',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api):
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.py b/recipe_modules/roll_util/tests/multiple_rolls.py
index de93b82..d61a9a6 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.py
+++ b/recipe_modules/roll_util/tests/multiple_rolls.py
@@ -20,7 +20,7 @@
'recipe_engine/step',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api):
diff --git a/recipe_modules/roll_util/tests/single_roll.py b/recipe_modules/roll_util/tests/single_roll.py
index 1bc1079..5e7721a 100644
--- a/recipe_modules/roll_util/tests/single_roll.py
+++ b/recipe_modules/roll_util/tests/single_roll.py
@@ -31,7 +31,7 @@
'new_revision': Property(kind=str),
}
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps( # pylint: disable=invalid-name
diff --git a/recipe_modules/util/__init__.py b/recipe_modules/util/__init__.py
index 77605dd..f2e3deb 100644
--- a/recipe_modules/util/__init__.py
+++ b/recipe_modules/util/__init__.py
@@ -24,4 +24,4 @@
'recipe_engine/swarming',
]
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
diff --git a/recipe_modules/util/tests/full.py b/recipe_modules/util/tests/full.py
index 3f4a109..28e6236 100644
--- a/recipe_modules/util/tests/full.py
+++ b/recipe_modules/util/tests/full.py
@@ -33,7 +33,7 @@
'comments': Property(kind=List(str), default=()),
}
-PYTHON_VERSION_COMPATIBILITY = "PY2+3"
+PYTHON_VERSION_COMPATIBILITY = "PY3"
def RunSteps(api, regex, comments): # pylint: disable=invalid-name
