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

skip dep resolution when ireq is None

Browse Source 
#1653

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
This commit is contained in:
Kenneth Reitz
2018-03-10 07:52:39 -05:00
parent f8f838a9f0
commit 9fbf6f4d2d
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pipfile.lock
Generated
+1
View File
@@ -214,6 +214,7 @@
"hashes": [
"sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff"
],
"markers": "python_version == '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*'",
"version": "==0.6.0"
},
"py": {
pipenv/patched/piptools/repositories/pypi.py
+20 -18
View File
@@ -162,27 +162,29 @@ class PyPIRepository(BaseRepository):
def get_dependencies(self, ireq):
json_results = set()
json_raised = False
if self.use_json:
if ireq:
if self.use_json:
try:
json_results = self.get_json_dependencies(ireq)
except TypeError:
json_raised = True
json_results = set()
legacy_raised = False
try:
json_results = self.get_json_dependencies(ireq)
except TypeError:
json_raised = True
json_results = set()
legacy_results = self.get_legacy_dependencies(ireq)
except Exception:
legacy_raised = True
legacy_results = set()
legacy_raised = False
try:
legacy_results = self.get_legacy_dependencies(ireq)
except Exception:
legacy_raised = True
legacy_results = set()
if all((legacy_raised, json_raised)):
raise ValueError(
'Your dependencies could not be resolved.\n'
'Please run "$ pipenv-resolver {0!r} --verbose" to debug.'.format(str(ireq.req))
)
if all((legacy_raised, json_raised)):
raise ValueError(
'Your dependencies could not be resolved.\n'
'Please run "$ pipenv-resolver {0!r} --verbose" to debug.'.format(str(ireq.req))
)
json_results.update(legacy_results)
json_results.update(legacy_results)
return json_results
def get_legacy_dependencies(self, ireq):