Fix merge errors and rename to "exclude-newer-than"

Author: notatallshaw

src/pip/_internal/cli/cmdoptions.py

@@ -798,31 +798,32 @@ def _handle_dependency_group(
 )
 
 
-def _handle_upload_before(
+def _handle_exclude_newer_than(
     option: Option, opt: str, value: str, parser: OptionParser
 ) -> None:
     """
-    Process a value provided for the --upload-before option.
+    Process a value provided for the --exclude-newer-than option.
 
-    This is an optparse.Option callback for the --upload-before option.
+    This is an optparse.Option callback for the --exclude-newer-than option.
     """
     if value is None:
         return None
-    upload_before = datetime.datetime.fromisoformat(value)
+    exclude_newer_than = datetime.datetime.fromisoformat(value)
     # Assume local timezone if no offset is given in the ISO string.
-    if upload_before.tzinfo is None:
-        upload_before = upload_before.astimezone()
-    parser.values.upload_before = upload_before
+    if exclude_newer_than.tzinfo is None:
+        exclude_newer_than = exclude_newer_than.astimezone()
+    parser.values.exclude_newer_than = exclude_newer_than
 
 
-upload_before: Callable[..., Option] = partial(
+exclude_newer_than: Callable[..., Option] = partial(
     Option,
-    "--upload-before",
-    dest="upload_before",
+    "--exclude-newer-than",
+    dest="exclude_newer_than",
     metavar="datetime",
     action="callback",
-    callback=_handle_upload_before,
-    help="Skip uploads after given time. This should be an ISO 8601 string.",
+    callback=_handle_exclude_newer_than,
+    type="str",
+    help="Exclude packages newer than given time. This should be an ISO 8601 string.",
 )
 
 no_build_isolation: Callable[..., Option] = partial(

src/pip/_internal/cli/req_command.py

@@ -5,6 +5,9 @@
 PackageFinder machinery and all its vendored dependencies, etc.
 """
 
+from __future__ import annotations
+
+import datetime
 import logging
 from functools import partial
 from optparse import Values
@@ -326,7 +329,7 @@ def _build_package_finder(
         session: PipSession,
         target_python: TargetPython | None = None,
         ignore_requires_python: bool | None = None,
-        upload_before: datetime.datetime | None = None,
+        exclude_newer_than: datetime.datetime | None = None,
     ) -> PackageFinder:
         """
         Create a package finder appropriate to this requirement command.
@@ -347,5 +350,5 @@ def _build_package_finder(
             link_collector=link_collector,
             selection_prefs=selection_prefs,
             target_python=target_python,
-            upload_before=upload_before,
+            exclude_newer_than=exclude_newer_than,
         )

src/pip/_internal/commands/download.py

@@ -51,7 +51,7 @@ def add_options(self) -> None:
         self.cmd_opts.add_option(cmdoptions.no_use_pep517())
         self.cmd_opts.add_option(cmdoptions.check_build_deps())
         self.cmd_opts.add_option(cmdoptions.ignore_requires_python())
-        self.cmd_opts.add_option(cmdoptions.upload_before())
+        self.cmd_opts.add_option(cmdoptions.exclude_newer_than())
 
         self.cmd_opts.add_option(
             "-d",
@@ -94,7 +94,7 @@ def run(self, options: Values, args: list[str]) -> int:
             session=session,
             target_python=target_python,
             ignore_requires_python=options.ignore_requires_python,
-            upload_before=options.upload_before,
+            exclude_newer_than=options.exclude_newer_than,
         )
 
         build_tracker = self.enter_context(get_build_tracker())

src/pip/_internal/commands/index.py

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 import datetime
+import json
 import logging
 from collections.abc import Iterable
 from optparse import Values
@@ -38,7 +41,7 @@ def add_options(self) -> None:
         cmdoptions.add_target_python_options(self.cmd_opts)
 
         self.cmd_opts.add_option(cmdoptions.ignore_requires_python())
-        self.cmd_opts.add_option(cmdoptions.upload_before())
+        self.cmd_opts.add_option(cmdoptions.exclude_newer_than())
         self.cmd_opts.add_option(cmdoptions.pre())
         self.cmd_opts.add_option(cmdoptions.json())
         self.cmd_opts.add_option(cmdoptions.no_binary())
@@ -85,7 +88,7 @@ def _build_package_finder(
         session: PipSession,
         target_python: TargetPython | None = None,
         ignore_requires_python: bool | None = None,
-        upload_before: datetime.datetime | None = None,
+        exclude_newer_than: datetime.datetime | None = None,
     ) -> PackageFinder:
         """
         Create a package finder appropriate to the index command.
@@ -103,7 +106,7 @@ def _build_package_finder(
             link_collector=link_collector,
             selection_prefs=selection_prefs,
             target_python=target_python,
-            upload_before=upload_before,
+            exclude_newer_than=exclude_newer_than,
         )
 
     def get_available_package_versions(self, options: Values, args: list[Any]) -> None:
@@ -119,7 +122,7 @@ def get_available_package_versions(self, options: Values, args: list[Any]) -> No
                 session=session,
                 target_python=target_python,
                 ignore_requires_python=options.ignore_requires_python,
-                upload_before=options.upload_before,
+                exclude_newer_than=options.exclude_newer_than,
             )
 
             versions: Iterable[Version] = (

src/pip/_internal/commands/install.py

@@ -207,7 +207,7 @@ def add_options(self) -> None:
             ),
         )
 
-        self.cmd_opts.add_option(cmdoptions.upload_before())
+        self.cmd_opts.add_option(cmdoptions.exclude_newer_than())
         self.cmd_opts.add_option(cmdoptions.ignore_requires_python())
         self.cmd_opts.add_option(cmdoptions.no_build_isolation())
         self.cmd_opts.add_option(cmdoptions.use_pep517())
@@ -345,7 +345,7 @@ def run(self, options: Values, args: list[str]) -> int:
             session=session,
             target_python=target_python,
             ignore_requires_python=options.ignore_requires_python,
-            upload_before=options.upload_before,
+            exclude_newer_than=options.exclude_newer_than,
         )
         build_tracker = self.enter_context(get_build_tracker())
 

src/pip/_internal/commands/list.py

@@ -145,8 +145,8 @@ def handle_pip_version_check(self, options: Values) -> None:
     def _build_package_finder(
         self,
         options: Values,
-        session: "PipSession",
-    ) -> "PackageFinder":
+        session: PipSession,
+    ) -> PackageFinder:
         """
         Create a package finder appropriate to this list command.
         """

src/pip/_internal/commands/wheel.py

@@ -64,7 +64,7 @@ def add_options(self) -> None:
         self.cmd_opts.add_option(cmdoptions.requirements())
         self.cmd_opts.add_option(cmdoptions.src())
         self.cmd_opts.add_option(cmdoptions.ignore_requires_python())
-        self.cmd_opts.add_option(cmdoptions.upload_before())
+        self.cmd_opts.add_option(cmdoptions.exclude_newer_than())
         self.cmd_opts.add_option(cmdoptions.no_deps())
         self.cmd_opts.add_option(cmdoptions.progress_bar())
 
@@ -107,7 +107,7 @@ def run(self, options: Values, args: list[str]) -> int:
         finder = self._build_package_finder(
             options=options,
             session=session,
-            upload_before=options.upload_before,
+            exclude_newer_than=options.exclude_newer_than,
         )
 
         options.wheel_dir = normalize_path(options.wheel_dir)

src/pip/_internal/index/package_finder.py

@@ -1,5 +1,7 @@
 """Routines related to PyPI, indexes"""
+from __future__ import annotations
 
+import datetime
 import enum
 import functools
 import itertools
@@ -131,7 +133,7 @@ def __init__(
         target_python: TargetPython,
         allow_yanked: bool,
         ignore_requires_python: Optional[bool] = None,
-        upload_before: Optional[datetime.datetime] = None,
+        exclude_newer_than: Optional[datetime.datetime] = None,
     ) -> None:
         """
         :param project_name: The user supplied package name.
@@ -149,7 +151,7 @@ def __init__(
         :param ignore_requires_python: Whether to ignore incompatible
             PEP 503 "data-requires-python" values in HTML links. Defaults
             to False.
-        :param upload_before: If set, only allow links prior to the given date.
+        :param exclude_newer_than: If set, only allow links prior to the given date.
         """
         if ignore_requires_python is None:
             ignore_requires_python = False
@@ -159,7 +161,7 @@ def __init__(
         self._ignore_requires_python = ignore_requires_python
         self._formats = formats
         self._target_python = target_python
-        self._upload_before = upload_before
+        self._exclude_newer_than = exclude_newer_than
 
         self.project_name = project_name
 
@@ -178,9 +180,9 @@ def evaluate_link(self, link: Link) -> tuple[LinkType, str]:
             reason = link.yanked_reason or "<none given>"
             return (LinkType.yanked, f"yanked for reason: {reason}")
 
-        if link.upload_time is not None and self._upload_before is not None:
-            if link.upload_time > self._upload_before:
-                reason = f"Upload time {link.upload_time} after {self._upload_before}"
+        if link.upload_time is not None and self._exclude_newer_than is not None:
+            if link.upload_time > self._exclude_newer_than:
+                reason = f"Upload time {link.upload_time} after {self._exclude_newer_than}"
                 return (LinkType.upload_too_late, reason)
 
         if link.egg_fragment:
@@ -600,7 +602,7 @@ def __init__(
         format_control: Optional[FormatControl] = None,
         candidate_prefs: Optional[CandidatePreferences] = None,
         ignore_requires_python: Optional[bool] = None,
-        upload_before: Optional[datetime.datetime] = None,
+        exclude_newer_than: Optional[datetime.datetime] = None,
     ) -> None:
         """
         This constructor is primarily meant to be used by the create() class
@@ -622,7 +624,7 @@ def __init__(
         self._ignore_requires_python = ignore_requires_python
         self._link_collector = link_collector
         self._target_python = target_python
-        self._upload_before = upload_before
+        self._exclude_newer_than = exclude_newer_than
 
         self.format_control = format_control
 
@@ -646,7 +648,7 @@ def create(
         link_collector: LinkCollector,
         selection_prefs: SelectionPreferences,
         target_python: Optional[TargetPython] = None,
-        upload_before: Optional[datetime.datetime] = None,
+        exclude_newer_than: Optional[datetime.datetime] = None,
     ) -> "PackageFinder":
         """Create a PackageFinder.
 
@@ -655,7 +657,7 @@ def create(
         :param target_python: The target Python interpreter to use when
             checking compatibility. If None (the default), a TargetPython
             object will be constructed from the running Python.
-        :param upload_before: If set, only find links prior to the given date.
+        :param exclude_newer_than: If set, only find links prior to the given date.
         """
         if target_python is None:
             target_python = TargetPython()
@@ -672,7 +674,7 @@ def create(
             allow_yanked=selection_prefs.allow_yanked,
             format_control=selection_prefs.format_control,
             ignore_requires_python=selection_prefs.ignore_requires_python,
-            upload_before=upload_before,
+            exclude_newer_than=exclude_newer_than,
         )
 
     @property
@@ -751,7 +753,7 @@ def make_link_evaluator(self, project_name: str) -> LinkEvaluator:
             target_python=self._target_python,
             allow_yanked=self._allow_yanked,
             ignore_requires_python=self._ignore_requires_python,
-            upload_before=self._upload_before,
+            exclude_newer_than=self._exclude_newer_than,
         )
 
     def _sort_links(self, links: Iterable[Link]) -> list[Link]:

src/pip/_internal/models/link.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 import functools
 import itertools