Revert some unnecessary changes

apache · Sep 11, 2024 · b608b1b · b608b1b
1 parent 769ecf8
commit b608b1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 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
@@ -2977,12 +2977,8 @@ class BeamModulePlugin implements Plugin<Project> {
             // 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.
-            // TODO: https://github.com/apache/beam/issues/32431
-            // Some packages failed on tag check on pip-24.2. We will need to update
-            // them to the latest version (e.g. xgboost) or wait for a new version (e.g. grpcio)
-            // before unpinning pip.
             args '-c', ". ${project.ext.envdir}/bin/activate && " +
-                "pip install --pre --retries 10 pip==24.1 --no-cache-dir && " +
+                "pip install --pre --retries 10 --upgrade pip --no-cache-dir && " +
                 "pip install --pre --retries 10 --upgrade tox --no-cache-dir"
           }
         }

diff --git a/sdks/python/pyproject.toml b/sdks/python/pyproject.toml
@@ -34,9 +34,7 @@ requires = [
     'pyyaml>=3.12,<7.0.0',
     # also update Jinja2 bounds in test-suites/xlang/build.gradle (look for xlangWrapperValidation task)
     "jinja2>=2.7.1,<4.0.0",
-    'yapf==0.29.0',
-    # TODO: unpin this after resolving blockers in https://github.com/apache/beam/issues/32431
-    "pip<=24.1",
+    'yapf==0.29.0'
 ]