From 4aceea41fd90b45077a8ebb5a86a792122105cea Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 4 Oct 2021 17:41:48 -0400 Subject: [PATCH] Update licensce test to work with newer pip --- awx/main/tests/functional/test_licenses.py | 15 +++++++++------ .../licenses/{tacacs-plus.txt => tacacs_plus.txt} | 0 2 files changed, 9 insertions(+), 6 deletions(-) rename docs/licenses/{tacacs-plus.txt => tacacs_plus.txt} (100%) diff --git a/awx/main/tests/functional/test_licenses.py b/awx/main/tests/functional/test_licenses.py index 8ff2e72bfe..d59ec0e45f 100644 --- a/awx/main/tests/functional/test_licenses.py +++ b/awx/main/tests/functional/test_licenses.py @@ -9,6 +9,8 @@ try: except ImportError: from pip.req import parse_requirements +from pip._internal.req.constructors import parse_req_from_line + def test_python_and_js_licenses(): def index_licenses(path): @@ -53,15 +55,16 @@ def test_python_and_js_licenses(): fname = '%s/%s' % (path, req_file) for reqt in parse_requirements(fname, session=''): - name = reqt.name - version = str(reqt.specifier) + parsed_requirement = parse_req_from_line(reqt.requirement, None) + name = parsed_requirement.requirement.name + version = str(parsed_requirement.requirement.specifier) if version.startswith('=='): version = version[2:] - if reqt.link: - if str(reqt.link).startswith(('http://', 'https://')): - (name, version) = str(reqt.req).split('==', 1) + if parsed_requirement.link: + if str(parsed_requirement.link).startswith(('http://', 'https://')): + (name, version) = str(parsed_requirement.requirement).split('==', 1) else: - (name, version) = reqt.link.filename.split('@', 1) + (name, version) = parsed_requirement.link.filename.split('@', 1) if name.endswith('.git'): name = name[:-4] if name == 'receptor': diff --git a/docs/licenses/tacacs-plus.txt b/docs/licenses/tacacs_plus.txt similarity index 100% rename from docs/licenses/tacacs-plus.txt rename to docs/licenses/tacacs_plus.txt