Updated pip and packaging versions to work with free-threading packages

bazelbuild · Dec 21, 2024 · c0d36d4 · c0d36d4
1 parent 66a8b5b
commit c0d36d4
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 19 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -505,13 +505,13 @@ tasks:
     # right thing.
     - "echo '' > requirements_lock.txt"
     - "! git diff --exit-code"
-    - "bazel run //:requirements.update"
+    - "bazel run //:requirements.update -- --no-annotate"
     - "git diff --exit-code"
     # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
     # right thing.
     - "echo '' > requirements_lock_linux.txt"
     - "! git diff --exit-code"
-    - "bazel run //:os_specific_requirements.update"
+    - "bazel run //:os_specific_requirements.update -- --no-annotate"
     - "git diff --exit-code"
   integration_test_compile_pip_requirements_debian:
     <<: *reusable_build_test_all
@@ -523,13 +523,13 @@ tasks:
     # right thing.
     - "echo '' > requirements_lock.txt"
     - "! git diff --exit-code"
-    - "bazel run //:requirements.update"
+    - "bazel run //:requirements.update -- --no-annotate"
     - "git diff --exit-code"
     # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
     # right thing.
     - "echo '' > requirements_lock_linux.txt"
     - "! git diff --exit-code"
-    - "bazel run //:os_specific_requirements.update"
+    - "bazel run //:os_specific_requirements.update -- --no-annotate"
     - "git diff --exit-code"
   integration_test_compile_pip_requirements_macos:
     <<: *reusable_build_test_all
@@ -541,7 +541,7 @@ tasks:
     # right thing.
     - "echo '' > requirements_lock.txt"
     - "! git diff --exit-code"
-    - "bazel run //:requirements.update"
+    - "bazel run //:requirements.update -- --no-annotate"
     - "git diff --exit-code"
     # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
     # right thing.
@@ -559,13 +559,13 @@ tasks:
     # right thing.
     - "echo '' > requirements_lock.txt"
     - "! git diff --exit-code"
-    - "bazel run //:requirements.update"
+    - "bazel run //:requirements.update -- --no-annotate"
     - "git diff --exit-code"
     # Make a change to the locked requirements and then assert that //:os_specific_requirements.update does the
     # right thing.
     - "echo '' > requirements_lock_windows.txt"
     - "! git diff --exit-code"
-    - "bazel run //:os_specific_requirements.update"
+    - "bazel run //:os_specific_requirements.update -- --no-annotate"
     - "git diff --exit-code"
 
 

diff --git a/python/private/pypi/deps.bzl b/python/private/pypi/deps.bzl
@@ -51,8 +51,8 @@ _RULE_DEPS = [
     ),
     (
         "pypi__packaging",
-        "https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl",
-        "2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
+        "https://files.pythonhosted.org/packages/88/ef/eb23f262cca3c0c4eb7ab1933c3b1f03d021f2c48f54763065b6f0e321be/packaging-24.2-py3-none-any.whl",
+        "09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759",
     ),
     (
         "pypi__pep517",
@@ -61,8 +61,8 @@ _RULE_DEPS = [
     ),
     (
         "pypi__pip",
-        "https://files.pythonhosted.org/packages/8a/6a/19e9fe04fca059ccf770861c7d5721ab4c2aebc539889e97c7977528a53b/pip-24.0-py3-none-any.whl",
-        "ba0d021a166865d2265246961bec0152ff124de910c5cc39f1156ce3fa7c69dc",
+        "https://files.pythonhosted.org/packages/ef/7d/500c9ad20238fcfcb4cb9243eede163594d7020ce87bd9610c9e02771876/pip-24.3.1-py3-none-any.whl",
+        "3790624780082365f47549d032f3770eeb2b1e8bd1f7b2e02dace1afa361b4ed",
     ),
     (
         "pypi__pip_tools",

diff --git a/python/private/pypi/evaluate_markers.bzl b/python/private/pypi/evaluate_markers.bzl
@@ -20,7 +20,7 @@ load(":pypi_repo_utils.bzl", "pypi_repo_utils")
 SRCS = [
     # When the version, or any of the files in `packaging` package changes,
     # this file will change as well.
-    Label("@pypi__packaging//:packaging-24.0.dist-info/RECORD"),
+    Label("@pypi__packaging//:packaging-24.2.dist-info/RECORD"),
     Label("//python/private/pypi/requirements_parser:resolve_target_platforms.py"),
     Label("//python/private/pypi/whl_installer:platform.py"),
 ]

diff --git a/tests/integration/compile_pip_requirements/BUILD.bazel b/tests/integration/compile_pip_requirements/BUILD.bazel
@@ -26,6 +26,7 @@ compile_pip_requirements(
         "requirements.in",
         "requirements_extra.in",
     ],
+    extra_args = ["--no-annotate"],
     requirements_txt = "requirements_lock.txt",
 )
 
@@ -36,6 +37,7 @@ compile_pip_requirements(
         "requirements.in",
         "requirements_extra.in",
     ],
+    extra_args = ["--no-annotate"],
     generate_hashes = False,
     requirements_txt = "requirements_nohashes_lock.txt",
 )
@@ -60,6 +62,7 @@ compile_pip_requirements(
         "requirements_extra.in",
         "requirements_os_specific.in",
     ],
+    extra_args = ["--no-annotate"],
     requirements_darwin = "requirements_lock_darwin.txt",
     requirements_linux = "requirements_lock_linux.txt",
     requirements_txt = "requirements_lock.txt",

diff --git a/tests/integration/compile_pip_requirements/requirements_lock.txt b/tests/integration/compile_pip_requirements/requirements_lock.txt
@@ -9,8 +9,6 @@
 pip==22.3.1 \
     --hash=sha256:65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38 \
     --hash=sha256:908c78e6bc29b676ede1c4d57981d490cb892eb45cd8c214ab6298125119e077
-    # via -r requirements.in
 setuptools==65.6.3 \
     --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \
     --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75
-    # via -r requirements_extra.in
diff --git a/tests/integration/compile_pip_requirements/requirements_lock_darwin.txt b/tests/integration/compile_pip_requirements/requirements_lock_darwin.txt
@@ -9,4 +9,3 @@
 pip==22.2.2 ; sys_platform == "darwin" \
     --hash=sha256:3fd1929db052f056d7a998439176d3333fa1b3f6c1ad881de1885c0717608a4b \
     --hash=sha256:b61a374b5bc40a6e982426aede40c9b5a08ff20e640f5b56977f4f91fed1e39a
-    # via -r requirements_os_specific.in
diff --git a/tests/integration/compile_pip_requirements/requirements_lock_linux.txt b/tests/integration/compile_pip_requirements/requirements_lock_linux.txt
@@ -9,4 +9,3 @@
 pip==22.3 ; sys_platform == "linux" \
     --hash=sha256:1daab4b8d3b97d1d763caeb01a4640a2250a0ea899e257b1e44b9eded91e15ab \
     --hash=sha256:8182aec21dad6c0a49a2a3d121a87cd524b950e0b6092b181625f07ebdde7530
-    # via -r requirements_os_specific.in
diff --git a/tests/integration/compile_pip_requirements/requirements_lock_windows.txt b/tests/integration/compile_pip_requirements/requirements_lock_windows.txt
@@ -9,4 +9,3 @@
 pip==22.2.1 ; sys_platform == "win32" \
     --hash=sha256:0bbbc87dfbe6eed217beff0021f8b7dea04c8f4a0baa9d31dc4cff281ffc5b2b \
     --hash=sha256:50516e47a2b79e77446f0d05649f0d53772c192571486236b1905492bfc24bac
-    # via -r requirements_os_specific.in
diff --git a/tests/integration/compile_pip_requirements/requirements_nohashes_lock.txt b/tests/integration/compile_pip_requirements/requirements_nohashes_lock.txt
@@ -7,6 +7,4 @@
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==22.3.1
-    # via -r requirements.in
 setuptools==65.6.3
-    # via -r requirements_extra.in