diff --git a/pipenv/core.py b/pipenv/core.py index 504ce47e..da39de5e 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -1779,7 +1779,8 @@ def do_install( keep_outdated = True more_packages = more_packages or [] # Don't search for requirements.txt files if the user provides one - skip_requirements = True if requirements else False + if requirements or package_name or project.pipfile_exists: + skip_requirements = True concurrent = (not sequential) # Ensure that virtualenv is available. ensure_project( diff --git a/pipenv/utils.py b/pipenv/utils.py index 7aff3d3d..913cc88d 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -217,7 +217,7 @@ def prepare_pip_source_args(sources, pip_args=None): return pip_args -def actually_resolve_reps( +def actually_resolve_deps( deps, index_lookup, markers_lookup, project, sources, verbose, clear, pre, req_dir=None ): from .patched.notpip._internal import basecommand @@ -389,7 +389,7 @@ def resolve_deps( req_dir = TemporaryDirectory(prefix='pipenv-', suffix='-requirements') with HackedPythonVersion(python_version=python, python_path=python_path): try: - resolved_tree, resolver = actually_resolve_reps( + resolved_tree, resolver = actually_resolve_deps( deps, index_lookup, markers_lookup, @@ -412,7 +412,7 @@ def resolve_deps( try: # Attempt to resolve again, with different Python version information, # particularly for particularly particular packages. - resolved_tree, resolver = actually_resolve_reps( + resolved_tree, resolver = actually_resolve_deps( deps, index_lookup, markers_lookup,