From 39ca6b272a6171b040dbfad35fef4be24eff34f0 Mon Sep 17 00:00:00 2001 From: Grey Baker Date: Tue, 5 Jun 2018 14:56:14 +0100 Subject: [PATCH 1/2] Fix typo (actually_resolve_reps -> actually_resolve_deps) --- pipenv/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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, From 83e1ba9a2d816758ccb6a5682693eecf85eacfef Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 6 Jun 2018 01:35:19 -0400 Subject: [PATCH 2/2] Don't search for requirements.txt if using pipfile - Also don't search for requirements.txt if taking in a package name - Fixes #2222 Signed-off-by: Dan Ryan --- pipenv/core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(