From f164bae4a30f125d39872dc45cc3dfcdbb8ef328 Mon Sep 17 00:00:00 2001 From: iarspider Date: Mon, 8 Nov 2021 20:22:33 +0100 Subject: Python tests: skip importing weirdly-named modules (#27151) * Python tests: allow importing weirdly-named modules e.g. with dashes in name * SIP tests: allow importing weirdly-named modules * Skip modules with invalid names * Changes from review * Update from review * Update from review * Cleanup --- lib/spack/spack/build_systems/python.py | 3 +++ lib/spack/spack/build_systems/sip.py | 3 +++ 2 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index a308e77cb9..2d003f38e3 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import inspect import os +import re import shutil import llnl.util.tty as tty @@ -144,6 +145,8 @@ class PythonPackage(PackageBase): modules.append(path.replace(root + os.sep, '', 1).replace( '.py', '').replace('/', '.')) + modules = [mod for mod in modules if re.match('[a-zA-Z0-9._]+$', mod)] + tty.debug('Detected the following modules: {0}'.format(modules)) return modules diff --git a/lib/spack/spack/build_systems/sip.py b/lib/spack/spack/build_systems/sip.py index 814aa2605b..49fdd621ee 100644 --- a/lib/spack/spack/build_systems/sip.py +++ b/lib/spack/spack/build_systems/sip.py @@ -5,6 +5,7 @@ import inspect import os +import re import llnl.util.tty as tty from llnl.util.filesystem import find, join_path, working_dir @@ -81,6 +82,8 @@ class SIPPackage(PackageBase): modules.append(path.replace(root + os.sep, '', 1).replace( '.py', '').replace('/', '.')) + modules = [mod for mod in modules if re.match('[a-zA-Z0-9._]+$', mod)] + tty.debug('Detected the following modules: {0}'.format(modules)) return modules -- cgit v1.2.3-70-g09d2