Split apart the massive utils.py take 1.

pypa · Mar 17, 2022 · 620bb7c · 620bb7c
1 parent 893bb0b
commit 620bb7c
Show file tree

Hide file tree

Showing 16 changed files with 2,383 additions and 2,376 deletions.
diff --git a/pipenv/core.py b/pipenv/core.py
@@ -1031,10 +1031,7 @@ def do_lock(
         for k, v in lockfile[section].copy().items():
             if not hasattr(v, "keys"):
                 del lockfile[section][k]
-    # Ensure that develop inherits from default.
-    dev_packages = project.dev_packages.copy()
-    dev_packages = overwrite_dev(project.packages, dev_packages)
-    # Resolve dev-package dependencies, with pip-tools.
+    # Resolve dev-package dependencies followed by packages dependencies.
     for is_dev in [True, False]:
         pipfile_section = "dev-packages" if is_dev else "packages"
         if project.pipfile_exists:

diff --git a/pipenv/environment.py b/pipenv/environment.py
@@ -12,6 +12,7 @@
 import pkg_resources
 
 import pipenv
+import utils.indexes
 
 from pipenv.environments import is_type_checking
 from pipenv.utils import make_posix, normalize_path, subprocess_run
@@ -598,7 +599,7 @@ def get_finder(self, pre=False):
         from .vendor.pip_shims.shims import InstallCommand, get_package_finder
 
         pip_command = InstallCommand()
-        pip_args = self._modules["pipenv"].utils.prepare_pip_source_args(self.sources)
+        pip_args = utils.indexes.prepare_pip_source_args(self.sources)
         pip_options, _ = pip_command.parser.parse_args(pip_args)
         pip_options.cache_dir = self.project.s.PIPENV_CACHE_DIR
         pip_options.pre = self.pipfile.get("pre", pre)