comment: suggestions from rickeylev

aignas · aignas · commit 3fd01c2b8560 · 2023-07-13T08:51:35.000+09:00
diff --git a/python/extensions/private/requirements.bzl.tmpl b/python/extensions/private/requirements.bzl.tmpl
@@ -33,7 +33,7 @@ def dist_info_requirement(name):
     return "%%MACRO_TMPL%%".format(_clean_name(name), "dist_info")
 
 def entry_point(pkg, script = None):
-    """entry_point returns the target of the canonical label of the package entry points.
+    """Returns a select() expression to locate the version-specific entry point.
     """
     selects = _entry_point(
         tmpl = "@@%%NAME%%//{pkg}/bin_py{version_label}:{script}",
@@ -45,4 +45,7 @@ def entry_point(pkg, script = None):
     if selects == None:
         fail("Package '{}' does not exist, select one from: {}".format(pkg, _packages.keys()))
 
+    # NOTE: We return a select() expression instead of an alias to such an expression
+    # to avoid having to eagerly load all versions of the wheel. See
+    # https://github.com/bazelbuild/rules_python/issues/1262 for discussion.
     return select(selects)
diff --git a/python/pip_install/tools/wheel_installer/wheel_installer.py b/python/pip_install/tools/wheel_installer/wheel_installer.py
@@ -391,7 +391,7 @@ def _extract_wheel(
         contents = textwrap.dedent(
             """\
         \"\"\"
-        This file contains the entrypoint script names as a dict, where the keys
+        This file contains the entry_point script names as a dict, where the keys
         are the script names and the values are the target names.
 
         generated by @rules_python//python/pip_install/tools/wheel_installer/wheel_installer.py
diff --git a/tests/pip_hub_repository/entry_point/BUILD.bazel b/tests/pip_hub_repository/entry_point/BUILD.bazel
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load(":entry_point_test.bzl", "entrypoint_test_suite")
+load(":entry_point_test.bzl", "entry_point_test_suite")
 
-entrypoint_test_suite(name = "entrypoint_tests")
+entry_point_test_suite(name = "entry_point_tests")
diff --git a/tests/pip_hub_repository/entry_point/entry_point_test.bzl b/tests/pip_hub_repository/entry_point/entry_point_test.bzl
@@ -29,7 +29,7 @@ def _label(label_str):
 
 _tests = []
 
-def _test_unknown_entrypoint_returns_none(env):
+def _test_unknown_entry_point_returns_none(env):
     actual = entry_point(
         pkg = "foo",
         packages = {},
@@ -45,7 +45,7 @@ def _test_unknown_entrypoint_returns_none(env):
     # None to the dict subject.
     env.expect.that_int(actual).equals(want)
 
-_tests.append(_test_unknown_entrypoint_returns_none)
+_tests.append(_test_unknown_entry_point_returns_none)
 
 def _test_constraint_values_are_set_correctly(env):
     actual = entry_point(
@@ -85,7 +85,7 @@ def _test_template_is_interpolated_correctly(env):
 
 _tests.append(_test_template_is_interpolated_correctly)
 
-def entrypoint_test_suite(name):
+def entry_point_test_suite(name):
     """Create the test suite.
 
     Args:
