From 18f9bd2315b67d9e18f0af78ec7b9f4ec1357826 Mon Sep 17 00:00:00 2001 From: Anand Inguva Date: Mon, 16 Oct 2023 16:04:33 -0400 Subject: [PATCH 1/2] Add no-cache-dir to tox install --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 3cea900278a8..85d4e3de65a1 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -2963,9 +2963,12 @@ class BeamModulePlugin implements Plugin { } project.exec { executable 'sh' + // TODO: https://github.com/apache/beam/issues/29022 + // pip 23.3 is failing due to Hash mismatch between expected SHA of the packaged and actual SHA. + // until it is resolved on pip's side, don't use pip's cache. args '-c', ". ${project.ext.envdir}/bin/activate && " + - "pip install --pre --retries 10 --upgrade pip && " + - "pip install --pre --retries 10 --upgrade tox" + "pip install --pre --retries 10 --upgrade pip --no-cache-dir && " + + "pip install --pre --retries 10 --upgrade tox --no-cache-dir" } } // Gradle will delete outputs whenever it thinks they are stale. Putting a From 4b533f69f2364d5ac9140c16ebf678063f98d277 Mon Sep 17 00:00:00 2001 From: Anand Inguva Date: Mon, 16 Oct 2023 17:17:49 -0400 Subject: [PATCH 2/2] Temp change --- sdks/python/apache_beam/ml/transforms/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/python/apache_beam/ml/transforms/base.py b/sdks/python/apache_beam/ml/transforms/base.py index 49ce6e9ec1e0..a0bc4a906100 100644 --- a/sdks/python/apache_beam/ml/transforms/base.py +++ b/sdks/python/apache_beam/ml/transforms/base.py @@ -33,8 +33,8 @@ TransformedMetadataT = TypeVar('TransformedMetadataT') # Input/Output types to the MLTransform. -ExampleT = TypeVar('ExampleT') MLTransformOutputT = TypeVar('MLTransformOutputT') +ExampleT = TypeVar('ExampleT') # Input to the apply() method of BaseOperation. OperationInputT = TypeVar('OperationInputT')