This is an automated email from the ASF dual-hosted git repository.
jrmccluskey pushed a commit to branch release-2.47.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.47.0 by this push:
new 9a730828077 [release-2.47.0] Cherry pick #26151 and #26174 into
release branch (#26184)
9a730828077 is described below
commit 9a730828077ea019334ddf80b0467057b29f8ab4
Author: Yi Hu <[email protected]>
AuthorDate: Mon Apr 10 09:13:22 2023 -0400
[release-2.47.0] Cherry pick #26151 and #26174 into release branch (#26184)
* use double quotes when using embedded values (#26151)
* Fix a couple of Python3.11 support followup (#26174)
* Fix a couple of Python3.11 support followup
* Bump tenacity version for pull_license script support Py3.11
* Fix Sickbay test no task defined
* Still Run ALL_SUPPORTED_VERSIONS For Python Sickbay
---------
Co-authored-by: Ahmed Abualsaud
<[email protected]>
---
.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy | 2 +-
.test-infra/jenkins/job_PreCommit_Portable_Python.groovy | 4 ++--
build.gradle.kts | 12 ------------
sdks/java/container/license_scripts/requirement.txt | 2 +-
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
b/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
index 9789121ee77..1122db78c9c 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
@@ -40,7 +40,7 @@ ALL_SUPPORTED_VERSIONS.each { pythonVersion ->
steps {
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
- tasks(":python${versionSuffix}SickbayPostCommit")
+
tasks(":sdks:python:test-suites:dataflow:py${versionSuffix}:postCommitSickbay")
commonJobProperties.setGradleSwitches(delegate)
}
}
diff --git a/.test-infra/jenkins/job_PreCommit_Portable_Python.groovy
b/.test-infra/jenkins/job_PreCommit_Portable_Python.groovy
index 1f502bef5bc..2992cbbd0d0 100644
--- a/.test-infra/jenkins/job_PreCommit_Portable_Python.groovy
+++ b/.test-infra/jenkins/job_PreCommit_Portable_Python.groovy
@@ -47,12 +47,12 @@ builder.build {
steps {
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
-
tasks(':sdks:python:test-suites:portable:py${lowestSupported}:preCommitPy${lowestSupported}')
+
tasks(":sdks:python:test-suites:portable:py${lowestSupported}:preCommitPy${lowestSupported}")
commonJobProperties.setGradleSwitches(delegate)
}
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
-
tasks(':sdks:python:test-suites:portable:${highestSupported}:preCommitPy${highestSupported}')
+
tasks(":sdks:python:test-suites:portable:py${highestSupported}:preCommitPy${highestSupported}")
commonJobProperties.setGradleSwitches(delegate)
}
}
diff --git a/build.gradle.kts b/build.gradle.kts
index f94f1622632..613d4097b6b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -535,18 +535,6 @@ tasks.register("python311PostCommit") {
dependsOn(":sdks:python:test-suites:portable:py311:postCommitPy311")
}
-task("python37SickbayPostCommit") {
- dependsOn(":sdks:python:test-suites:dataflow:py37:postCommitSickbay")
-}
-
-task("python38SickbayPostCommit") {
- dependsOn(":sdks:python:test-suites:dataflow:py38:postCommitSickbay")
-}
-
-task("python39SickbayPostCommit") {
- dependsOn(":sdks:python:test-suites:dataflow:py39:postCommitSickbay")
-}
-
tasks.register("portablePythonPreCommit") {
dependsOn(":sdks:python:test-suites:portable:py37:preCommitPy37")
dependsOn(":sdks:python:test-suites:portable:py311:preCommitPy311")
diff --git a/sdks/java/container/license_scripts/requirement.txt
b/sdks/java/container/license_scripts/requirement.txt
index 954315cd0f9..d978cb27ef8 100644
--- a/sdks/java/container/license_scripts/requirement.txt
+++ b/sdks/java/container/license_scripts/requirement.txt
@@ -18,4 +18,4 @@
beautifulsoup4>=4.9.0,<5.0
pyyaml>=3.12,<6.0.0
-tenacity>=5.0.2,<6.0
+tenacity>=6.1.0,<9.0
