From 8f5f6a1aa1a99640483d067f84fcf7719d9e6c38 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 8 Aug 2019 20:11:34 +0200 Subject: [PATCH] tools: update lint.py to work with pip 10+ some more (#2273) main() and InstallRequirement were also removed from the public API. --- tools/lint/lint.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/lint/lint.py b/tools/lint/lint.py index cac68bf25a..b4a18e77f0 100755 --- a/tools/lint/lint.py +++ b/tools/lint/lint.py @@ -5,11 +5,12 @@ import argparse import inflect import os -import pip try: - from pip._internal.req import parse_requirements + from pip._internal import main as pip + from pip._internal.req import parse_requirements, InstallRequirement except ImportError: - from pip.req import parse_requirements + from pip import main as pip + from pip.req import parse_requirements, InstallRequirement import sys ie = inflect.engine() @@ -18,14 +19,14 @@ try: __import__('yaml') except ImportError: for item in parse_requirements("./tools/lint/requirements.txt", session="test262"): - if isinstance(item, pip.req.InstallRequirement): + if isinstance(item, InstallRequirement): requirement = item.name if len(str(item.req.specifier)) > 0: requirement = "{}{}".format(requirement, item.req.specifier) # print(requirement) - pip.main(['install', requirement]) + pip(['install', requirement]) from lib.collect_files import collect_files