chore: extra code removals before 1.0 (#2421) Alternatives have existed for a long time and we just ensure that we remove before the 1.0 release. Summary: - remove pip_install_dependencies - remove DEFAULT_PYTHON_VERSION from interpreters.bzl Work towards #1361
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a73766..4c6a08d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md
@@ -97,7 +97,10 @@ {#v0-0-0-removed} ### Removed -* Nothing removed. +* (pypi): Remove `pypi_install_dependencies` macro that has been included in + {bzl:obj}`py_repositories` for a long time. +* (bzlmod): Remove `DEFAULT_PYTHON_VERSION` from `interpreters.bzl` file. If + you need the version, please use it from the `versions.bzl` file instead. {#v0-40-0} ## [0.40.0] - 2024-11-17
diff --git a/examples/bzlmod/MODULE.bazel.lock b/examples/bzlmod/MODULE.bazel.lock index 59d04d8..9cad595 100644 --- a/examples/bzlmod/MODULE.bazel.lock +++ b/examples/bzlmod/MODULE.bazel.lock
@@ -1562,7 +1562,7 @@ }, "@@rules_python~//python/extensions:pip.bzl%pip": { "general": { - "bzlTransitiveDigest": "pwyX8REqPzcGLCGxpBHKvPiXm+kZooA+w1EfP3jA0Dc=", + "bzlTransitiveDigest": "i5dWUNj1rZ4NKXmzLiGceV+1gAsDWtpJED1w1tdB7WY=", "usagesDigest": "VmrNvB/4EhzsYieLDka9584M+pYKPpjNLl3Wcb5rx/c=", "recordedFileInputs": { "@@//requirements_lock_3_10.txt": "5e7083982a7e60f34998579a0ae83b520d46ab8f2552cc51337217f024e6def5", @@ -7035,7 +7035,7 @@ }, "@@rules_python~//python/private/pypi:pip.bzl%pip_internal": { "general": { - "bzlTransitiveDigest": "XbkLEmpZ7PqBehe0QCZ4xvdtEesh5rpQLTvZg/+zWyI=", + "bzlTransitiveDigest": "ltVKFX5LXgwSpZtjuyF02xZspYIWHEFmpxmzvnyMbQ8=", "usagesDigest": "/lZXl/ZgP+u5PE8WkeWTyYBsvX9XQWFn1antj5qrBzQ=", "recordedFileInputs": { "@@rules_python~//tools/publish/requirements_linux.txt": "8175b4c8df50ae2f22d1706961884beeb54e7da27bd2447018314a175981997d",
diff --git a/python/pip_install/BUILD.bazel b/python/pip_install/BUILD.bazel index 683199f..09bc46e 100644 --- a/python/pip_install/BUILD.bazel +++ b/python/pip_install/BUILD.bazel
@@ -35,14 +35,6 @@ deps = ["//python/private/pypi:pip_compile_bzl"], ) -bzl_library( - name = "repositories_bzl", - srcs = ["repositories.bzl"], - deps = [ - "//python/private/pypi:deps_bzl", - ], -) - filegroup( name = "distribution", srcs = glob(["**"]),
diff --git a/python/pip_install/repositories.bzl b/python/pip_install/repositories.bzl deleted file mode 100644 index 5231d1f..0000000 --- a/python/pip_install/repositories.bzl +++ /dev/null
@@ -1,19 +0,0 @@ -# Copyright 2023 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"" - -load("//python/private/pypi:deps.bzl", "pypi_deps") - -pip_install_dependencies = pypi_deps
diff --git a/python/private/pythons_hub.bzl b/python/private/pythons_hub.bzl index 8afee5a..ac928ff 100644 --- a/python/private/pythons_hub.bzl +++ b/python/private/pythons_hub.bzl
@@ -86,7 +86,6 @@ INTERPRETER_LABELS = {{ {interpreter_labels} }} -DEFAULT_PYTHON_VERSION = "{default_python_version}" """ _line_for_hub_template = """\ @@ -125,8 +124,6 @@ rctx.file( "interpreters.bzl", _interpreters_bzl_template.format( - # TODO @aignas 2024-09-28: before 1.0 remove the value from here - default_python_version = rctx.attr.default_python_version, interpreter_labels = interpreter_labels, ), executable = False,
diff --git a/tests/integration/pip_parse/WORKSPACE b/tests/integration/pip_parse/WORKSPACE index db0cd0c..e31655d 100644 --- a/tests/integration/pip_parse/WORKSPACE +++ b/tests/integration/pip_parse/WORKSPACE
@@ -7,15 +7,6 @@ py_repositories() -# This call is included in `py_repositories` and we are calling -# `pip_install_dependencies` only to ensure that we are not breaking really old -# code. -# -# TODO @aignas 2024-06-23: remove this before 1.0.0 -load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies") - -pip_install_dependencies() - python_register_toolchains( name = "python39", python_version = "3.9",