From aef756f1aff4073a1f779669a1809ecbb96f9684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?McCoy=20Pati=C3=B1o?= <39780829+mccoyp@users.noreply.github.com> Date: Fri, 19 Aug 2022 17:13:32 -0700 Subject: [PATCH] Catch InvalidRequirement error --- scripts/devops_tasks/tox_harness.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/devops_tasks/tox_harness.py b/scripts/devops_tasks/tox_harness.py index a235b02f5f5e..78b56774e6e4 100644 --- a/scripts/devops_tasks/tox_harness.py +++ b/scripts/devops_tasks/tox_harness.py @@ -28,6 +28,7 @@ from ci_tools.parsing import ParsedSetup from ci_tools.build import create_package +from packaging.requirements import InvalidRequirement from pkg_resources import parse_requirements, RequirementParseError import logging @@ -210,7 +211,7 @@ def inject_custom_reqs(file, injected_packages, package_dir): for line in f: try: parsed_req = [req for req in parse_requirements(line)] - except RequirementParseError as e: + except (RequirementParseError, InvalidRequirement) as e: parsed_req = [None] req_lines.append((line, parsed_req)) @@ -461,4 +462,4 @@ def prep_and_run_tox(targeted_packages, parsed_args, options_array=[]): if not parsed_args.disablecov: collect_tox_coverage_files(targeted_packages) - sys.exit(return_code) \ No newline at end of file + sys.exit(return_code)