kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into requirementtxt-fix

Browse Source
This commit is contained in:
Tzu-ping Chung
2018-06-08 00:57:27 +08:00
committed by GitHub
parent 83e1ba9a2d 066dc938bb
commit 0d5ab61760
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/utils.py
+3 -3
View File
@@ -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,