Vendor in Pip 24.0

news/6117.vendor.rst

@@ -0,0 +1 @@
+Vendor in ``pip==24.0``

pipenv/patched/patched.txt

@@ -1,2 +1,2 @@
-pip==23.3.2
+pip==24.0
 safety==2.3.2

pipenv/patched/pip/__init__.py

@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "23.3.2"
+__version__ = "24.0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

pipenv/patched/pip/_internal/cli/cmdoptions.py

@@ -582,10 +582,7 @@ def _handle_python_version(
  """
  version_info, error_msg = _convert_python_version(value)
  if error_msg is not None:
- msg = "invalid --python-version value: {!r}: {}".format(
- value,
- error_msg,
- )
+ msg = f"invalid --python-version value: {value!r}: {error_msg}"
  raise_option_error(parser, option=option, msg=msg)
 
  parser.values.python_version = version_info
@@ -921,9 +918,9 @@ def _handle_merge_hash(
  algo, digest = value.split(":", 1)
  except ValueError:
  parser.error(
- "Arguments to {} must be a hash name "
+ f"Arguments to {opt_str} must be a hash name "
  "followed by a value, like --hash=sha256:"
- "abcde...".format(opt_str)
+ "abcde..."
  )
  if algo not in STRONG_HASHES:
  parser.error(

pipenv/patched/pip/_internal/cli/parser.py

@@ -229,9 +229,9 @@ def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]:
  val = strtobool(val)
  except ValueError:
  self.error(
- "{} is not a valid value for {} option, "
+ f"{val} is not a valid value for {key} option, "
  "please specify a boolean value like yes/no, "
- "true/false or 1/0 instead.".format(val, key)
+ "true/false or 1/0 instead."
  )
  elif option.action == "count":
  with suppress(ValueError):
@@ -240,10 +240,10 @@ def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]:
  val = int(val)
  if not isinstance(val, int) or val < 0:
  self.error(
- "{} is not a valid value for {} option, "
+ f"{val} is not a valid value for {key} option, "
  "please instead specify either a non-negative integer "
  "or a boolean value like yes/no or false/true "
- "which is equivalent to 1/0.".format(val, key)
+ "which is equivalent to 1/0."
  )
  elif option.action == "append":
  val = val.split()

pipenv/patched/pip/_internal/commands/cache.py

@@ -175,7 +175,7 @@ def remove_cache_items(self, options: Values, args: List[Any]) -> None:
  files += self._find_http_files(options)
  else:
  # Add the pattern to the log message
- no_matching_msg += ' for pattern "{}"'.format(args[0])
+ no_matching_msg += f' for pattern "{args[0]}"'
 
  if not files:
  logger.warning(no_matching_msg)

pipenv/patched/pip/_internal/commands/configuration.py

@@ -242,17 +242,15 @@ def open_in_editor(self, options: Values, args: List[str]) -> None:
  e.filename = editor
  raise
  except subprocess.CalledProcessError as e:
- raise PipError(
- "Editor Subprocess exited with exit code {}".format(e.returncode)
- )
+ raise PipError(f"Editor Subprocess exited with exit code {e.returncode}")
 
  def _get_n_args(self, args: List[str], example: str, n: int) -> Any:
  """Helper to make sure the command got the right number of arguments"""
  if len(args) != n:
  msg = (
- "Got unexpected number of arguments, expected {}. "
- '(example: "{} config {}")'
- ).format(n, get_prog(), example)
+ f"Got unexpected number of arguments, expected {n}. "
+ f'(example: "{get_prog()} config {example}")'
+ )
  raise PipError(msg)
 
  if n == 1:

pipenv/patched/pip/_internal/commands/debug.py

@@ -95,7 +95,7 @@ def show_actual_vendor_versions(vendor_txt_versions: Dict[str, str]) -> None:
  elif parse_version(actual_version) != parse_version(expected_version):
  extra_message = (
  " (CONFLICT: vendor.txt suggests version should"
- " be {})".format(expected_version)
+ f" be {expected_version})"
  )
  logger.info("%s==%s%s", module_name, actual_version, extra_message)
 
@@ -120,7 +120,7 @@ def show_tags(options: Values) -> None:
  if formatted_target:
  suffix = f" (target: {formatted_target})"
 
- msg = "Compatible tags: {}{}".format(len(tags), suffix)
+ msg = f"Compatible tags: {len(tags)}{suffix}"
  logger.info(msg)
 
  if options.verbose < 1 and len(tags) > tag_limit:
@@ -134,9 +134,7 @@ def show_tags(options: Values) -> None:
  logger.info(str(tag))
 
  if tags_limited:
- msg = (
- "...\n[First {tag_limit} tags shown. Pass --verbose to show all.]"
- ).format(tag_limit=tag_limit)
+ msg = f"...\n[First {tag_limit} tags shown. Pass --verbose to show all.]"
  logger.info(msg)
 
 

pipenv/patched/pip/_internal/commands/index.py

@@ -128,12 +128,12 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
 
  if not versions:
  raise DistributionNotFound(
- "No matching distribution found for {}".format(query)
+ f"No matching distribution found for {query}"
  )
 
  formatted_versions = [str(ver) for ver in sorted(versions, reverse=True)]
  latest = formatted_versions[0]
 
- write_output("{} ({})".format(query, latest))
+ write_output(f"{query} ({latest})")
  write_output("Available versions: {}".format(", ".join(formatted_versions)))
  print_dist_installation_info(query, latest)

pipenv/patched/pip/_internal/commands/install.py

@@ -607,12 +607,8 @@ def _warn_about_conflicts(
  version = package_set[project_name][0]
  for dependency in missing[project_name]:
  message = (
- "{name} {version} requires {requirement}, "
+ f"{project_name} {version} requires {dependency[1]}, "
  "which is not installed."
- ).format(
- name=project_name,
- version=version,
- requirement=dependency[1],
  )
  parts.append(message)
 

pipenv/patched/pip/_internal/configuration.py

@@ -59,8 +59,8 @@ def _disassemble_key(name: str) -> List[str]:
  if "." not in name:
  error_message = (
  "Key does not contain dot separated section and key. "
- "Perhaps you wanted to use 'global.{}' instead?"
- ).format(name)
+ f"Perhaps you wanted to use 'global.{name}' instead?"
+ )
  raise ConfigurationError(error_message)
  return name.split(".", 1)
 
@@ -327,33 +327,35 @@ def get_environ_vars(self) -> Iterable[Tuple[str, str]]:
  def iter_config_files(self) -> Iterable[Tuple[Kind, List[str]]]:
  """Yields variant and configuration files associated with it.
 
- This should be treated like items of a dictionary.
+ This should be treated like items of a dictionary. The order
+ here doesn't affect what gets overridden. That is controlled
+ by OVERRIDE_ORDER. However this does control the order they are
+ displayed to the user. It's probably most ergononmic to display
+ things in the same order as OVERRIDE_ORDER
  """
  # SMELL: Move the conditions out of this function
 
- # environment variables have the lowest priority
- config_file = os.environ.get("PIP_CONFIG_FILE", None)
- if config_file is not None:
- yield kinds.ENV, [config_file]
- else:
- yield kinds.ENV, []
-
+ env_config_file = os.environ.get("PIP_CONFIG_FILE", None)
  config_files = get_configuration_files()
 
- # at the base we have any global configuration
  yield kinds.GLOBAL, config_files[kinds.GLOBAL]
 
- # per-user configuration next
+ # per-user config is not loaded when env_config_file exists
  should_load_user_config = not self.isolated and not (
- config_file and os.path.exists(config_file)
+ env_config_file and os.path.exists(env_config_file)
  )
  if should_load_user_config:
  # The legacy config file is overridden by the new config file
  yield kinds.USER, config_files[kinds.USER]
 
- # finally virtualenv configuration first trumping others
+ # virtualenv config
  yield kinds.SITE, config_files[kinds.SITE]
 
+ if env_config_file is not None:
+ yield kinds.ENV, [env_config_file]
+ else:
+ yield kinds.ENV, []
+
  def get_values_in_config(self, variant: Kind) -> Dict[str, Any]:
  """Get values present in a config file"""
  return self._config[variant]

pipenv/patched/pip/_internal/exceptions.py

@@ -247,10 +247,7 @@ def __init__(
  def __str__(self) -> str:
  # Use `dist` in the error message because its stringification
  # includes more information, like the version and location.
- return "None {} metadata found for distribution: {}".format(
- self.metadata_name,
- self.dist,
- )
+ return f"None {self.metadata_name} metadata found for distribution: {self.dist}"
 
 
 class UserInstallationInvalid(InstallationError):
@@ -594,7 +591,7 @@ def __init__(self, allowed: Dict[str, List[str]], gots: Dict[str, "_Hash"]) -> N
  self.gots = gots
 
  def body(self) -> str:
- return " {}:\n{}".format(self._requirement_name(), self._hash_comparison())
+ return f" {self._requirement_name()}:\n{self._hash_comparison()}"
 
  def _hash_comparison(self) -> str:
  """
@@ -616,11 +613,9 @@ def hash_then_or(hash_name: str) -> "chain[str]":
  lines: List[str] = []
  for hash_name, expecteds in self.allowed.items():
  prefix = hash_then_or(hash_name)
- lines.extend(
- (" Expected {} {}".format(next(prefix), e)) for e in expecteds
- )
+ lines.extend((f" Expected {next(prefix)} {e}") for e in expecteds)
  lines.append(
- " Got {}\n".format(self.gots[hash_name].hexdigest())
+ f" Got {self.gots[hash_name].hexdigest()}\n"
  )
  return "\n".join(lines)
 

pipenv/patched/pip/_internal/index/collector.py

@@ -478,6 +478,7 @@ def collect_sources(
  page_validator=self.session.is_secure_origin,
  expand_dir=False,
  cache_link_parsing=False,
+ project_name=project_name,
  )
  for loc in self.search_scope.get_index_urls_locations(project_name)
  ).values()
@@ -488,6 +489,7 @@ def collect_sources(
  page_validator=self.session.is_secure_origin,
  expand_dir=True,
  cache_link_parsing=True,
+ project_name=project_name,
  )
  for loc in self.find_links
  ).values()

pipenv/patched/pip/_internal/index/package_finder.py

@@ -542,8 +542,8 @@ def _sort_key(
  except ValueError:
  if not ignore_compatibility:
  raise UnsupportedWheel(
- "{} is not a supported wheel for this platform. It "
- "can't be sorted.".format(wheel.filename)
+ f"{wheel.filename} is not a supported wheel for this platform. It "
+ "can't be sorted."
  )
  pri = -support_num
  if self._prefer_binary:
@@ -952,9 +952,7 @@ def _format_versions(cand_iter: Iterable[InstallationCandidate]) -> str:
  _format_versions(best_candidate_result.iter_all()),
  )
 
- raise DistributionNotFound(
- "No matching distribution found for {}".format(req)
- )
+ raise DistributionNotFound(f"No matching distribution found for {req}")
 
  def _should_install_candidate(
  candidate: Optional[InstallationCandidate],