summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Ingram <di@users.noreply.github.com>2019-04-18 15:41:18 -0500
committerDustin Ingram <di@users.noreply.github.com>2019-04-18 15:41:18 -0500
commitc3100aecf05dfc39c4ab8cdb39f94bdf85bd198d (patch)
tree3160be625aed82fe9c6a2b6e83a57db8cc438106
parentbccda86a4eb6c4c1f3600040f23e781e39a9f199 (diff)
downloadisort-c3100aecf05dfc39c4ab8cdb39f94bdf85bd198d.tar.gz
Use pip-api instead of importing pip
-rw-r--r--isort/finders.py14
-rwxr-xr-xsetup.py2
2 files changed, 5 insertions, 11 deletions
diff --git a/isort/finders.py b/isort/finders.py
index 75fe79a3..c7e24b62 100644
--- a/isort/finders.py
+++ b/isort/finders.py
@@ -20,15 +20,9 @@ except ImportError:
pipreqs = None
try:
- # pip>=10
- from pip._internal.download import PipSession
- from pip._internal.req import parse_requirements
+ from pip_api import parse_requirements
except ImportError:
- try:
- from pip.download import PipSession
- from pip.req import parse_requirements
- except ImportError:
- parse_requirements = None
+ parse_requirements = None
try:
from requirementslib import Pipfile
@@ -325,8 +319,8 @@ class RequirementsFinder(ReqsBaseFinder):
result = []
with chdir(os.path.dirname(path)):
- requirements = parse_requirements(path, session=PipSession())
- for req in requirements:
+ requirements = parse_requirements(path)
+ for req in requirements.values():
if req.name:
result.append(req.name)
diff --git a/setup.py b/setup.py
index e48e97a9..810a5aaf 100755
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ setup(name='isort',
extras_require={
'pipfile': ['pipreqs', 'requirementslib'],
'pyproject': ['toml'],
- 'requirements': ['pip', 'pipreqs'],
+ 'requirements': ['pip', 'pipreqs', 'pip-api'],
'xdg_home': ['appdirs>=1.4.0'],
},
python_requires=">=3.4",