diff options
6759 files changed, 11321 insertions, 9684 deletions
diff --git a/lib/spack/docs/developer_guide.rst b/lib/spack/docs/developer_guide.rst index 179ec40267..671e6900f5 100644 --- a/lib/spack/docs/developer_guide.rst +++ b/lib/spack/docs/developer_guide.rst @@ -151,7 +151,7 @@ Package-related modules ^^^^^^^^^^^^^^^^^^^^^^^ :mod:`spack.package` - Contains the :class:`~spack.package.Package` class, which + Contains the :class:`~spack.package_base.Package` class, which is the superclass for all packages in Spack. Methods on ``Package`` implement all phases of the :ref:`package lifecycle <package-lifecycle>` and manage the build process. diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 4633ef25a8..d0aab3b3a9 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2393,9 +2393,9 @@ Influence how dependents are built or run Spack provides a mechanism for dependencies to influence the environment of their dependents by overriding the -:meth:`setup_dependent_run_environment <spack.package.PackageBase.setup_dependent_run_environment>` +:meth:`setup_dependent_run_environment <spack.package_base.PackageBase.setup_dependent_run_environment>` or the -:meth:`setup_dependent_build_environment <spack.package.PackageBase.setup_dependent_build_environment>` +:meth:`setup_dependent_build_environment <spack.package_base.PackageBase.setup_dependent_build_environment>` methods. The Qt package, for instance, uses this call: @@ -2417,7 +2417,7 @@ will have the ``PYTHONPATH``, ``PYTHONHOME`` and ``PATH`` environment variables set appropriately before starting the installation. To make things even simpler the ``python setup.py`` command is also inserted into the module scope of dependents by overriding a third method called -:meth:`setup_dependent_package <spack.package.PackageBase.setup_dependent_package>` +:meth:`setup_dependent_package <spack.package_base.PackageBase.setup_dependent_package>` : .. literalinclude:: _spack_root/var/spack/repos/builtin/packages/python/package.py @@ -3022,7 +3022,7 @@ The classes that are currently provided by Spack are: +----------------------------------------------------------+----------------------------------+ | **Base Class** | **Purpose** | +==========================================================+==================================+ -| :class:`~spack.package.Package` | General base class not | +| :class:`~spack.package_base.Package` | General base class not | | | specialized for any build system | +----------------------------------------------------------+----------------------------------+ | :class:`~spack.build_systems.makefile.MakefilePackage` | Specialized class for packages | @@ -3153,7 +3153,7 @@ for the install phase is: For those not used to Python instance methods, this is the package itself. In this case it's an instance of ``Foo``, which extends ``Package``. For API docs on Package objects, see - :py:class:`Package <spack.package.Package>`. + :py:class:`Package <spack.package_base.Package>`. ``spec`` This is the concrete spec object created by Spack from an diff --git a/lib/spack/spack/analyzers/libabigail.py b/lib/spack/spack/analyzers/libabigail.py index 25c18d7294..92e2faee0e 100644 --- a/lib/spack/spack/analyzers/libabigail.py +++ b/lib/spack/spack/analyzers/libabigail.py @@ -12,7 +12,7 @@ import spack.bootstrap import spack.error import spack.hooks import spack.monitor -import spack.package +import spack.package_base import spack.repo import spack.util.executable diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 6b461cf672..ae961a695b 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -55,7 +55,7 @@ import spack.build_systems.meson import spack.config import spack.install_test import spack.main -import spack.package +import spack.package_base import spack.paths import spack.platforms import spack.repo @@ -722,7 +722,7 @@ def get_std_cmake_args(pkg): package were a CMakePackage instance. Args: - pkg (spack.package.PackageBase): package under consideration + pkg (spack.package_base.PackageBase): package under consideration Returns: list: arguments for cmake @@ -738,7 +738,7 @@ def get_std_meson_args(pkg): package were a MesonPackage instance. Args: - pkg (spack.package.PackageBase): package under consideration + pkg (spack.package_base.PackageBase): package under consideration Returns: list: arguments for meson @@ -748,12 +748,12 @@ def get_std_meson_args(pkg): def parent_class_modules(cls): """ - Get list of superclass modules that descend from spack.package.PackageBase + Get list of superclass modules that descend from spack.package_base.PackageBase Includes cls.__module__ """ - if (not issubclass(cls, spack.package.PackageBase) or - issubclass(spack.package.PackageBase, cls)): + if (not issubclass(cls, spack.package_base.PackageBase) or + issubclass(spack.package_base.PackageBase, cls)): return [] result = [] module = sys.modules.get(cls.__module__) @@ -771,7 +771,7 @@ def load_external_modules(pkg): associated with them. Args: - pkg (spack.package.PackageBase): package to load deps for + pkg (spack.package_base.PackageBase): package to load deps for """ for dep in list(pkg.spec.traverse()): external_modules = dep.external_modules or [] @@ -1109,7 +1109,7 @@ def start_build_process(pkg, function, kwargs): Args: - pkg (spack.package.PackageBase): package whose environment we should set up the + pkg (spack.package_base.PackageBase): package whose environment we should set up the child process for. function (typing.Callable): argless function to run in the child process. @@ -1234,7 +1234,7 @@ def get_package_context(traceback, context=3): if 'self' in frame.f_locals: # Find the first proper subclass of PackageBase. obj = frame.f_locals['self'] - if isinstance(obj, spack.package.PackageBase): + if isinstance(obj, spack.package_base.PackageBase): break # We found obj, the Package implementation we care about. diff --git a/lib/spack/spack/build_systems/aspell_dict.py b/lib/spack/spack/build_systems/aspell_dict.py index 7967fb9fa7..5927973906 100644 --- a/lib/spack/spack/build_systems/aspell_dict.py +++ b/lib/spack/spack/build_systems/aspell_dict.py @@ -9,7 +9,7 @@ from llnl.util.filesystem import filter_file from spack.build_systems.autotools import AutotoolsPackage from spack.directives import extends -from spack.package import ExtensionError +from spack.package_base import ExtensionError from spack.util.executable import which diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index 08c65bcda2..6909fda1b4 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -16,7 +16,7 @@ from llnl.util.filesystem import force_remove, working_dir from spack.build_environment import InstallError from spack.directives import conflicts, depends_on from spack.operating_systems.mac_os import macos_version -from spack.package import PackageBase, run_after, run_before +from spack.package_base import PackageBase, run_after, run_before from spack.util.executable import Executable from spack.version import Version diff --git a/lib/spack/spack/build_systems/cached_cmake.py b/lib/spack/spack/build_systems/cached_cmake.py index e5e96186eb..47b95f6f89 100644 --- a/lib/spack/spack/build_systems/cached_cmake.py +++ b/lib/spack/spack/build_systems/cached_cmake.py @@ -8,7 +8,7 @@ import llnl.util.tty as tty from llnl.util.filesystem import install, mkdirp from spack.build_systems.cmake import CMakePackage -from spack.package import run_after +from spack.package_base import run_after def cmake_cache_path(name, value, comment=""): diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index 105e9d5ab8..265341344a 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -18,7 +18,7 @@ from llnl.util.filesystem import working_dir import spack.build_environment from spack.directives import conflicts, depends_on, variant -from spack.package import InstallError, PackageBase, run_after +from spack.package_base import InstallError, PackageBase, run_after from spack.util.path import convert_to_posix_path # Regex to extract the primary generator from the CMake generator diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index e8810a471f..312f2d8f46 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -6,7 +6,7 @@ import spack.variant from spack.directives import conflicts, depends_on, variant from spack.multimethod import when -from spack.package import PackageBase +from spack.package_base import PackageBase class CudaPackage(PackageBase): diff --git a/lib/spack/spack/build_systems/gnu.py b/lib/spack/spack/build_systems/gnu.py index 6ac38065e5..2bca018872 100644 --- a/lib/spack/spack/build_systems/gnu.py +++ b/lib/spack/spack/build_systems/gnu.py @@ -3,14 +3,16 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import spack.package +from typing import Optional + +import spack.package_base import spack.util.url -class GNUMirrorPackage(spack.package.PackageBase): +class GNUMirrorPackage(spack.package_base.PackageBase): """Mixin that takes care of setting url and mirrors for GNU packages.""" #: Path of the package in a GNU mirror - gnu_mirror_path = None + gnu_mirror_path = None # type: Optional[str] #: List of GNU mirrors used by Spack base_mirrors = [ diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index ad60456fb2..aeb3f861c1 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -26,7 +26,7 @@ from llnl.util.filesystem import ( import spack.error from spack.build_environment import dso_suffix -from spack.package import InstallError, PackageBase, run_after +from spack.package_base import InstallError, PackageBase, run_after from spack.util.environment import EnvironmentModifications from spack.util.executable import Executable from spack.util.prefix import Prefix @@ -1115,7 +1115,7 @@ class IntelPackage(PackageBase): raise InstallError('compilers_of_client arg required for MPI') def setup_dependent_package(self, module, dep_spec): - # https://spack.readthedocs.io/en/latest/spack.html#spack.package.PackageBase.setup_dependent_package + # https://spack.readthedocs.io/en/latest/spack.html#spack.package_base.PackageBase.setup_dependent_package # Reminder: "module" refers to Python module. # Called before the install() method of dependents. diff --git a/lib/spack/spack/build_systems/lua.py b/lib/spack/spack/build_systems/lua.py index 3a836de012..ed71aac9e9 100644 --- a/lib/spack/spack/build_systems/lua.py +++ b/lib/spack/spack/build_systems/lua.py @@ -10,7 +10,7 @@ from llnl.util.filesystem import find from spack.directives import depends_on, extends from spack.multimethod import when -from spack.package import PackageBase +from spack.package_base import PackageBase from spack.util.executable import Executable diff --git a/lib/spack/spack/build_systems/makefile.py b/lib/spack/spack/build_systems/makefile.py index 75574a6130..be5986da33 100644 --- a/lib/spack/spack/build_systems/makefile.py +++ b/lib/spack/spack/build_systems/makefile.py @@ -11,7 +11,7 @@ import llnl.util.tty as tty from llnl.util.filesystem import working_dir from spack.directives import conflicts -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class MakefilePackage(PackageBase): diff --git a/lib/spack/spack/build_systems/maven.py b/lib/spack/spack/build_systems/maven.py index bd0b36655f..ffa67346ab 100644 --- a/lib/spack/spack/build_systems/maven.py +++ b/lib/spack/spack/build_systems/maven.py @@ -7,7 +7,7 @@ from llnl.util.filesystem import install_tree, working_dir from spack.directives import depends_on -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after from spack.util.executable import which diff --git a/lib/spack/spack/build_systems/meson.py b/lib/spack/spack/build_systems/meson.py index 1baeca171a..9e3bbf20c8 100644 --- a/lib/spack/spack/build_systems/meson.py +++ b/lib/spack/spack/build_systems/meson.py @@ -11,7 +11,7 @@ from typing import List # novm from llnl.util.filesystem import working_dir from spack.directives import depends_on, variant -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class MesonPackage(PackageBase): diff --git a/lib/spack/spack/build_systems/octave.py b/lib/spack/spack/build_systems/octave.py index a7c6dc570b..13dd864e3b 100644 --- a/lib/spack/spack/build_systems/octave.py +++ b/lib/spack/spack/build_systems/octave.py @@ -6,7 +6,7 @@ import inspect from spack.directives import extends -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class OctavePackage(PackageBase): diff --git a/lib/spack/spack/build_systems/oneapi.py b/lib/spack/spack/build_systems/oneapi.py index d8120b5293..76c69acd5e 100644 --- a/lib/spack/spack/build_systems/oneapi.py +++ b/lib/spack/spack/build_systems/oneapi.py @@ -14,7 +14,7 @@ from os.path import basename, dirname, isdir from llnl.util.filesystem import find_headers, find_libraries, join_path -from spack.package import Package +from spack.package_base import Package from spack.util.environment import EnvironmentModifications from spack.util.executable import Executable diff --git a/lib/spack/spack/build_systems/perl.py b/lib/spack/spack/build_systems/perl.py index ab5f7a4d46..60530abd05 100644 --- a/lib/spack/spack/build_systems/perl.py +++ b/lib/spack/spack/build_systems/perl.py @@ -10,7 +10,7 @@ import os from llnl.util.filesystem import filter_file from spack.directives import extends -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after from spack.util.executable import Executable diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index fd836afe92..d72b9c5a8d 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -6,6 +6,7 @@ import inspect import os import re import shutil +from typing import Optional import llnl.util.tty as tty from llnl.util.filesystem import ( @@ -19,13 +20,13 @@ from llnl.util.filesystem import ( from llnl.util.lang import match_predicate from spack.directives import depends_on, extends -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class PythonPackage(PackageBase): """Specialized class for packages that are built using pip.""" #: Package name, version, and extension on PyPI - pypi = None + pypi = None # type: Optional[str] maintainers = ['adamjstewart'] @@ -46,7 +47,7 @@ class PythonPackage(PackageBase): # package manually depends_on('py-wheel', type='build') - py_namespace = None + py_namespace = None # type: Optional[str] @staticmethod def _std_args(cls): diff --git a/lib/spack/spack/build_systems/qmake.py b/lib/spack/spack/build_systems/qmake.py index 3272602f12..b2330ce963 100644 --- a/lib/spack/spack/build_systems/qmake.py +++ b/lib/spack/spack/build_systems/qmake.py @@ -9,7 +9,7 @@ import inspect from llnl.util.filesystem import working_dir from spack.directives import depends_on -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class QMakePackage(PackageBase): diff --git a/lib/spack/spack/build_systems/r.py b/lib/spack/spack/build_systems/r.py index 0c0cb48bbc..b1df2f594d 100644 --- a/lib/spack/spack/build_systems/r.py +++ b/lib/spack/spack/build_systems/r.py @@ -5,9 +5,10 @@ import inspect +from typing import Optional from spack.directives import extends -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class RPackage(PackageBase): @@ -28,10 +29,10 @@ class RPackage(PackageBase): # package attributes that can be expanded to set the homepage, url, # list_url, and git values # For CRAN packages - cran = None + cran = None # type: Optional[str] # For Bioconductor packages - bioc = None + bioc = None # type: Optional[str] maintainers = ['glennpj'] diff --git a/lib/spack/spack/build_systems/racket.py b/lib/spack/spack/build_systems/racket.py index 5bb4026cf4..1c9e8e84d8 100644 --- a/lib/spack/spack/build_systems/racket.py +++ b/lib/spack/spack/build_systems/racket.py @@ -3,13 +3,14 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +from typing import Optional import llnl.util.tty as tty from llnl.util.filesystem import working_dir from spack.build_environment import SPACK_NO_PARALLEL_MAKE, determine_number_of_jobs from spack.directives import extends -from spack.package import PackageBase +from spack.package_base import PackageBase from spack.util.environment import env_flag from spack.util.executable import Executable, ProcessError @@ -36,8 +37,8 @@ class RacketPackage(PackageBase): extends('racket') pkgs = False - subdirectory = None - name = None + subdirectory = None # type: Optional[str] + name = None # type: Optional[str] parallel = True @property diff --git a/lib/spack/spack/build_systems/rocm.py b/lib/spack/spack/build_systems/rocm.py index 65c51ff749..9a31c579fb 100644 --- a/lib/spack/spack/build_systems/rocm.py +++ b/lib/spack/spack/build_systems/rocm.py @@ -77,7 +77,7 @@ import spack.variant from spack.directives import conflicts, depends_on, variant -from spack.package import PackageBase +from spack.package_base import PackageBase class ROCmPackage(PackageBase): diff --git a/lib/spack/spack/build_systems/ruby.py b/lib/spack/spack/build_systems/ruby.py index 1fa14e923a..cec1116477 100644 --- a/lib/spack/spack/build_systems/ruby.py +++ b/lib/spack/spack/build_systems/ruby.py @@ -7,7 +7,7 @@ import glob import inspect from spack.directives import extends -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class RubyPackage(PackageBase): diff --git a/lib/spack/spack/build_systems/scons.py b/lib/spack/spack/build_systems/scons.py index 2c189840c5..55ae072085 100644 --- a/lib/spack/spack/build_systems/scons.py +++ b/lib/spack/spack/build_systems/scons.py @@ -7,7 +7,7 @@ import inspect from spack.directives import depends_on -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class SConsPackage(PackageBase): diff --git a/lib/spack/spack/build_systems/sip.py b/lib/spack/spack/build_systems/sip.py index b4be6ed5f2..bb039b2600 100644 --- a/lib/spack/spack/build_systems/sip.py +++ b/lib/spack/spack/build_systems/sip.py @@ -11,7 +11,7 @@ import llnl.util.tty as tty from llnl.util.filesystem import find, join_path, working_dir from spack.directives import depends_on, extends -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class SIPPackage(PackageBase): diff --git a/lib/spack/spack/build_systems/sourceforge.py b/lib/spack/spack/build_systems/sourceforge.py index ea0b408707..38032f6b1b 100644 --- a/lib/spack/spack/build_systems/sourceforge.py +++ b/lib/spack/spack/build_systems/sourceforge.py @@ -3,15 +3,17 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import spack.package +from typing import Optional + +import spack.package_base import spack.util.url -class SourceforgePackage(spack.package.PackageBase): +class SourceforgePackage(spack.package_base.PackageBase): """Mixin that takes care of setting url and mirrors for Sourceforge packages.""" #: Path of the package in a Sourceforge mirror - sourceforge_mirror_path = None + sourceforge_mirror_path = None # type: Optional[str] #: List of Sourceforge mirrors used by Spack base_mirrors = [ diff --git a/lib/spack/spack/build_systems/sourceware.py b/lib/spack/spack/build_systems/sourceware.py index bdf42e4947..a26ea345ee 100644 --- a/lib/spack/spack/build_systems/sourceware.py +++ b/lib/spack/spack/build_systems/sourceware.py @@ -2,16 +2,17 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from typing import Optional -import spack.package +import spack.package_base import spack.util.url -class SourcewarePackage(spack.package.PackageBase): +class SourcewarePackage(spack.package_base.PackageBase): """Mixin that takes care of setting url and mirrors for Sourceware.org packages.""" #: Path of the package in a Sourceware mirror - sourceware_mirror_path = None + sourceware_mirror_path = None # type: Optional[str] #: List of Sourceware mirrors used by Spack base_mirrors = [ diff --git a/lib/spack/spack/build_systems/waf.py b/lib/spack/spack/build_systems/waf.py index f40ec9f258..8a65f48ec4 100644 --- a/lib/spack/spack/build_systems/waf.py +++ b/lib/spack/spack/build_systems/waf.py @@ -9,7 +9,7 @@ import inspect from llnl.util.filesystem import working_dir from spack.directives import depends_on -from spack.package import PackageBase, run_after +from spack.package_base import PackageBase, run_after class WafPackage(PackageBase): diff --git a/lib/spack/spack/build_systems/xorg.py b/lib/spack/spack/build_systems/xorg.py index 0d0f80a7c5..246e830254 100644 --- a/lib/spack/spack/build_systems/xorg.py +++ b/lib/spack/spack/build_systems/xorg.py @@ -3,15 +3,17 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import spack.package +from typing import Optional + +import spack.package_base import spack.util.url -class XorgPackage(spack.package.PackageBase): +class XorgPackage(spack.package_base.PackageBase): """Mixin that takes care of setting url and mirrors for x.org packages.""" #: Path of the package in a x.org mirror - xorg_mirror_path = None + xorg_mirror_path = None # type: Optional[str] #: List of x.org mirrors used by Spack # Note: x.org mirrors are a bit tricky, since many are out-of-sync or off. diff --git a/lib/spack/spack/cmd/checksum.py b/lib/spack/spack/cmd/checksum.py index db431c5ed9..f88417dd2f 100644 --- a/lib/spack/spack/cmd/checksum.py +++ b/lib/spack/spack/cmd/checksum.py @@ -14,7 +14,7 @@ import spack.cmd.common.arguments as arguments import spack.repo import spack.stage import spack.util.crypto -from spack.package import preferred_version +from spack.package_base import preferred_version from spack.util.naming import valid_fully_qualified_module_name from spack.version import Version, ver diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index 94ddc7d292..1fcbb26f5d 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -57,7 +57,7 @@ package_template = '''\ # See the Spack documentation for more information on packaging. # ---------------------------------------------------------------------------- -from spack import * +from spack.package import * class {class_name}({base_class_name}): diff --git a/lib/spack/spack/cmd/dependencies.py b/lib/spack/spack/cmd/dependencies.py index 23aa12d9c5..b273c74297 100644 --- a/lib/spack/spack/cmd/dependencies.py +++ b/lib/spack/spack/cmd/dependencies.py @@ -11,7 +11,7 @@ from llnl.util.tty.colify import colify import spack.cmd import spack.cmd.common.arguments as arguments import spack.environment as ev -import spack.package +import spack.package_base import spack.repo import spack.store @@ -57,7 +57,7 @@ def dependencies(parser, args): else: spec = specs[0] - dependencies = spack.package.possible_dependencies( + dependencies = spack.package_base.possible_dependencies( spec, transitive=args.transitive, expand_virtuals=args.expand_virtuals, diff --git a/lib/spack/spack/cmd/external.py b/lib/spack/spack/cmd/external.py index 8b9c845c3e..a307b5e1ef 100644 --- a/lib/spack/spack/cmd/external.py +++ b/lib/spack/spack/cmd/external.py @@ -200,7 +200,7 @@ def external_list(args): list(spack.repo.path.all_packages()) # Print all the detectable packages tty.msg("Detectable packages per repository") - for namespace, pkgs in sorted(spack.package.detectable_packages.items()): + for namespace, pkgs in sorted(spack.package_base.detectable_packages.items()): print("Repository:", namespace) colify.colify(pkgs, indent=4, output=sys.stdout) diff --git a/lib/spack/spack/cmd/info.py b/lib/spack/spack/cmd/info.py index 7a086dc416..31ea53f384 100644 --- a/lib/spack/spack/cmd/info.py +++ b/lib/spack/spack/cmd/info.py @@ -18,7 +18,7 @@ import spack.cmd.common.arguments as arguments import spack.fetch_strategy as fs import spack.repo import spack.spec -from spack.package import has_test_method, preferred_version +from spack.package_base import has_test_method, preferred_version description = 'get detailed information on a particular package' section = 'basic' @@ -269,14 +269,14 @@ def print_tests(pkg): names = [] pkg_cls = pkg if inspect.isclass(pkg) else pkg.__class__ if has_test_method(pkg_cls): - pkg_base = spack.package.PackageBase + pkg_base = spack.package_base.PackageBase test_pkgs = [str(cls.test) for cls in inspect.getmro(pkg_cls) if issubclass(cls, pkg_base) and cls.test != pkg_base.test] test_pkgs = list(set(test_pkgs)) names.extend([(test.split()[1]).lower() for test in test_pkgs]) # TODO Refactor START - # Use code from package.py's test_process IF this functionality is + # Use code from package_base.py's test_process IF this functionality is # accepted. v_names = list(set([vspec.name for vspec in pkg.virtuals_provided])) diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index bab245f736..2781deb60c 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -302,7 +302,7 @@ environment variables: ) reporter = spack.report.collect_info( - spack.package.PackageInstaller, '_install_task', args.log_format, args) + spack.package_base.PackageInstaller, '_install_task', args.log_format, args) if args.log_file: reporter.filename = args.log_file diff --git a/lib/spack/spack/cmd/mark.py b/lib/spack/spack/cmd/mark.py index ae25ccbe88..da31917c39 100644 --- a/lib/spack/spack/cmd/mark.py +++ b/lib/spack/spack/cmd/mark.py @@ -12,7 +12,7 @@ from llnl.util import tty import spack.cmd import spack.cmd.common.arguments as arguments import spack.error -import spack.package +import spack.package_base import spack.repo import spack.store from spack.database import InstallStatuses diff --git a/lib/spack/spack/cmd/solve.py b/lib/spack/spack/cmd/solve.py index ba5cc218cb..29f96ba485 100644 --- a/lib/spack/spack/cmd/solve.py +++ b/lib/spack/spack/cmd/solve.py @@ -18,7 +18,7 @@ import spack.cmd.common.arguments as arguments import spack.config import spack.environment import spack.hash_types as ht -import spack.package +import spack.package_base import spack.solver.asp as asp description = "concretize a specs using an ASP solver" diff --git a/lib/spack/spack/cmd/style.py b/lib/spack/spack/cmd/style.py index 658e7e98cd..5c31228391 100644 --- a/lib/spack/spack/cmd/style.py +++ b/lib/spack/spack/cmd/style.py @@ -65,7 +65,7 @@ def is_package(f): packages, since we allow `from spack import *` and poking globals into packages. """ - return f.startswith("var/spack/repos/") + return f.startswith("var/spack/repos/") and f.endswith('package.py') #: decorator for adding tools to the list @@ -236,7 +236,7 @@ def rewrite_and_print_output( continue if not args.root_relative and re_obj: line = re_obj.sub(translate, line) - print(" " + line) + print(line) def print_style_header(file_list, args): @@ -290,20 +290,26 @@ def run_flake8(flake8_cmd, file_list, args): @tool("mypy") def run_mypy(mypy_cmd, file_list, args): # always run with config from running spack prefix - mypy_args = [ + common_mypy_args = [ "--config-file", os.path.join(spack.paths.prefix, "pyproject.toml"), - "--package", "spack", - "--package", "llnl", "--show-error-codes", ] - # not yet, need other updates to enable this - # if any([is_package(f) for f in file_list]): - # mypy_args.extend(["--package", "packages"]) + mypy_arg_sets = [common_mypy_args + [ + "--package", "spack", + "--package", "llnl", + ]] + if 'SPACK_MYPY_CHECK_PACKAGES' in os.environ: + mypy_arg_sets.append(common_mypy_args + [ + '--package', 'packages', + '--disable-error-code', 'no-redef', + ]) - output = mypy_cmd(*mypy_args, fail_on_error=False, output=str) - returncode = mypy_cmd.returncode + returncode = 0 + for mypy_args in mypy_arg_sets: + output = mypy_cmd(*mypy_args, fail_on_error=False, output=str) + returncode |= mypy_cmd.returncode - rewrite_and_print_output(output, args) + rewrite_and_print_output(output, args) print_tool_result("mypy", returncode) return returncode @@ -318,16 +324,29 @@ def run_isort(isort_cmd, file_list, args): pat = re.compile("ERROR: (.*) Imports are incorrectly sorted") replacement = "ERROR: {0} Imports are incorrectly sorted" - returncode = 0 - for chunk in grouper(file_list, 100): - packed_args = isort_args + tuple(chunk) - output = isort_cmd(*packed_args, fail_on_error=False, output=str, error=str) - returncode |= isort_cmd.returncode + returncode = [0] - rewrite_and_print_output(output, args, pat, replacement) + def process_files(file_list, is_args): + for chunk in grouper(file_list, 100): + packed_args = is_args + tuple(chunk) + output = isort_cmd(*packed_args, fail_on_error=False, output=str, error=str) + returncode[0] |= isort_cmd.returncode - print_tool_result("isort", returncode) - return returncode + rewrite_and_print_output(output, args, pat, replacement) + + packages_isort_args = ('--rm', 'spack', '--rm', 'spack.pkgkit', '--rm', + 'spack.package_defs', '-a', 'from spack.package import *') + packages_isort_args = packages_isort_args + isort_args + + # packages + process_files(filter(is_package, file_list), + packages_isort_args) + # non-packages + process_files(filter(lambda f: not is_package(f), file_list), + isort_args) + + print_tool_result("isort", returncode[0]) + return returncode[0] @tool("black") diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index 358fcb8846..51d23da429 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -20,7 +20,7 @@ import spack.cmd import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.install_test -import spack.package +import spack.package_base import spack.repo import spack.report @@ -189,7 +189,7 @@ environment variables: # Set up reporter setattr(args, 'package', [s.format() for s in test_suite.specs]) reporter = spack.report.collect_info( - spack.package.PackageBase, 'do_test', args.log_format, args) + spack.package_base.PackageBase, 'do_test', args.log_format, args) if not reporter.filename: if args.log_file: if os.path.isabs(args.log_file): @@ -217,7 +217,7 @@ def test_list(args): else set() def has_test_and_tags(pkg_class): - return spack.package.has_test_method(pkg_class) and \ + return spack.package_base.has_test_method(pkg_class) and \ (not args.tag or pkg_class.name in tagged) if args.list_all: diff --git a/lib/spack/spack/cmd/uninstall.py b/lib/spack/spack/cmd/uninstall.py index 37fe98d0d0..643be0044b 100644 --- a/lib/spack/spack/cmd/uninstall.py +++ b/lib/spack/spack/cmd/uninstall.py @@ -15,7 +15,7 @@ import spack.cmd import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.error -import spack.package +import spack.package_base import spack.repo import spack.store from spack.database import InstallStatuses @@ -221,7 +221,7 @@ def do_uninstall(env, specs, force): except spack.repo.UnknownEntityError: # The package.py file has gone away -- but still # want to uninstall. - spack.package.Package.uninstall_by_spec(item, force=True) + spack.package_base.Package.uninstall_by_spec(item, force=True) # A package is ready to be uninstalled when nothing else references it, # unless we are requested to force uninstall it. diff --git a/lib/spack/spack/cmd/url.py b/lib/spack/spack/cmd/url.py index d7710d684a..97fa300a3d 100644 --- a/lib/spack/spack/cmd/url.py +++ b/lib/spack/spack/cmd/url.py @@ -422,7 +422,7 @@ def url_list_parsing(args, urls, url, pkg): urls (set): List of URLs that have already been added url (str or None): A URL to potentially add to ``urls`` depending on ``args`` - pkg (spack.package.PackageBase): The Spack package + pkg (spack.package_base.PackageBase): The Spack package Returns: set: The updated set of ``urls`` @@ -470,7 +470,7 @@ def name_parsed_correctly(pkg, name): """Determine if the name of a package was correctly parsed. Args: - pkg (spack.package.PackageBase): The Spack package + pkg (spack.package_base.PackageBase): The Spack package name (str): The name that was extracted from the URL Returns: @@ -487,7 +487,7 @@ def version_parsed_correctly(pkg, version): """Determine if the version of a package was correctly parsed. Args: - pkg (spack.package.PackageBase): The Spack package + pkg (spack.package_base.PackageBase): The Spack package version (str): The version that was extracted from the URL Returns: diff --git a/lib/spack/spack/detection/common.py b/lib/spack/spack/detection/common.py index a8f0e82a87..813f235868 100644 --- a/lib/spack/spack/detection/common.py +++ b/lib/spack/spack/detection/common.py @@ -240,7 +240,7 @@ def compute_windows_program_path_for_package(pkg): program files location, return list of best guesses Args: - pkg (spack.package.Package): package for which + pkg (spack.package_base.Package): package for which Program Files location is to be computed """ if not is_windows: diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 378209308f..d1da1e6974 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -1556,7 +1556,7 @@ def _extrapolate(pkg, version): try: return URLFetchStrategy(pkg.url_for_version(version), fetch_options=pkg.fetch_options) - except spack.package.NoURLError: + except spack.package_base.NoURLError: msg = ("Can't extrapolate a URL for version %s " "because package %s defines no URLs") raise ExtrapolationError(msg % (version, pkg.name)) diff --git a/lib/spack/spack/installer.py b/lib/spack/spack/installer.py index 2e430b8a07..45ee08104b 100644 --- a/lib/spack/spack/installer.py +++ b/lib/spack/spack/installer.py @@ -50,7 +50,7 @@ import spack.compilers import spack.error import spack.hooks import spack.monitor -import spack.package +import spack.package_base import spack.package_prefs as prefs import spack.repo import spack.store @@ -103,7 +103,7 @@ def _check_last_phase(pkg): package already. Args: - pkg (spack.package.PackageBase): the package being installed + pkg (spack.package_base.PackageBase): the package being installed Raises: ``BadInstallPhase`` if stop_before or last phase is invalid @@ -125,7 +125,7 @@ def _handle_external_and_upstream(pkg, explicit): database if it is external package. Args: - pkg (spack.package.Package): the package whose installation is under + pkg (spack.package_base.Package): the package whose installation is under consideration explicit (bool): the package was explicitly requested by the user Return: @@ -265,7 +265,7 @@ def _install_from_cache(pkg, cache_only, explicit, unsigned=False): Extract the package from binary cache Args: - pkg (spack.package.PackageBase): the package to install from the binary cache + pkg (spack.package_base.PackageBase): package to install from the binary cache cache_only (bool): only extract from binary cache explicit (bool): ``True`` if installing the package was explicitly requested by the user, otherwise, ``False`` @@ -355,7 +355,7 @@ def _process_binary_cache_tarball(pkg, binary_spec, explicit, unsigned, Process the binary cache tarball. Args: - pkg (spack.package.PackageBase): the package being installed + pkg (spack.package_base.PackageBase): the package being installed binary_spec (spack.spec.Spec): the spec whose cache has been confirmed explicit (bool): the package was explicitly requested by the user unsigned (bool): ``True`` if binary package signatures to be checked, @@ -394,7 +394,7 @@ def _try_install_from_binary_cache(pkg, explicit, unsigned=False): Try to extract the package from binary cache. Args: - pkg (spack.package.PackageBase): the package to be extracted from binary cache + pkg (spack.package_base.PackageBase): package to be extracted from binary cache explicit (bool): the package was explicitly requested by the user unsigned (bool): ``True`` if binary package signatures to be checked, otherwise, ``False`` @@ -530,7 +530,7 @@ def log(pkg): Copy provenance into the install directory on success Args: - pkg (spack.package.Package): the package that was built and installed + pkg (spack.package_base.Package): the package that was built and installed """ packages_dir = spack.store.layout.build_packages_path(pkg.spec) @@ -616,7 +616,7 @@ def package_id(pkg): and packages for combinatorial environments. Args: - pkg (spack.package.PackageBase): the package from which the identifier is + pkg (spack.package_base.PackageBase): the package from which the identifier is derived """ if not pkg.spec.concrete: @@ -769,7 +769,7 @@ class PackageInstaller(object): Args: compiler: the compiler to boostrap architecture: the architecture for which to bootstrap the compiler - pkgs (spack.package.PackageBase): the package with possible compiler + pkgs (spack.package_base.PackageBase): the package with possible compiler dependencies request (BuildRequest): the associated install request all_deps (defaultdict(set)): dictionary of all dependencies and @@ -786,7 +786,7 @@ class PackageInstaller(object): Creates and queus the initial build task for the package. Args: - pkg (spack.package.Package): the package to be built and installed + pkg (spack.package_base.Package): the package to be built and installed request (BuildRequest or None): the associated install request where ``None`` can be used to indicate the package was explicitly requested by the user @@ -968,7 +968,7 @@ class PackageInstaller(object): Cleanup the build task for the spec Args: - pkg (spack.package.PackageBase): the package being installed + pkg (spack.package_base.PackageBase): the package being installed """ self._remove_task(package_id(pkg)) @@ -982,7 +982,7 @@ class PackageInstaller(object): already locked. Args: - pkg (spack.package.PackageBase): the package being locally installed + pkg (spack.package_base.PackageBase): the package being locally installed """ pkg_id = package_id(pkg) pre = "{0} cannot be installed locally:".format(pkg_id) @@ -1014,7 +1014,8 @@ class PackageInstaller(object): Args: lock_type (str): 'read' for a read lock, 'write' for a write lock - pkg (spack.package.PackageBase): the package whose spec is being installed + pkg (spack.package_base.PackageBase): the package whose spec is being + installed Return: (lock_type, lock) tuple where lock will be None if it could not @@ -1228,7 +1229,7 @@ class PackageInstaller(object): # Create a child process to do the actual installation. # Preserve verbosity settings across installs. - spack.package.PackageBase._verbose = ( + spack.package_base.PackageBase._verbose = ( spack.build_environment.start_build_process( pkg, build_process, install_args) ) @@ -1373,7 +1374,7 @@ class PackageInstaller(object): Write a small metadata file with the current spack environment. Args: - pkg (spack.package.Package): the package to be built and installed + pkg (spack.package_base.Package): the package to be built and installed """ if not os.path.exists(pkg.spec.prefix): tty.debug('Creating the installation directory {0}'.format(pkg.spec.prefix)) @@ -1447,7 +1448,7 @@ class PackageInstaller(object): known dependents. Args: - pkg (spack.package.Package): Package that has been installed locally, + pkg (spack.package_base.Package): Package that has been installed locally, externally or upstream dependent_ids (list or None): list of the package's dependent ids, or None if the dependent ids are limited to @@ -1536,7 +1537,7 @@ class PackageInstaller(object): Install the requested package(s) and or associated dependencies. Args: - pkg (spack.package.Package): the package to be built and installed""" + pkg (spack.package_base.Package): the package to be built and installed""" self._init_queue() fail_fast_err = 'Terminating after first install failure' @@ -1788,7 +1789,7 @@ class BuildProcessInstaller(object): process in the build. Arguments: - pkg (spack.package.PackageBase) the package being installed. + pkg (spack.package_base.PackageBase) the package being installed. install_args (dict) arguments to do_install() from parent process. """ @@ -1848,8 +1849,8 @@ class BuildProcessInstaller(object): # get verbosity from do_install() parameter or saved value self.echo = self.verbose - if spack.package.PackageBase._verbose is not None: - self.echo = spack.package.PackageBase._verbose + if spack.package_base.PackageBase._verbose is not None: + self.echo = spack.package_base.PackageBase._verbose self.pkg.stage.keep = self.keep_stage @@ -2001,7 +2002,7 @@ def build_process(pkg, install_args): This function's return value is returned to the parent process. Arguments: - pkg (spack.package.PackageBase): the package being installed. + pkg (spack.package_base.PackageBase): the package being installed. install_args (dict): arguments to do_install() from parent process. """ @@ -2049,7 +2050,7 @@ class BuildTask(object): Instantiate a build task for a package. Args: - pkg (spack.package.Package): the package to be built and installed + pkg (spack.package_base.Package): the package to be built and installed request (BuildRequest or None): the associated install request where ``None`` can be used to indicate the package was explicitly requested by the user @@ -2062,7 +2063,7 @@ class BuildTask(object): """ # Ensure dealing with a package that has a concrete spec - if not isinstance(pkg, spack.package.PackageBase): + if not isinstance(pkg, spack.package_base.PackageBase): raise ValueError("{0} must be a package".format(str(pkg))) self.pkg = pkg @@ -2240,11 +2241,11 @@ class BuildRequest(object): Instantiate a build request for a package. Args: - pkg (spack.package.Package): the package to be built and installed + pkg (spack.package_base.Package): the package to be built and installed install_args (dict): the install arguments associated with ``pkg`` """ # Ensure dealing with a package that has a concrete spec - if not isinstance(pkg, spack.package.PackageBase): + if not isinstance(pkg, spack.package_base.PackageBase): raise ValueError("{0} must be a package".format(str(pkg))) self.pkg = pkg @@ -2314,7 +2315,7 @@ class BuildRequest(object): """Determine the required dependency types for the associated package. Args: - pkg (spack.package.PackageBase): explicit or implicit package being + pkg (spack.package_base.PackageBase): explicit or implicit package being installed Returns: @@ -2337,7 +2338,7 @@ class BuildRequest(object): """Determine if the tests should be run for the provided packages Args: - pkg (spack.package.PackageBase): explicit or implicit package being + pkg (spack.package_base.PackageBase): explicit or implicit package being installed Returns: diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 549c71f52b..84053d1cea 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -3,3078 +3,83 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -"""This is where most of the action happens in Spack. +# flake8: noqa: F401 +"""spack.util.package is a set of useful build tools and directives for packages. -The spack package class structure is based strongly on Homebrew -(http://brew.sh/), mainly because Homebrew makes it very easy to create -packages. +Everything in this module is automatically imported into Spack package files. """ - -import base64 -import collections -import contextlib -import copy -import functools -import glob -import hashlib -import inspect -import os -import re -import shutil -import sys -import textwrap -import time -import traceback -import types -import warnings -from typing import Any, Callable, Dict, List, Optional # novm - -import six - -import llnl.util.filesystem as fsys -import llnl.util.tty as tty -from llnl.util.lang import memoized, nullcontext -from llnl.util.link_tree import LinkTree - -import spack.compilers -import spack.config -import spack.dependency -import spack.directives -import spack.directory_layout -import spack.environment -import spack.error -import spack.fetch_strategy as fs -import spack.hooks -import spack.mirror -import spack.mixins -import spack.multimethod -import spack.paths -import spack.repo -import spack.store -import spack.url -import spack.util.environment -import spack.util.path -import spack.util.web -from spack.filesystem_view import YamlFilesystemView -from spack.install_test import TestFailure, TestSuite -from spack.installer import InstallError, PackageInstaller -from spack.stage import ResourceStage, Stage, StageComposite, stage_prefix -from spack.util.executable import ProcessError, which -from spack.util.package_hash import package_hash -from spack.util.prefix import Prefix -from spack.version import Version - -"""Allowed URL schemes for spack packages.""" -_ALLOWED_URL_SCHEMES = ["http", "https", "ftp", "file", "git"] - - -# Filename for the Spack build/install log. -_spack_build_logfile = 'spack-build-out.txt' - -# Filename for the Spack build/install environment file. -_spack_build_envfile = 'spack-build-env.txt' - -# Filename for the Spack build/install environment modifications file. -_spack_build_envmodsfile = 'spack-build-env-mods.txt' - -# Filename for the Spack install phase-time test log. -_spack_install_test_log = 'install-time-test-log.txt' - -# Filename of json with total build and phase times (seconds) -_spack_times_log = 'install_times.json' - -# Filename for the Spack configure args file. -_spack_configure_argsfile = 'spack-configure-args.txt' - - -def preferred_version(pkg): - """ - Returns a sorted list of the preferred versions of the package. - - Arguments: - pkg (Package): The package whose versions are to be assessed. - """ - # Here we sort first on the fact that a version is marked - # as preferred in the package, then on the fact that the - # version is not develop, then lexicographically - key_fn = lambda v: (pkg.versions[v].get('preferred', False), - not v.isdevelop(), - v) - return sorted(pkg.versions, key=key_fn).pop() - - -class InstallPhase(object): - """Manages a single phase of the installation. - - This descriptor stores at creation time the name of the method it should - search for execution. The method is retrieved at __get__ time, so that - it can be overridden by subclasses of whatever class declared the phases. - - It also provides hooks to execute arbitrary callbacks before and after - the phase. - """ - - def __init__(self, name): - self.name = name - self.run_before = [] - self.run_after = [] - - def __get__(self, instance, owner): - # The caller is a class that is trying to customize - # my behavior adding something - if instance is None: - return self - # If instance is there the caller wants to execute the - # install phase, thus return a properly set wrapper - phase = getattr(instance, self.name) - - @functools.wraps(phase) - def phase_wrapper(spec, prefix): - # Check instance attributes at the beginning of a phase - self._on_phase_start(instance) - # Execute phase pre-conditions, - # and give them the chance to fail - for callback in self.run_before: - callback(instance) - phase(spec, prefix) - # Execute phase sanity_checks, - # and give them the chance to fail - for callback in self.run_after: - callback(instance) - # Check instance attributes at the end of a phase - self._on_phase_exit(instance) - return phase_wrapper - - def _on_phase_start(self, instance): - # If a phase has a matching stop_before_phase attribute, - # stop the installation process raising a StopPhase - if getattr(instance, 'stop_before_phase', None) == self.name: - from spack.build_environment import StopPhase - raise StopPhase('Stopping before \'{0}\' phase'.format(self.name)) - - def _on_phase_exit(self, instance): - # If a phase has a matching last_phase attribute, - # stop the installation process raising a StopPhase - if getattr(instance, 'last_phase', None) == self.name: - from spack.build_environment import StopPhase - raise StopPhase('Stopping at \'{0}\' phase'.format(self.name)) - - def copy(self): - try: - return copy.deepcopy(self) - except TypeError: - # This bug-fix was not back-ported in Python 2.6 - # http://bugs.python.org/issue1515 - other = InstallPhase(self.name) - other.run_before.extend(self.run_before) - other.run_after.extend(self.run_after) - return other - - -#: Registers which are the detectable packages, by repo and package name -#: Need a pass of package repositories to be filled. -detectable_packages = collections.defaultdict(list) - - -class DetectablePackageMeta(object): - """Check if a package is detectable and add default implementations - for the detection function. - """ - def __init__(cls, name, bases, attr_dict): - if hasattr(cls, 'executables') and hasattr(cls, 'libraries'): - msg = "a package can have either an 'executables' or 'libraries' attribute" - msg += " [package '{0.name}' defines both]" - raise spack.error.SpackError(msg.format(cls)) - - # On windows, extend the list of regular expressions to look for - # filenames ending with ".exe" - # (in some cases these regular expressions include "$" to avoid - # pulling in filenames with unexpected suffixes, but this allows - # for example detecting "foo.exe" when the package writer specified - # that "foo" was a possible executable. - - # If a package has the executables or libraries attribute then it's - # assumed to be detectable - if hasattr(cls, 'executables') or hasattr(cls, 'libraries'): - @property - def platform_executables(self): - def to_windows_exe(exe): - if exe.endswith('$'): - exe = exe.replace('$', '%s$' % spack.util.path.win_exe_ext()) - else: - exe += spack.util.path.win_exe_ext() - return exe - plat_exe = [] - if hasattr(self, 'executables'): - for exe in self.executables: - if sys.platform == 'win32': - exe = to_windows_exe(exe) - plat_exe.append(exe) - return plat_exe - - @classmethod - def determine_spec_details(cls, prefix, objs_in_prefix): - """Allow ``spack external find ...`` to locate installations. - - Args: - prefix (str): the directory containing the executables - or libraries - objs_in_prefix (set): the executables or libraries that - match the regex - - Returns: - The list of detected specs for this package - """ - objs_by_version = collections.defaultdict(list) - # The default filter function is the identity function for the - # list of executables - filter_fn = getattr(cls, 'filter_detected_exes', - lambda x, exes: exes) - objs_in_prefix = filter_fn(prefix, objs_in_prefix) - for obj in objs_in_prefix: - try: - version_str = cls.determine_version(obj) - if version_str: - objs_by_version[version_str].append(obj) - except Exception as e: - msg = ('An error occurred when trying to detect ' - 'the version of "{0}" [{1}]') - tty.debug(msg.format(obj, str(e))) - - specs = [] - for version_str, objs in objs_by_version.items(): - variants = cls.determine_variants(objs, version_str) - # Normalize output to list - if not isinstance(variants, list): - variants = [variants] - - for variant in variants: - if isinstance(variant, six.string_types): - variant = (variant, {}) - variant_str, extra_attributes = variant - spec_str = '{0}@{1} {2}'.format( - cls.name, version_str, variant_str - ) - - # Pop a few reserved keys from extra attributes, since - # they have a different semantics - external_path = extra_attributes.pop('prefix', None) - external_modules = extra_attributes.pop( - 'modules', None - ) - try: - spec = spack.spec.Spec( - spec_str, - external_path=external_path, - external_modules=external_modules - ) - except Exception as e: - msg = 'Parsing failed [spec_str="{0}", error={1}]' - tty.debug(msg.format(spec_str, str(e))) - else: - specs.append(spack.spec.Spec.from_detection( - spec, extra_attributes=extra_attributes - )) - - return sorted(specs) - - @classmethod - def determine_variants(cls, objs, version_str): - return '' - - # Register the class as a detectable package - detectable_packages[cls.namespace].append(cls.name) - - # Attach function implementations to the detectable class - default = False - if not hasattr(cls, 'determine_spec_details'): - default = True - cls.determine_spec_details = determine_spec_details - - if default and not hasattr(cls, 'determine_version'): - msg = ('the package "{0}" in the "{1}" repo needs to define' - ' the "determine_version" method to be detectable') - NotImplementedError(msg.format(cls.name, cls.namespace)) - - if default and not hasattr(cls, 'determine_variants'): - cls.determine_variants = determine_variants - - # This function should not be overridden by subclasses, - # as it is not designed for bespoke pkg detection but rather - # on a per-platform basis - if 'platform_executables' in cls.__dict__.keys(): - raise PackageError("Packages should not override platform_executables") - cls.platform_executables = platform_executables - - super(DetectablePackageMeta, cls).__init__(name, bases, attr_dict) - - -class PackageMeta( - DetectablePackageMeta, - spack.directives.DirectiveMeta, - spack.mixins.PackageMixinsMeta, - spack.multimethod.MultiMethodMeta -): - """ - Package metaclass for supporting directives (e.g., depends_on) and phases - """ - phase_fmt = '_InstallPhase_{0}' - - # These are accessed only through getattr, by name - _InstallPhase_run_before = {} # type: Dict[str, List[Callable]] - _InstallPhase_run_after = {} # type: Dict[str, List[Callable]] - - def __new__(cls, name, bases, attr_dict): - """ - Instance creation is preceded by phase attribute transformations. - - Conveniently transforms attributes to permit extensible phases by - iterating over the attribute 'phases' and creating / updating private - InstallPhase attributes in the class that will be initialized in - __init__. - """ - if 'phases' in attr_dict: - # Turn the strings in 'phases' into InstallPhase instances - # and add them as private attributes - _InstallPhase_phases = [PackageMeta.phase_fmt.format(x) for x in attr_dict['phases']] # NOQA: ignore=E501 - for phase_name, callback_name in zip(_InstallPhase_phases, attr_dict['phases']): # NOQA: ignore=E501 - attr_dict[phase_name] = InstallPhase(callback_name) - attr_dict['_InstallPhase_phases'] = _InstallPhase_phases - - def _flush_callbacks(check_name): - # Name of the attribute I am going to check it exists - check_attr = PackageMeta.phase_fmt.format(check_name) - checks = getattr(cls, check_attr) - if checks: - for phase_name, funcs in checks.items(): - phase_attr = PackageMeta.phase_fmt.format(phase_name) - try: - # Search for the phase in the attribute dictionary - phase = attr_dict[phase_attr] - except KeyError: - # If it is not there it's in the bases - # and we added a check. We need to copy - # and extend - for base in bases: - phase = getattr(base, phase_attr, None) - if phase is not None: - break - - phase = attr_dict[phase_attr] = phase.copy() - getattr(phase, check_name).extend(funcs) - # Clear the attribute for the next class - setattr(cls, check_attr, {}) - - _flush_callbacks('run_before') - _flush_callbacks('run_after') - - # Reset names for packages that inherit from another - # package with a different name - attr_dict['_name'] = None - - return super(PackageMeta, cls).__new__(cls, name, bases, attr_dict) - - @staticmethod - def register_callback(check_type, *phases): - def _decorator(func): - attr_name = PackageMeta.phase_fmt.format(check_type) - check_list = getattr(PackageMeta, attr_name) - for item in phases: - checks = check_list.setdefault(item, []) - checks.append(func) - setattr(PackageMeta, attr_name, check_list) - return func - return _decorator - - @property - def package_dir(self): - """Directory where the package.py file lives.""" - return os.path.abspath(os.path.dirname(self.module.__file__)) - - @property - def module(self): - """Module object (not just the name) that this package is defined in. - - We use this to add variables to package modules. This makes - install() methods easier to write (e.g., can call configure()) - """ - return __import__(self.__module__, fromlist=[self.__name__]) - - @property - def namespace(self): - """Spack namespace for the package, which identifies its repo.""" - return spack.repo.namespace_from_fullname(self.__module__) - - @property - def fullname(self): - """Name of this package, including the namespace""" - return '%s.%s' % (self.namespace, self.name) - - @property - def fullnames(self): - """ - Fullnames for this package and any packages from which it inherits. - """ - fullnames = [] - for cls in inspect.getmro(self): - namespace = getattr(cls, 'namespace', None) - if namespace: - fullnames.append('%s.%s' % (namespace, self.name)) - if namespace == 'builtin': - # builtin packages cannot inherit from other repos - break - return fullnames - - @property - def name(self): - """The name of this package. - - The name of a package is the name of its Python module, without - the containing module names. - """ - if self._name is None: - self._name = self.module.__name__ - if '.' in self._name: - self._name = self._name[self._name.rindex('.') + 1:] - return self._name - - @property - def global_license_dir(self): - """Returns the directory where license files for all packages are stored.""" - return spack.util.path.canonicalize_path(spack.config.get('config:license_dir')) - - -def run_before(*phases): - """Registers a method of a package to be run before a given phase""" - return PackageMeta.register_callback('run_before', *phases) - - -def run_after(*phases): - """Registers a method of a package to be run after a given phase""" - return PackageMeta.register_callback('run_after', *phases) - - -def on_package_attributes(**attr_dict): - """Decorator: executes instance function only if object has attr valuses. - - Executes the decorated method only if at the moment of calling the - instance has attributes that are equal to certain values. - - Args: - attr_dict (dict): dictionary mapping attribute names to their - required values - """ - def _execute_under_condition(func): - - @functools.wraps(func) - def _wrapper(instance, *args, **kwargs): - # If all the attributes have the value we require, then execute - has_all_attributes = all( - [hasattr(instance, key) for key in attr_dict] - ) - if has_all_attributes: - has_the_right_values = all( - [getattr(instance, key) == value for key, value in attr_dict.items()] # NOQA: ignore=E501 - ) - if has_the_right_values: - func(instance, *args, **kwargs) - return _wrapper - - return _execute_under_condition - - -class PackageViewMixin(object): - """This collects all functionality related to adding installed Spack - package to views. Packages can customize how they are added to views by - overriding these functions. - """ - def view_source(self): - """The source root directory that will be added to the view: files are - added such that their path relative to the view destination matches - their path relative to the view source. - """ - return self.spec.prefix - - def view_destination(self, view): - """The target root directory: each file is added relative to this - directory. - """ - return view.get_projection_for_spec(self.spec) - - def view_file_conflicts(self, view, merge_map): - """Report any files which prevent adding this package to the view. The - default implementation looks for any files which already exist. - Alternative implementations may allow some of the files to exist in - the view (in this case they would be omitted from the results). - """ - return set(dst for dst in merge_map.values() if os.path.lexists(dst)) - - def add_files_to_view(self, view, merge_map, skip_if_exists=True): - """Given a map of package files to destination paths in the view, add - the files to the view. By default this adds all files. Alternative - implementations may skip some files, for example if other packages - linked into the view already include the file. - - Args: - view (spack.filesystem_view.FilesystemView): the view that's updated - merge_map (dict): maps absolute source paths to absolute dest paths for - all files in from this package. - skip_if_exists (bool): when True, don't link files in view when they - already exist. When False, always link files, without checking - if they already exist. - """ - if skip_if_exists: - for src, dst in merge_map.items(): - if not os.path.lexists(dst): - view.link(src, dst, spec=self.spec) - else: - for src, dst in merge_map.items(): - view.link(src, dst, spec=self.spec) - - def remove_files_from_view(self, view, merge_map): - """Given a map of package files to files currently linked in the view, - remove the files from the view. The default implementation removes all - files. Alternative implementations may not remove all files. For - example if two packages include the same file, it should only be - removed when both packages are removed. - """ - view.remove_files(merge_map.values()) - - -def test_log_pathname(test_stage, spec): - """Build the pathname of the test log file - - Args: - test_stage (str): path to the test stage directory - spec (spack.spec.Spec): instance of the spec under test - - Returns: - (str): the pathname of the test log file - """ - return os.path.join(test_stage, - 'test-{0}-out.txt'.format(TestSuite.test_pkg_id(spec))) - - -class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)): - """This is the superclass for all spack packages. - - ***The Package class*** - - At its core, a package consists of a set of software to be installed. - A package may focus on a piece of software and its associated software - dependencies or it may simply be a set, or bundle, of software. The - former requires defining how to fetch, verify (via, e.g., sha256), build, - and install that software and the packages it depends on, so that - dependencies can be installed along with the package itself. The latter, - sometimes referred to as a ``no-source`` package, requires only defining - the packages to be built. - - Packages are written in pure Python. - - There are two main parts of a Spack package: - - 1. **The package class**. Classes contain ``directives``, which are - special functions, that add metadata (versions, patches, - dependencies, and other information) to packages (see - ``directives.py``). Directives provide the constraints that are - used as input to the concretizer. - - 2. **Package instances**. Once instantiated, a package is - essentially a software installer. Spack calls methods like - ``do_install()`` on the ``Package`` object, and it uses those to - drive user-implemented methods like ``patch()``, ``install()``, and - other build steps. To install software, an instantiated package - needs a *concrete* spec, which guides the behavior of the various - install methods. - - Packages are imported from repos (see ``repo.py``). - - **Package DSL** - - Look in ``lib/spack/docs`` or check https://spack.readthedocs.io for - the full documentation of the package domain-specific language. That - used to be partially documented here, but as it grew, the docs here - became increasingly out of date. - - **Package Lifecycle** - - A package's lifecycle over a run of Spack looks something like this: - - .. code-block:: python - - p = Package() # Done for you by spack - - p.do_fetch() # downloads tarball from a URL (or VCS) - p.do_stage() # expands tarball in a temp directory - p.do_patch() # applies patches to expanded source - p.do_install() # calls package's install() function - p.do_uninstall() # removes install directory - - although packages that do not have code have nothing to fetch so omit - ``p.do_fetch()``. - - There are also some other commands that clean the build area: - - .. code-block:: python - - p.do_clean() # removes the stage directory entirely - p.do_restage() # removes the build directory and - # re-expands the archive. - - The convention used here is that a ``do_*`` function is intended to be - called internally by Spack commands (in ``spack.cmd``). These aren't for - package writers to override, and doing so may break the functionality - of the Package class. - - Package creators have a lot of freedom, and they could technically - override anything in this class. That is not usually required. - - For most use cases. Package creators typically just add attributes - like ``homepage`` and, for a code-based package, ``url``, or functions - such as ``install()``. - There are many custom ``Package`` subclasses in the - ``spack.build_systems`` package that make things even easier for - specific build systems. - - """ - # - # These are default values for instance variables. - # - - #: A list or set of build time test functions to be called when tests - #: are executed or 'None' if there are no such test functions. - build_time_test_callbacks = None # type: Optional[List[str]] - - #: By default, packages are not virtual - #: Virtual packages override this attribute - virtual = False - - #: Most Spack packages are used to install source or binary code while - #: those that do not can be used to install a set of other Spack packages. - has_code = True - - #: A list or set of install time test functions to be called when tests - #: are executed or 'None' if there are no such test functions. - install_time_test_callbacks = None # type: Optional[List[str]] - - #: By default we build in parallel. Subclasses can override this. - parallel = True - - #: By default do not run tests within package's install() - run_tests = False - - # FIXME: this is a bad object-oriented design, should be moved to Clang. - #: By default do not setup mockup XCode on macOS with Clang - use_xcode = False - - #: Most packages are NOT extendable. Set to True if you want extensions. - extendable = False - - #: When True, add RPATHs for the entire DAG. When False, add RPATHs only - #: for immediate dependencies. - transitive_rpaths = True - - #: List of prefix-relative file paths (or a single path). If these do - #: not exist after install, or if they exist but are not files, - #: sanity checks fail. - sanity_check_is_file = [] # type: List[str] - - #: List of prefix-relative directory paths (or a single path). If - #: these do not exist after install, or if they exist but are not - #: directories, sanity checks will fail. - sanity_check_is_dir = [] # type: List[str] - - #: List of glob expressions. Each expression must either be - #: absolute or relative to the package source path. - #: Matching artifacts found at the end of the build process will be - #: copied in the same directory tree as _spack_build_logfile and - #: _spack_build_envfile. - archive_files = [] # type: List[str] - - #: Boolean. Set to ``True`` for packages that require a manual download. - #: This is currently used by package sanity tests and generation of a - #: more meaningful fetch failure error. - manual_download = False - - #: Set of additional options used when fetching package versions. - fetch_options = {} # type: Dict[str, Any] - - # - # Set default licensing information - # - #: Boolean. If set to ``True``, this software requires a license. - #: If set to ``False``, all of the ``license_*`` attributes will - #: be ignored. Defaults to ``False``. - license_required = False - - #: String. Contains the symbol used by the license manager to denote - #: a comment. Defaults to ``#``. - license_comment = '#' - - #: List of strings. These are files that the software searches for when - #: looking for a license. All file paths must be relative to the - #: installation directory. More complex packages like Intel may require - #: multiple licenses for individual components. Defaults to the empty list. - license_files = [] # type: List[str] - - #: List of strings. Environment variables that can be set to tell the - #: software where to look for a license if it is not in the usual location. - #: Defaults to the empty list. - license_vars = [] # type: List[str] - - #: String. A URL pointing to license setup instructions for the software. - #: Defaults to the empty string. - license_url = '' - - #: Verbosity level, preserved across installs. - _verbose = None - - #: index of patches by sha256 sum, built lazily - _patches_by_hash = None - - #: Package homepage where users can find more information about the package - homepage = None # type: str - - #: Default list URL (place to find available versions) - list_url = None # type: str - - #: Link depth to which list_url should be searched for new versions - list_depth = 0 - - #: List of strings which contains GitHub usernames of package maintainers. - #: Do not include @ here in order not to unnecessarily ping the users. - maintainers = [] # type: List[str] - - #: List of attributes to be excluded from a package's hash. - metadata_attrs = [ - "homepage", - "url", - "urls", - "list_url", - "extendable", - "parallel", - "make_jobs", - "maintainers", - "tags", - ] - - #: Boolean. If set to ``True``, the smoke/install test requires a compiler. - #: This is currently used by smoke tests to ensure a compiler is available - #: to build a custom test code. - test_requires_compiler = False - - #: List of test failures encountered during a smoke/install test run. - test_failures = None - - #: TestSuite instance used to manage smoke/install tests for one or more - #: specs. - test_suite = None - - def __init__(self, spec): - # this determines how the package should be built. - self.spec = spec - - # Allow custom staging paths for packages - self.path = None - - # Keep track of whether or not this package was installed from - # a binary cache. - self.installed_from_binary_cache = False - - # Ensure that only one of these two attributes are present - if getattr(self, 'url', None) and getattr(self, 'urls', None): - msg = "a package can have either a 'url' or a 'urls' attribute" - msg += " [package '{0.name}' defines both]" - raise ValueError(msg.format(self)) - - # init internal variables - self._stage = None - self._fetcher = None - - # Set up timing variables - self._fetch_time = 0.0 - - if self.is_extension: - spack.repo.get(self.extendee_spec)._check_extendable() - - super(PackageBase, self).__init__() - - @classmethod - def possible_dependencies( - cls, transitive=True, expand_virtuals=True, deptype='all', - visited=None, missing=None, virtuals=None): - """Return dict of possible dependencies of this package. - - Args: - transitive (bool or None): return all transitive dependencies if - True, only direct dependencies if False (default True).. - expand_virtuals (bool or None): expand virtual dependencies into - all possible implementations (default True) - deptype (str or tuple or None): dependency types to consider - visited (dict or None): dict of names of dependencies visited so - far, mapped to their immediate dependencies' names. - missing (dict or None): dict to populate with packages and their - *missing* dependencies. - virtuals (set): if provided, populate with virtuals seen so far. - - Returns: - (dict): dictionary mapping dependency names to *their* - immediate dependencies - - Each item in the returned dictionary maps a (potentially - transitive) dependency of this package to its possible - *immediate* dependencies. If ``expand_virtuals`` is ``False``, - virtual package names wil be inserted as keys mapped to empty - sets of dependencies. Virtuals, if not expanded, are treated as - though they have no immediate dependencies. - - Missing dependencies by default are ignored, but if a - missing dict is provided, it will be populated with package names - mapped to any dependencies they have that are in no - repositories. This is only populated if transitive is True. - - Note: the returned dict *includes* the package itself. - - """ - deptype = spack.dependency.canonical_deptype(deptype) - - visited = {} if visited is None else visited - missing = {} if missing is None else missing - - visited.setdefault(cls.name, set()) - - for name, conditions in cls.dependencies.items(): - # check whether this dependency could be of the type asked for - types = [dep.type for cond, dep in conditions.items()] - types = set.union(*types) - if not any(d in types for d in deptype): - continue - - # expand virtuals if enabled, otherwise just stop at virtuals - if spack.repo.path.is_virtual(name): - if virtuals is not None: - virtuals.add(name) - if expand_virtuals: - providers = spack.repo.path.providers_for(name) - dep_names = [spec.name for spec in providers] - else: - visited.setdefault(cls.name, set()).add(name) - visited.setdefault(name, set()) - continue - else: - dep_names = [name] - - # add the dependency names to the visited dict - visited.setdefault(cls.name, set()).update(set(dep_names)) - - # recursively traverse dependencies - for dep_name in dep_names: - if dep_name in visited: - continue - - visited.setdefault(dep_name, set()) - - # skip the rest if not transitive - if not transitive: - continue - - try: - dep_cls = spack.repo.path.get_pkg_class(dep_name) - except spack.repo.UnknownPackageError: - # log unknown packages - missing.setdefault(cls.name, set()).add(dep_name) - continue - - dep_cls.possible_dependencies( - transitive, expand_virtuals, deptype, visited, missing, - virtuals) - - return visited - - def enum_constraints(self, visited=None): - """Return transitive dependency constraints on this package.""" - if visited is None: - visited = set() - visited.add(self.name) - - names = [] - clauses = [] - - for name in self.dependencies: - if name not in visited and not spack.spec.Spec(name).virtual: - pkg = spack.repo.get(name) - dvis, dnames, dclauses = pkg.enum_constraints(visited) - visited |= dvis - names.extend(dnames) - clauses.extend(dclauses) - - return visited - - # package_dir and module are *class* properties (see PackageMeta), - # but to make them work on instances we need these defs as well. - @property - def package_dir(self): - """Directory where the package.py file lives.""" - return type(self).package_dir - - @property - def module(self): - """Module object that this package is defined in.""" - return type(self).module - - @property - def namespace(self): - """Spack namespace for the package, which identifies its repo.""" - return type(self).namespace - - @property - def fullname(self): - """Name of this package, including namespace: namespace.name.""" - return type(self).fullname - - @property - def fullnames(self): - return type(self).fullnames - - @property - def name(self): - """Name of this package (the module without parent modules).""" - return type(self).name - - @property - def global_license_dir(self): - """Returns the directory where global license files are stored.""" - return type(self).global_license_dir - - @property - def global_license_file(self): - """Returns the path where a global license file for this - particular package should be stored.""" - if not self.license_files: - return - return os.path.join(self.global_license_dir, self.name, - os.path.basename(self.license_files[0])) - - @property - def version(self): - if not self.spec.versions.concrete: - raise ValueError("Version requested for a package that" - " does not have a concrete version.") - return self.spec.versions[0] - - @memoized - def version_urls(self): - """OrderedDict of explicitly defined URLs for versions of this package. - - Return: - An OrderedDict (version -> URL) different versions of this - package, sorted by version. - - A version's URL only appears in the result if it has an an - explicitly defined ``url`` argument. So, this list may be empty - if a package only defines ``url`` at the top level. - """ - version_urls = collections.OrderedDict() - for v, args in sorted(self.versions.items()): - if 'url' in args: - version_urls[v] = args['url'] - return version_urls - - def nearest_url(self, version): - """Finds the URL with the "closest" version to ``version``. - - This uses the following precedence order: - - 1. Find the next lowest or equal version with a URL. - 2. If no lower URL, return the next *higher* URL. - 3. If no higher URL, return None. - - """ - version_urls = self.version_urls() - - if version in version_urls: - return version_urls[version] - - last_url = None - for v, u in self.version_urls().items(): - if v > version: - if last_url: - return last_url - last_url = u - - return last_url - - def url_for_version(self, version): - """Returns a URL from which the specified version of this package - may be downloaded. - - version: class Version - The version for which a URL is sought. - - See Class Version (version.py) - """ - return self._implement_all_urls_for_version(version)[0] - - def all_urls_for_version(self, version, custom_url_for_version=None): - """Returns all URLs derived from version_urls(), url, urls, and - list_url (if it contains a version) in a package in that order. - - version: class Version - The version for which a URL is sought. - - See Class Version (version.py) - """ - uf = None - if type(self).url_for_version != Package.url_for_version: - uf = self.url_for_version - return self._implement_all_urls_for_version(version, uf) - - def _implement_all_urls_for_version(self, version, custom_url_for_version=None): - if not isinstance(version, Version): - version = Version(version) - - urls = [] - - # If we have a specific URL for this version, don't extrapolate. - version_urls = self.version_urls() - if version in version_urls: - urls.append(version_urls[version]) - - # if there is a custom url_for_version, use it - if custom_url_for_version is not None: - u = custom_url_for_version(version) - if u not in urls and u is not None: - urls.append(u) - - def sub_and_add(u): - if u is None: - return - # skip the url if there is no version to replace - try: - spack.url.parse_version(u) - except spack.url.UndetectableVersionError: - return - nu = spack.url.substitute_version(u, self.url_version(version)) - - urls.append(nu) - # If no specific URL, use the default, class-level URL - sub_and_add(getattr(self, 'url', None)) - for u in getattr(self, 'urls', []): - sub_and_add(u) - - sub_and_add(getattr(self, 'list_url', None)) - - # if no version-bearing URLs can be found, try them raw - if not urls: - default_url = getattr(self, "url", getattr(self, "urls", [None])[0]) - - # if no exact match AND no class-level default, use the nearest URL - if not default_url: - default_url = self.nearest_url(version) - - # if there are NO URLs to go by, then we can't do anything - if not default_url: - raise NoURLError(self.__class__) - urls.append( - spack.url.substitute_version( - default_url, self.url_version(version) - ) - ) - - return urls - - def find_valid_url_for_version(self, version): - """Returns a URL from which the specified version of this package - may be downloaded after testing whether the url is valid. Will try - url, urls, and list_url before failing. - - version: class Version - The version for which a URL is sought. - - See Class Version (version.py) - """ - urls = self.all_urls_for_version(version) - - for u in urls: - if spack.util.web.url_exists(u): - return u - - return None - - def _make_resource_stage(self, root_stage, fetcher, resource): - resource_stage_folder = self._resource_stage(resource) - mirror_paths = spack.mirror.mirror_archive_paths( - fetcher, - os.path.join(self.name, "%s-%s" % (resource.name, self.version))) - stage = ResourceStage(resource.fetcher, - root=root_stage, - resource=resource, - name=resource_stage_folder, - mirror_paths=mirror_paths, - path=self.path) - return stage - - def _download_search(self): - dynamic_fetcher = fs.from_list_url(self) - return [dynamic_fetcher] if dynamic_fetcher else [] - - def _make_root_stage(self, fetcher): - # Construct a mirror path (TODO: get this out of package.py) - mirror_paths = spack.mirror.mirror_archive_paths( - fetcher, - os.path.join(self.name, "%s-%s" % (self.name, self.version)), - self.spec) - # Construct a path where the stage should build.. - s = self.spec - stage_name = "{0}{1}-{2}-{3}".format(stage_prefix, s.name, s.version, - s.dag_hash()) - - stage = Stage(fetcher, mirror_paths=mirror_paths, name=stage_name, - path=self.path, search_fn=self._download_search) - return stage - - def _make_stage(self): - # If it's a dev package (not transitively), use a DIY stage object - dev_path_var = self.spec.variants.get('dev_path', None) - if dev_path_var: - return spack.stage.DIYStage(dev_path_var.value) - - # Construct a composite stage on top of the composite FetchStrategy - composite_fetcher = self.fetcher - composite_stage = StageComposite() - resources = self._get_needed_resources() - for ii, fetcher in enumerate(composite_fetcher): - if ii == 0: - # Construct root stage first - stage = self._make_root_stage(fetcher) - else: - # Construct resource stage - resource = resources[ii - 1] # ii == 0 is root! - stage = self._make_resource_stage(composite_stage[0], fetcher, - resource) - # Append the item to the composite - composite_stage.append(stage) - - return composite_stage - - @property - def stage(self): - """Get the build staging area for this package. - - This automatically instantiates a ``Stage`` object if the package - doesn't have one yet, but it does not create the Stage directory - on the filesystem. - """ - if not self.spec.versions.concrete: - raise ValueError( - "Cannot retrieve stage for package without concrete version.") - if self._stage is None: - self._stage = self._make_stage() - return self._stage - - @stage.setter - def stage(self, stage): - """Allow a stage object to be set to override the default.""" - self._stage = stage - - @property - def env_path(self): - """Return the build environment file path associated with staging.""" - # Backward compatibility: Return the name of an existing log path; - # otherwise, return the current install env path name. - old_filename = os.path.join(self.stage.path, 'spack-build.env') - if os.path.exists(old_filename): - return old_filename - else: - return os.path.join(self.stage.path, _spack_build_envfile) - - @property - def env_mods_path(self): - """ - Return the build environment modifications file path associated with - staging. - """ - return os.path.join(self.stage.path, _spack_build_envmodsfile) - - @property - def metadata_dir(self): - """Return the install metadata directory.""" - return spack.store.layout.metadata_path(self.spec) - - @property - def install_env_path(self): - """ - Return the build environment file path on successful installation. - """ - # Backward compatibility: Return the name of an existing log path; - # otherwise, return the current install env path name. - old_filename = os.path.join(self.metadata_dir, 'build.env') - if os.path.exists(old_filename): - return old_filename - else: - return os.path.join(self.metadata_dir, _spack_build_envfile) - - @property - def log_path(self): - """Return the build log file path associated with staging.""" - # Backward compatibility: Return the name of an existing log path. - for filename in ['spack-build.out', 'spack-build.txt']: - old_log = os.path.join(self.stage.path, filename) - if os.path.exists(old_log): - return old_log - - # Otherwise, return the current log path name. - return os.path.join(self.stage.path, _spack_build_logfile) - - @property - def phase_log_files(self): - """Find sorted phase log files written to the staging directory""" - logs_dir = os.path.join(self.stage.path, "spack-build-*-out.txt") - log_files = glob.glob(logs_dir) - log_files.sort() - return log_files - - @property - def install_log_path(self): - """Return the build log file path on successful installation.""" - # Backward compatibility: Return the name of an existing install log. - for filename in ['build.out', 'build.txt']: - old_log = os.path.join(self.metadata_dir, filename) - if os.path.exists(old_log): - return old_log - - # Otherwise, return the current install log path name. - return os.path.join(self.metadata_dir, _spack_build_logfile) - - @property - def configure_args_path(self): - """Return the configure args file path associated with staging.""" - return os.path.join(self.stage.path, _spack_configure_argsfile) - - @property - def test_install_log_path(self): - """Return the install phase-time test log file path, if set.""" - return getattr(self, 'test_log_file', None) - - @property - def install_test_install_log_path(self): - """Return the install location for the install phase-time test log.""" - return fsys.join_path(self.metadata_dir, _spack_install_test_log) - - @property - def times_log_path(self): - """Return the times log json file.""" - return os.path.join(self.metadata_dir, _spack_times_log) - - @property - def install_configure_args_path(self): - """Return the configure args file path on successful installation.""" - return os.path.join(self.metadata_dir, _spack_configure_argsfile) - - @property - def install_test_root(self): - """Return the install test root directory.""" - return os.path.join(self.metadata_dir, 'test') - - @property - def installed(self): - msg = ('the "PackageBase.installed" property is deprecated and will be ' - 'removed in Spack v0.19, use "Spec.installed" instead') - warnings.warn(msg) - return self.spec.installed - - @property - def installed_upstream(self): - msg = ('the "PackageBase.installed_upstream" property is deprecated and will ' - 'be removed in Spack v0.19, use "Spec.installed_upstream" instead') - warnings.warn(msg) - return self.spec.installed_upstream - - def _make_fetcher(self): - # Construct a composite fetcher that always contains at least - # one element (the root package). In case there are resources - # associated with the package, append their fetcher to the - # composite. - root_fetcher = fs.for_package_version(self, self.version) - fetcher = fs.FetchStrategyComposite() # Composite fetcher - fetcher.append(root_fetcher) # Root fetcher is always present - resources = self._get_needed_resources() - for resource in resources: - fetcher.append(resource.fetcher) - return fetcher - - @property - def fetcher(self): - if not self.spec.versions.concrete: - raise ValueError("Cannot retrieve fetcher for" - " package without concrete version.") - if not self._fetcher: - self._fetcher = self._make_fetcher() - return self._fetcher - - @fetcher.setter - def fetcher(self, f): - self._fetcher = f - - def dependencies_of_type(self, *deptypes): - """Get dependencies that can possibly have these deptypes. - - This analyzes the package and determines which dependencies *can* - be a certain kind of dependency. Note that they may not *always* - be this kind of dependency, since dependencies can be optional, - so something may be a build dependency in one configuration and a - run dependency in another. - """ - return dict( - (name, conds) for name, conds in self.dependencies.items() - if any(dt in self.dependencies[name][cond].type - for cond in conds for dt in deptypes)) - - @property - def extendee_spec(self): - """ - Spec of the extendee of this package, or None if it is not an extension - """ - if not self.extendees: - return None - - deps = [] - - # If the extendee is in the spec's deps already, return that. - for dep in self.spec.traverse(deptype=('link', 'run')): - if dep.name in self.extendees: - deps.append(dep) - - # TODO: allow more than one active extendee. - if deps: - assert len(deps) == 1 - return deps[0] - - # if the spec is concrete already, then it extends something - # that is an *optional* dependency, and the dep isn't there. - if self.spec._concrete: - return None - else: - # TODO: do something sane here with more than one extendee - # If it's not concrete, then return the spec from the - # extends() directive since that is all we know so far. - spec, kwargs = next(iter(self.extendees.items())) - return spec - - @property - def extendee_args(self): - """ - Spec of the extendee of this package, or None if it is not an extension - """ - if not self.extendees: - return None - - # TODO: allow multiple extendees. - name = next(iter(self.extendees)) - return self.extendees[name][1] - - @property - def is_extension(self): - # if it is concrete, it's only an extension if it actually - # dependes on the extendee. - if self.spec._concrete: - return self.extendee_spec is not None - else: - # If not, then it's an extension if it *could* be an extension - return bool(self.extendees) - - def extends(self, spec): - ''' - Returns True if this package extends the given spec. - - If ``self.spec`` is concrete, this returns whether this package extends - the given spec. - - If ``self.spec`` is not concrete, this returns whether this package may - extend the given spec. - ''' - if spec.name not in self.extendees: - return False - s = self.extendee_spec - return s and spec.satisfies(s) - - def is_activated(self, view): - """Return True if package is activated.""" - if not self.is_extension: - raise ValueError( - "is_activated called on package that is not an extension.") - if self.extendee_spec.installed_upstream: - # If this extends an upstream package, it cannot be activated for - # it. This bypasses construction of the extension map, which can - # can fail when run in the context of a downstream Spack instance - return False - extensions_layout = view.extensions_layout - exts = extensions_layout.extension_map(self.extendee_spec) - return (self.name in exts) and (exts[self.name] == self.spec) - - def provides(self, vpkg_name): - """ - True if this package provides a virtual package with the specified name - """ - return any( - any(self.spec.satisfies(c) for c in constraints) - for s, constraints in self.provided.items() if s.name == vpkg_name - ) - - @property - def virtuals_provided(self): - """ - virtual packages provided by this package with its spec - """ - return [vspec for vspec, constraints in self.provided.items() - if any(self.spec.satisfies(c) for c in constraints)] - - @property - def prefix(self): - """Get the prefix into which this package should be installed.""" - return self.spec.prefix - - @property # type: ignore[misc] - @memoized - def compiler(self): - """Get the spack.compiler.Compiler object used to build this package""" - if not self.spec.concrete: - raise ValueError("Can only get a compiler for a concrete package.") - - return spack.compilers.compiler_for_spec(self.spec.compiler, - self.spec.architecture) - - def url_version(self, version): - """ - Given a version, this returns a string that should be substituted - into the package's URL to download that version. - - By default, this just returns the version string. Subclasses may need - to override this, e.g. for boost versions where you need to ensure that - there are _'s in the download URL. - """ - return str(version) - - def remove_prefix(self): - """ - Removes the prefix for a package along with any empty parent - directories - """ - spack.store.layout.remove_install_directory(self.spec) - - @property - def download_instr(self): - """ - Defines the default manual download instructions. Packages can - override the property to provide more information. - - Returns: - (str): default manual download instructions - """ - required = ('Manual download is required for {0}. ' - .format(self.spec.name) if self.manual_download else '') - return ('{0}Refer to {1} for download instructions.' - .format(required, self.spec.package.homepage)) - - def do_fetch(self, mirror_only=False): - """ - Creates a stage directory and downloads the tarball for this package. - Working directory will be set to the stage directory. - """ - if not self.has_code or self.spec.external: - tty.debug('No fetch required for {0}'.format(self.name)) - return - - checksum = spack.config.get('config:checksum') - fetch = self.stage.managed_by_spack - if checksum and fetch and (self.version not in self.versions) \ - and (not self.version.is_commit): - tty.warn("There is no checksum on file to fetch %s safely." % - self.spec.cformat('{name}{@version}')) - - # Ask the user whether to skip the checksum if we're - # interactive, but just fail if non-interactive. - ck_msg = "Add a checksum or use --no-checksum to skip this check." - ignore_checksum = False - if sys.stdout.isatty(): - ignore_checksum = tty.get_yes_or_no(" Fetch anyway?", - default=False) - if ignore_checksum: - tty.debug('Fetching with no checksum. {0}' - .format(ck_msg)) - - if not ignore_checksum: - raise FetchError("Will not fetch %s" % - self.spec.format('{name}{@version}'), ck_msg) - - deprecated = spack.config.get('config:deprecated') - if not deprecated and self.versions.get( - self.version, {}).get('deprecated', False): - tty.warn("{0} is deprecated and may be removed in a future Spack " - "release.".format( - self.spec.format('{name}{@version}'))) - - # Ask the user whether to install deprecated version if we're - # interactive, but just fail if non-interactive. - dp_msg = ("If you are willing to be a maintainer for this version " - "of the package, submit a PR to remove `deprecated=False" - "`, or use `--deprecated` to skip this check.") - ignore_deprecation = False - if sys.stdout.isatty(): - ignore_deprecation = tty.get_yes_or_no(" Fetch anyway?", - default=False) - - if ignore_deprecation: - tty.debug("Fetching deprecated version. {0}".format( - dp_msg)) - - if not ignore_deprecation: - raise FetchError("Will not fetch {0}".format( - self.spec.format('{name}{@version}')), dp_msg) - - self.stage.create() - err_msg = None if not self.manual_download else self.download_instr - start_time = time.time() - self.stage.fetch(mirror_only, err_msg=err_msg) - self._fetch_time = time.time() - start_time - - if checksum and self.version in self.versions: - self.stage.check() - - self.stage.cache_local() - - for patch in self.spec.patches: - patch.fetch() - if patch.stage: - patch.stage.cache_local() - - def do_stage(self, mirror_only=False): - """Unpacks and expands the fetched tarball.""" - # Always create the stage directory at this point. Why? A no-code - # package may want to use the installation process to install metadata. - self.stage.create() - - # Fetch/expand any associated code. - if self.has_code: - self.do_fetch(mirror_only) - self.stage.expand_archive() - - if not os.listdir(self.stage.path): - raise FetchError("Archive was empty for %s" % self.name) - else: - # Support for post-install hooks requires a stage.source_path - fsys.mkdirp(self.stage.source_path) - - def do_patch(self): - """Applies patches if they haven't been applied already.""" - if not self.spec.concrete: - raise ValueError("Can only patch concrete packages.") - - # Kick off the stage first. This creates the stage. - self.do_stage() - - # Package can add its own patch function. - has_patch_fun = hasattr(self, 'patch') and callable(self.patch) - - # Get the patches from the spec (this is a shortcut for the MV-variant) - patches = self.spec.patches - - # If there are no patches, note it. - if not patches and not has_patch_fun: - tty.msg('No patches needed for {0}'.format(self.name)) - return - - # Construct paths to special files in the archive dir used to - # keep track of whether patches were successfully applied. - archive_dir = self.stage.source_path - good_file = os.path.join(archive_dir, '.spack_patched') - no_patches_file = os.path.join(archive_dir, '.spack_no_patches') - bad_file = os.path.join(archive_dir, '.spack_patch_failed') - - # If we encounter an archive that failed to patch, restage it - # so that we can apply all the patches again. - if os.path.isfile(bad_file): - tty.debug('Patching failed last time. Restaging.') - self.stage.restage() - - # If this file exists, then we already applied all the patches. - if os.path.isfile(good_file): - tty.msg('Already patched {0}'.format(self.name)) - return - elif os.path.isfile(no_patches_file): - tty.msg('No patches needed for {0}'.format(self.name)) - return - - # Apply all the patches for specs that match this one - patched = False - for patch in patches: - try: - with fsys.working_dir(self.stage.source_path): - patch.apply(self.stage) - tty.msg('Applied patch {0}'.format(patch.path_or_url)) - patched = True - except spack.error.SpackError as e: - tty.debug(e) - - # Touch bad file if anything goes wrong. - tty.msg('Patch %s failed.' % patch.path_or_url) - fsys.touch(bad_file) - raise - - if has_patch_fun: - try: - with fsys.working_dir(self.stage.source_path): - self.patch() - tty.msg('Ran patch() for {0}'.format(self.name)) - patched = True - except spack.multimethod.NoSuchMethodError: - # We are running a multimethod without a default case. - # If there's no default it means we don't need to patch. - if not patched: - # if we didn't apply a patch from a patch() - # directive, AND the patch function didn't apply, say - # no patches are needed. Otherwise, we already - # printed a message for each patch. - tty.msg('No patches needed for {0}'.format(self.name)) - except spack.error.SpackError as e: - tty.debug(e) - - # Touch bad file if anything goes wrong. - tty.msg('patch() function failed for {0}'.format(self.name)) - fsys.touch(bad_file) - raise - - # Get rid of any old failed file -- patches have either succeeded - # or are not needed. This is mostly defensive -- it's needed - # if the restage() method doesn't clean *everything* (e.g., for a repo) - if os.path.isfile(bad_file): - os.remove(bad_file) - - # touch good or no patches file so that we skip next time. - if patched: - fsys.touch(good_file) - else: - fsys.touch(no_patches_file) - - @classmethod - def all_patches(cls): - """Retrieve all patches associated with the package. - - Retrieves patches on the package itself as well as patches on the - dependencies of the package.""" - patches = [] - for _, patch_list in cls.patches.items(): - for patch in patch_list: - patches.append(patch) - - pkg_deps = cls.dependencies - for dep_name in pkg_deps: - for _, dependency in pkg_deps[dep_name].items(): - for _, patch_list in dependency.patches.items(): - for patch in patch_list: - patches.append(patch) - - return patches - - def content_hash(self, content=None): - """Create a hash based on the artifacts and patches used to build this package. - - This includes: - * source artifacts (tarballs, repositories) used to build; - * content hashes (``sha256``'s) of all patches applied by Spack; and - * canonicalized contents the ``package.py`` recipe used to build. - - This hash is only included in Spack's DAG hash for concrete specs, but if it - happens to be called on a package with an abstract spec, only applicable (i.e., - determinable) portions of the hash will be included. - - """ - # list of components to make up the hash - hash_content = [] - - # source artifacts/repositories - # TODO: resources - if self.spec.versions.concrete: - try: - source_id = fs.for_package_version(self, self.version).source_id() - except (fs.ExtrapolationError, fs.InvalidArgsError): - # ExtrapolationError happens if the package has no fetchers defined. - # InvalidArgsError happens when there are version directives with args, - # but none of them identifies an actual fetcher. - source_id = None - - if not source_id: - # TODO? in cases where a digest or source_id isn't available, - # should this attempt to download the source and set one? This - # probably only happens for source repositories which are - # referenced by branch name rather than tag or commit ID. - env = spack.environment.active_environment() - from_local_sources = env and env.is_develop(self.spec) - if not self.spec.external and not from_local_sources: - message = 'Missing a source id for {s.name}@{s.version}' - tty.warn(message.format(s=self)) - hash_content.append(''.encode('utf-8')) - else: - hash_content.append(source_id.encode('utf-8')) - - # patch sha256's - # Only include these if they've been assigned by the concretizer. - # We check spec._patches_assigned instead of spec.concrete because - # we have to call package_hash *before* marking specs concrete - if self.spec._patches_assigned(): - hash_content.extend( - ':'.join((p.sha256, str(p.level))).encode('utf-8') - for p in self.spec.patches - ) - - # package.py contents - hash_content.append(package_hash(self.spec, source=content).encode('utf-8')) - - # put it all together and encode as base32 - b32_hash = base64.b32encode( - hashlib.sha256( - bytes().join(sorted(hash_content)) - ).digest() - ).lower() - - # convert from bytes if running python 3 - if sys.version_info[0] >= 3: - b32_hash = b32_hash.decode('utf-8') - - return b32_hash - - def _has_make_target(self, target): - """Checks to see if 'target' is a valid target in a Makefile. - - Parameters: - target (str): the target to check for - - Returns: - bool: True if 'target' is found, else False - """ - # Prevent altering LC_ALL for 'make' outside this function - make = copy.deepcopy(inspect.getmodule(self).make) - - # Use English locale for missing target message comparison - make.add_default_env('LC_ALL', 'C') - - # Check if we have a Makefile - for makefile in ['GNUmakefile', 'Makefile', 'makefile']: - if os.path.exists(makefile): - break - else: - tty.debug('No Makefile found in the build directory') - return False - - # Check if 'target' is a valid target. - # - # `make -n target` performs a "dry run". It prints the commands that - # would be run but doesn't actually run them. If the target does not - # exist, you will see one of the following error messages: - # - # GNU Make: - # make: *** No rule to make target `test'. Stop. - # *** No rule to make target 'test'. Stop. - # - # BSD Make: - # make: don't know how to make test. Stop - missing_target_msgs = [ - "No rule to make target `{0}'. Stop.", - "No rule to make target '{0}'. Stop.", - "don't know how to make {0}. Stop", - ] - - kwargs = { - 'fail_on_error': False, - 'output': os.devnull, - 'error': str, - } - - stderr = make('-n', target, **kwargs) - - for missing_target_msg in missing_target_msgs: - if missing_target_msg.format(target) in stderr: - tty.debug("Target '{0}' not found in {1}" - .format(target, makefile)) - return False - - return True - - def _if_make_target_execute(self, target, *args, **kwargs): - """Runs ``make target`` if 'target' is a valid target in the Makefile. - - Parameters: - target (str): the target to potentially execute - """ - if self._has_make_target(target): - # Execute target - inspect.getmodule(self).make(target, *args, **kwargs) - - def _has_ninja_target(self, target): - """Checks to see if 'target' is a valid target in a Ninja build script. - - Parameters: - target (str): the target to check for - - Returns: - bool: True if 'target' is found, else False - """ - ninja = inspect.getmodule(self).ninja - - # Check if we have a Ninja build script - if not os.path.exists('build.ninja'): - tty.debug('No Ninja build script found in the build directory') - return False - - # Get a list of all targets in the Ninja build script - # https://ninja-build.org/manual.html#_extra_tools - all_targets = ninja('-t', 'targets', 'all', output=str).split('\n') - - # Check if 'target' is a valid target - matches = [line for line in all_targets - if line.startswith(target + ':')] - - if not matches: - tty.debug("Target '{0}' not found in build.ninja" - .format(target)) - return False - - return True - - def _if_ninja_target_execute(self, target, *args, **kwargs): - """Runs ``ninja target`` if 'target' is a valid target in the Ninja - build script. - - Parameters: - target (str): the target to potentially execute - """ - if self._has_ninja_target(target): - # Execute target - inspect.getmodule(self).ninja(target, *args, **kwargs) - - def _get_needed_resources(self): - resources = [] - # Select the resources that are needed for this build - if self.spec.concrete: - for when_spec, resource_list in self.resources.items(): - if when_spec in self.spec: - resources.extend(resource_list) - else: - for when_spec, resource_list in self.resources.items(): - # Note that variant checking is always strict for specs where - # the name is not specified. But with strict variant checking, - # only variants mentioned in 'other' are checked. Here we only - # want to make sure that no constraints in when_spec - # conflict with the spec, so we need to invoke - # when_spec.satisfies(self.spec) vs. - # self.spec.satisfies(when_spec) - if when_spec.satisfies(self.spec, strict=False): - resources.extend(resource_list) - # Sorts the resources by the length of the string representing their - # destination. Since any nested resource must contain another - # resource's name in its path, it seems that should work - resources = sorted(resources, key=lambda res: len(res.destination)) - return resources - - def _resource_stage(self, resource): - pieces = ['resource', resource.name, self.spec.dag_hash()] - resource_stage_folder = '-'.join(pieces) - return resource_stage_folder - - @contextlib.contextmanager - def _stage_and_write_lock(self): - """Prefix lock nested in a stage.""" - with self.stage: - with spack.store.db.prefix_write_lock(self.spec): - yield - - def do_install(self, **kwargs): - """Called by commands to install a package and or its dependencies. - - Package implementations should override install() to describe - their build process. - - Args: - cache_only (bool): Fail if binary package unavailable. - dirty (bool): Don't clean the build environment before installing. - explicit (bool): True if package was explicitly installed, False - if package was implicitly installed (as a dependency). - fail_fast (bool): Fail if any dependency fails to install; - otherwise, the default is to install as many dependencies as - possible (i.e., best effort installation). - fake (bool): Don't really build; install fake stub files instead. - force (bool): Install again, even if already installed. - install_deps (bool): Install dependencies before installing this - package - install_source (bool): By default, source is not installed, but - for debugging it might be useful to keep it around. - keep_prefix (bool): Keep install prefix on failure. By default, - destroys it. - keep_stage (bool): By default, stage is destroyed only if there - are no exceptions during build. Set to True to keep the stage - even with exceptions. - restage (bool): Force spack to restage the package source. - skip_patch (bool): Skip patch stage of build if True. - stop_before (InstallPhase): stop execution before this - installation phase (or None) - stop_at (InstallPhase): last installation phase to be executed - (or None) - tests (bool or list or set): False to run no tests, True to test - all packages, or a list of package names to run tests for some - use_cache (bool): Install from binary package, if available. - verbose (bool): Display verbose build output (by default, - suppresses it) - """ - # Non-transitive dev specs need to keep the dev stage and be built from - # source every time. Transitive ones just need to be built from source. - dev_path_var = self.spec.variants.get('dev_path', None) - if dev_path_var: - kwargs['keep_stage'] = True - - builder = PackageInstaller([(self, kwargs)]) - builder.install() - - def cache_extra_test_sources(self, srcs): - """Copy relative source paths to the corresponding install test subdir - - This method is intended as an optional install test setup helper for - grabbing source files/directories during the installation process and - copying them to the installation test subdirectory for subsequent use - during install testing. - - Args: - srcs (str or list): relative path for files and or - subdirectories located in the staged source path that are to - be copied to the corresponding location(s) under the install - testing directory. - """ - paths = [srcs] if isinstance(srcs, six.string_types) else srcs - - for path in paths: - src_path = os.path.join(self.stage.source_path, path) - dest_path = os.path.join(self.install_test_root, path) - if os.path.isdir(src_path): - fsys.install_tree(src_path, dest_path) - else: - fsys.mkdirp(os.path.dirname(dest_path)) - fsys.copy(src_path, dest_path) - - @contextlib.contextmanager - def _setup_test(self, verbose, externals): - self.test_failures = [] - if self.test_suite: - self.test_log_file = self.test_suite.log_file_for_spec(self.spec) - self.tested_file = self.test_suite.tested_file_for_spec(self.spec) - pkg_id = self.test_suite.test_pkg_id(self.spec) - else: - self.test_log_file = fsys.join_path( - self.stage.path, _spack_install_test_log) - pkg_id = self.spec.format('{name}-{version}-{hash:7}') - fsys.touch(self.test_log_file) # Otherwise log_parse complains - - with tty.log.log_output(self.test_log_file, verbose) as logger: - with logger.force_echo(): - tty.msg('Testing package {0}'.format(pkg_id)) - - # use debug print levels for log file to record commands - old_debug = tty.is_debug() - tty.set_debug(True) - - try: - yield logger - finally: - # reset debug level - tty.set_debug(old_debug) - - def do_test(self, dirty=False, externals=False): - if self.test_requires_compiler: - compilers = spack.compilers.compilers_for_spec( - self.spec.compiler, arch_spec=self.spec.architecture) - if not compilers: - tty.error('Skipping tests for package %s\n' % - self.spec.format('{name}-{version}-{hash:7}') + - 'Package test requires missing compiler %s' % - self.spec.compiler) - return - - kwargs = { - 'dirty': dirty, 'fake': False, 'context': 'test', - 'externals': externals - } - if tty.is_verbose(): - kwargs['verbose'] = True - spack.build_environment.start_build_process( - self, test_process, kwargs) - - def test(self): - # Defer tests to virtual and concrete packages - pass - - def run_test(self, exe, options=[], expected=[], status=0, - installed=False, purpose='', skip_missing=False, - work_dir=None): - """Run the test and confirm the expected results are obtained - - Log any failures and continue, they will be re-raised later - - Args: - exe (str): the name of the executable - options (str or list): list of options to pass to the runner - expected (str or list): list of expected output strings. - Each string is a regex expected to match part of the output. - status (int or list): possible passing status values - with 0 meaning the test is expected to succeed - installed (bool): if ``True``, the executable must be in the - install prefix - purpose (str): message to display before running test - skip_missing (bool): skip the test if the executable is not - in the install prefix bin directory or the provided work_dir - work_dir (str or None): path to the smoke test directory - """ - wdir = '.' if work_dir is None else work_dir - with fsys.working_dir(wdir, create=True): - try: - runner = which(exe) - if runner is None and skip_missing: - return - assert runner is not None, \ - "Failed to find executable '{0}'".format(exe) - - self._run_test_helper( - runner, options, expected, status, installed, purpose) - print("PASSED") - return True - except BaseException as e: - # print a summary of the error to the log file - # so that cdash and junit reporters know about it - exc_type, _, tb = sys.exc_info() - print('FAILED: {0}'.format(e)) - import traceback - - # remove the current call frame to exclude the extract_stack - # call from the error - stack = traceback.extract_stack()[:-1] - - # Package files have a line added at import time, so we re-read - # the file to make line numbers match. We have to subtract two - # from the line number because the original line number is - # inflated once by the import statement and the lines are - # displaced one by the import statement. - for i, entry in enumerate(stack): - filename, lineno, function, text = entry - if spack.repo.is_package_file(filename): - with open(filename, 'r') as f: - lines = f.readlines() - new_lineno = lineno - 2 - text = lines[new_lineno] - stack[i] = (filename, new_lineno, function, text) - - # Format the stack to print and print it - out = traceback.format_list(stack) - for line in out: - print(line.rstrip('\n')) - - if exc_type is spack.util.executable.ProcessError: - out = six.StringIO() - spack.build_environment.write_log_summary( - out, 'test', self.test_log_file, last=1) - m = out.getvalue() - else: - # We're below the package context, so get context from - # stack instead of from traceback. - # The traceback is truncated here, so we can't use it to - # traverse the stack. - m = '\n'.join( - spack.build_environment.get_package_context(tb) - ) - - exc = e # e is deleted after this block - - # If we fail fast, raise another error - if spack.config.get('config:fail_fast', False): - raise TestFailure([(exc, m)]) - else: - self.test_failures.append((exc, m)) - return False - - def _run_test_helper(self, runner, options, expected, status, installed, - purpose): - status = [status] if isinstance(status, six.integer_types) else status - expected = [expected] if isinstance(expected, six.string_types) else \ - expected - options = [options] if isinstance(options, six.string_types) else \ - options - - if purpose: - tty.msg(purpose) - else: - tty.debug('test: {0}: expect command status in {1}' - .format(runner.name, status)) - - if installed: - msg = "Executable '{0}' expected in prefix".format(runner.name) - msg += ", found in {0} instead".format(runner.path) - assert runner.path.startswith(self.spec.prefix), msg - - try: - output = runner(*options, output=str.split, error=str.split) - - assert 0 in status, \ - 'Expected {0} execution to fail'.format(runner.name) - except ProcessError as err: - output = str(err) - match = re.search(r'exited with status ([0-9]+)', output) - if not (match and int(match.group(1)) in status): - raise - - for check in expected: - cmd = ' '.join([runner.name] + options) - msg = "Expected '{0}' to match output of `{1}`".format(check, cmd) - msg += '\n\nOutput: {0}'.format(output) - assert re.search(check, output), msg - - def unit_test_check(self): - """Hook for unit tests to assert things about package internals. - - Unit tests can override this function to perform checks after - ``Package.install`` and all post-install hooks run, but before - the database is updated. - - The overridden function may indicate that the install procedure - should terminate early (before updating the database) by - returning ``False`` (or any value such that ``bool(result)`` is - ``False``). - - Return: - (bool): ``True`` to continue, ``False`` to skip ``install()`` - """ - return True - - def sanity_check_prefix(self): - """This function checks whether install succeeded.""" - - def check_paths(path_list, filetype, predicate): - if isinstance(path_list, six.string_types): - path_list = [path_list] - - for path in path_list: - abs_path = os.path.join(self.prefix, path) - if not predicate(abs_path): - raise InstallError( - "Install failed for %s. No such %s in prefix: %s" % - (self.name, filetype, path)) - - check_paths(self.sanity_check_is_file, 'file', os.path.isfile) - check_paths(self.sanity_check_is_dir, 'directory', os.path.isdir) - - installed = set(os.listdir(self.prefix)) - installed.difference_update( - spack.store.layout.hidden_file_regexes) - if not installed: - raise InstallError( - "Install failed for %s. Nothing was installed!" % self.name) - - def apply_macos_rpath_fixups(self): - """On Darwin, make installed libraries more easily relocatable. - - Some build systems (handrolled, autotools, makefiles) can set their own - rpaths that are duplicated by spack's compiler wrapper. This fixup - interrogates, and postprocesses if necessary, all libraries installed - by the code. - - It should be added as a @run_after to packaging systems (or individual - packages) that do not install relocatable libraries by default. - """ - if 'platform=darwin' not in self.spec: - return - - from spack.relocate import fixup_macos_rpaths - fixup_macos_rpaths(self.spec) - - @property - def build_log_path(self): - """ - Return the expected (or current) build log file path. The path points - to the staging build file until the software is successfully installed, - when it points to the file in the installation directory. - """ - return self.install_log_path if self.spec.installed else self.log_path - - @classmethod - def inject_flags(cls, name, flags): - """ - flag_handler that injects all flags through the compiler wrapper. - """ - return flags, None, None - - @classmethod - def env_flags(cls, name, flags): - """ - flag_handler that adds all flags to canonical environment variables. - """ - return None, flags, None - - @classmethod - def build_system_flags(cls, name, flags): - """ - flag_handler that passes flags to the build system arguments. Any - package using `build_system_flags` must also implement - `flags_to_build_system_args`, or derive from a class that - implements it. Currently, AutotoolsPackage and CMakePackage - implement it. - """ - return None, None, flags - - def setup_build_environment(self, env): - """Sets up the build environment for a package. - - This method will be called before the current package prefix exists in - Spack's store. - - Args: - env (spack.util.environment.EnvironmentModifications): environment - modifications to be applied when the package is built. Package authors - can call methods on it to alter the build environment. - """ - pass - - def setup_run_environment(self, env): - """Sets up the run environment for a package. - - Args: - env (spack.util.environment.EnvironmentModifications): environment - modifications to be applied when the package is run. Package authors - can call methods on it to alter the run environment. - """ - pass - - def setup_dependent_build_environment(self, env, dependent_spec): - """Sets up the build environment of packages that depend on this one. - - This is similar to ``setup_build_environment``, but it is used to - modify the build environments of packages that *depend* on this one. - - This gives packages like Python and others that follow the extension - model a way to implement common environment or compile-time settings - for dependencies. - - This method will be called before the dependent package prefix exists - in Spack's store. - - Examples: - 1. Installing python modules generally requires ``PYTHONPATH`` - to point to the ``lib/pythonX.Y/site-packages`` directory in the - module's install prefix. This method could be used to set that - variable. - - Args: - env (spack.util.environment.EnvironmentModifications): environment - modifications to be applied when the dependent package is built. - Package authors can call methods on it to alter the build environment. - - dependent_spec (spack.spec.Spec): the spec of the dependent package - about to be built. This allows the extendee (self) to query - the dependent's state. Note that *this* package's spec is - available as ``self.spec`` - """ - pass - - def setup_dependent_run_environment(self, env, dependent_spec): - """Sets up the run environment of packages that depend on this one. - - This is similar to ``setup_run_environment``, but it is used to - modify the run environments of packages that *depend* on this one. - - This gives packages like Python and others that follow the extension - model a way to implement common environment or run-time settings - for dependencies. - - Args: - env (spack.util.environment.EnvironmentModifications): environment - modifications to be applied when the dependent package is run. - Package authors can call methods on it to alter the build environment. - - dependent_spec (spack.spec.Spec): The spec of the dependent package - about to be run. This allows the extendee (self) to query - the dependent's state. Note that *this* package's spec is - available as ``self.spec`` - """ - pass - - def setup_dependent_package(self, module, dependent_spec): - """Set up Python module-scope variables for dependent packages. - - Called before the install() method of dependents. - - Default implementation does nothing, but this can be - overridden by an extendable package to set up the module of - its extensions. This is useful if there are some common steps - to installing all extensions for a certain package. - - Examples: - - 1. Extensions often need to invoke the ``python`` interpreter - from the Python installation being extended. This routine - can put a ``python()`` Executable object in the module scope - for the extension package to simplify extension installs. - - 2. MPI compilers could set some variables in the dependent's - scope that point to ``mpicc``, ``mpicxx``, etc., allowing - them to be called by common name regardless of which MPI is used. - - 3. BLAS/LAPACK implementations can set some variables - indicating the path to their libraries, since these - paths differ by BLAS/LAPACK implementation. - - Args: - module (spack.package.PackageBase.module): The Python ``module`` - object of the dependent package. Packages can use this to set - module-scope variables for the dependent to use. - - dependent_spec (spack.spec.Spec): The spec of the dependent package - about to be built. This allows the extendee (self) to - query the dependent's state. Note that *this* - package's spec is available as ``self.spec``. - """ - pass - - flag_handler = inject_flags - # The flag handler method is called for each of the allowed compiler flags. - # It returns a triple of inject_flags, env_flags, build_system_flags. - # The flags returned as inject_flags are injected through the spack - # compiler wrappers. - # The flags returned as env_flags are passed to the build system through - # the environment variables of the same name. - # The flags returned as build_system_flags are passed to the build system - # package subclass to be turned into the appropriate part of the standard - # arguments. This is implemented for build system classes where - # appropriate and will otherwise raise a NotImplementedError. - - def flags_to_build_system_args(self, flags): - # Takes flags as a dict name: list of values - if any(v for v in flags.values()): - msg = 'The {0} build system'.format(self.__class__.__name__) - msg += ' cannot take command line arguments for compiler flags' - raise NotImplementedError(msg) - - @staticmethod - def uninstall_by_spec(spec, force=False, deprecator=None): - if not os.path.isdir(spec.prefix): - # prefix may not exist, but DB may be inconsistent. Try to fix by - # removing, but omit hooks. - specs = spack.store.db.query(spec, installed=True) - if specs: - if deprecator: - spack.store.db.deprecate(specs[0], deprecator) - tty.debug('Deprecating stale DB entry for {0}' - .format(spec.short_spec)) - else: - spack.store.db.remove(specs[0]) - tty.debug('Removed stale DB entry for {0}' - .format(spec.short_spec)) - return - else: - raise InstallError(str(spec) + " is not installed.") - - if not force: - dependents = spack.store.db.installed_relatives( - spec, - direction='parents', - transitive=True, - deptype=("link", "run"), - ) - if dependents: - raise PackageStillNeededError(spec, dependents) - - # Try to get the package for the spec - try: - pkg = spec.package - except spack.repo.UnknownEntityError: - pkg = None - - # Pre-uninstall hook runs first. - with spack.store.db.prefix_write_lock(spec): - - if pkg is not None: - try: - spack.hooks.pre_uninstall(spec) - except Exception as error: - if force: - error_msg = ( - "One or more pre_uninstall hooks have failed" - " for {0}, but Spack is continuing with the" - " uninstall".format(str(spec))) - if isinstance(error, spack.error.SpackError): - error_msg += ( - "\n\nError message: {0}".format(str(error))) - tty.warn(error_msg) - # Note that if the uninstall succeeds then we won't be - # seeing this error again and won't have another chance - # to run the hook. - else: - raise - - # Uninstalling in Spack only requires removing the prefix. - if not spec.external: - msg = 'Deleting package prefix [{0}]' - tty.debug(msg.format(spec.short_spec)) - # test if spec is already deprecated, not whether we want to - # deprecate it now - deprecated = bool(spack.store.db.deprecator(spec)) - spack.store.layout.remove_install_directory(spec, deprecated) - # Delete DB entry - if deprecator: - msg = 'deprecating DB entry [{0}] in favor of [{1}]' - tty.debug(msg.format(spec.short_spec, deprecator.short_spec)) - spack.store.db.deprecate(spec, deprecator) - else: - msg = 'Deleting DB entry [{0}]' - tty.debug(msg.format(spec.short_spec)) - spack.store.db.remove(spec) - - if pkg is not None: - try: - spack.hooks.post_uninstall(spec) - except Exception: - # If there is a failure here, this is our only chance to do - # something about it: at this point the Spec has been removed - # from the DB and prefix, so the post-uninstallation hooks - # will not have another chance to run. - error_msg = ( - "One or more post-uninstallation hooks failed for" - " {0}, but the prefix has been removed (if it is not" - " external).".format(str(spec))) - tb_msg = traceback.format_exc() - error_msg += "\n\nThe error:\n\n{0}".format(tb_msg) - tty.warn(error_msg) - - tty.msg('Successfully uninstalled {0}'.format(spec.short_spec)) - - def do_uninstall(self, force=False): - """Uninstall this package by spec.""" - # delegate to instance-less method. - Package.uninstall_by_spec(self.spec, force) - - def do_deprecate(self, deprecator, link_fn): - """Deprecate this package in favor of deprecator spec""" - spec = self.spec - - # Check whether package to deprecate has active extensions - if self.extendable: - view = spack.filesystem_view.YamlFilesystemView(spec.prefix, - spack.store.layout) - active_exts = view.extensions_layout.extension_map(spec).values() - if active_exts: - short = spec.format('{name}/{hash:7}') - m = "Spec %s has active extensions\n" % short - for active in active_exts: - m += ' %s\n' % active.format('{name}/{hash:7}') - m += "Deactivate extensions before deprecating %s" % short - tty.die(m) - - # Check whether package to deprecate is an active extension - if self.is_extension: - extendee = self.extendee_spec - view = spack.filesystem_view.YamlFilesystemView(extendee.prefix, - spack.store.layout) - - if self.is_activated(view): - short = spec.format('{name}/{hash:7}') - short_ext = extendee.format('{name}/{hash:7}') - msg = "Spec %s is an active extension of %s\n" % (short, - short_ext) - msg += "Deactivate %s to be able to deprecate it" % short - tty.die(msg) - - # Install deprecator if it isn't installed already - if not spack.store.db.query(deprecator): - deprecator.package.do_install() - - old_deprecator = spack.store.db.deprecator(spec) - if old_deprecator: - # Find this specs yaml file from its old deprecation - self_yaml = spack.store.layout.deprecated_file_path(spec, - old_deprecator) - else: - self_yaml = spack.store.layout.spec_file_path(spec) - - # copy spec metadata to "deprecated" dir of deprecator - depr_yaml = spack.store.layout.deprecated_file_path(spec, - deprecator) - fsys.mkdirp(os.path.dirname(depr_yaml)) - shutil.copy2(self_yaml, depr_yaml) - - # Any specs deprecated in favor of this spec are re-deprecated in - # favor of its new deprecator - for deprecated in spack.store.db.specs_deprecated_by(spec): - deprecated.package.do_deprecate(deprecator, link_fn) - - # Now that we've handled metadata, uninstall and replace with link - Package.uninstall_by_spec(spec, force=True, deprecator=deprecator) - link_fn(deprecator.prefix, spec.prefix) - - def _check_extendable(self): - if not self.extendable: - raise ValueError("Package %s is not extendable!" % self.name) - - def _sanity_check_extension(self): - if not self.is_extension: - raise ActivationError("This package is not an extension.") - - extendee_package = self.extendee_spec.package - extendee_package._check_extendable() - - if not self.extendee_spec.installed: - raise ActivationError( - "Can only (de)activate extensions for installed packages.") - if not self.spec.installed: - raise ActivationError("Extensions must first be installed.") - if self.extendee_spec.name not in self.extendees: - raise ActivationError("%s does not extend %s!" % - (self.name, self.extendee.name)) - - def do_activate(self, view=None, with_dependencies=True, verbose=True): - """Called on an extension to invoke the extendee's activate method. - - Commands should call this routine, and should not call - activate() directly. - """ - if verbose: - tty.msg('Activating extension {0} for {1}'.format( - self.spec.cshort_spec, self.extendee_spec.cshort_spec)) - - self._sanity_check_extension() - if not view: - view = YamlFilesystemView( - self.extendee_spec.prefix, spack.store.layout) - - extensions_layout = view.extensions_layout - - try: - extensions_layout.check_extension_conflict( - self.extendee_spec, self.spec) - except spack.directory_layout.ExtensionAlreadyInstalledError as e: - # already installed, let caller know - tty.msg(e.message) - return - - # Activate any package dependencies that are also extensions. - if with_dependencies: - for spec in self.dependency_activations(): - if not spec.package.is_activated(view): - spec.package.do_activate( - view, with_dependencies=with_dependencies, - verbose=verbose) - - self.extendee_spec.package.activate( - self, view, **self.extendee_args) - - extensions_layout.add_extension(self.extendee_spec, self.spec) - - if verbose: - tty.debug('Activated extension {0} for {1}'.format( - self.spec.cshort_spec, self.extendee_spec.cshort_spec)) - - def dependency_activations(self): - return (spec for spec in self.spec.traverse(root=False, deptype='run') - if spec.package.extends(self.extendee_spec)) - - def activate(self, extension, view, **kwargs): - """ - Add the extension to the specified view. - - Package authors can override this function to maintain some - centralized state related to the set of activated extensions - for a package. - - Spack internals (commands, hooks, etc.) should call - do_activate() method so that proper checks are always executed. - """ - view.merge(extension.spec, ignore=kwargs.get('ignore', None)) - - def do_deactivate(self, view=None, **kwargs): - """Remove this extension package from the specified view. Called - on the extension to invoke extendee's deactivate() method. - - `remove_dependents=True` deactivates extensions depending on this - package instead of raising an error. - """ - self._sanity_check_extension() - force = kwargs.get('force', False) - verbose = kwargs.get('verbose', True) - remove_dependents = kwargs.get('remove_dependents', False) - - if verbose: - tty.msg('Deactivating extension {0} for {1}'.format( - self.spec.cshort_spec, self.extendee_spec.cshort_spec)) - - if not view: - view = YamlFilesystemView( - self.extendee_spec.prefix, spack.store.layout) - extensions_layout = view.extensions_layout - - # Allow a force deactivate to happen. This can unlink - # spurious files if something was corrupted. - if not force: - extensions_layout.check_activated( - self.extendee_spec, self.spec) - - activated = extensions_layout.extension_map( - self.extendee_spec) - for name, aspec in activated.items(): - if aspec == self.spec: - continue - for dep in aspec.traverse(deptype='run'): - if self.spec == dep: - if remove_dependents: - aspec.package.do_deactivate(**kwargs) - else: - msg = ('Cannot deactivate {0} because {1} is ' - 'activated and depends on it') - raise ActivationError(msg.format( - self.spec.cshort_spec, aspec.cshort_spec)) - - self.extendee_spec.package.deactivate( - self, view, **self.extendee_args) - - # redundant activation check -- makes SURE the spec is not - # still activated even if something was wrong above. - if self.is_activated(view): - extensions_layout.remove_extension( - self.extendee_spec, self.spec) - - if verbose: - tty.debug('Deactivated extension {0} for {1}'.format( - self.spec.cshort_spec, self.extendee_spec.cshort_spec)) - - def deactivate(self, extension, view, **kwargs): - """ - Remove all extension files from the specified view. - - Package authors can override this method to support other - extension mechanisms. Spack internals (commands, hooks, etc.) - should call do_deactivate() method so that proper checks are - always executed. - """ - view.unmerge(extension.spec, ignore=kwargs.get('ignore', None)) - - def view(self): - """Create a view with the prefix of this package as the root. - Extensions added to this view will modify the installation prefix of - this package. - """ - return YamlFilesystemView(self.prefix, spack.store.layout) - - def do_restage(self): - """Reverts expanded/checked out source to a pristine state.""" - self.stage.restage() - - def do_clean(self): - """Removes the package's build stage and source tarball.""" - for patch in self.spec.patches: - patch.clean() - - self.stage.destroy() - - def format_doc(self, **kwargs): - """Wrap doc string at 72 characters and format nicely""" - indent = kwargs.get('indent', 0) - - if not self.__doc__: - return "" - - doc = re.sub(r'\s+', ' ', self.__doc__) - lines = textwrap.wrap(doc, 72) - results = six.StringIO() - for line in lines: - results.write((" " * indent) + line + "\n") - return results.getvalue() - - @property - def all_urls(self): - """A list of all URLs in a package. - - Check both class-level and version-specific URLs. - - Returns: - list: a list of URLs - """ - urls = [] - if hasattr(self, 'url') and self.url: - urls.append(self.url) - - # fetch from first entry in urls to save time - if hasattr(self, 'urls') and self.urls: - urls.append(self.urls[0]) - - for args in self.versions.values(): - if 'url' in args: - urls.append(args['url']) - return urls - - def fetch_remote_versions(self, concurrency=128): - """Find remote versions of this package. - - Uses ``list_url`` and any other URLs listed in the package file. - - Returns: - dict: a dictionary mapping versions to URLs - """ - if not self.all_urls: - return {} - - try: - return spack.util.web.find_versions_of_archive( - self.all_urls, - self.list_url, - self.list_depth, - concurrency, - reference_package=self, - ) - except spack.util.web.NoNetworkConnectionError as e: - tty.die("Package.fetch_versions couldn't connect to:", e.url, - e.message) - - @property - def rpath(self): - """Get the rpath this package links with, as a list of paths.""" - rpaths = [self.prefix.lib, self.prefix.lib64] - deps = self.spec.dependencies(deptype='link') - rpaths.extend(d.prefix.lib for d in deps - if os.path.isdir(d.prefix.lib)) - rpaths.extend(d.prefix.lib64 for d in deps - if os.path.isdir(d.prefix.lib64)) - return rpaths - - @property - def rpath_args(self): - """ - Get the rpath args as a string, with -Wl,-rpath, for each element - """ - return " ".join("-Wl,-rpath,%s" % p for p in self.rpath) - - def _run_test_callbacks(self, method_names, callback_type='install'): - """Tries to call all of the listed methods, returning immediately - if the list is None.""" - if method_names is None: - return - - fail_fast = spack.config.get('config:fail_fast', False) - - with self._setup_test(verbose=False, externals=False) as logger: - # Report running each of the methods in the build log - print_test_message( - logger, 'Running {0}-time tests'.format(callback_type), True) - - for name in method_names: - try: - fn = getattr(self, name) - - msg = 'RUN-TESTS: {0}-time tests [{1}]' \ - .format(callback_type, name), - print_test_message(logger, msg, True) - - fn() - except AttributeError as e: - msg = 'RUN-TESTS: method not implemented [{0}]' \ - .format(name), - print_test_message(logger, msg, True) - - self.test_failures.append((e, msg)) - if fail_fast: - break - - # Raise any collected failures here - if self.test_failures: - raise TestFailure(self.test_failures) - - @on_package_attributes(run_tests=True) - def _run_default_build_time_test_callbacks(self): - """Tries to call all the methods that are listed in the attribute - ``build_time_test_callbacks`` if ``self.run_tests is True``. - """ - self._run_test_callbacks(self.build_time_test_callbacks, 'build') - - @on_package_attributes(run_tests=True) - def _run_default_install_time_test_callbacks(self): - """Tries to call all the methods that are listed in the attribute - ``install_time_test_callbacks`` if ``self.run_tests is True``. - """ - self._run_test_callbacks(self.install_time_test_callbacks, 'install') - - -def has_test_method(pkg): - """Determine if the package defines its own stand-alone test method. - - Args: - pkg (str): the package being checked - - Returns: - (bool): ``True`` if the package overrides the default method; else - ``False`` - """ - if not inspect.isclass(pkg): - tty.die('{0}: is not a class, it is {1}'.format(pkg, type(pkg))) - - return ( - (issubclass(pkg, PackageBase) and pkg.test != PackageBase.test) or - (isinstance(pkg, PackageBase) and pkg.test.__func__ != PackageBase.test) - ) - - -def print_test_message(logger, msg, verbose): - if verbose: - with logger.force_echo(): - tty.msg(msg) - else: - tty.msg(msg) - - -def test_process(pkg, kwargs): - verbose = kwargs.get('verbose', False) - externals = kwargs.get('externals', False) - - with pkg._setup_test(verbose, externals) as logger: - if pkg.spec.external and not externals: - print_test_message( - logger, 'Skipped tests for external package', verbose) - return - - # run test methods from the package and all virtuals it - # provides virtuals have to be deduped by name - v_names = list(set([vspec.name - for vspec in pkg.virtuals_provided])) - - # hack for compilers that are not dependencies (yet) - # TODO: this all eventually goes away - c_names = ('gcc', 'intel', 'intel-parallel-studio', 'pgi') - if pkg.name in c_names: - v_names.extend(['c', 'cxx', 'fortran']) - if pkg.spec.satisfies('llvm+clang'): - v_names.extend(['c', 'cxx']) - - test_specs = [pkg.spec] + [spack.spec.Spec(v_name) - for v_name in sorted(v_names)] - - ran_actual_test_function = False - try: - with fsys.working_dir(pkg.test_suite.test_dir_for_spec(pkg.spec)): - for spec in test_specs: - pkg.test_suite.current_test_spec = spec - # Fail gracefully if a virtual has no package/tests - try: - spec_pkg = spec.package - except spack.repo.UnknownPackageError: - continue - - # copy installed test sources cache into test cache dir - if spec.concrete: - cache_source = spec_pkg.install_test_root - cache_dir = pkg.test_suite.current_test_cache_dir - if (os.path.isdir(cache_source) and - not os.path.exists(cache_dir)): - fsys.install_tree(cache_source, cache_dir) - - # copy test data into test data dir - data_source = Prefix(spec_pkg.package_dir).test - data_dir = pkg.test_suite.current_test_data_dir - if (os.path.isdir(data_source) and - not os.path.exists(data_dir)): - # We assume data dir is used read-only - # maybe enforce this later - shutil.copytree(data_source, data_dir) - - # grab the function for each method so we can call - # it with the package - test_fn = spec_pkg.__class__.test - if not isinstance(test_fn, types.FunctionType): - test_fn = test_fn.__func__ - - # Skip any test methods consisting solely of 'pass' - # since they do not contribute to package testing. - source = (inspect.getsource(test_fn)).splitlines()[1:] - lines = (ln.strip() for ln in source) - statements = [ln for ln in lines if not ln.startswith('#')] - if len(statements) > 0 and statements[0] == 'pass': - continue - - # Run the tests - ran_actual_test_function = True - context = logger.force_echo if verbose else nullcontext - with context(): - test_fn(pkg) - - # If fail-fast was on, we error out above - # If we collect errors, raise them in batch here - if pkg.test_failures: - raise TestFailure(pkg.test_failures) - - finally: - # flag the package as having been tested (i.e., ran one or more - # non-pass-only methods - if ran_actual_test_function: - fsys.touch(pkg.tested_file) - else: - print_test_message(logger, 'No tests to run', verbose) - - -inject_flags = PackageBase.inject_flags -env_flags = PackageBase.env_flags -build_system_flags = PackageBase.build_system_flags - - -class BundlePackage(PackageBase): - """General purpose bundle, or no-code, package class.""" - #: There are no phases by default but the property is required to support - #: post-install hooks (e.g., for module generation). - phases = [] # type: List[str] - #: This attribute is used in UI queries that require to know which - #: build-system class we are using - build_system_class = 'BundlePackage' - - #: Bundle packages do not have associated source or binary code. - has_code = False - - -class Package(PackageBase): - """General purpose class with a single ``install`` - phase that needs to be coded by packagers. - """ - #: The one and only phase - phases = ['install'] - #: This attribute is used in UI queries that require to know which - #: build-system class we are using - build_system_class = 'Package' - # This will be used as a registration decorator in user - # packages, if need be - run_after('install')(PackageBase.sanity_check_prefix) - # On macOS, force rpaths for shared library IDs and remove duplicate rpaths - run_after('install')(PackageBase.apply_macos_rpath_fixups) - - -def install_dependency_symlinks(pkg, spec, prefix): - """ - Execute a dummy install and flatten dependencies. - - This routine can be used in a ``package.py`` definition by setting - ``install = install_dependency_symlinks``. - - This feature comes in handy for creating a common location for the - the installation of third-party libraries. - """ - flatten_dependencies(spec, prefix) - - -def use_cray_compiler_names(): - """Compiler names for builds that rely on cray compiler names.""" - os.environ['CC'] = 'cc' - os.environ['CXX'] = 'CC' - os.environ['FC'] = 'ftn' - os.environ['F77'] = 'ftn' - - -def flatten_dependencies(spec, flat_dir): - """Make each dependency of spec present in dir via symlink.""" - for dep in spec.traverse(root=False): - name = dep.name - - dep_path = spack.store.layout.path_for_spec(dep) - dep_files = LinkTree(dep_path) - - os.mkdir(flat_dir + '/' + name) - - conflict = dep_files.find_conflict(flat_dir + '/' + name) - if conflict: - raise DependencyConflictError(conflict) - - dep_files.merge(flat_dir + '/' + name) - - -def possible_dependencies(*pkg_or_spec, **kwargs): - """Get the possible dependencies of a number of packages. - - See ``PackageBase.possible_dependencies`` for details. - """ - packages = [] - for pos in pkg_or_spec: - if isinstance(pos, PackageMeta): - packages.append(pos) - continue - - if not isinstance(pos, spack.spec.Spec): - pos = spack.spec.Spec(pos) - - if spack.repo.path.is_virtual(pos.name): - packages.extend( - p.package_class - for p in spack.repo.path.providers_for(pos.name) - ) - continue - else: - packages.append(pos.package_class) - - visited = {} - for pkg in packages: - pkg.possible_dependencies(visited=visited, **kwargs) - - return visited - - -class FetchError(spack.error.SpackError): - """Raised when something goes wrong during fetch.""" - - def __init__(self, message, long_msg=None): - super(FetchError, self).__init__(message, long_msg) - - -class PackageStillNeededError(InstallError): - """Raised when package is still needed by another on uninstall.""" - def __init__(self, spec, dependents): - super(PackageStillNeededError, self).__init__("Cannot uninstall %s" % - spec) - self.spec = spec - self.dependents = dependents - - -class PackageError(spack.error.SpackError): - """Raised when something is wrong with a package definition.""" - def __init__(self, message, long_msg=None): - super(PackageError, self).__init__(message, long_msg) - - -class PackageVersionError(PackageError): - """Raised when a version URL cannot automatically be determined.""" - def __init__(self, version): - super(PackageVersionError, self).__init__( - "Cannot determine a URL automatically for version %s" % version, - "Please provide a url for this version in the package.py file.") - - -class NoURLError(PackageError): - """Raised when someone tries to build a URL for a package with no URLs.""" - - def __init__(self, cls): - super(NoURLError, self).__init__( - "Package %s has no version with a URL." % cls.__name__) - - -class InvalidPackageOpError(PackageError): - """Raised when someone tries perform an invalid operation on a package.""" - - -class ExtensionError(PackageError): - """Superclass for all errors having to do with extension packages.""" - - -class ActivationError(ExtensionError): - """Raised when there are problems activating an extension.""" - def __init__(self, msg, long_msg=None): - super(ActivationError, self).__init__(msg, long_msg) - - -class DependencyConflictError(spack.error.SpackError): - """Raised when the dependencies cannot be flattened as asked for.""" - def __init__(self, conflict): - super(DependencyConflictError, self).__init__( - "%s conflicts with another file in the flattened directory." % ( - conflict)) +# import most common types used in packages +from typing import Dict, List, Optional + +import llnl.util.filesystem +from llnl.util.filesystem import * + +import spack.util.executable +from spack.build_systems.aspell_dict import AspellDictPackage +from spack.build_systems.autotools import AutotoolsPackage +from spack.build_systems.cached_cmake import ( + CachedCMakePackage, + cmake_cache_option, + cmake_cache_path, + cmake_cache_string, +) +from spack.build_systems.cmake import CMakePackage +from spack.build_systems.cuda import CudaPackage +from spack.build_systems.gnu import GNUMirrorPackage +from spack.build_systems.intel import IntelPackage +from spack.build_systems.lua import LuaPackage +from spack.build_systems.makefile import MakefilePackage +from spack.build_systems.maven import MavenPackage +from spack.build_systems.meson import MesonPackage +from spack.build_systems.octave import OctavePackage +from spack.build_systems.oneapi import ( + IntelOneApiLibraryPackage, + IntelOneApiPackage, + IntelOneApiStaticLibraryList, +) +from spack.build_systems.perl import PerlPackage +from spack.build_systems.python import PythonPackage +from spack.build_systems.qmake import QMakePackage +from spack.build_systems.r import RPackage +from spack.build_systems.racket import RacketPackage +from spack.build_systems.rocm import ROCmPackage +from spack.build_systems.ruby import RubyPackage +from spack.build_systems.scons import SConsPackage +from spack.build_systems.sip import SIPPackage +from spack.build_systems.sourceforge import SourceforgePackage +from spack.build_systems.sourceware import SourcewarePackage +from spack.build_systems.waf import WafPackage +from spack.build_systems.xorg import XorgPackage +from spack.dependency import all_deptypes +from spack.directives import * +from spack.install_test import get_escaped_text_output +from spack.installer import ( + ExternalPackageError, + InstallError, + InstallLockError, + UpstreamPackageError, +) +from spack.mixins import filter_compiler_wrappers +from spack.multimethod import when +from spack.package_base import ( + BundlePackage, + DependencyConflictError, + Package, + build_system_flags, + env_flags, + flatten_dependencies, + inject_flags, + install_dependency_symlinks, + on_package_attributes, + run_after, + run_before, +) +from spack.spec import InvalidSpecDetected, Spec +from spack.util.executable import * +from spack.variant import ( + any_combination_of, + auto_or_any_combination_of, + conditional, + disjoint_sets, +) +from spack.version import Version, ver
\ No newline at end of file diff --git a/lib/spack/spack/package_base.py b/lib/spack/spack/package_base.py new file mode 100644 index 0000000000..1c736fb326 --- /dev/null +++ b/lib/spack/spack/package_base.py @@ -0,0 +1,3107 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +"""This is where most of the action happens in Spack. + +The spack package class structure is based strongly on Homebrew +(http://brew.sh/), mainly because Homebrew makes it very easy to create +packages. +""" + +import base64 +import collections +import contextlib +import copy +import functools +import glob +import hashlib +import inspect +import os +import re +import shutil +import sys +import textwrap +import time +import traceback +import types +import warnings +from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type # novm + +import six + +import llnl.util.filesystem as fsys +import llnl.util.tty as tty +from llnl.util.lang import memoized, nullcontext +from llnl.util.link_tree import LinkTree + +import spack.compilers +import spack.config +import spack.dependency +import spack.directives +import spack.directory_layout +import spack.environment +import spack.error +import spack.fetch_strategy as fs +import spack.hooks +import spack.mirror +import spack.mixins +import spack.multimethod +import spack.paths +import spack.repo +import spack.store +import spack.url +import spack.util.environment +import spack.util.path +import spack.util.web +from spack.filesystem_view import YamlFilesystemView +from spack.install_test import TestFailure, TestSuite +from spack.installer import InstallError, PackageInstaller +from spack.stage import ResourceStage, Stage, StageComposite, stage_prefix +from spack.util.executable import ProcessError, which +from spack.util.package_hash import package_hash +from spack.util.prefix import Prefix +from spack.version import Version + +if sys.version_info[0] >= 3: + FLAG_HANDLER_RETURN_TYPE = Tuple[ + Optional[Iterable[str]], + Optional[Iterable[str]], + Optional[Iterable[str]], + ] + FLAG_HANDLER_TYPE = Callable[ + [str, Iterable[str]], + FLAG_HANDLER_RETURN_TYPE + ] + +"""Allowed URL schemes for spack packages.""" +_ALLOWED_URL_SCHEMES = ["http", "https", "ftp", "file", "git"] + + +# Filename for the Spack build/install log. +_spack_build_logfile = 'spack-build-out.txt' + +# Filename for the Spack build/install environment file. +_spack_build_envfile = 'spack-build-env.txt' + +# Filename for the Spack build/install environment modifications file. +_spack_build_envmodsfile = 'spack-build-env-mods.txt' + +# Filename for the Spack install phase-time test log. +_spack_install_test_log = 'install-time-test-log.txt' + +# Filename of json with total build and phase times (seconds) +_spack_times_log = 'install_times.json' + +# Filename for the Spack configure args file. +_spack_configure_argsfile = 'spack-configure-args.txt' + + +def preferred_version(pkg): + """ + Returns a sorted list of the preferred versions of the package. + + Arguments: + pkg (Package): The package whose versions are to be assessed. + """ + # Here we sort first on the fact that a version is marked + # as preferred in the package, then on the fact that the + # version is not develop, then lexicographically + key_fn = lambda v: (pkg.versions[v].get('preferred', False), + not v.isdevelop(), + v) + return sorted(pkg.versions, key=key_fn).pop() + + +class InstallPhase(object): + """Manages a single phase of the installation. + + This descriptor stores at creation time the name of the method it should + search for execution. The method is retrieved at __get__ time, so that + it can be overridden by subclasses of whatever class declared the phases. + + It also provides hooks to execute arbitrary callbacks before and after + the phase. + """ + + def __init__(self, name): + self.name = name + self.run_before = [] + self.run_after = [] + + def __get__(self, instance, owner): + # The caller is a class that is trying to customize + # my behavior adding something + if instance is None: + return self + # If instance is there the caller wants to execute the + # install phase, thus return a properly set wrapper + phase = getattr(instance, self.name) + + @functools.wraps(phase) + def phase_wrapper(spec, prefix): + # Check instance attributes at the beginning of a phase + self._on_phase_start(instance) + # Execute phase pre-conditions, + # and give them the chance to fail + for callback in self.run_before: + callback(instance) + phase(spec, prefix) + # Execute phase sanity_checks, + # and give them the chance to fail + for callback in self.run_after: + callback(instance) + # Check instance attributes at the end of a phase + self._on_phase_exit(instance) + return phase_wrapper + + def _on_phase_start(self, instance): + # If a phase has a matching stop_before_phase attribute, + # stop the installation process raising a StopPhase + if getattr(instance, 'stop_before_phase', None) == self.name: + from spack.build_environment import StopPhase + raise StopPhase('Stopping before \'{0}\' phase'.format(self.name)) + + def _on_phase_exit(self, instance): + # If a phase has a matching last_phase attribute, + # stop the installation process raising a StopPhase + if getattr(instance, 'last_phase', None) == self.name: + from spack.build_environment import StopPhase + raise StopPhase('Stopping at \'{0}\' phase'.format(self.name)) + + def copy(self): + try: + return copy.deepcopy(self) + except TypeError: + # This bug-fix was not back-ported in Python 2.6 + # http://bugs.python.org/issue1515 + other = InstallPhase(self.name) + other.run_before.extend(self.run_before) + other.run_after.extend(self.run_after) + return other + + +#: Registers which are the detectable packages, by repo and package name +#: Need a pass of package repositories to be filled. +detectable_packages = collections.defaultdict(list) + + +class DetectablePackageMeta(object): + """Check if a package is detectable and add default implementations + for the detection function. + """ + def __init__(cls, name, bases, attr_dict): + if hasattr(cls, 'executables') and hasattr(cls, 'libraries'): + msg = "a package can have either an 'executables' or 'libraries' attribute" + msg += " [package '{0.name}' defines both]" + raise spack.error.SpackError(msg.format(cls)) + + # On windows, extend the list of regular expressions to look for + # filenames ending with ".exe" + # (in some cases these regular expressions include "$" to avoid + # pulling in filenames with unexpected suffixes, but this allows + # for example detecting "foo.exe" when the package writer specified + # that "foo" was a possible executable. + + # If a package has the executables or libraries attribute then it's + # assumed to be detectable + if hasattr(cls, 'executables') or hasattr(cls, 'libraries'): + @property + def platform_executables(self): + def to_windows_exe(exe): + if exe.endswith('$'): + exe = exe.replace('$', '%s$' % spack.util.path.win_exe_ext()) + else: + exe += spack.util.path.win_exe_ext() + return exe + plat_exe = [] + if hasattr(self, 'executables'): + for exe in self.executables: + if sys.platform == 'win32': + exe = to_windows_exe(exe) + plat_exe.append(exe) + return plat_exe + + @classmethod + def determine_spec_details(cls, prefix, objs_in_prefix): + """Allow ``spack external find ...`` to locate installations. + + Args: + prefix (str): the directory containing the executables + or libraries + objs_in_prefix (set): the executables or libraries that + match the regex + + Returns: + The list of detected specs for this package + """ + objs_by_version = collections.defaultdict(list) + # The default filter function is the identity function for the + # list of executables + filter_fn = getattr(cls, 'filter_detected_exes', + lambda x, exes: exes) + objs_in_prefix = filter_fn(prefix, objs_in_prefix) + for obj in objs_in_prefix: + try: + version_str = cls.determine_version(obj) + if version_str: + objs_by_version[version_str].append(obj) + except Exception as e: + msg = ('An error occurred when trying to detect ' + 'the version of "{0}" [{1}]') + tty.debug(msg.format(obj, str(e))) + + specs = [] + for version_str, objs in objs_by_version.items(): + variants = cls.determine_variants(objs, version_str) + # Normalize output to list + if not isinstance(variants, list): + variants = [variants] + + for variant in variants: + if isinstance(variant, six.string_types): + variant = (variant, {}) + variant_str, extra_attributes = variant + spec_str = '{0}@{1} {2}'.format( + cls.name, version_str, variant_str + ) + + # Pop a few reserved keys from extra attributes, since + # they have a different semantics + external_path = extra_attributes.pop('prefix', None) + external_modules = extra_attributes.pop( + 'modules', None + ) + try: + spec = spack.spec.Spec( + spec_str, + external_path=external_path, + external_modules=external_modules + ) + except Exception as e: + msg = 'Parsing failed [spec_str="{0}", error={1}]' + tty.debug(msg.format(spec_str, str(e))) + else: + specs.append(spack.spec.Spec.from_detection( + spec, extra_attributes=extra_attributes + )) + + return sorted(specs) + + @classmethod + def determine_variants(cls, objs, version_str): + return '' + + # Register the class as a detectable package + detectable_packages[cls.namespace].append(cls.name) + + # Attach function implementations to the detectable class + default = False + if not hasattr(cls, 'determine_spec_details'): + default = True + cls.determine_spec_details = determine_spec_details + + if default and not hasattr(cls, 'determine_version'): + msg = ('the package "{0}" in the "{1}" repo needs to define' + ' the "determine_version" method to be detectable') + NotImplementedError(msg.format(cls.name, cls.namespace)) + + if default and not hasattr(cls, 'determine_variants'): + cls.determine_variants = determine_variants + + # This function should not be overridden by subclasses, + # as it is not designed for bespoke pkg detection but rather + # on a per-platform basis + if 'platform_executables' in cls.__dict__.keys(): + raise PackageError("Packages should not override platform_executables") + cls.platform_executables = platform_executables + + super(DetectablePackageMeta, cls).__init__(name, bases, attr_dict) + + +class PackageMeta( + DetectablePackageMeta, + spack.directives.DirectiveMeta, + spack.mixins.PackageMixinsMeta, + spack.multimethod.MultiMethodMeta +): + """ + Package metaclass for supporting directives (e.g., depends_on) and phases + """ + phase_fmt = '_InstallPhase_{0}' + + # These are accessed only through getattr, by name + _InstallPhase_run_before = {} # type: Dict[str, List[Callable]] + _InstallPhase_run_after = {} # type: Dict[str, List[Callable]] + + def __new__(cls, name, bases, attr_dict): + """ + Instance creation is preceded by phase attribute transformations. + + Conveniently transforms attributes to permit extensible phases by + iterating over the attribute 'phases' and creating / updating private + InstallPhase attributes in the class that will be initialized in + __init__. + """ + if 'phases' in attr_dict: + # Turn the strings in 'phases' into InstallPhase instances + # and add them as private attributes + _InstallPhase_phases = [PackageMeta.phase_fmt.format(x) for x in attr_dict['phases']] # NOQA: ignore=E501 + for phase_name, callback_name in zip(_InstallPhase_phases, attr_dict['phases']): # NOQA: ignore=E501 + attr_dict[phase_name] = InstallPhase(callback_name) + attr_dict['_InstallPhase_phases'] = _InstallPhase_phases + + def _flush_callbacks(check_name): + # Name of the attribute I am going to check it exists + check_attr = PackageMeta.phase_fmt.format(check_name) + checks = getattr(cls, check_attr) + if checks: + for phase_name, funcs in checks.items(): + phase_attr = PackageMeta.phase_fmt.format(phase_name) + try: + # Search for the phase in the attribute dictionary + phase = attr_dict[phase_attr] + except KeyError: + # If it is not there it's in the bases + # and we added a check. We need to copy + # and extend + for base in bases: + phase = getattr(base, phase_attr, None) + if phase is not None: + break + + phase = attr_dict[phase_attr] = phase.copy() + getattr(phase, check_name).extend(funcs) + # Clear the attribute for the next class + setattr(cls, check_attr, {}) + + _flush_callbacks('run_before') + _flush_callbacks('run_after') + + # Reset names for packages that inherit from another + # package with a different name + attr_dict['_name'] = None + + return super(PackageMeta, cls).__new__(cls, name, bases, attr_dict) + + @staticmethod + def register_callback(check_type, *phases): + def _decorator(func): + attr_name = PackageMeta.phase_fmt.format(check_type) + check_list = getattr(PackageMeta, attr_name) + for item in phases: + checks = check_list.setdefault(item, []) + checks.append(func) + setattr(PackageMeta, attr_name, check_list) + return func + return _decorator + + @property + def package_dir(self): + """Directory where the package.py file lives.""" + return os.path.abspath(os.path.dirname(self.module.__file__)) + + @property + def module(self): + """Module object (not just the name) that this package is defined in. + + We use this to add variables to package modules. This makes + install() methods easier to write (e.g., can call configure()) + """ + return __import__(self.__module__, fromlist=[self.__name__]) + + @property + def namespace(self): + """Spack namespace for the package, which identifies its repo.""" + return spack.repo.namespace_from_fullname(self.__module__) + + @property + def fullname(self): + """Name of this package, including the namespace""" + return '%s.%s' % (self.namespace, self.name) + + @property + def fullnames(self): + """ + Fullnames for this package and any packages from which it inherits. + """ + fullnames = [] + for cls in inspect.getmro(self): + namespace = getattr(cls, 'namespace', None) + if namespace: + fullnames.append('%s.%s' % (namespace, self.name)) + if namespace == 'builtin': + # builtin packages cannot inherit from other repos + break + return fullnames + + @property + def name(self): + """The name of this package. + + The name of a package is the name of its Python module, without + the containing module names. + """ + if self._name is None: + self._name = self.module.__name__ + if '.' in self._name: + self._name = self._name[self._name.rindex('.') + 1:] + return self._name + + @property + def global_license_dir(self): + """Returns the directory where license files for all packages are stored.""" + return spack.util.path.canonicalize_path(spack.config.get('config:license_dir')) + + +def run_before(*phases): + """Registers a method of a package to be run before a given phase""" + return PackageMeta.register_callback('run_before', *phases) + + +def run_after(*phases): + """Registers a method of a package to be run after a given phase""" + return PackageMeta.register_callback('run_after', *phases) + + +def on_package_attributes(**attr_dict): + """Decorator: executes instance function only if object has attr valuses. + + Executes the decorated method only if at the moment of calling the + instance has attributes that are equal to certain values. + + Args: + attr_dict (dict): dictionary mapping attribute names to their + required values + """ + def _execute_under_condition(func): + + @functools.wraps(func) + def _wrapper(instance, *args, **kwargs): + # If all the attributes have the value we require, then execute + has_all_attributes = all( + [hasattr(instance, key) for key in attr_dict] + ) + if has_all_attributes: + has_the_right_values = all( + [getattr(instance, key) == value for key, value in attr_dict.items()] # NOQA: ignore=E501 + ) + if has_the_right_values: + func(instance, *args, **kwargs) + return _wrapper + + return _execute_under_condition + + +class PackageViewMixin(object): + """This collects all functionality related to adding installed Spack + package to views. Packages can customize how they are added to views by + overriding these functions. + """ + def view_source(self): + """The source root directory that will be added to the view: files are + added such that their path relative to the view destination matches + their path relative to the view source. + """ + return self.spec.prefix + + def view_destination(self, view): + """The target root directory: each file is added relative to this + directory. + """ + return view.get_projection_for_spec(self.spec) + + def view_file_conflicts(self, view, merge_map): + """Report any files which prevent adding this package to the view. The + default implementation looks for any files which already exist. + Alternative implementations may allow some of the files to exist in + the view (in this case they would be omitted from the results). + """ + return set(dst for dst in merge_map.values() if os.path.lexists(dst)) + + def add_files_to_view(self, view, merge_map, skip_if_exists=True): + """Given a map of package files to destination paths in the view, add + the files to the view. By default this adds all files. Alternative + implementations may skip some files, for example if other packages + linked into the view already include the file. + + Args: + view (spack.filesystem_view.FilesystemView): the view that's updated + merge_map (dict): maps absolute source paths to absolute dest paths for + all files in from this package. + skip_if_exists (bool): when True, don't link files in view when they + already exist. When False, always link files, without checking + if they already exist. + """ + if skip_if_exists: + for src, dst in merge_map.items(): + if not os.path.lexists(dst): + view.link(src, dst, spec=self.spec) + else: + for src, dst in merge_map.items(): + view.link(src, dst, spec=self.spec) + + def remove_files_from_view(self, view, merge_map): + """Given a map of package files to files currently linked in the view, + remove the files from the view. The default implementation removes all + files. Alternative implementations may not remove all files. For + example if two packages include the same file, it should only be + removed when both packages are removed. + """ + view.remove_files(merge_map.values()) + + +def test_log_pathname(test_stage, spec): + """Build the pathname of the test log file + + Args: + test_stage (str): path to the test stage directory + spec (spack.spec.Spec): instance of the spec under test + + Returns: + (str): the pathname of the test log file + """ + return os.path.join(test_stage, + 'test-{0}-out.txt'.format(TestSuite.test_pkg_id(spec))) + + +class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)): + """This is the superclass for all spack packages. + + ***The Package class*** + + At its core, a package consists of a set of software to be installed. + A package may focus on a piece of software and its associated software + dependencies or it may simply be a set, or bundle, of software. The + former requires defining how to fetch, verify (via, e.g., sha256), build, + and install that software and the packages it depends on, so that + dependencies can be installed along with the package itself. The latter, + sometimes referred to as a ``no-source`` package, requires only defining + the packages to be built. + + Packages are written in pure Python. + + There are two main parts of a Spack package: + + 1. **The package class**. Classes contain ``directives``, which are + special functions, that add metadata (versions, patches, + dependencies, and other information) to packages (see + ``directives.py``). Directives provide the constraints that are + used as input to the concretizer. + + 2. **Package instances**. Once instantiated, a package is + essentially a software installer. Spack calls methods like + ``do_install()`` on the ``Package`` object, and it uses those to + drive user-implemented methods like ``patch()``, ``install()``, and + other build steps. To install software, an instantiated package + needs a *concrete* spec, which guides the behavior of the various + install methods. + + Packages are imported from repos (see ``repo.py``). + + **Package DSL** + + Look in ``lib/spack/docs`` or check https://spack.readthedocs.io for + the full documentation of the package domain-specific language. That + used to be partially documented here, but as it grew, the docs here + became increasingly out of date. + + **Package Lifecycle** + + A package's lifecycle over a run of Spack looks something like this: + + .. code-block:: python + + p = Package() # Done for you by spack + + p.do_fetch() # downloads tarball from a URL (or VCS) + p.do_stage() # expands tarball in a temp directory + p.do_patch() # applies patches to expanded source + p.do_install() # calls package's install() function + p.do_uninstall() # removes install directory + + although packages that do not have code have nothing to fetch so omit + ``p.do_fetch()``. + + There are also some other commands that clean the build area: + + .. code-block:: python + + p.do_clean() # removes the stage directory entirely + p.do_restage() # removes the build directory and + # re-expands the archive. + + The convention used here is that a ``do_*`` function is intended to be + called internally by Spack commands (in ``spack.cmd``). These aren't for + package writers to override, and doing so may break the functionality + of the Package class. + + Package creators have a lot of freedom, and they could technically + override anything in this class. That is not usually required. + + For most use cases. Package creators typically just add attributes + like ``homepage`` and, for a code-based package, ``url``, or functions + such as ``install()``. + There are many custom ``Package`` subclasses in the + ``spack.build_systems`` package that make things even easier for + specific build systems. + + """ + # + # These are default values for instance variables. + # + + #: A list or set of build time test functions to be called when tests + #: are executed or 'None' if there are no such test functions. + build_time_test_callbacks = None # type: Optional[List[str]] + + #: By default, packages are not virtual + #: Virtual packages override this attribute + virtual = False + + #: Most Spack packages are used to install source or binary code while + #: those that do not can be used to install a set of other Spack packages. + has_code = True + + #: A list or set of install time test functions to be called when tests + #: are executed or 'None' if there are no such test functions. + install_time_test_callbacks = None # type: Optional[List[str]] + + #: By default we build in parallel. Subclasses can override this. + parallel = True + + #: By default do not run tests within package's install() + run_tests = False + + # FIXME: this is a bad object-oriented design, should be moved to Clang. + #: By default do not setup mockup XCode on macOS with Clang + use_xcode = False + + #: Most packages are NOT extendable. Set to True if you want extensions. + extendable = False + + #: When True, add RPATHs for the entire DAG. When False, add RPATHs only + #: for immediate dependencies. + transitive_rpaths = True + + #: List of prefix-relative file paths (or a single path). If these do + #: not exist after install, or if they exist but are not files, + #: sanity checks fail. + sanity_check_is_file = [] # type: List[str] + + #: List of prefix-relative directory paths (or a single path). If + #: these do not exist after install, or if they exist but are not + #: directories, sanity checks will fail. + sanity_check_is_dir = [] # type: List[str] + + #: List of glob expressions. Each expression must either be + #: absolute or relative to the package source path. + #: Matching artifacts found at the end of the build process will be + #: copied in the same directory tree as _spack_build_logfile and + #: _spack_build_envfile. + archive_files = [] # type: List[str] + + #: Boolean. Set to ``True`` for packages that require a manual download. + #: This is currently used by package sanity tests and generation of a + #: more meaningful fetch failure error. + manual_download = False + + #: Set of additional options used when fetching package versions. + fetch_options = {} # type: Dict[str, Any] + + # + # Set default licensing information + # + #: Boolean. If set to ``True``, this software requires a license. + #: If set to ``False``, all of the ``license_*`` attributes will + #: be ignored. Defaults to ``False``. + license_required = False + + #: String. Contains the symbol used by the license manager to denote + #: a comment. Defaults to ``#``. + license_comment = '#' + + #: List of strings. These are files that the software searches for when + #: looking for a license. All file paths must be relative to the + #: installation directory. More complex packages like Intel may require + #: multiple licenses for individual components. Defaults to the empty list. + license_files = [] # type: List[str] + + #: List of strings. Environment variables that can be set to tell the + #: software where to look for a license if it is not in the usual location. + #: Defaults to the empty list. + license_vars = [] # type: List[str] + + #: String. A URL pointing to license setup instructions for the software. + #: Defaults to the empty string. + license_url = '' + + #: Verbosity level, preserved across installs. + _verbose = None + + #: index of patches by sha256 sum, built lazily + _patches_by_hash = None + + #: Package homepage where users can find more information about the package + homepage = None # type: str + + #: Default list URL (place to find available versions) + list_url = None # type: str + + #: Link depth to which list_url should be searched for new versions + list_depth = 0 + + #: List of strings which contains GitHub usernames of package maintainers. + #: Do not include @ here in order not to unnecessarily ping the users. + maintainers = [] # type: List[str] + + #: List of attributes to be excluded from a package's hash. + metadata_attrs = [ + "homepage", + "url", + "urls", + "list_url", + "extendable", + "parallel", + "make_jobs", + "maintainers", + "tags", + ] + + #: Boolean. If set to ``True``, the smoke/install test requires a compiler. + #: This is currently used by smoke tests to ensure a compiler is available + #: to build a custom test code. + test_requires_compiler = False + + #: List of test failures encountered during a smoke/install test run. + test_failures = None + + #: TestSuite instance used to manage smoke/install tests for one or more + #: specs. + test_suite = None + + def __init__(self, spec): + # this determines how the package should be built. + self.spec = spec + + # Allow custom staging paths for packages + self.path = None + + # Keep track of whether or not this package was installed from + # a binary cache. + self.installed_from_binary_cache = False + + # Ensure that only one of these two attributes are present + if getattr(self, 'url', None) and getattr(self, 'urls', None): + msg = "a package can have either a 'url' or a 'urls' attribute" + msg += " [package '{0.name}' defines both]" + raise ValueError(msg.format(self)) + + # init internal variables + self._stage = None + self._fetcher = None + + # Set up timing variables + self._fetch_time = 0.0 + + if self.is_extension: + spack.repo.get(self.extendee_spec)._check_extendable() + + super(PackageBase, self).__init__() + + @classmethod + def possible_dependencies( + cls, transitive=True, expand_virtuals=True, deptype='all', + visited=None, missing=None, virtuals=None): + """Return dict of possible dependencies of this package. + + Args: + transitive (bool or None): return all transitive dependencies if + True, only direct dependencies if False (default True).. + expand_virtuals (bool or None): expand virtual dependencies into + all possible implementations (default True) + deptype (str or tuple or None): dependency types to consider + visited (dict or None): dict of names of dependencies visited so + far, mapped to their immediate dependencies' names. + missing (dict or None): dict to populate with packages and their + *missing* dependencies. + virtuals (set): if provided, populate with virtuals seen so far. + + Returns: + (dict): dictionary mapping dependency names to *their* + immediate dependencies + + Each item in the returned dictionary maps a (potentially + transitive) dependency of this package to its possible + *immediate* dependencies. If ``expand_virtuals`` is ``False``, + virtual package names wil be inserted as keys mapped to empty + sets of dependencies. Virtuals, if not expanded, are treated as + though they have no immediate dependencies. + + Missing dependencies by default are ignored, but if a + missing dict is provided, it will be populated with package names + mapped to any dependencies they have that are in no + repositories. This is only populated if transitive is True. + + Note: the returned dict *includes* the package itself. + + """ + deptype = spack.dependency.canonical_deptype(deptype) + + visited = {} if visited is None else visited + missing = {} if missing is None else missing + + visited.setdefault(cls.name, set()) + + for name, conditions in cls.dependencies.items(): + # check whether this dependency could be of the type asked for + types = [dep.type for cond, dep in conditions.items()] + types = set.union(*types) + if not any(d in types for d in deptype): + continue + + # expand virtuals if enabled, otherwise just stop at virtuals + if spack.repo.path.is_virtual(name): + if virtuals is not None: + virtuals.add(name) + if expand_virtuals: + providers = spack.repo.path.providers_for(name) + dep_names = [spec.name for spec in providers] + else: + visited.setdefault(cls.name, set()).add(name) + visited.setdefault(name, set()) + continue + else: + dep_names = [name] + + # add the dependency names to the visited dict + visited.setdefault(cls.name, set()).update(set(dep_names)) + + # recursively traverse dependencies + for dep_name in dep_names: + if dep_name in visited: + continue + + visited.setdefault(dep_name, set()) + + # skip the rest if not transitive + if not transitive: + continue + + try: + dep_cls = spack.repo.path.get_pkg_class(dep_name) + except spack.repo.UnknownPackageError: + # log unknown packages + missing.setdefault(cls.name, set()).add(dep_name) + continue + + dep_cls.possible_dependencies( + transitive, expand_virtuals, deptype, visited, missing, + virtuals) + + return visited + + def enum_constraints(self, visited=None): + """Return transitive dependency constraints on this package.""" + if visited is None: + visited = set() + visited.add(self.name) + + names = [] + clauses = [] + + for name in self.dependencies: + if name not in visited and not spack.spec.Spec(name).virtual: + pkg = spack.repo.get(name) + dvis, dnames, dclauses = pkg.enum_constraints(visited) + visited |= dvis + names.extend(dnames) + clauses.extend(dclauses) + + return visited + + # package_dir and module are *class* properties (see PackageMeta), + # but to make them work on instances we need these defs as well. + @property + def package_dir(self): + """Directory where the package.py file lives.""" + return type(self).package_dir + + @property + def module(self): + """Module object that this package is defined in.""" + return type(self).module + + @property + def namespace(self): + """Spack namespace for the package, which identifies its repo.""" + return type(self).namespace + + @property + def fullname(self): + """Name of this package, including namespace: namespace.name.""" + return type(self).fullname + + @property + def fullnames(self): + return type(self).fullnames + + @property + def name(self): + """Name of this package (the module without parent modules).""" + return type(self).name + + @property + def global_license_dir(self): + """Returns the directory where global license files are stored.""" + return type(self).global_license_dir + + @property + def global_license_file(self): + """Returns the path where a global license file for this + particular package should be stored.""" + if not self.license_files: + return + return os.path.join(self.global_license_dir, self.name, + os.path.basename(self.license_files[0])) + + @property + def version(self): + if not self.spec.versions.concrete: + raise ValueError("Version requested for a package that" + " does not have a concrete version.") + return self.spec.versions[0] + + @memoized + def version_urls(self): + """OrderedDict of explicitly defined URLs for versions of this package. + + Return: + An OrderedDict (version -> URL) different versions of this + package, sorted by version. + + A version's URL only appears in the result if it has an an + explicitly defined ``url`` argument. So, this list may be empty + if a package only defines ``url`` at the top level. + """ + version_urls = collections.OrderedDict() + for v, args in sorted(self.versions.items()): + if 'url' in args: + version_urls[v] = args['url'] + return version_urls + + def nearest_url(self, version): + """Finds the URL with the "closest" version to ``version``. + + This uses the following precedence order: + + 1. Find the next lowest or equal version with a URL. + 2. If no lower URL, return the next *higher* URL. + 3. If no higher URL, return None. + + """ + version_urls = self.version_urls() + + if version in version_urls: + return version_urls[version] + + last_url = None + for v, u in self.version_urls().items(): + if v > version: + if last_url: + return last_url + last_url = u + + return last_url + + def url_for_version(self, version): + """Returns a URL from which the specified version of this package + may be downloaded. + + version: class Version + The version for which a URL is sought. + + See Class Version (version.py) + """ + return self._implement_all_urls_for_version(version)[0] + + def all_urls_for_version(self, version, custom_url_for_version=None): + """Returns all URLs derived from version_urls(), url, urls, and + list_url (if it contains a version) in a package in that order. + + version: class Version + The version for which a URL is sought. + + See Class Version (version.py) + """ + uf = None + if type(self).url_for_version != Package.url_for_version: + uf = self.url_for_version + return self._implement_all_urls_for_version(version, uf) + + def _implement_all_urls_for_version(self, version, custom_url_for_version=None): + if not isinstance(version, Version): + version = Version(version) + + urls = [] + + # If we have a specific URL for this version, don't extrapolate. + version_urls = self.version_urls() + if version in version_urls: + urls.append(version_urls[version]) + + # if there is a custom url_for_version, use it + if custom_url_for_version is not None: + u = custom_url_for_version(version) + if u not in urls and u is not None: + urls.append(u) + + def sub_and_add(u): + if u is None: + return + # skip the url if there is no version to replace + try: + spack.url.parse_version(u) + except spack.url.UndetectableVersionError: + return + nu = spack.url.substitute_version(u, self.url_version(version)) + + urls.append(nu) + # If no specific URL, use the default, class-level URL + sub_and_add(getattr(self, 'url', None)) + for u in getattr(self, 'urls', []): + sub_and_add(u) + + sub_and_add(getattr(self, 'list_url', None)) + + # if no version-bearing URLs can be found, try them raw + if not urls: + default_url = getattr(self, "url", getattr(self, "urls", [None])[0]) + + # if no exact match AND no class-level default, use the nearest URL + if not default_url: + default_url = self.nearest_url(version) + + # if there are NO URLs to go by, then we can't do anything + if not default_url: + raise NoURLError(self.__class__) + urls.append( + spack.url.substitute_version( + default_url, self.url_version(version) + ) + ) + + return urls + + def find_valid_url_for_version(self, version): + """Returns a URL from which the specified version of this package + may be downloaded after testing whether the url is valid. Will try + url, urls, and list_url before failing. + + version: class Version + The version for which a URL is sought. + + See Class Version (version.py) + """ + urls = self.all_urls_for_version(version) + + for u in urls: + if spack.util.web.url_exists(u): + return u + + return None + + def _make_resource_stage(self, root_stage, fetcher, resource): + resource_stage_folder = self._resource_stage(resource) + mirror_paths = spack.mirror.mirror_archive_paths( + fetcher, + os.path.join(self.name, "%s-%s" % (resource.name, self.version))) + stage = ResourceStage(resource.fetcher, + root=root_stage, + resource=resource, + name=resource_stage_folder, + mirror_paths=mirror_paths, + path=self.path) + return stage + + def _download_search(self): + dynamic_fetcher = fs.from_list_url(self) + return [dynamic_fetcher] if dynamic_fetcher else [] + + def _make_root_stage(self, fetcher): + # Construct a mirror path (TODO: get this out of package.py) + mirror_paths = spack.mirror.mirror_archive_paths( + fetcher, + os.path.join(self.name, "%s-%s" % (self.name, self.version)), + self.spec) + # Construct a path where the stage should build.. + s = self.spec + stage_name = "{0}{1}-{2}-{3}".format(stage_prefix, s.name, s.version, + s.dag_hash()) + + stage = Stage(fetcher, mirror_paths=mirror_paths, name=stage_name, + path=self.path, search_fn=self._download_search) + return stage + + def _make_stage(self): + # If it's a dev package (not transitively), use a DIY stage object + dev_path_var = self.spec.variants.get('dev_path', None) + if dev_path_var: + return spack.stage.DIYStage(dev_path_var.value) + + # Construct a composite stage on top of the composite FetchStrategy + composite_fetcher = self.fetcher + composite_stage = StageComposite() + resources = self._get_needed_resources() + for ii, fetcher in enumerate(composite_fetcher): + if ii == 0: + # Construct root stage first + stage = self._make_root_stage(fetcher) + else: + # Construct resource stage + resource = resources[ii - 1] # ii == 0 is root! + stage = self._make_resource_stage(composite_stage[0], fetcher, + resource) + # Append the item to the composite + composite_stage.append(stage) + + return composite_stage + + @property + def stage(self): + """Get the build staging area for this package. + + This automatically instantiates a ``Stage`` object if the package + doesn't have one yet, but it does not create the Stage directory + on the filesystem. + """ + if not self.spec.versions.concrete: + raise ValueError( + "Cannot retrieve stage for package without concrete version.") + if self._stage is None: + self._stage = self._make_stage() + return self._stage + + @stage.setter + def stage(self, stage): + """Allow a stage object to be set to override the default.""" + self._stage = stage + + @property + def env_path(self): + """Return the build environment file path associated with staging.""" + # Backward compatibility: Return the name of an existing log path; + # otherwise, return the current install env path name. + old_filename = os.path.join(self.stage.path, 'spack-build.env') + if os.path.exists(old_filename): + return old_filename + else: + return os.path.join(self.stage.path, _spack_build_envfile) + + @property + def env_mods_path(self): + """ + Return the build environment modifications file path associated with + staging. + """ + return os.path.join(self.stage.path, _spack_build_envmodsfile) + + @property + def metadata_dir(self): + """Return the install metadata directory.""" + return spack.store.layout.metadata_path(self.spec) + + @property + def install_env_path(self): + """ + Return the build environment file path on successful installation. + """ + # Backward compatibility: Return the name of an existing log path; + # otherwise, return the current install env path name. + old_filename = os.path.join(self.metadata_dir, 'build.env') + if os.path.exists(old_filename): + return old_filename + else: + return os.path.join(self.metadata_dir, _spack_build_envfile) + + @property + def log_path(self): + """Return the build log file path associated with staging.""" + # Backward compatibility: Return the name of an existing log path. + for filename in ['spack-build.out', 'spack-build.txt']: + old_log = os.path.join(self.stage.path, filename) + if os.path.exists(old_log): + return old_log + + # Otherwise, return the current log path name. + return os.path.join(self.stage.path, _spack_build_logfile) + + @property + def phase_log_files(self): + """Find sorted phase log files written to the staging directory""" + logs_dir = os.path.join(self.stage.path, "spack-build-*-out.txt") + log_files = glob.glob(logs_dir) + log_files.sort() + return log_files + + @property + def install_log_path(self): + """Return the build log file path on successful installation.""" + # Backward compatibility: Return the name of an existing install log. + for filename in ['build.out', 'build.txt']: + old_log = os.path.join(self.metadata_dir, filename) + if os.path.exists(old_log): + return old_log + + # Otherwise, return the current install log path name. + return os.path.join(self.metadata_dir, _spack_build_logfile) + + @property + def configure_args_path(self): + """Return the configure args file path associated with staging.""" + return os.path.join(self.stage.path, _spack_configure_argsfile) + + @property + def test_install_log_path(self): + """Return the install phase-time test log file path, if set.""" + return getattr(self, 'test_log_file', None) + + @property + def install_test_install_log_path(self): + """Return the install location for the install phase-time test log.""" + return fsys.join_path(self.metadata_dir, _spack_install_test_log) + + @property + def times_log_path(self): + """Return the times log json file.""" + return os.path.join(self.metadata_dir, _spack_times_log) + + @property + def install_configure_args_path(self): + """Return the configure args file path on successful installation.""" + return os.path.join(self.metadata_dir, _spack_configure_argsfile) + + @property + def install_test_root(self): + """Return the install test root directory.""" + return os.path.join(self.metadata_dir, 'test') + + @property + def installed(self): + msg = ('the "PackageBase.installed" property is deprecated and will be ' + 'removed in Spack v0.19, use "Spec.installed" instead') + warnings.warn(msg) + return self.spec.installed + + @property + def installed_upstream(self): + msg = ('the "PackageBase.installed_upstream" property is deprecated and will ' + 'be removed in Spack v0.19, use "Spec.installed_upstream" instead') + warnings.warn(msg) + return self.spec.installed_upstream + + def _make_fetcher(self): + # Construct a composite fetcher that always contains at least + # one element (the root package). In case there are resources + # associated with the package, append their fetcher to the + # composite. + root_fetcher = fs.for_package_version(self, self.version) + fetcher = fs.FetchStrategyComposite() # Composite fetcher + fetcher.append(root_fetcher) # Root fetcher is always present + resources = self._get_needed_resources() + for resource in resources: + fetcher.append(resource.fetcher) + return fetcher + + @property + def fetcher(self): + if not self.spec.versions.concrete: + raise ValueError("Cannot retrieve fetcher for" + " package without concrete version.") + if not self._fetcher: + self._fetcher = self._make_fetcher() + return self._fetcher + + @fetcher.setter + def fetcher(self, f): + self._fetcher = f + + def dependencies_of_type(self, *deptypes): + """Get dependencies that can possibly have these deptypes. + + This analyzes the package and determines which dependencies *can* + be a certain kind of dependency. Note that they may not *always* + be this kind of dependency, since dependencies can be optional, + so something may be a build dependency in one configuration and a + run dependency in another. + """ + return dict( + (name, conds) for name, conds in self.dependencies.items() + if any(dt in self.dependencies[name][cond].type + for cond in conds for dt in deptypes)) + + @property + def extendee_spec(self): + """ + Spec of the extendee of this package, or None if it is not an extension + """ + if not self.extendees: + return None + + deps = [] + + # If the extendee is in the spec's deps already, return that. + for dep in self.spec.traverse(deptype=('link', 'run')): + if dep.name in self.extendees: + deps.append(dep) + + # TODO: allow more than one active extendee. + if deps: + assert len(deps) == 1 + return deps[0] + + # if the spec is concrete already, then it extends something + # that is an *optional* dependency, and the dep isn't there. + if self.spec._concrete: + return None + else: + # TODO: do something sane here with more than one extendee + # If it's not concrete, then return the spec from the + # extends() directive since that is all we know so far. + spec, kwargs = next(iter(self.extendees.items())) + return spec + + @property + def extendee_args(self): + """ + Spec of the extendee of this package, or None if it is not an extension + """ + if not self.extendees: + return None + + # TODO: allow multiple extendees. + name = next(iter(self.extendees)) + return self.extendees[name][1] + + @property + def is_extension(self): + # if it is concrete, it's only an extension if it actually + # dependes on the extendee. + if self.spec._concrete: + return self.extendee_spec is not None + else: + # If not, then it's an extension if it *could* be an extension + return bool(self.extendees) + + def extends(self, spec): + ''' + Returns True if this package extends the given spec. + + If ``self.spec`` is concrete, this returns whether this package extends + the given spec. + + If ``self.spec`` is not concrete, this returns whether this package may + extend the given spec. + ''' + if spec.name not in self.extendees: + return False + s = self.extendee_spec + return s and spec.satisfies(s) + + def is_activated(self, view): + """Return True if package is activated.""" + if not self.is_extension: + raise ValueError( + "is_activated called on package that is not an extension.") + if self.extendee_spec.installed_upstream: + # If this extends an upstream package, it cannot be activated for + # it. This bypasses construction of the extension map, which can + # can fail when run in the context of a downstream Spack instance + return False + extensions_layout = view.extensions_layout + exts = extensions_layout.extension_map(self.extendee_spec) + return (self.name in exts) and (exts[self.name] == self.spec) + + def provides(self, vpkg_name): + """ + True if this package provides a virtual package with the specified name + """ + return any( + any(self.spec.satisfies(c) for c in constraints) + for s, constraints in self.provided.items() if s.name == vpkg_name + ) + + @property + def virtuals_provided(self): + """ + virtual packages provided by this package with its spec + """ + return [vspec for vspec, constraints in self.provided.items() + if any(self.spec.satisfies(c) for c in constraints)] + + @property + def prefix(self): + """Get the prefix into which this package should be installed.""" + return self.spec.prefix + + @property # type: ignore[misc] + @memoized + def compiler(self): + """Get the spack.compiler.Compiler object used to build this package""" + if not self.spec.concrete: + raise ValueError("Can only get a compiler for a concrete package.") + + return spack.compilers.compiler_for_spec(self.spec.compiler, + self.spec.architecture) + + def url_version(self, version): + """ + Given a version, this returns a string that should be substituted + into the package's URL to download that version. + + By default, this just returns the version string. Subclasses may need + to override this, e.g. for boost versions where you need to ensure that + there are _'s in the download URL. + """ + return str(version) + + def remove_prefix(self): + """ + Removes the prefix for a package along with any empty parent + directories + """ + spack.store.layout.remove_install_directory(self.spec) + + @property + def download_instr(self): + """ + Defines the default manual download instructions. Packages can + override the property to provide more information. + + Returns: + (str): default manual download instructions + """ + required = ('Manual download is required for {0}. ' + .format(self.spec.name) if self.manual_download else '') + return ('{0}Refer to {1} for download instructions.' + .format(required, self.spec.package.homepage)) + + def do_fetch(self, mirror_only=False): + """ + Creates a stage directory and downloads the tarball for this package. + Working directory will be set to the stage directory. + """ + if not self.has_code or self.spec.external: + tty.debug('No fetch required for {0}'.format(self.name)) + return + + checksum = spack.config.get('config:checksum') + fetch = self.stage.managed_by_spack + if checksum and fetch and (self.version not in self.versions) \ + and (not self.version.is_commit): + tty.warn("There is no checksum on file to fetch %s safely." % + self.spec.cformat('{name}{@version}')) + + # Ask the user whether to skip the checksum if we're + # interactive, but just fail if non-interactive. + ck_msg = "Add a checksum or use --no-checksum to skip this check." + ignore_checksum = False + if sys.stdout.isatty(): + ignore_checksum = tty.get_yes_or_no(" Fetch anyway?", + default=False) + if ignore_checksum: + tty.debug('Fetching with no checksum. {0}' + .format(ck_msg)) + + if not ignore_checksum: + raise FetchError("Will not fetch %s" % + self.spec.format('{name}{@version}'), ck_msg) + + deprecated = spack.config.get('config:deprecated') + if not deprecated and self.versions.get( + self.version, {}).get('deprecated', False): + tty.warn("{0} is deprecated and may be removed in a future Spack " + "release.".format( + self.spec.format('{name}{@version}'))) + + # Ask the user whether to install deprecated version if we're + # interactive, but just fail if non-interactive. + dp_msg = ("If you are willing to be a maintainer for this version " + "of the package, submit a PR to remove `deprecated=False" + "`, or use `--deprecated` to skip this check.") + ignore_deprecation = False + if sys.stdout.isatty(): + ignore_deprecation = tty.get_yes_or_no(" Fetch anyway?", + default=False) + + if ignore_deprecation: + tty.debug("Fetching deprecated version. {0}".format( + dp_msg)) + + if not ignore_deprecation: + raise FetchError("Will not fetch {0}".format( + self.spec.format('{name}{@version}')), dp_msg) + + self.stage.create() + err_msg = None if not self.manual_download else self.download_instr + start_time = time.time() + self.stage.fetch(mirror_only, err_msg=err_msg) + self._fetch_time = time.time() - start_time + + if checksum and self.version in self.versions: + self.stage.check() + + self.stage.cache_local() + + for patch in self.spec.patches: + patch.fetch() + if patch.stage: + patch.stage.cache_local() + + def do_stage(self, mirror_only=False): + """Unpacks and expands the fetched tarball.""" + # Always create the stage directory at this point. Why? A no-code + # package may want to use the installation process to install metadata. + self.stage.create() + + # Fetch/expand any associated code. + if self.has_code: + self.do_fetch(mirror_only) + self.stage.expand_archive() + + if not os.listdir(self.stage.path): + raise FetchError("Archive was empty for %s" % self.name) + else: + # Support for post-install hooks requires a stage.source_path + fsys.mkdirp(self.stage.source_path) + + def do_patch(self): + """Applies patches if they haven't been applied already.""" + if not self.spec.concrete: + raise ValueError("Can only patch concrete packages.") + + # Kick off the stage first. This creates the stage. + self.do_stage() + + # Package can add its own patch function. + has_patch_fun = hasattr(self, 'patch') and callable(self.patch) + + # Get the patches from the spec (this is a shortcut for the MV-variant) + patches = self.spec.patches + + # If there are no patches, note it. + if not patches and not has_patch_fun: + tty.msg('No patches needed for {0}'.format(self.name)) + return + + # Construct paths to special files in the archive dir used to + # keep track of whether patches were successfully applied. + archive_dir = self.stage.source_path + good_file = os.path.join(archive_dir, '.spack_patched') + no_patches_file = os.path.join(archive_dir, '.spack_no_patches') + bad_file = os.path.join(archive_dir, '.spack_patch_failed') + + # If we encounter an archive that failed to patch, restage it + # so that we can apply all the patches again. + if os.path.isfile(bad_file): + tty.debug('Patching failed last time. Restaging.') + self.stage.restage() + + # If this file exists, then we already applied all the patches. + if os.path.isfile(good_file): + tty.msg('Already patched {0}'.format(self.name)) + return + elif os.path.isfile(no_patches_file): + tty.msg('No patches needed for {0}'.format(self.name)) + return + + # Apply all the patches for specs that match this one + patched = False + for patch in patches: + try: + with fsys.working_dir(self.stage.source_path): + patch.apply(self.stage) + tty.msg('Applied patch {0}'.format(patch.path_or_url)) + patched = True + except spack.error.SpackError as e: + tty.debug(e) + + # Touch bad file if anything goes wrong. + tty.msg('Patch %s failed.' % patch.path_or_url) + fsys.touch(bad_file) + raise + + if has_patch_fun: + try: + with fsys.working_dir(self.stage.source_path): + self.patch() + tty.msg('Ran patch() for {0}'.format(self.name)) + patched = True + except spack.multimethod.NoSuchMethodError: + # We are running a multimethod without a default case. + # If there's no default it means we don't need to patch. + if not patched: + # if we didn't apply a patch from a patch() + # directive, AND the patch function didn't apply, say + # no patches are needed. Otherwise, we already + # printed a message for each patch. + tty.msg('No patches needed for {0}'.format(self.name)) + except spack.error.SpackError as e: + tty.debug(e) + + # Touch bad file if anything goes wrong. + tty.msg('patch() function failed for {0}'.format(self.name)) + fsys.touch(bad_file) + raise + + # Get rid of any old failed file -- patches have either succeeded + # or are not needed. This is mostly defensive -- it's needed + # if the restage() method doesn't clean *everything* (e.g., for a repo) + if os.path.isfile(bad_file): + os.remove(bad_file) + + # touch good or no patches file so that we skip next time. + if patched: + fsys.touch(good_file) + else: + fsys.touch(no_patches_file) + + @classmethod + def all_patches(cls): + """Retrieve all patches associated with the package. + + Retrieves patches on the package itself as well as patches on the + dependencies of the package.""" + patches = [] + for _, patch_list in cls.patches.items(): + for patch in patch_list: + patches.append(patch) + + pkg_deps = cls.dependencies + for dep_name in pkg_deps: + for _, dependency in pkg_deps[dep_name].items(): + for _, patch_list in dependency.patches.items(): + for patch in patch_list: + patches.append(patch) + + return patches + + def content_hash(self, content=None): + """Create a hash based on the artifacts and patches used to build this package. + + This includes: + * source artifacts (tarballs, repositories) used to build; + * content hashes (``sha256``'s) of all patches applied by Spack; and + * canonicalized contents the ``package.py`` recipe used to build. + + This hash is only included in Spack's DAG hash for concrete specs, but if it + happens to be called on a package with an abstract spec, only applicable (i.e., + determinable) portions of the hash will be included. + + """ + # list of components to make up the hash + hash_content = [] + + # source artifacts/repositories + # TODO: resources + if self.spec.versions.concrete: + try: + source_id = fs.for_package_version(self, self.version).source_id() + except (fs.ExtrapolationError, fs.InvalidArgsError): + # ExtrapolationError happens if the package has no fetchers defined. + # InvalidArgsError happens when there are version directives with args, + # but none of them identifies an actual fetcher. + source_id = None + + if not source_id: + # TODO? in cases where a digest or source_id isn't available, + # should this attempt to download the source and set one? This + # probably only happens for source repositories which are + # referenced by branch name rather than tag or commit ID. + env = spack.environment.active_environment() + from_local_sources = env and env.is_develop(self.spec) + if not self.spec.external and not from_local_sources: + message = 'Missing a source id for {s.name}@{s.version}' + tty.warn(message.format(s=self)) + hash_content.append(''.encode('utf-8')) + else: + hash_content.append(source_id.encode('utf-8')) + + # patch sha256's + # Only include these if they've been assigned by the concretizer. + # We check spec._patches_assigned instead of spec.concrete because + # we have to call package_hash *before* marking specs concrete + if self.spec._patches_assigned(): + hash_content.extend( + ':'.join((p.sha256, str(p.level))).encode('utf-8') + for p in self.spec.patches + ) + + # package.py contents + hash_content.append(package_hash(self.spec, source=content).encode('utf-8')) + + # put it all together and encode as base32 + b32_hash = base64.b32encode( + hashlib.sha256( + bytes().join(sorted(hash_content)) + ).digest() + ).lower() + + # convert from bytes if running python 3 + if sys.version_info[0] >= 3: + b32_hash = b32_hash.decode('utf-8') + + return b32_hash + + def _has_make_target(self, target): + """Checks to see if 'target' is a valid target in a Makefile. + + Parameters: + target (str): the target to check for + + Returns: + bool: True if 'target' is found, else False + """ + # Prevent altering LC_ALL for 'make' outside this function + make = copy.deepcopy(inspect.getmodule(self).make) + + # Use English locale for missing target message comparison + make.add_default_env('LC_ALL', 'C') + + # Check if we have a Makefile + for makefile in ['GNUmakefile', 'Makefile', 'makefile']: + if os.path.exists(makefile): + break + else: + tty.debug('No Makefile found in the build directory') + return False + + # Check if 'target' is a valid target. + # + # `make -n target` performs a "dry run". It prints the commands that + # would be run but doesn't actually run them. If the target does not + # exist, you will see one of the following error messages: + # + # GNU Make: + # make: *** No rule to make target `test'. Stop. + # *** No rule to make target 'test'. Stop. + # + # BSD Make: + # make: don't know how to make test. Stop + missing_target_msgs = [ + "No rule to make target `{0}'. Stop.", + "No rule to make target '{0}'. Stop.", + "don't know how to make {0}. Stop", + ] + + kwargs = { + 'fail_on_error': False, + 'output': os.devnull, + 'error': str, + } + + stderr = make('-n', target, **kwargs) + + for missing_target_msg in missing_target_msgs: + if missing_target_msg.format(target) in stderr: + tty.debug("Target '{0}' not found in {1}" + .format(target, makefile)) + return False + + return True + + def _if_make_target_execute(self, target, *args, **kwargs): + """Runs ``make target`` if 'target' is a valid target in the Makefile. + + Parameters: + target (str): the target to potentially execute + """ + if self._has_make_target(target): + # Execute target + inspect.getmodule(self).make(target, *args, **kwargs) + + def _has_ninja_target(self, target): + """Checks to see if 'target' is a valid target in a Ninja build script. + + Parameters: + target (str): the target to check for + + Returns: + bool: True if 'target' is found, else False + """ + ninja = inspect.getmodule(self).ninja + + # Check if we have a Ninja build script + if not os.path.exists('build.ninja'): + tty.debug('No Ninja build script found in the build directory') + return False + + # Get a list of all targets in the Ninja build script + # https://ninja-build.org/manual.html#_extra_tools + all_targets = ninja('-t', 'targets', 'all', output=str).split('\n') + + # Check if 'target' is a valid target + matches = [line for line in all_targets + if line.startswith(target + ':')] + + if not matches: + tty.debug("Target '{0}' not found in build.ninja" + .format(target)) + return False + + return True + + def _if_ninja_target_execute(self, target, *args, **kwargs): + """Runs ``ninja target`` if 'target' is a valid target in the Ninja + build script. + + Parameters: + target (str): the target to potentially execute + """ + if self._has_ninja_target(target): + # Execute target + inspect.getmodule(self).ninja(target, *args, **kwargs) + + def _get_needed_resources(self): + resources = [] + # Select the resources that are needed for this build + if self.spec.concrete: + for when_spec, resource_list in self.resources.items(): + if when_spec in self.spec: + resources.extend(resource_list) + else: + for when_spec, resource_list in self.resources.items(): + # Note that variant checking is always strict for specs where + # the name is not specified. But with strict variant checking, + # only variants mentioned in 'other' are checked. Here we only + # want to make sure that no constraints in when_spec + # conflict with the spec, so we need to invoke + # when_spec.satisfies(self.spec) vs. + # self.spec.satisfies(when_spec) + if when_spec.satisfies(self.spec, strict=False): + resources.extend(resource_list) + # Sorts the resources by the length of the string representing their + # destination. Since any nested resource must contain another + # resource's name in its path, it seems that should work + resources = sorted(resources, key=lambda res: len(res.destination)) + return resources + + def _resource_stage(self, resource): + pieces = ['resource', resource.name, self.spec.dag_hash()] + resource_stage_folder = '-'.join(pieces) + return resource_stage_folder + + @contextlib.contextmanager + def _stage_and_write_lock(self): + """Prefix lock nested in a stage.""" + with self.stage: + with spack.store.db.prefix_write_lock(self.spec): + yield + + def do_install(self, **kwargs): + """Called by commands to install a package and or its dependencies. + + Package implementations should override install() to describe + their build process. + + Args: + cache_only (bool): Fail if binary package unavailable. + dirty (bool): Don't clean the build environment before installing. + explicit (bool): True if package was explicitly installed, False + if package was implicitly installed (as a dependency). + fail_fast (bool): Fail if any dependency fails to install; + otherwise, the default is to install as many dependencies as + possible (i.e., best effort installation). + fake (bool): Don't really build; install fake stub files instead. + force (bool): Install again, even if already installed. + install_deps (bool): Install dependencies before installing this + package + install_source (bool): By default, source is not installed, but + for debugging it might be useful to keep it around. + keep_prefix (bool): Keep install prefix on failure. By default, + destroys it. + keep_stage (bool): By default, stage is destroyed only if there + are no exceptions during build. Set to True to keep the stage + even with exceptions. + restage (bool): Force spack to restage the package source. + skip_patch (bool): Skip patch stage of build if True. + stop_before (InstallPhase): stop execution before this + installation phase (or None) + stop_at (InstallPhase): last installation phase to be executed + (or None) + tests (bool or list or set): False to run no tests, True to test + all packages, or a list of package names to run tests for some + use_cache (bool): Install from binary package, if available. + verbose (bool): Display verbose build output (by default, + suppresses it) + """ + # Non-transitive dev specs need to keep the dev stage and be built from + # source every time. Transitive ones just need to be built from source. + dev_path_var = self.spec.variants.get('dev_path', None) + if dev_path_var: + kwargs['keep_stage'] = True + + builder = PackageInstaller([(self, kwargs)]) + builder.install() + + def cache_extra_test_sources(self, srcs): + """Copy relative source paths to the corresponding install test subdir + + This method is intended as an optional install test setup helper for + grabbing source files/directories during the installation process and + copying them to the installation test subdirectory for subsequent use + during install testing. + + Args: + srcs (str or list): relative path for files and or + subdirectories located in the staged source path that are to + be copied to the corresponding location(s) under the install + testing directory. + """ + paths = [srcs] if isinstance(srcs, six.string_types) else srcs + + for path in paths: + src_path = os.path.join(self.stage.source_path, path) + dest_path = os.path.join(self.install_test_root, path) + if os.path.isdir(src_path): + fsys.install_tree(src_path, dest_path) + else: + fsys.mkdirp(os.path.dirname(dest_path)) + fsys.copy(src_path, dest_path) + + @contextlib.contextmanager + def _setup_test(self, verbose, externals): + self.test_failures = [] + if self.test_suite: + self.test_log_file = self.test_suite.log_file_for_spec(self.spec) + self.tested_file = self.test_suite.tested_file_for_spec(self.spec) + pkg_id = self.test_suite.test_pkg_id(self.spec) + else: + self.test_log_file = fsys.join_path( + self.stage.path, _spack_install_test_log) + pkg_id = self.spec.format('{name}-{version}-{hash:7}') + fsys.touch(self.test_log_file) # Otherwise log_parse complains + + with tty.log.log_output(self.test_log_file, verbose) as logger: + with logger.force_echo(): + tty.msg('Testing package {0}'.format(pkg_id)) + + # use debug print levels for log file to record commands + old_debug = tty.is_debug() + tty.set_debug(True) + + try: + yield logger + finally: + # reset debug level + tty.set_debug(old_debug) + + def do_test(self, dirty=False, externals=False): + if self.test_requires_compiler: + compilers = spack.compilers.compilers_for_spec( + self.spec.compiler, arch_spec=self.spec.architecture) + if not compilers: + tty.error('Skipping tests for package %s\n' % + self.spec.format('{name}-{version}-{hash:7}') + + 'Package test requires missing compiler %s' % + self.spec.compiler) + return + + kwargs = { + 'dirty': dirty, 'fake': False, 'context': 'test', + 'externals': externals + } + if tty.is_verbose(): + kwargs['verbose'] = True + spack.build_environment.start_build_process( + self, test_process, kwargs) + + def test(self): + # Defer tests to virtual and concrete packages + pass + + def run_test(self, exe, options=[], expected=[], status=0, + installed=False, purpose='', skip_missing=False, + work_dir=None): + """Run the test and confirm the expected results are obtained + + Log any failures and continue, they will be re-raised later + + Args: + exe (str): the name of the executable + options (str or list): list of options to pass to the runner + expected (str or list): list of expected output strings. + Each string is a regex expected to match part of the output. + status (int or list): possible passing status values + with 0 meaning the test is expected to succeed + installed (bool): if ``True``, the executable must be in the + install prefix + purpose (str): message to display before running test + skip_missing (bool): skip the test if the executable is not + in the install prefix bin directory or the provided work_dir + work_dir (str or None): path to the smoke test directory + """ + wdir = '.' if work_dir is None else work_dir + with fsys.working_dir(wdir, create=True): + try: + runner = which(exe) + if runner is None and skip_missing: + return + assert runner is not None, \ + "Failed to find executable '{0}'".format(exe) + + self._run_test_helper( + runner, options, expected, status, installed, purpose) + print("PASSED") + return True + except BaseException as e: + # print a summary of the error to the log file + # so that cdash and junit reporters know about it + exc_type, _, tb = sys.exc_info() + print('FAILED: {0}'.format(e)) + import traceback + + # remove the current call frame to exclude the extract_stack + # call from the error + stack = traceback.extract_stack()[:-1] + + # Package files have a line added at import time, so we re-read + # the file to make line numbers match. We have to subtract two + # from the line number because the original line number is + # inflated once by the import statement and the lines are + # displaced one by the import statement. + for i, entry in enumerate(stack): + filename, lineno, function, text = entry + if spack.repo.is_package_file(filename): + with open(filename, 'r') as f: + lines = f.readlines() + new_lineno = lineno - 2 + text = lines[new_lineno] + stack[i] = (filename, new_lineno, function, text) + + # Format the stack to print and print it + out = traceback.format_list(stack) + for line in out: + print(line.rstrip('\n')) + + if exc_type is spack.util.executable.ProcessError: + out = six.StringIO() + spack.build_environment.write_log_summary( + out, 'test', self.test_log_file, last=1) + m = out.getvalue() + else: + # We're below the package context, so get context from + # stack instead of from traceback. + # The traceback is truncated here, so we can't use it to + # traverse the stack. + m = '\n'.join( + spack.build_environment.get_package_context(tb) + ) + + exc = e # e is deleted after this block + + # If we fail fast, raise another error + if spack.config.get('config:fail_fast', False): + raise TestFailure([(exc, m)]) + else: + self.test_failures.append((exc, m)) + return False + + def _run_test_helper(self, runner, options, expected, status, installed, + purpose): + status = [status] if isinstance(status, six.integer_types) else status + expected = [expected] if isinstance(expected, six.string_types) else \ + expected + options = [options] if isinstance(options, six.string_types) else \ + options + + if purpose: + tty.msg(purpose) + else: + tty.debug('test: {0}: expect command status in {1}' + .format(runner.name, status)) + + if installed: + msg = "Executable '{0}' expected in prefix".format(runner.name) + msg += ", found in {0} instead".format(runner.path) + assert runner.path.startswith(self.spec.prefix), msg + + try: + output = runner(*options, output=str.split, error=str.split) + + assert 0 in status, \ + 'Expected {0} execution to fail'.format(runner.name) + except ProcessError as err: + output = str(err) + match = re.search(r'exited with status ([0-9]+)', output) + if not (match and int(match.group(1)) in status): + raise + + for check in expected: + cmd = ' '.join([runner.name] + options) + msg = "Expected '{0}' to match output of `{1}`".format(check, cmd) + msg += '\n\nOutput: {0}'.format(output) + assert re.search(check, output), msg + + def unit_test_check(self): + """Hook for unit tests to assert things about package internals. + + Unit tests can override this function to perform checks after + ``Package.install`` and all post-install hooks run, but before + the database is updated. + + The overridden function may indicate that the install procedure + should terminate early (before updating the database) by + returning ``False`` (or any value such that ``bool(result)`` is + ``False``). + + Return: + (bool): ``True`` to continue, ``False`` to skip ``install()`` + """ + return True + + def sanity_check_prefix(self): + """This function checks whether install succeeded.""" + + def check_paths(path_list, filetype, predicate): + if isinstance(path_list, six.string_types): + path_list = [path_list] + + for path in path_list: + abs_path = os.path.join(self.prefix, path) + if not predicate(abs_path): + raise InstallError( + "Install failed for %s. No such %s in prefix: %s" % + (self.name, filetype, path)) + + check_paths(self.sanity_check_is_file, 'file', os.path.isfile) + check_paths(self.sanity_check_is_dir, 'directory', os.path.isdir) + + installed = set(os.listdir(self.prefix)) + installed.difference_update( + spack.store.layout.hidden_file_regexes) + if not installed: + raise InstallError( + "Install failed for %s. Nothing was installed!" % self.name) + + def apply_macos_rpath_fixups(self): + """On Darwin, make installed libraries more easily relocatable. + + Some build systems (handrolled, autotools, makefiles) can set their own + rpaths that are duplicated by spack's compiler wrapper. This fixup + interrogates, and postprocesses if necessary, all libraries installed + by the code. + + It should be added as a @run_after to packaging systems (or individual + packages) that do not install relocatable libraries by default. + """ + if 'platform=darwin' not in self.spec: + return + + from spack.relocate import fixup_macos_rpaths + fixup_macos_rpaths(self.spec) + + @property + def build_log_path(self): + """ + Return the expected (or current) build log file path. The path points + to the staging build file until the software is successfully installed, + when it points to the file in the installation directory. + """ + return self.install_log_path if self.spec.installed else self.log_path + + @classmethod + def inject_flags(cls, name, flags): + # type: (Type, str, Iterable[str]) -> FLAG_HANDLER_RETURN_TYPE + """ + flag_handler that injects all flags through the compiler wrapper. + """ + return flags, None, None + + @classmethod + def env_flags(cls, name, flags): + # type: (Type, str, Iterable[str]) -> FLAG_HANDLER_RETURN_TYPE + """ + flag_handler that adds all flags to canonical environment variables. + """ + return None, flags, None + + @classmethod + def build_system_flags(cls, name, flags): + # type: (Type, str, Iterable[str]) -> FLAG_HANDLER_RETURN_TYPE + """ + flag_handler that passes flags to the build system arguments. Any + package using `build_system_flags` must also implement + `flags_to_build_system_args`, or derive from a class that + implements it. Currently, AutotoolsPackage and CMakePackage + implement it. + """ + return None, None, flags + + def setup_build_environment(self, env): + """Sets up the build environment for a package. + + This method will be called before the current package prefix exists in + Spack's store. + + Args: + env (spack.util.environment.EnvironmentModifications): environment + modifications to be applied when the package is built. Package authors + can call methods on it to alter the build environment. + """ + pass + + def setup_run_environment(self, env): + """Sets up the run environment for a package. + + Args: + env (spack.util.environment.EnvironmentModifications): environment + modifications to be applied when the package is run. Package authors + can call methods on it to alter the run environment. + """ + pass + + def setup_dependent_build_environment(self, env, dependent_spec): + """Sets up the build environment of packages that depend on this one. + + This is similar to ``setup_build_environment``, but it is used to + modify the build environments of packages that *depend* on this one. + + This gives packages like Python and others that follow the extension + model a way to implement common environment or compile-time settings + for dependencies. + + This method will be called before the dependent package prefix exists + in Spack's store. + + Examples: + 1. Installing python modules generally requires ``PYTHONPATH`` + to point to the ``lib/pythonX.Y/site-packages`` directory in the + module's install prefix. This method could be used to set that + variable. + + Args: + env (spack.util.environment.EnvironmentModifications): environment + modifications to be applied when the dependent package is built. + Package authors can call methods on it to alter the build environment. + + dependent_spec (spack.spec.Spec): the spec of the dependent package + about to be built. This allows the extendee (self) to query + the dependent's state. Note that *this* package's spec is + available as ``self.spec`` + """ + pass + + def setup_dependent_run_environment(self, env, dependent_spec): + """Sets up the run environment of packages that depend on this one. + + This is similar to ``setup_run_environment``, but it is used to + modify the run environments of packages that *depend* on this one. + + This gives packages like Python and others that follow the extension + model a way to implement common environment or run-time settings + for dependencies. + + Args: + env (spack.util.environment.EnvironmentModifications): environment + modifications to be applied when the dependent package is run. + Package authors can call methods on it to alter the build environment. + + dependent_spec (spack.spec.Spec): The spec of the dependent package + about to be run. This allows the extendee (self) to query + the dependent's state. Note that *this* package's spec is + available as ``self.spec`` + """ + pass + + def setup_dependent_package(self, module, dependent_spec): + """Set up Python module-scope variables for dependent packages. + + Called before the install() method of dependents. + + Default implementation does nothing, but this can be + overridden by an extendable package to set up the module of + its extensions. This is useful if there are some common steps + to installing all extensions for a certain package. + + Examples: + + 1. Extensions often need to invoke the ``python`` interpreter + from the Python installation being extended. This routine + can put a ``python()`` Executable object in the module scope + for the extension package to simplify extension installs. + + 2. MPI compilers could set some variables in the dependent's + scope that point to ``mpicc``, ``mpicxx``, etc., allowing + them to be called by common name regardless of which MPI is used. + + 3. BLAS/LAPACK implementations can set some variables + indicating the path to their libraries, since these + paths differ by BLAS/LAPACK implementation. + + Args: + module (spack.package_base.PackageBase.module): The Python ``module`` + object of the dependent package. Packages can use this to set + module-scope variables for the dependent to use. + + dependent_spec (spack.spec.Spec): The spec of the dependent package + about to be built. This allows the extendee (self) to + query the dependent's state. Note that *this* + package's spec is available as ``self.spec``. + """ + pass + + _flag_handler = None # type: Optional[FLAG_HANDLER_TYPE] + + @property + def flag_handler(self): + # type: () -> FLAG_HANDLER_TYPE + if self._flag_handler is None: + self._flag_handler = PackageBase.inject_flags + return self._flag_handler + + @flag_handler.setter + def flag_handler(self, var): + # type: (FLAG_HANDLER_TYPE) -> None + self._flag_handler = var + + # The flag handler method is called for each of the allowed compiler flags. + # It returns a triple of inject_flags, env_flags, build_system_flags. + # The flags returned as inject_flags are injected through the spack + # compiler wrappers. + # The flags returned as env_flags are passed to the build system through + # the environment variables of the same name. + # The flags returned as build_system_flags are passed to the build system + # package subclass to be turned into the appropriate part of the standard + # arguments. This is implemented for build system classes where + # appropriate and will otherwise raise a NotImplementedError. + + def flags_to_build_system_args(self, flags): + # Takes flags as a dict name: list of values + if any(v for v in flags.values()): + msg = 'The {0} build system'.format(self.__class__.__name__) + msg += ' cannot take command line arguments for compiler flags' + raise NotImplementedError(msg) + + @staticmethod + def uninstall_by_spec(spec, force=False, deprecator=None): + if not os.path.isdir(spec.prefix): + # prefix may not exist, but DB may be inconsistent. Try to fix by + # removing, but omit hooks. + specs = spack.store.db.query(spec, installed=True) + if specs: + if deprecator: + spack.store.db.deprecate(specs[0], deprecator) + tty.debug('Deprecating stale DB entry for {0}' + .format(spec.short_spec)) + else: + spack.store.db.remove(specs[0]) + tty.debug('Removed stale DB entry for {0}' + .format(spec.short_spec)) + return + else: + raise InstallError(str(spec) + " is not installed.") + + if not force: + dependents = spack.store.db.installed_relatives( + spec, + direction='parents', + transitive=True, + deptype=("link", "run"), + ) + if dependents: + raise PackageStillNeededError(spec, dependents) + + # Try to get the package for the spec + try: + pkg = spec.package + except spack.repo.UnknownEntityError: + pkg = None + + # Pre-uninstall hook runs first. + with spack.store.db.prefix_write_lock(spec): + + if pkg is not None: + try: + spack.hooks.pre_uninstall(spec) + except Exception as error: + if force: + error_msg = ( + "One or more pre_uninstall hooks have failed" + " for {0}, but Spack is continuing with the" + " uninstall".format(str(spec))) + if isinstance(error, spack.error.SpackError): + error_msg += ( + "\n\nError message: {0}".format(str(error))) + tty.warn(error_msg) + # Note that if the uninstall succeeds then we won't be + # seeing this error again and won't have another chance + # to run the hook. + else: + raise + + # Uninstalling in Spack only requires removing the prefix. + if not spec.external: + msg = 'Deleting package prefix [{0}]' + tty.debug(msg.format(spec.short_spec)) + # test if spec is already deprecated, not whether we want to + # deprecate it now + deprecated = bool(spack.store.db.deprecator(spec)) + spack.store.layout.remove_install_directory(spec, deprecated) + # Delete DB entry + if deprecator: + msg = 'deprecating DB entry [{0}] in favor of [{1}]' + tty.debug(msg.format(spec.short_spec, deprecator.short_spec)) + spack.store.db.deprecate(spec, deprecator) + else: + msg = 'Deleting DB entry [{0}]' + tty.debug(msg.format(spec.short_spec)) + spack.store.db.remove(spec) + + if pkg is not None: + try: + spack.hooks.post_uninstall(spec) + except Exception: + # If there is a failure here, this is our only chance to do + # something about it: at this point the Spec has been removed + # from the DB and prefix, so the post-uninstallation hooks + # will not have another chance to run. + error_msg = ( + "One or more post-uninstallation hooks failed for" + " {0}, but the prefix has been removed (if it is not" + " external).".format(str(spec))) + tb_msg = traceback.format_exc() + error_msg += "\n\nThe error:\n\n{0}".format(tb_msg) + tty.warn(error_msg) + + tty.msg('Successfully uninstalled {0}'.format(spec.short_spec)) + + def do_uninstall(self, force=False): + """Uninstall this package by spec.""" + # delegate to instance-less method. + Package.uninstall_by_spec(self.spec, force) + + def do_deprecate(self, deprecator, link_fn): + """Deprecate this package in favor of deprecator spec""" + spec = self.spec + + # Check whether package to deprecate has active extensions + if self.extendable: + view = spack.filesystem_view.YamlFilesystemView(spec.prefix, + spack.store.layout) + active_exts = view.extensions_layout.extension_map(spec).values() + if active_exts: + short = spec.format('{name}/{hash:7}') + m = "Spec %s has active extensions\n" % short + for active in active_exts: + m += ' %s\n' % active.format('{name}/{hash:7}') + m += "Deactivate extensions before deprecating %s" % short + tty.die(m) + + # Check whether package to deprecate is an active extension + if self.is_extension: + extendee = self.extendee_spec + view = spack.filesystem_view.YamlFilesystemView(extendee.prefix, + spack.store.layout) + + if self.is_activated(view): + short = spec.format('{name}/{hash:7}') + short_ext = extendee.format('{name}/{hash:7}') + msg = "Spec %s is an active extension of %s\n" % (short, + short_ext) + msg += "Deactivate %s to be able to deprecate it" % short + tty.die(msg) + + # Install deprecator if it isn't installed already + if not spack.store.db.query(deprecator): + deprecator.package.do_install() + + old_deprecator = spack.store.db.deprecator(spec) + if old_deprecator: + # Find this specs yaml file from its old deprecation + self_yaml = spack.store.layout.deprecated_file_path(spec, + old_deprecator) + else: + self_yaml = spack.store.layout.spec_file_path(spec) + + # copy spec metadata to "deprecated" dir of deprecator + depr_yaml = spack.store.layout.deprecated_file_path(spec, + deprecator) + fsys.mkdirp(os.path.dirname(depr_yaml)) + shutil.copy2(self_yaml, depr_yaml) + + # Any specs deprecated in favor of this spec are re-deprecated in + # favor of its new deprecator + for deprecated in spack.store.db.specs_deprecated_by(spec): + deprecated.package.do_deprecate(deprecator, link_fn) + + # Now that we've handled metadata, uninstall and replace with link + Package.uninstall_by_spec(spec, force=True, deprecator=deprecator) + link_fn(deprecator.prefix, spec.prefix) + + def _check_extendable(self): + if not self.extendable: + raise ValueError("Package %s is not extendable!" % self.name) + + def _sanity_check_extension(self): + if not self.is_extension: + raise ActivationError("This package is not an extension.") + + extendee_package = self.extendee_spec.package + extendee_package._check_extendable() + + if not self.extendee_spec.installed: + raise ActivationError( + "Can only (de)activate extensions for installed packages.") + if not self.spec.installed: + raise ActivationError("Extensions must first be installed.") + if self.extendee_spec.name not in self.extendees: + raise ActivationError("%s does not extend %s!" % + (self.name, self.extendee.name)) + + def do_activate(self, view=None, with_dependencies=True, verbose=True): + """Called on an extension to invoke the extendee's activate method. + + Commands should call this routine, and should not call + activate() directly. + """ + if verbose: + tty.msg('Activating extension {0} for {1}'.format( + self.spec.cshort_spec, self.extendee_spec.cshort_spec)) + + self._sanity_check_extension() + if not view: + view = YamlFilesystemView( + self.extendee_spec.prefix, spack.store.layout) + + extensions_layout = view.extensions_layout + + try: + extensions_layout.check_extension_conflict( + self.extendee_spec, self.spec) + except spack.directory_layout.ExtensionAlreadyInstalledError as e: + # already installed, let caller know + tty.msg(e.message) + return + + # Activate any package dependencies that are also extensions. + if with_dependencies: + for spec in self.dependency_activations(): + if not spec.package.is_activated(view): + spec.package.do_activate( + view, with_dependencies=with_dependencies, + verbose=verbose) + + self.extendee_spec.package.activate( + self, view, **self.extendee_args) + + extensions_layout.add_extension(self.extendee_spec, self.spec) + + if verbose: + tty.debug('Activated extension {0} for {1}'.format( + self.spec.cshort_spec, self.extendee_spec.cshort_spec)) + + def dependency_activations(self): + return (spec for spec in self.spec.traverse(root=False, deptype='run') + if spec.package.extends(self.extendee_spec)) + + def activate(self, extension, view, **kwargs): + """ + Add the extension to the specified view. + + Package authors can override this function to maintain some + centralized state related to the set of activated extensions + for a package. + + Spack internals (commands, hooks, etc.) should call + do_activate() method so that proper checks are always executed. + """ + view.merge(extension.spec, ignore=kwargs.get('ignore', None)) + + def do_deactivate(self, view=None, **kwargs): + """Remove this extension package from the specified view. Called + on the extension to invoke extendee's deactivate() method. + + `remove_dependents=True` deactivates extensions depending on this + package instead of raising an error. + """ + self._sanity_check_extension() + force = kwargs.get('force', False) + verbose = kwargs.get('verbose', True) + remove_dependents = kwargs.get('remove_dependents', False) + + if verbose: + tty.msg('Deactivating extension {0} for {1}'.format( + self.spec.cshort_spec, self.extendee_spec.cshort_spec)) + + if not view: + view = YamlFilesystemView( + self.extendee_spec.prefix, spack.store.layout) + extensions_layout = view.extensions_layout + + # Allow a force deactivate to happen. This can unlink + # spurious files if something was corrupted. + if not force: + extensions_layout.check_activated( + self.extendee_spec, self.spec) + + activated = extensions_layout.extension_map( + self.extendee_spec) + for name, aspec in activated.items(): + if aspec == self.spec: + continue + for dep in aspec.traverse(deptype='run'): + if self.spec == dep: + if remove_dependents: + aspec.package.do_deactivate(**kwargs) + else: + msg = ('Cannot deactivate {0} because {1} is ' + 'activated and depends on it') + raise ActivationError(msg.format( + self.spec.cshort_spec, aspec.cshort_spec)) + + self.extendee_spec.package.deactivate( + self, view, **self.extendee_args) + + # redundant activation check -- makes SURE the spec is not + # still activated even if something was wrong above. + if self.is_activated(view): + extensions_layout.remove_extension( + self.extendee_spec, self.spec) + + if verbose: + tty.debug('Deactivated extension {0} for {1}'.format( + self.spec.cshort_spec, self.extendee_spec.cshort_spec)) + + def deactivate(self, extension, view, **kwargs): + """ + Remove all extension files from the specified view. + + Package authors can override this method to support other + extension mechanisms. Spack internals (commands, hooks, etc.) + should call do_deactivate() method so that proper checks are + always executed. + """ + view.unmerge(extension.spec, ignore=kwargs.get('ignore', None)) + + def view(self): + """Create a view with the prefix of this package as the root. + Extensions added to this view will modify the installation prefix of + this package. + """ + return YamlFilesystemView(self.prefix, spack.store.layout) + + def do_restage(self): + """Reverts expanded/checked out source to a pristine state.""" + self.stage.restage() + + def do_clean(self): + """Removes the package's build stage and source tarball.""" + for patch in self.spec.patches: + patch.clean() + + self.stage.destroy() + + def format_doc(self, **kwargs): + """Wrap doc string at 72 characters and format nicely""" + indent = kwargs.get('indent', 0) + + if not self.__doc__: + return "" + + doc = re.sub(r'\s+', ' ', self.__doc__) + lines = textwrap.wrap(doc, 72) + results = six.StringIO() + for line in lines: + results.write((" " * indent) + line + "\n") + return results.getvalue() + + @property + def all_urls(self): + """A list of all URLs in a package. + + Check both class-level and version-specific URLs. + + Returns: + list: a list of URLs + """ + urls = [] + if hasattr(self, 'url') and self.url: + urls.append(self.url) + + # fetch from first entry in urls to save time + if hasattr(self, 'urls') and self.urls: + urls.append(self.urls[0]) + + for args in self.versions.values(): + if 'url' in args: + urls.append(args['url']) + return urls + + def fetch_remote_versions(self, concurrency=128): + """Find remote versions of this package. + + Uses ``list_url`` and any other URLs listed in the package file. + + Returns: + dict: a dictionary mapping versions to URLs + """ + if not self.all_urls: + return {} + + try: + return spack.util.web.find_versions_of_archive( + self.all_urls, + self.list_url, + self.list_depth, + concurrency, + reference_package=self, + ) + except spack.util.web.NoNetworkConnectionError as e: + tty.die("Package.fetch_versions couldn't connect to:", e.url, + e.message) + + @property + def rpath(self): + """Get the rpath this package links with, as a list of paths.""" + rpaths = [self.prefix.lib, self.prefix.lib64] + deps = self.spec.dependencies(deptype='link') + rpaths.extend(d.prefix.lib for d in deps + if os.path.isdir(d.prefix.lib)) + rpaths.extend(d.prefix.lib64 for d in deps + if os.path.isdir(d.prefix.lib64)) + return rpaths + + @property + def rpath_args(self): + """ + Get the rpath args as a string, with -Wl,-rpath, for each element + """ + return " ".join("-Wl,-rpath,%s" % p for p in self.rpath) + + def _run_test_callbacks(self, method_names, callback_type='install'): + """Tries to call all of the listed methods, returning immediately + if the list is None.""" + if method_names is None: + return + + fail_fast = spack.config.get('config:fail_fast', False) + + with self._setup_test(verbose=False, externals=False) as logger: + # Report running each of the methods in the build log + print_test_message( + logger, 'Running {0}-time tests'.format(callback_type), True) + + for name in method_names: + try: + fn = getattr(self, name) + + msg = 'RUN-TESTS: {0}-time tests [{1}]' \ + .format(callback_type, name), + print_test_message(logger, msg, True) + + fn() + except AttributeError as e: + msg = 'RUN-TESTS: method not implemented [{0}]' \ + .format(name), + print_test_message(logger, msg, True) + + self.test_failures.append((e, msg)) + if fail_fast: + break + + # Raise any collected failures here + if self.test_failures: + raise TestFailure(self.test_failures) + + @on_package_attributes(run_tests=True) + def _run_default_build_time_test_callbacks(self): + """Tries to call all the methods that are listed in the attribute + ``build_time_test_callbacks`` if ``self.run_tests is True``. + """ + self._run_test_callbacks(self.build_time_test_callbacks, 'build') + + @on_package_attributes(run_tests=True) + def _run_default_install_time_test_callbacks(self): + """Tries to call all the methods that are listed in the attribute + ``install_time_test_callbacks`` if ``self.run_tests is True``. + """ + self._run_test_callbacks(self.install_time_test_callbacks, 'install') + + +def has_test_method(pkg): + """Determine if the package defines its own stand-alone test method. + + Args: + pkg (str): the package being checked + + Returns: + (bool): ``True`` if the package overrides the default method; else + ``False`` + """ + if not inspect.isclass(pkg): + tty.die('{0}: is not a class, it is {1}'.format(pkg, type(pkg))) + + return ( + (issubclass(pkg, PackageBase) and pkg.test != PackageBase.test) or + (isinstance(pkg, PackageBase) and pkg.test.__func__ != PackageBase.test) + ) + + +def print_test_message(logger, msg, verbose): + if verbose: + with logger.force_echo(): + tty.msg(msg) + else: + tty.msg(msg) + + +def test_process(pkg, kwargs): + verbose = kwargs.get('verbose', False) + externals = kwargs.get('externals', False) + + with pkg._setup_test(verbose, externals) as logger: + if pkg.spec.external and not externals: + print_test_message( + logger, 'Skipped tests for external package', verbose) + return + + # run test methods from the package and all virtuals it + # provides virtuals have to be deduped by name + v_names = list(set([vspec.name + for vspec in pkg.virtuals_provided])) + + # hack for compilers that are not dependencies (yet) + # TODO: this all eventually goes away + c_names = ('gcc', 'intel', 'intel-parallel-studio', 'pgi') + if pkg.name in c_names: + v_names.extend(['c', 'cxx', 'fortran']) + if pkg.spec.satisfies('llvm+clang'): + v_names.extend(['c', 'cxx']) + + test_specs = [pkg.spec] + [spack.spec.Spec(v_name) + for v_name in sorted(v_names)] + + ran_actual_test_function = False + try: + with fsys.working_dir(pkg.test_suite.test_dir_for_spec(pkg.spec)): + for spec in test_specs: + pkg.test_suite.current_test_spec = spec + # Fail gracefully if a virtual has no package/tests + try: + spec_pkg = spec.package + except spack.repo.UnknownPackageError: + continue + + # copy installed test sources cache into test cache dir + if spec.concrete: + cache_source = spec_pkg.install_test_root + cache_dir = pkg.test_suite.current_test_cache_dir + if (os.path.isdir(cache_source) and + not os.path.exists(cache_dir)): + fsys.install_tree(cache_source, cache_dir) + + # copy test data into test data dir + data_source = Prefix(spec_pkg.package_dir).test + data_dir = pkg.test_suite.current_test_data_dir + if (os.path.isdir(data_source) and + not os.path.exists(data_dir)): + # We assume data dir is used read-only + # maybe enforce this later + shutil.copytree(data_source, data_dir) + + # grab the function for each method so we can call + # it with the package + test_fn = spec_pkg.__class__.test + if not isinstance(test_fn, types.FunctionType): + test_fn = test_fn.__func__ + + # Skip any test methods consisting solely of 'pass' + # since they do not contribute to package testing. + source = (inspect.getsource(test_fn)).splitlines()[1:] + lines = (ln.strip() for ln in source) + statements = [ln for ln in lines if not ln.startswith('#')] + if len(statements) > 0 and statements[0] == 'pass': + continue + + # Run the tests + ran_actual_test_function = True + context = logger.force_echo if verbose else nullcontext + with context(): + test_fn(pkg) + + # If fail-fast was on, we error out above + # If we collect errors, raise them in batch here + if pkg.test_failures: + raise TestFailure(pkg.test_failures) + + finally: + # flag the package as having been tested (i.e., ran one or more + # non-pass-only methods + if ran_actual_test_function: + fsys.touch(pkg.tested_file) + else: + print_test_message(logger, 'No tests to run', verbose) + + +inject_flags = PackageBase.inject_flags +env_flags = PackageBase.env_flags +build_system_flags = PackageBase.build_system_flags + + +class BundlePackage(PackageBase): + """General purpose bundle, or no-code, package class.""" + #: There are no phases by default but the property is required to support + #: post-install hooks (e.g., for module generation). + phases = [] # type: List[str] + #: This attribute is used in UI queries that require to know which + #: build-system class we are using + build_system_class = 'BundlePackage' + + #: Bundle packages do not have associated source or binary code. + has_code = False + + +class Package(PackageBase): + """General purpose class with a single ``install`` + phase that needs to be coded by packagers. + """ + #: The one and only phase + phases = ['install'] + #: This attribute is used in UI queries that require to know which + #: build-system class we are using + build_system_class = 'Package' + # This will be used as a registration decorator in user + # packages, if need be + run_after('install')(PackageBase.sanity_check_prefix) + # On macOS, force rpaths for shared library IDs and remove duplicate rpaths + run_after('install')(PackageBase.apply_macos_rpath_fixups) + + +def install_dependency_symlinks(pkg, spec, prefix): + """ + Execute a dummy install and flatten dependencies. + + This routine can be used in a ``package.py`` definition by setting + ``install = install_dependency_symlinks``. + + This feature comes in handy for creating a common location for the + the installation of third-party libraries. + """ + flatten_dependencies(spec, prefix) + + +def use_cray_compiler_names(): + """Compiler names for builds that rely on cray compiler names.""" + os.environ['CC'] = 'cc' + os.environ['CXX'] = 'CC' + os.environ['FC'] = 'ftn' + os.environ['F77'] = 'ftn' + + +def flatten_dependencies(spec, flat_dir): + """Make each dependency of spec present in dir via symlink.""" + for dep in spec.traverse(root=False): + name = dep.name + + dep_path = spack.store.layout.path_for_spec(dep) + dep_files = LinkTree(dep_path) + + os.mkdir(flat_dir + '/' + name) + + conflict = dep_files.find_conflict(flat_dir + '/' + name) + if conflict: + raise DependencyConflictError(conflict) + + dep_files.merge(flat_dir + '/' + name) + + +def possible_dependencies(*pkg_or_spec, **kwargs): + """Get the possible dependencies of a number of packages. + + See ``PackageBase.possible_dependencies`` for details. + """ + packages = [] + for pos in pkg_or_spec: + if isinstance(pos, PackageMeta): + packages.append(pos) + continue + + if not isinstance(pos, spack.spec.Spec): + pos = spack.spec.Spec(pos) + + if spack.repo.path.is_virtual(pos.name): + packages.extend( + p.package_class + for p in spack.repo.path.providers_for(pos.name) + ) + continue + else: + packages.append(pos.package_class) + + visited = {} + for pkg in packages: + pkg.possible_dependencies(visited=visited, **kwargs) + + return visited + + +class FetchError(spack.error.SpackError): + """Raised when something goes wrong during fetch.""" + + def __init__(self, message, long_msg=None): + super(FetchError, self).__init__(message, long_msg) + + +class PackageStillNeededError(InstallError): + """Raised when package is still needed by another on uninstall.""" + def __init__(self, spec, dependents): + super(PackageStillNeededError, self).__init__("Cannot uninstall %s" % + spec) + self.spec = spec + self.dependents = dependents + + +class PackageError(spack.error.SpackError): + """Raised when something is wrong with a package definition.""" + def __init__(self, message, long_msg=None): + super(PackageError, self).__init__(message, long_msg) + + +class PackageVersionError(PackageError): + """Raised when a version URL cannot automatically be determined.""" + def __init__(self, version): + super(PackageVersionError, self).__init__( + "Cannot determine a URL automatically for version %s" % version, + "Please provide a url for this version in the package.py file.") + + +class NoURLError(PackageError): + """Raised when someone tries to build a URL for a package with no URLs.""" + + def __init__(self, cls): + super(NoURLError, self).__init__( + "Package %s has no version with a URL." % cls.__name__) + + +class InvalidPackageOpError(PackageError): + """Raised when someone tries perform an invalid operation on a package.""" + + +class ExtensionError(PackageError): + """Superclass for all errors having to do with extension packages.""" + + +class ActivationError(ExtensionError): + """Raised when there are problems activating an extension.""" + def __init__(self, msg, long_msg=None): + super(ActivationError, self).__init__(msg, long_msg) + + +class DependencyConflictError(spack.error.SpackError): + """Raised when the dependencies cannot be flattened as asked for.""" + def __init__(self, conflict): + super(DependencyConflictError, self).__init__( + "%s conflicts with another file in the flattened directory." % ( + conflict)) diff --git a/lib/spack/spack/patch.py b/lib/spack/spack/patch.py index 33f9fa57eb..237e85ad75 100644 --- a/lib/spack/spack/patch.py +++ b/lib/spack/spack/patch.py @@ -356,7 +356,7 @@ class PatchCache(object): Arguments: sha256 (str): sha256 hash to look up - pkg (spack.package.Package): Package object to get patch for. + pkg (spack.package_base.Package): Package object to get patch for. We build patch objects lazily because building them requires that we have information about the package's location in its repo. diff --git a/lib/spack/spack/pkgkit.py b/lib/spack/spack/pkgkit.py deleted file mode 100644 index c7fbfe1af8..0000000000 --- a/lib/spack/spack/pkgkit.py +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# flake8: noqa: F401 -"""pkgkit is a set of useful build tools and directives for packages. - -Everything in this module is automatically imported into Spack package files. -""" -import llnl.util.filesystem -from llnl.util.filesystem import * - -import spack.directives -import spack.util.executable -from spack.build_systems.aspell_dict import AspellDictPackage -from spack.build_systems.autotools import AutotoolsPackage -from spack.build_systems.cached_cmake import ( - CachedCMakePackage, - cmake_cache_option, - cmake_cache_path, - cmake_cache_string, -) -from spack.build_systems.cmake import CMakePackage -from spack.build_systems.cuda import CudaPackage -from spack.build_systems.gnu import GNUMirrorPackage -from spack.build_systems.intel import IntelPackage -from spack.build_systems.lua import LuaPackage -from spack.build_systems.makefile import MakefilePackage -from spack.build_systems.maven import MavenPackage -from spack.build_systems.meson import MesonPackage -from spack.build_systems.octave import OctavePackage -from spack.build_systems.oneapi import ( - IntelOneApiLibraryPackage, - IntelOneApiPackage, - IntelOneApiStaticLibraryList, -) -from spack.build_systems.perl import PerlPackage -from spack.build_systems.python import PythonPackage -from spack.build_systems.qmake import QMakePackage -from spack.build_systems.r import RPackage -from spack.build_systems.racket import RacketPackage -from spack.build_systems.rocm import ROCmPackage -from spack.build_systems.ruby import RubyPackage -from spack.build_systems.scons import SConsPackage -from spack.build_systems.sip import SIPPackage -from spack.build_systems.sourceforge import SourceforgePackage -from spack.build_systems.sourceware import SourcewarePackage -from spack.build_systems.waf import WafPackage -from spack.build_systems.xorg import XorgPackage -from spack.dependency import all_deptypes -from spack.directives import * -from spack.install_test import get_escaped_text_output -from spack.installer import ( - ExternalPackageError, - InstallError, - InstallLockError, - UpstreamPackageError, -) -from spack.mixins import filter_compiler_wrappers -from spack.multimethod import when -from spack.package import ( - BundlePackage, - DependencyConflictError, - Package, - build_system_flags, - env_flags, - flatten_dependencies, - inject_flags, - install_dependency_symlinks, - on_package_attributes, - run_after, - run_before, -) -from spack.spec import InvalidSpecDetected, Spec -from spack.util.executable import * -from spack.variant import ( - any_combination_of, - auto_or_any_combination_of, - conditional, - disjoint_sets, -) -from spack.version import Version, ver diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py index 50f0b8a9fb..82ac03ecdc 100644 --- a/lib/spack/spack/repo.py +++ b/lib/spack/spack/repo.py @@ -202,17 +202,11 @@ class RepoLoader(_PrependFileLoader): """Loads a Python module associated with a package in specific repository""" #: Code in ``_package_prepend`` is prepended to imported packages. #: - #: Spack packages were originally expected to call `from spack import *` - #: themselves, but it became difficult to manage and imports in the Spack - #: core the top-level namespace polluted by package symbols this way. To - #: solve this, the top-level ``spack`` package contains very few symbols - #: of its own, and importing ``*`` is essentially a no-op. The common - #: routines and directives that packages need are now in ``spack.pkgkit``, - #: and the import system forces packages to automatically include - #: this. This way, old packages that call ``from spack import *`` will - #: continue to work without modification, but it's no longer required. + #: Spack packages are expected to call `from spack.package import *` + #: themselves, but we are allowing a deprecation period before breaking + #: external repos that don't do this yet. _package_prepend = ('from __future__ import absolute_import;' - 'from spack.pkgkit import *') + 'from spack.package import *') def __init__(self, fullname, repo, package_name): self.repo = repo @@ -450,10 +444,10 @@ def is_package_file(filename): # Package files are named `package.py` and are not in lib/spack/spack # We have to remove the file extension because it can be .py and can be # .pyc depending on context, and can differ between the files - import spack.package # break cycle + import spack.package_base # break cycle filename_noext = os.path.splitext(filename)[0] packagebase_filename_noext = os.path.splitext( - inspect.getfile(spack.package.PackageBase))[0] + inspect.getfile(spack.package_base.PackageBase))[0] return (filename_noext != packagebase_filename_noext and os.path.basename(filename_noext) == 'package') diff --git a/lib/spack/spack/report.py b/lib/spack/spack/report.py index c8975a8f77..b67f2e71cc 100644 --- a/lib/spack/spack/report.py +++ b/lib/spack/spack/report.py @@ -15,7 +15,7 @@ import llnl.util.lang import spack.build_environment import spack.fetch_strategy -import spack.package +import spack.package_base from spack.install_test import TestSuite from spack.reporter import Reporter from spack.reporters.cdash import CDash @@ -131,7 +131,7 @@ class InfoCollector(object): """ @functools.wraps(do_fn) def wrapper(instance, *args, **kwargs): - if isinstance(instance, spack.package.PackageBase): + if isinstance(instance, spack.package_base.PackageBase): pkg = instance elif hasattr(args[0], 'pkg'): pkg = args[0].pkg diff --git a/lib/spack/spack/reporters/cdash.py b/lib/spack/spack/reporters/cdash.py index d947becde8..388884039d 100644 --- a/lib/spack/spack/reporters/cdash.py +++ b/lib/spack/spack/reporters/cdash.py @@ -22,7 +22,7 @@ from llnl.util.filesystem import working_dir import spack.build_environment import spack.fetch_strategy -import spack.package +import spack.package_base from spack.error import SpackError from spack.reporter import Reporter from spack.util.crypto import checksum diff --git a/lib/spack/spack/reporters/junit.py b/lib/spack/spack/reporters/junit.py index 8ed299fe23..fa19bdd2bd 100644 --- a/lib/spack/spack/reporters/junit.py +++ b/lib/spack/spack/reporters/junit.py @@ -7,7 +7,7 @@ import posixpath import spack.build_environment import spack.fetch_strategy -import spack.package +import spack.package_base from spack.reporter import Reporter __all__ = ['JUnit'] diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index 1b3eb8b1a8..bcdb929fdc 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -41,7 +41,7 @@ import spack.dependency import spack.directives import spack.environment as ev import spack.error -import spack.package +import spack.package_base import spack.package_prefs import spack.platforms import spack.repo @@ -1822,7 +1822,7 @@ class SpackSolverSetup(object): self.possible_virtuals = set( x.name for x in specs if x.virtual ) - possible = spack.package.possible_dependencies( + possible = spack.package_base.possible_dependencies( *specs, virtuals=self.possible_virtuals, deptype=spack.dependency.all_deptypes diff --git a/lib/spack/spack/test/build_systems.py b/lib/spack/spack/test/build_systems.py index 5c1f3c293c..304fa4c7bd 100644 --- a/lib/spack/spack/test/build_systems.py +++ b/lib/spack/spack/test/build_systems.py @@ -128,7 +128,7 @@ def test_cmake_bad_generator(config, mock_packages): s.concretize() pkg = spack.repo.get(s) pkg.generator = 'Yellow Sticky Notes' - with pytest.raises(spack.package.InstallError): + with pytest.raises(spack.package_base.InstallError): get_std_cmake_args(pkg) diff --git a/lib/spack/spack/test/cmd/analyze.py b/lib/spack/spack/test/cmd/analyze.py index 77f26ccb23..17f5331804 100644 --- a/lib/spack/spack/test/cmd/analyze.py +++ b/lib/spack/spack/test/cmd/analyze.py @@ -10,7 +10,7 @@ import pytest import spack.cmd.install import spack.config -import spack.package +import spack.package_base import spack.util.spack_json as sjson from spack.main import SpackCommand from spack.spec import Spec diff --git a/lib/spack/spack/test/cmd/clean.py b/lib/spack/spack/test/cmd/clean.py index fb0bb87ed0..82c8833a0c 100644 --- a/lib/spack/spack/test/cmd/clean.py +++ b/lib/spack/spack/test/cmd/clean.py @@ -9,7 +9,7 @@ import pytest import spack.caches import spack.main -import spack.package +import spack.package_base import spack.stage clean = spack.main.SpackCommand('clean') @@ -31,7 +31,7 @@ def mock_calls_for_clean(monkeypatch): def __call__(self, *args, **kwargs): counts[self.name] += 1 - monkeypatch.setattr(spack.package.PackageBase, 'do_clean', + monkeypatch.setattr(spack.package_base.PackageBase, 'do_clean', Counter('package')) monkeypatch.setattr(spack.stage, 'purge', Counter('stages')) monkeypatch.setattr( diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 4b9f578c34..f9194f664d 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -20,7 +20,7 @@ import spack.compilers as compilers import spack.config import spack.environment as ev import spack.hash_types as ht -import spack.package +import spack.package_base import spack.util.executable from spack.error import SpackError from spack.main import SpackCommand @@ -66,7 +66,7 @@ def test_install_package_and_dependency( def test_install_runtests_notests(monkeypatch, mock_packages, install_mockery): def check(pkg): assert not pkg.run_tests - monkeypatch.setattr(spack.package.PackageBase, 'unit_test_check', check) + monkeypatch.setattr(spack.package_base.PackageBase, 'unit_test_check', check) install('-v', 'dttop') @@ -75,7 +75,7 @@ def test_install_runtests_root(monkeypatch, mock_packages, install_mockery): def check(pkg): assert pkg.run_tests == (pkg.name == 'dttop') - monkeypatch.setattr(spack.package.PackageBase, 'unit_test_check', check) + monkeypatch.setattr(spack.package_base.PackageBase, 'unit_test_check', check) install('--test=root', 'dttop') @@ -84,7 +84,7 @@ def test_install_runtests_all(monkeypatch, mock_packages, install_mockery): def check(pkg): assert pkg.run_tests - monkeypatch.setattr(spack.package.PackageBase, 'unit_test_check', check) + monkeypatch.setattr(spack.package_base.PackageBase, 'unit_test_check', check) install('--test=all', 'a') @@ -257,7 +257,7 @@ def test_install_commit( """ repo_path, filename, commits = mock_git_version_info - monkeypatch.setattr(spack.package.PackageBase, + monkeypatch.setattr(spack.package_base.PackageBase, 'git', 'file://%s' % repo_path, raising=False) diff --git a/lib/spack/spack/test/cmd/pkg.py b/lib/spack/spack/test/cmd/pkg.py index b868c62c66..e43fca0535 100644 --- a/lib/spack/spack/test/cmd/pkg.py +++ b/lib/spack/spack/test/cmd/pkg.py @@ -22,7 +22,7 @@ pytestmark = pytest.mark.skipif(not which('git'), #: new fake package template pkg_template = '''\ -from spack import * +from spack.package import * class {name}(Package): homepage = "http://www.example.com" diff --git a/lib/spack/spack/test/cmd/stage.py b/lib/spack/spack/test/cmd/stage.py index b7120a5a95..5c586a11b0 100644 --- a/lib/spack/spack/test/cmd/stage.py +++ b/lib/spack/spack/test/cmd/stage.py @@ -28,7 +28,7 @@ def test_stage_spec(monkeypatch): def fake_stage(pkg, mirror_only=False): expected.remove(pkg.name) - monkeypatch.setattr(spack.package.PackageBase, 'do_stage', fake_stage) + monkeypatch.setattr(spack.package_base.PackageBase, 'do_stage', fake_stage) stage('trivial-install-test-package', 'mpileaks') @@ -42,7 +42,7 @@ def check_stage_path(monkeypatch, tmpdir): def fake_stage(pkg, mirror_only=False): assert pkg.path == expected_path - monkeypatch.setattr(spack.package.PackageBase, 'do_stage', fake_stage) + monkeypatch.setattr(spack.package_base.PackageBase, 'do_stage', fake_stage) return expected_path @@ -69,7 +69,7 @@ def test_stage_with_env_outside_env(mutable_mock_env_path, monkeypatch): assert pkg.name == 'trivial-install-test-package' assert pkg.path is None - monkeypatch.setattr(spack.package.PackageBase, 'do_stage', fake_stage) + monkeypatch.setattr(spack.package_base.PackageBase, 'do_stage', fake_stage) e = ev.create('test') e.add('mpileaks') @@ -87,7 +87,7 @@ def test_stage_with_env_inside_env(mutable_mock_env_path, monkeypatch): assert pkg.name == 'mpileaks' assert pkg.version == Version('100.100') - monkeypatch.setattr(spack.package.PackageBase, 'do_stage', fake_stage) + monkeypatch.setattr(spack.package_base.PackageBase, 'do_stage', fake_stage) e = ev.create('test') e.add('mpileaks@100.100') @@ -115,7 +115,7 @@ def test_stage_full_env(mutable_mock_env_path, monkeypatch): def fake_stage(pkg, mirror_only=False): expected.remove(pkg.name) - monkeypatch.setattr(spack.package.PackageBase, 'do_stage', fake_stage) + monkeypatch.setattr(spack.package_base.PackageBase, 'do_stage', fake_stage) with e: stage() diff --git a/lib/spack/spack/test/cmd/style.py b/lib/spack/spack/test/cmd/style.py index 4269f0bd28..8b70a791dc 100644 --- a/lib/spack/spack/test/cmd/style.py +++ b/lib/spack/spack/test/cmd/style.py @@ -76,7 +76,9 @@ def flake8_package_with_errors(scope="function"): package = FileFilter(filename) package.filter("state = 'unmodified'", "state = 'modified'", string=True) package.filter( - "from spack import *", "from spack import *\nimport os", string=True + "from spack.package import *", + "from spack.package import *\nimport os", + string=True ) yield filename finally: @@ -273,17 +275,17 @@ def test_style(flake8_package, tmpdir): relative = os.path.relpath(flake8_package) # no args - output = style() + output = style(fail_on_error=False) assert relative in output assert "spack style checks were clean" in output # one specific arg - output = style(flake8_package) + output = style(flake8_package, fail_on_error=False) assert relative in output assert "spack style checks were clean" in output # specific file that isn't changed - output = style(__file__) + output = style(__file__, fail_on_error=False) assert relative not in output assert __file__ in output assert "spack style checks were clean" in output diff --git a/lib/spack/spack/test/cmd/test.py b/lib/spack/spack/test/cmd/test.py index 0278ca344c..0555dc6ca1 100644 --- a/lib/spack/spack/test/cmd/test.py +++ b/lib/spack/spack/test/cmd/test.py @@ -13,7 +13,7 @@ from llnl.util.filesystem import copy_tree import spack.cmd.install import spack.config -import spack.package +import spack.package_base import spack.paths import spack.store from spack.main import SpackCommand @@ -239,7 +239,7 @@ def test_test_list( reason="Not supported on Windows (yet)") def test_has_test_method_fails(capsys): with pytest.raises(SystemExit): - spack.package.has_test_method('printing-package') + spack.package_base.has_test_method('printing-package') captured = capsys.readouterr()[1] assert 'is not a class' in captured diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 7298fc804f..089a073e09 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -35,7 +35,7 @@ import spack.config import spack.database import spack.directory_layout import spack.environment as ev -import spack.package +import spack.package_base import spack.package_prefs import spack.paths import spack.platforms @@ -532,7 +532,7 @@ def _pkg_install_fn(pkg, spec, prefix): @pytest.fixture def mock_pkg_install(monkeypatch): - monkeypatch.setattr(spack.package.PackageBase, 'install', + monkeypatch.setattr(spack.package_base.PackageBase, 'install', _pkg_install_fn, raising=False) @@ -934,7 +934,7 @@ def mock_fetch(mock_archive, monkeypatch): mock_fetcher.append(URLFetchStrategy(mock_archive.url)) monkeypatch.setattr( - spack.package.PackageBase, 'fetcher', mock_fetcher) + spack.package_base.PackageBase, 'fetcher', mock_fetcher) class MockLayout(object): diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py index 0315857f1d..e61a46cbc5 100644 --- a/lib/spack/spack/test/database.py +++ b/lib/spack/spack/test/database.py @@ -29,7 +29,7 @@ import llnl.util.lock as lk from llnl.util.tty.colify import colify import spack.database -import spack.package +import spack.package_base import spack.repo import spack.spec import spack.store @@ -792,7 +792,7 @@ def test_uninstall_by_spec(mutable_database): with mutable_database.write_transaction(): for spec in mutable_database.query(): if spec.installed: - spack.package.PackageBase.uninstall_by_spec(spec, force=True) + spack.package_base.PackageBase.uninstall_by_spec(spec, force=True) else: mutable_database.remove(spec) assert len(mutable_database.query()) == 0 diff --git a/lib/spack/spack/test/flag_handlers.py b/lib/spack/spack/test/flag_handlers.py index f40b8ea14a..97a0ec171c 100644 --- a/lib/spack/spack/test/flag_handlers.py +++ b/lib/spack/spack/test/flag_handlers.py @@ -10,7 +10,7 @@ import pytest import spack.build_environment import spack.repo import spack.spec -from spack.pkgkit import build_system_flags, env_flags, inject_flags +from spack.package import build_system_flags, env_flags, inject_flags @pytest.fixture() diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index 599087ac78..42c68fd6bd 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -15,7 +15,7 @@ import spack.patch import spack.repo import spack.store import spack.util.spack_json as sjson -from spack.package import ( +from spack.package_base import ( InstallError, PackageBase, PackageStillNeededError, @@ -238,7 +238,7 @@ def test_flatten_deps( assert dependency_name not in os.listdir(pkg.prefix) # Flatten the dependencies and ensure the dependency directory is there. - spack.package.flatten_dependencies(spec, pkg.prefix) + spack.package_base.flatten_dependencies(spec, pkg.prefix) dependency_dir = os.path.join(pkg.prefix, dependency_name) assert os.path.isdir(dependency_dir) @@ -322,7 +322,7 @@ def test_partial_install_keep_prefix(install_mockery, mock_fetch, monkeypatch): # If remove_prefix is called at any point in this test, that is an # error pkg.succeed = False # make the build fail - monkeypatch.setattr(spack.package.Package, 'remove_prefix', mock_remove_prefix) + monkeypatch.setattr(spack.package_base.Package, 'remove_prefix', mock_remove_prefix) with pytest.raises(spack.build_environment.ChildError): pkg.do_install(keep_prefix=True) assert os.path.exists(pkg.prefix) @@ -340,7 +340,7 @@ def test_partial_install_keep_prefix(install_mockery, mock_fetch, monkeypatch): def test_second_install_no_overwrite_first(install_mockery, mock_fetch, monkeypatch): spec = Spec('canfail').concretized() pkg = spack.repo.get(spec) - monkeypatch.setattr(spack.package.Package, 'remove_prefix', mock_remove_prefix) + monkeypatch.setattr(spack.package_base.Package, 'remove_prefix', mock_remove_prefix) pkg.succeed = True pkg.do_install() diff --git a/lib/spack/spack/test/installer.py b/lib/spack/spack/test/installer.py index b0e768a387..f228ec2d77 100644 --- a/lib/spack/spack/test/installer.py +++ b/lib/spack/spack/test/installer.py @@ -69,7 +69,8 @@ def create_build_task(pkg, install_args={}): Create a built task for the given (concretized) package Args: - pkg (spack.package.PackageBase): concretized package associated with the task + pkg (spack.package_base.PackageBase): concretized package associated with + the task install_args (dict): dictionary of kwargs (or install args) Return: @@ -716,7 +717,7 @@ def test_install_task_add_compiler(install_mockery, monkeypatch, capfd): task.compiler = True # Preclude any meaningful side-effects - monkeypatch.setattr(spack.package.PackageBase, 'unit_test_check', _true) + monkeypatch.setattr(spack.package_base.PackageBase, 'unit_test_check', _true) monkeypatch.setattr(inst.PackageInstaller, '_setup_install_dir', _noop) monkeypatch.setattr(spack.build_environment, 'start_build_process', _noop) monkeypatch.setattr(spack.database.Database, 'add', _noop) @@ -1049,7 +1050,7 @@ def test_install_fail_fast_on_except(install_mockery, monkeypatch, capsys): # This will prevent b from installing, which will cause the build of a # to be skipped. monkeypatch.setattr( - spack.package.PackageBase, + spack.package_base.PackageBase, 'do_patch', _test_install_fail_fast_on_except_patch ) diff --git a/lib/spack/spack/test/package_class.py b/lib/spack/spack/test/package_class.py index b3afa57f9a..909cf4193f 100644 --- a/lib/spack/spack/test/package_class.py +++ b/lib/spack/spack/test/package_class.py @@ -17,7 +17,7 @@ import pytest import llnl.util.filesystem as fs -import spack.package +import spack.package_base import spack.repo @@ -80,7 +80,7 @@ def test_possible_dependencies_virtual(mock_packages, mpi_names): # only one mock MPI has a dependency expected['fake'] = set() - assert expected == spack.package.possible_dependencies( + assert expected == spack.package_base.possible_dependencies( "mpi", transitive=False) @@ -125,7 +125,7 @@ def test_possible_dependencies_with_multiple_classes( 'dt-diamond-bottom': set(), }) - assert expected == spack.package.possible_dependencies(*pkgs) + assert expected == spack.package_base.possible_dependencies(*pkgs) def setup_install_test(source_paths, install_test_root): diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index ed01e410f8..dabe768b37 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -16,7 +16,7 @@ import llnl.util.tty as tty # do sanity checks only on packagess modified by a PR import spack.cmd.style as style import spack.fetch_strategy -import spack.package +import spack.package_base import spack.paths import spack.repo import spack.util.crypto as crypto @@ -265,7 +265,7 @@ def test_all_dependencies_exist(): """Make sure no packages have nonexisting dependencies.""" missing = {} pkgs = [pkg for pkg in spack.repo.path.all_package_names()] - spack.package.possible_dependencies( + spack.package_base.possible_dependencies( *pkgs, transitive=True, missing=missing) lines = [ diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index e403d85899..5d2928115e 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -135,10 +135,10 @@ def test_urls_for_versions(mock_packages, config): def test_url_for_version_with_no_urls(mock_packages, config): pkg = spack.repo.get('git-test') - with pytest.raises(spack.package.NoURLError): + with pytest.raises(spack.package_base.NoURLError): pkg.url_for_version('1.0') - with pytest.raises(spack.package.NoURLError): + with pytest.raises(spack.package_base.NoURLError): pkg.url_for_version('1.1') @@ -377,7 +377,7 @@ def test_fetch_options(mock_packages, config): def test_has_test_method_fails(capsys): with pytest.raises(SystemExit): - spack.package.has_test_method('printing-package') + spack.package_base.has_test_method('printing-package') captured = capsys.readouterr()[1] assert 'is not a class' in captured diff --git a/lib/spack/spack/test/packaging.py b/lib/spack/spack/test/packaging.py index ff68418ac4..63a3cf9a3e 100644 --- a/lib/spack/spack/test/packaging.py +++ b/lib/spack/spack/test/packaging.py @@ -21,7 +21,7 @@ from llnl.util.symlink import symlink import spack.binary_distribution as bindist import spack.cmd.buildcache as buildcache -import spack.package +import spack.package_base import spack.repo import spack.store import spack.util.gpg @@ -575,10 +575,10 @@ def mock_download(): def fake_fn(self): return fetcher - orig_fn = spack.package.PackageBase.fetcher - spack.package.PackageBase.fetcher = fake_fn + orig_fn = spack.package_base.PackageBase.fetcher + spack.package_base.PackageBase.fetcher = fake_fn yield - spack.package.PackageBase.fetcher = orig_fn + spack.package_base.PackageBase.fetcher = orig_fn @pytest.mark.parametrize("manual,instr", [(False, False), (False, True), @@ -598,7 +598,7 @@ def test_manual_download(install_mockery, mock_download, monkeypatch, manual, pkg.manual_download = manual if instr: - monkeypatch.setattr(spack.package.PackageBase, 'download_instr', + monkeypatch.setattr(spack.package_base.PackageBase, 'download_instr', _instr) expected = pkg.download_instr if manual else 'All fetchers failed' @@ -616,7 +616,7 @@ def fetching_not_allowed(monkeypatch): raise Exception("Sources are fetched but shouldn't have been") fetcher = FetchStrategyComposite() fetcher.append(FetchingNotAllowed()) - monkeypatch.setattr(spack.package.PackageBase, 'fetcher', fetcher) + monkeypatch.setattr(spack.package_base.PackageBase, 'fetcher', fetcher) def test_fetch_without_code_is_noop(install_mockery, fetching_not_allowed): diff --git a/lib/spack/spack/test/repo.py b/lib/spack/spack/test/repo.py index 98b202635d..5dfa9597fc 100644 --- a/lib/spack/spack/test/repo.py +++ b/lib/spack/spack/test/repo.py @@ -7,7 +7,7 @@ import sys import pytest -import spack.package +import spack.package_base import spack.paths import spack.repo @@ -116,11 +116,12 @@ def test_absolute_import_spack_packages_as_python_modules(mock_packages): assert hasattr(spack.pkg.builtin.mock, 'mpileaks') assert hasattr(spack.pkg.builtin.mock.mpileaks, 'Mpileaks') assert isinstance(spack.pkg.builtin.mock.mpileaks.Mpileaks, - spack.package.PackageMeta) - assert issubclass(spack.pkg.builtin.mock.mpileaks.Mpileaks, spack.package.Package) + spack.package_base.PackageMeta) + assert issubclass(spack.pkg.builtin.mock.mpileaks.Mpileaks, + spack.package_base.Package) def test_relative_import_spack_packages_as_python_modules(mock_packages): from spack.pkg.builtin.mock.mpileaks import Mpileaks - assert isinstance(Mpileaks, spack.package.PackageMeta) - assert issubclass(Mpileaks, spack.package.Package) + assert isinstance(Mpileaks, spack.package_base.PackageMeta) + assert issubclass(Mpileaks, spack.package_base.Package) diff --git a/lib/spack/spack/test/spec_dag.py b/lib/spack/spack/test/spec_dag.py index 8fc137008c..566d9ccb8d 100644 --- a/lib/spack/spack/test/spec_dag.py +++ b/lib/spack/spack/test/spec_dag.py @@ -8,7 +8,7 @@ These tests check Spec DAG operations using dummy packages. import pytest import spack.error -import spack.package +import spack.package_base import spack.util.hash as hashutil from spack.dependency import Dependency, all_deptypes, canonical_deptype from spack.spec import Spec diff --git a/lib/spack/spack/test/test_activations.py b/lib/spack/spack/test/test_activations.py index a832236c49..a4439f9596 100644 --- a/lib/spack/spack/test/test_activations.py +++ b/lib/spack/spack/test/test_activations.py @@ -14,7 +14,7 @@ import pytest from llnl.util.link_tree import MergeConflictError -import spack.package +import spack.package_base import spack.spec from spack.directory_layout import DirectoryLayout from spack.filesystem_view import YamlFilesystemView diff --git a/lib/spack/spack/test/versions.py b/lib/spack/spack/test/versions.py index dcffcf379f..c8e7e45196 100644 --- a/lib/spack/spack/test/versions.py +++ b/lib/spack/spack/test/versions.py @@ -14,7 +14,7 @@ import pytest from llnl.util.filesystem import working_dir -import spack.package +import spack.package_base import spack.spec from spack.util.executable import which from spack.version import Version, VersionList, VersionRange, ver @@ -590,7 +590,7 @@ def test_invalid_versions(version_str): reason="Not supported on Windows (yet)") def test_versions_from_git(mock_git_version_info, monkeypatch, mock_packages): repo_path, filename, commits = mock_git_version_info - monkeypatch.setattr(spack.package.PackageBase, 'git', 'file://%s' % repo_path, + monkeypatch.setattr(spack.package_base.PackageBase, 'git', 'file://%s' % repo_path, raising=False) for commit in commits: @@ -614,7 +614,7 @@ def test_git_hash_comparisons( """Check that hashes compare properly to versions """ repo_path, filename, commits = mock_git_version_info - monkeypatch.setattr(spack.package.PackageBase, + monkeypatch.setattr(spack.package_base.PackageBase, 'git', 'file://%s' % repo_path, raising=False) diff --git a/lib/spack/spack/util/mock_package.py b/lib/spack/spack/util/mock_package.py index b89b989311..29f9cb472c 100644 --- a/lib/spack/spack/util/mock_package.py +++ b/lib/spack/spack/util/mock_package.py @@ -15,7 +15,7 @@ __all__ = ["MockPackageMultiRepo"] class MockPackageBase(object): - """Internal base class for mocking ``spack.package.PackageBase``. + """Internal base class for mocking ``spack.package_base.PackageBase``. Use ``MockPackageMultiRepo.add_package()`` to create new instances. diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py index 8340a9eab7..7b97649eb5 100644 --- a/lib/spack/spack/util/package_hash.py +++ b/lib/spack/spack/util/package_hash.py @@ -7,7 +7,7 @@ import ast import spack.directives import spack.error -import spack.package +import spack.package_base import spack.repo import spack.spec import spack.util.hash @@ -63,7 +63,7 @@ class RemoveDirectives(ast.NodeTransformer): # list of URL attributes and metadata attributes # these will be removed from packages. self.metadata_attrs = [s.url_attr for s in spack.fetch_strategy.all_strategies] - self.metadata_attrs += spack.package.Package.metadata_attrs + self.metadata_attrs += spack.package_base.Package.metadata_attrs self.spec = spec self.in_classdef = False # used to avoid nested classdefs diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py index 4bd0d92586..a137c5f6b3 100644 --- a/lib/spack/spack/util/web.py +++ b/lib/spack/spack/util/web.py @@ -594,7 +594,7 @@ def find_versions_of_archive( list_depth (int): max depth to follow links on list_url pages. Defaults to 0. concurrency (int): maximum number of concurrent requests - reference_package (spack.package.Package or None): a spack package + reference_package (spack.package_base.Package or None): a spack package used as a reference for url detection. Uses the url_for_version method on the package to produce reference urls which, if found, are preferred. diff --git a/lib/spack/spack/variant.py b/lib/spack/spack/variant.py index 4ec016830e..aad453bb11 100644 --- a/lib/spack/spack/variant.py +++ b/lib/spack/spack/variant.py @@ -95,7 +95,7 @@ class Variant(object): Args: vspec (Variant): instance to be validated - pkg (spack.package.Package): the package that required the validation, + pkg (spack.package_base.Package): the package that required the validation, if available Raises: diff --git a/lib/spack/spack/version.py b/lib/spack/spack/version.py index 495cfee6e3..5fa7793da2 100644 --- a/lib/spack/spack/version.py +++ b/lib/spack/spack/version.py @@ -177,6 +177,7 @@ class Version(object): ] def __init__(self, string): + # type: (str) -> None if not isinstance(string, str): string = str(string) diff --git a/pyproject.toml b/pyproject.toml index 4b6da081c2..ffa28cfdba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,8 +16,9 @@ honor_noqa = true [tool.mypy] python_version = 3.7 -files = ['lib/spack/llnl/**/*.py', 'lib/spack/spack/**/*.py'] +files = ['lib/spack/llnl/**/*.py', 'lib/spack/spack/**/*.py', './var/spack/repos/builtin/packages/*/package.py'] mypy_path = ['bin', 'lib/spack', 'lib/spack/external', 'var/spack/repos/builtin'] +allow_redefinition = true # This and a generated import file allows supporting packages namespace_packages = true @@ -36,6 +37,8 @@ ignore_missing_imports = true module = 'packages.*' ignore_errors = false ignore_missing_imports = false + # we can't do this here, not a module scope option, in spack style instead + # disable_error_code = 'no-redef' [[tool.mypy.overrides]] module = 'llnl.*' @@ -58,6 +61,15 @@ ignore_missing_imports = true module = 'jinja2' follow_imports = 'skip' +[tool.pyright] +useLibraryCodeForTypes = true +reportMissingImports = true +reportWildcardImportFromLibrary = false +include = ['lib/spack'] +ignore = ['lib/spack/external'] +extraPaths = ['lib/spack', 'lib/spack/external'] + + [tool.coverage.run] parallel = true concurrency = ["multiprocessing"] diff --git a/share/spack/qa/flake8_formatter.py b/share/spack/qa/flake8_formatter.py index 0611d54019..523ee7b4d0 100644 --- a/share/spack/qa/flake8_formatter.py +++ b/share/spack/qa/flake8_formatter.py @@ -16,10 +16,10 @@ from flake8.style_guide import Violation pattern_exemptions = { # exemptions applied only to package.py files. r"package.py$": { - # Allow 'from spack import *' in packages, but no other wildcards + # Allow 'from spack.package import *' in packages, but no other wildcards "F403": [ - r"^from spack import \*$", - r"^from spack.pkgkit import \*$", + r"^from spack.package import \*$", + r"^from spack.package_defs import \*$", ], # Exempt lines with urls and descriptions from overlong line errors. "E501": [ diff --git a/var/spack/repos/builtin.mock/packages/a/package.py b/var/spack/repos/builtin.mock/packages/a/package.py index 0a3d6e2f6b..4edee6b144 100644 --- a/var/spack/repos/builtin.mock/packages/a/package.py +++ b/var/spack/repos/builtin.mock/packages/a/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class A(AutotoolsPackage): diff --git a/var/spack/repos/builtin.mock/packages/archive-files/package.py b/var/spack/repos/builtin.mock/packages/archive-files/package.py index 80ddf63acd..f168d25173 100644 --- a/var/spack/repos/builtin.mock/packages/archive-files/package.py +++ b/var/spack/repos/builtin.mock/packages/archive-files/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ArchiveFiles(AutotoolsPackage): diff --git a/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py b/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py index 8875c57d3b..ca046c548a 100644 --- a/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py +++ b/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class AutotoolsConditionalVariantsTest(AutotoolsPackage): homepage = "https://www.example.com" has_code = False diff --git a/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py b/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py index a834d3d672..a869a359db 100644 --- a/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py +++ b/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class AutotoolsConfigReplacement(AutotoolsPackage): diff --git a/var/spack/repos/builtin.mock/packages/b/package.py b/var/spack/repos/builtin.mock/packages/b/package.py index 12abdc1b3d..ed328f9268 100644 --- a/var/spack/repos/builtin.mock/packages/b/package.py +++ b/var/spack/repos/builtin.mock/packages/b/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class B(Package): diff --git a/var/spack/repos/builtin.mock/packages/boost/package.py b/var/spack/repos/builtin.mock/packages/boost/package.py index e1d43c5f52..476456a57a 100644 --- a/var/spack/repos/builtin.mock/packages/boost/package.py +++ b/var/spack/repos/builtin.mock/packages/boost/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Boost(Package): diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py index 6a3fd7888e..9dded76188 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BothLinkAndBuildDepA(Package): diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py index ae0d22723b..f4812e7fc6 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BothLinkAndBuildDepB(Package): diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py index fae33821e2..70a9ce1158 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BothLinkAndBuildDepC(Package): diff --git a/var/spack/repos/builtin.mock/packages/bowtie/package.py b/var/spack/repos/builtin.mock/packages/bowtie/package.py index ca3c624412..273619d6cc 100644 --- a/var/spack/repos/builtin.mock/packages/bowtie/package.py +++ b/var/spack/repos/builtin.mock/packages/bowtie/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Bowtie(Package): """Mock package to test conflicts on compiler ranges""" diff --git a/var/spack/repos/builtin.mock/packages/brillig/package.py b/var/spack/repos/builtin.mock/packages/brillig/package.py index 19f1285839..cc3d5c94d1 100644 --- a/var/spack/repos/builtin.mock/packages/brillig/package.py +++ b/var/spack/repos/builtin.mock/packages/brillig/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Brillig(Package): diff --git a/var/spack/repos/builtin.mock/packages/build-error/package.py b/var/spack/repos/builtin.mock/packages/build-error/package.py index 41771bf714..7473d11b8d 100644 --- a/var/spack/repos/builtin.mock/packages/build-error/package.py +++ b/var/spack/repos/builtin.mock/packages/build-error/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BuildError(Package): diff --git a/var/spack/repos/builtin.mock/packages/build-warnings/package.py b/var/spack/repos/builtin.mock/packages/build-warnings/package.py index 0a81477b01..2dbeec5f0a 100644 --- a/var/spack/repos/builtin.mock/packages/build-warnings/package.py +++ b/var/spack/repos/builtin.mock/packages/build-warnings/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BuildWarnings(Package): diff --git a/var/spack/repos/builtin.mock/packages/c/package.py b/var/spack/repos/builtin.mock/packages/c/package.py index cbc539b182..c94378f404 100644 --- a/var/spack/repos/builtin.mock/packages/c/package.py +++ b/var/spack/repos/builtin.mock/packages/c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class C(Package): diff --git a/var/spack/repos/builtin.mock/packages/callpath/package.py b/var/spack/repos/builtin.mock/packages/callpath/package.py index 3f3da665a9..95056ccce3 100644 --- a/var/spack/repos/builtin.mock/packages/callpath/package.py +++ b/var/spack/repos/builtin.mock/packages/callpath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Callpath(Package): diff --git a/var/spack/repos/builtin.mock/packages/canfail/package.py b/var/spack/repos/builtin.mock/packages/canfail/package.py index 0d509c533b..0fd79aa230 100644 --- a/var/spack/repos/builtin.mock/packages/canfail/package.py +++ b/var/spack/repos/builtin.mock/packages/canfail/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Canfail(Package): diff --git a/var/spack/repos/builtin.mock/packages/cmake-client/package.py b/var/spack/repos/builtin.mock/packages/cmake-client/package.py index 0e8d1a3d9b..e0e45be508 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-client/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-client/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * def check(condition, msg): diff --git a/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py b/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py index 2b4d299200..0ce1bac894 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class CmakeConditionalVariantsTest(CMakePackage): homepage = "https://dev.null" version('1.0') diff --git a/var/spack/repos/builtin.mock/packages/cmake/package.py b/var/spack/repos/builtin.mock/packages/cmake/package.py index 8c19ca8a6e..0aa8f59087 100644 --- a/var/spack/repos/builtin.mock/packages/cmake/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * is_windows = sys.platform == 'win32' diff --git a/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py b/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py index b63b324768..6b9d87a360 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ConditionalConstrainedDependencies(Package): """Package that has a variant which adds a dependency forced to use non default values. diff --git a/var/spack/repos/builtin.mock/packages/conditional-provider/package.py b/var/spack/repos/builtin.mock/packages/conditional-provider/package.py index 45bedd56b3..643944a6f7 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-provider/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ConditionalProvider(Package): """Mimic the real netlib-lapack, that may be built on top of an optimized blas. diff --git a/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py b/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py index 74895cb7c0..ffb4a837b5 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ConditionalValuesInVariant(Package): """Package with conditional possible values in a variant""" homepage = "https://dev.null" diff --git a/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py b/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py index 7b26ba93db..87da713d30 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ConditionalVariantPkg(Package): """This package is used to test conditional variants.""" homepage = "http://www.example.com/conditional-variant-pkg" diff --git a/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py index 8bc641e4b2..65d13ba634 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ConditionalVirtualDependency(Package): """Brings in a virtual dependency if certain conditions are met.""" homepage = "https://dev.null" diff --git a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py index 45da25b766..fddb46d145 100644 --- a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ConditionallyPatchDependency(Package): """Package that conditionally requries a patched version of a dependency.""" diff --git a/var/spack/repos/builtin.mock/packages/configure-warning/package.py b/var/spack/repos/builtin.mock/packages/configure-warning/package.py index f13309a0ab..6c2418fe99 100644 --- a/var/spack/repos/builtin.mock/packages/configure-warning/package.py +++ b/var/spack/repos/builtin.mock/packages/configure-warning/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ConfigureWarning(AutotoolsPackage): diff --git a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py index 64abfe3525..be70a1dfb8 100644 --- a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ConflictParent(Package): diff --git a/var/spack/repos/builtin.mock/packages/conflict/package.py b/var/spack/repos/builtin.mock/packages/conflict/package.py index 891a6c9ec2..48981b9f65 100644 --- a/var/spack/repos/builtin.mock/packages/conflict/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Conflict(Package): diff --git a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py index 92cb6c4777..d11b599191 100644 --- a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ConflictingDependent(Package): diff --git a/var/spack/repos/builtin.mock/packages/corge/package.py b/var/spack/repos/builtin.mock/packages/corge/package.py index 4108bfaa52..5846ce3985 100644 --- a/var/spack/repos/builtin.mock/packages/corge/package.py +++ b/var/spack/repos/builtin.mock/packages/corge/package.py @@ -7,7 +7,7 @@ import os import sys -from spack import * +from spack.package import * class Corge(Package): diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py index b382399cdc..c546fbb127 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class CumulativeVrangeBottom(Package): """Test that creating cumulative version ranges of the form X.Y:X works and allows for the selection of all the diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py index 5cd19a3f6f..1eaeea3c7b 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class CumulativeVrangeMiddle(Package): """Test that creating cumulative version ranges of the form X.Y:X works and allows for the selection of all the diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py index d4ed2c8188..37e138bf6b 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class CumulativeVrangeRoot(Package): """Test that creating cumulative version ranges of the form X.Y:X works and allows for the selection of all the diff --git a/var/spack/repos/builtin.mock/packages/cvs-test/package.py b/var/spack/repos/builtin.mock/packages/cvs-test/package.py index 7a595f4526..85e8a5e888 100644 --- a/var/spack/repos/builtin.mock/packages/cvs-test/package.py +++ b/var/spack/repos/builtin.mock/packages/cvs-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CvsTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py index bffedecf1c..2639e7aeac 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DepDiamondPatchMid1(Package): diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py index 72b6f150b7..a53c213bcb 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DepDiamondPatchMid2(Package): diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py index 01f1683d6b..43de59c8ca 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DepDiamondPatchTop(Package): diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py index 23e9c91296..b3d15c2bc0 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DepWithVariantsIfDevelopRoot(Package): """Package that adds a dependency with many variants only at @develop""" homepage = "https://dev.null" diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py index 208cea0aa5..756350dcc1 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DepWithVariantsIfDevelop(Package): """Package that adds a dependency with many variants only at @develop""" homepage = "https://dev.null" diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py index 68921ea334..dd28b07eaa 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DepWithVariants(Package): """Package that has a variant which adds a dependency forced to use non default values. diff --git a/var/spack/repos/builtin.mock/packages/depb/package.py b/var/spack/repos/builtin.mock/packages/depb/package.py index 6984b45b39..ea361f1f7a 100644 --- a/var/spack/repos/builtin.mock/packages/depb/package.py +++ b/var/spack/repos/builtin.mock/packages/depb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Depb(AutotoolsPackage): diff --git a/var/spack/repos/builtin.mock/packages/dependency-install/package.py b/var/spack/repos/builtin.mock/packages/dependency-install/package.py index 2aede0ffa9..20c1fcd911 100644 --- a/var/spack/repos/builtin.mock/packages/dependency-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependency-install/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DependencyInstall(Package): diff --git a/var/spack/repos/builtin.mock/packages/dependent-install/package.py b/var/spack/repos/builtin.mock/packages/dependent-install/package.py index d5910395cb..9c4308cfb8 100644 --- a/var/spack/repos/builtin.mock/packages/dependent-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependent-install/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DependentInstall(Package): diff --git a/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py b/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py index 322f0d7edf..4706d439b8 100644 --- a/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py +++ b/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DependentOfDevBuild(Package): homepage = "example.com" url = "fake.com" diff --git a/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py b/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py index ff3ee9057c..94cb686cad 100644 --- a/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DependsOnOpenmpi(Package): diff --git a/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py b/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py index e70bfd9df7..0ca9fb2cfa 100644 --- a/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py +++ b/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DependsOnRunEnv(Package): diff --git a/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py b/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py index 8f8db7d5e4..2480651b2d 100644 --- a/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py +++ b/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DeprecatedVersions(Package): """Package with the most recent version deprecated""" diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py index bd6c36d5a0..8260b23362 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DevBuildTestDependent(Package): homepage = "example.com" url = "fake.com" diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py index 4436f4eb72..4d5b731415 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py @@ -5,6 +5,8 @@ from time import sleep +from spack.package import * + class DevBuildTestInstallPhases(Package): homepage = "example.com" diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py index 843dac73c7..f21c5ca085 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DevBuildTestInstall(Package): homepage = "example.com" url = "fake.com" diff --git a/var/spack/repos/builtin.mock/packages/develop-test/package.py b/var/spack/repos/builtin.mock/packages/develop-test/package.py index d91cc0f2e7..2067b9a22f 100644 --- a/var/spack/repos/builtin.mock/packages/develop-test/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DevelopTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/develop-test2/package.py b/var/spack/repos/builtin.mock/packages/develop-test2/package.py index 94b93fd7c6..33d604ab7f 100644 --- a/var/spack/repos/builtin.mock/packages/develop-test2/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-test2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DevelopTest2(Package): diff --git a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py index a4ef13211a..7b5964fb43 100644 --- a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DirectMpich(Package): diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py index 46a9613e1a..7f04f20d5e 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DtDiamondBottom(Package): diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py index f4010ee00d..3c3ec9401e 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DtDiamondLeft(Package): diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py index 34e78340db..8fe65f0219 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DtDiamondRight(Package): diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py index 881635c40b..ef7287bc6a 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DtDiamond(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py index 36063bdd48..c08a9accc4 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtbuild1(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py index f7d5674e73..4991861202 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtbuild2(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py index ac2a37c656..31c7a739af 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtbuild3(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtlink1/package.py b/var/spack/repos/builtin.mock/packages/dtlink1/package.py index fa64416f37..2b0be1ebdc 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtlink1(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtlink2/package.py b/var/spack/repos/builtin.mock/packages/dtlink2/package.py index 86e4819909..116b0f4fbd 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtlink2(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtlink3/package.py b/var/spack/repos/builtin.mock/packages/dtlink3/package.py index 507acf0d00..2784ee04b9 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtlink3(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtlink4/package.py b/var/spack/repos/builtin.mock/packages/dtlink4/package.py index dedb2a20ba..ee3d94de82 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink4/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtlink4(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtlink5/package.py b/var/spack/repos/builtin.mock/packages/dtlink5/package.py index 32abd3253c..7ceaeb9a9c 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink5/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink5/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtlink5(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtrun1/package.py b/var/spack/repos/builtin.mock/packages/dtrun1/package.py index 0a54c0ebea..2ac34a7b90 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtrun1(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtrun2/package.py b/var/spack/repos/builtin.mock/packages/dtrun2/package.py index 38246710c0..4b8698fe92 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtrun2(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtrun3/package.py b/var/spack/repos/builtin.mock/packages/dtrun3/package.py index f792d679bc..99a6121376 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtrun3(Package): diff --git a/var/spack/repos/builtin.mock/packages/dttop/package.py b/var/spack/repos/builtin.mock/packages/dttop/package.py index 5f3e78cff1..a238d17b6a 100644 --- a/var/spack/repos/builtin.mock/packages/dttop/package.py +++ b/var/spack/repos/builtin.mock/packages/dttop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dttop(Package): diff --git a/var/spack/repos/builtin.mock/packages/dtuse/package.py b/var/spack/repos/builtin.mock/packages/dtuse/package.py index 56248b54e0..847d4dfff9 100644 --- a/var/spack/repos/builtin.mock/packages/dtuse/package.py +++ b/var/spack/repos/builtin.mock/packages/dtuse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtuse(Package): diff --git a/var/spack/repos/builtin.mock/packages/dyninst/package.py b/var/spack/repos/builtin.mock/packages/dyninst/package.py index a33cde4ce7..70bc106c3c 100644 --- a/var/spack/repos/builtin.mock/packages/dyninst/package.py +++ b/var/spack/repos/builtin.mock/packages/dyninst/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dyninst(Package): diff --git a/var/spack/repos/builtin.mock/packages/e/package.py b/var/spack/repos/builtin.mock/packages/e/package.py index da446f91b7..36d7cf1b4c 100644 --- a/var/spack/repos/builtin.mock/packages/e/package.py +++ b/var/spack/repos/builtin.mock/packages/e/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class E(Package): diff --git a/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py b/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py index 1daaa809db..72ef2afd8b 100644 --- a/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py +++ b/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class EcpVizSdk(Package): """Package that has a dependency with a variant which adds a transitive dependency forced to use non default diff --git a/var/spack/repos/builtin.mock/packages/extendee/package.py b/var/spack/repos/builtin.mock/packages/extendee/package.py index da0add0138..9d0ab197de 100644 --- a/var/spack/repos/builtin.mock/packages/extendee/package.py +++ b/var/spack/repos/builtin.mock/packages/extendee/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Extendee(Package): diff --git a/var/spack/repos/builtin.mock/packages/extends-spec/package.py b/var/spack/repos/builtin.mock/packages/extends-spec/package.py index 7e557f06aa..bd443cba4c 100644 --- a/var/spack/repos/builtin.mock/packages/extends-spec/package.py +++ b/var/spack/repos/builtin.mock/packages/extends-spec/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ExtendsSpec(Package): diff --git a/var/spack/repos/builtin.mock/packages/extension1/package.py b/var/spack/repos/builtin.mock/packages/extension1/package.py index 0ff7d160e2..c5c08eb32d 100644 --- a/var/spack/repos/builtin.mock/packages/extension1/package.py +++ b/var/spack/repos/builtin.mock/packages/extension1/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Extension1(Package): diff --git a/var/spack/repos/builtin.mock/packages/extension2/package.py b/var/spack/repos/builtin.mock/packages/extension2/package.py index a7af5f0fd2..43e14b6ce0 100644 --- a/var/spack/repos/builtin.mock/packages/extension2/package.py +++ b/var/spack/repos/builtin.mock/packages/extension2/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Extension2(Package): diff --git a/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py b/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py index f474d9d8ff..eecf3b975e 100644 --- a/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ExternalBuildableWithVariant(Package): diff --git a/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py b/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py index a918c1eb54..ae67a75b8a 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ExternalCommonGdbm(Package): diff --git a/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py b/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py index 9816b5e5e5..cd63be42a0 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ExternalCommonOpenssl(Package): diff --git a/var/spack/repos/builtin.mock/packages/external-common-perl/package.py b/var/spack/repos/builtin.mock/packages/external-common-perl/package.py index d6c900f106..fe8e664bfd 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-perl/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-perl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ExternalCommonPerl(Package): diff --git a/var/spack/repos/builtin.mock/packages/external-common-python/package.py b/var/spack/repos/builtin.mock/packages/external-common-python/package.py index 6ad1e0e3f2..643a50825a 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-python/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ExternalCommonPython(Package): diff --git a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py index 4bc6c7b2e4..8995498d84 100644 --- a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ExternalNonDefaultVariant(Package): """An external that is registered with a non-default value""" homepage = "http://www.python.org" diff --git a/var/spack/repos/builtin.mock/packages/externalmodule/package.py b/var/spack/repos/builtin.mock/packages/externalmodule/package.py index fbb3de3674..4a38bbb083 100644 --- a/var/spack/repos/builtin.mock/packages/externalmodule/package.py +++ b/var/spack/repos/builtin.mock/packages/externalmodule/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Externalmodule(Package): diff --git a/var/spack/repos/builtin.mock/packages/externalprereq/package.py b/var/spack/repos/builtin.mock/packages/externalprereq/package.py index 48d1d1a1cc..3d36bbd82e 100644 --- a/var/spack/repos/builtin.mock/packages/externalprereq/package.py +++ b/var/spack/repos/builtin.mock/packages/externalprereq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Externalprereq(Package): diff --git a/var/spack/repos/builtin.mock/packages/externaltest/package.py b/var/spack/repos/builtin.mock/packages/externaltest/package.py index 588b3fa34a..eb9da8b196 100644 --- a/var/spack/repos/builtin.mock/packages/externaltest/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Externaltest(Package): diff --git a/var/spack/repos/builtin.mock/packages/externaltool/package.py b/var/spack/repos/builtin.mock/packages/externaltool/package.py index 12741f8e06..0be498ab12 100644 --- a/var/spack/repos/builtin.mock/packages/externaltool/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Externaltool(Package): diff --git a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py index b40b52db76..ab36db92ce 100644 --- a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Externalvirtual(Package): diff --git a/var/spack/repos/builtin.mock/packages/failing-build/package.py b/var/spack/repos/builtin.mock/packages/failing-build/package.py index ba9c17899e..3ac8fb5210 100644 --- a/var/spack/repos/builtin.mock/packages/failing-build/package.py +++ b/var/spack/repos/builtin.mock/packages/failing-build/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FailingBuild(Package): diff --git a/var/spack/repos/builtin.mock/packages/fake/package.py b/var/spack/repos/builtin.mock/packages/fake/package.py index 118e8b1811..a51b02f129 100644 --- a/var/spack/repos/builtin.mock/packages/fake/package.py +++ b/var/spack/repos/builtin.mock/packages/fake/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fake(Package): diff --git a/var/spack/repos/builtin.mock/packages/fetch-options/package.py b/var/spack/repos/builtin.mock/packages/fetch-options/package.py index 43529f4d1c..7f6e7d137e 100644 --- a/var/spack/repos/builtin.mock/packages/fetch-options/package.py +++ b/var/spack/repos/builtin.mock/packages/fetch-options/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FetchOptions(Package): diff --git a/var/spack/repos/builtin.mock/packages/fftw/package.py b/var/spack/repos/builtin.mock/packages/fftw/package.py index fa37ebaed5..237c725b2a 100644 --- a/var/spack/repos/builtin.mock/packages/fftw/package.py +++ b/var/spack/repos/builtin.mock/packages/fftw/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Fftw(Package): """Used to test that a few problematic concretization cases with the old concretizer have been solved by the diff --git a/var/spack/repos/builtin.mock/packages/find-externals1/package.py b/var/spack/repos/builtin.mock/packages/find-externals1/package.py index c85598e891..0b626d4f52 100644 --- a/var/spack/repos/builtin.mock/packages/find-externals1/package.py +++ b/var/spack/repos/builtin.mock/packages/find-externals1/package.py @@ -5,7 +5,8 @@ import os import re -import spack.package +import spack.package_base +from spack.package import * class FindExternals1(AutotoolsPackage): diff --git a/var/spack/repos/builtin.mock/packages/flake8/package.py b/var/spack/repos/builtin.mock/packages/flake8/package.py index df0e8ef78d..ec9454cfec 100644 --- a/var/spack/repos/builtin.mock/packages/flake8/package.py +++ b/var/spack/repos/builtin.mock/packages/flake8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flake8(Package): diff --git a/var/spack/repos/builtin.mock/packages/flatten-deps/package.py b/var/spack/repos/builtin.mock/packages/flatten-deps/package.py index 4cea332e0b..4dacf0b14d 100644 --- a/var/spack/repos/builtin.mock/packages/flatten-deps/package.py +++ b/var/spack/repos/builtin.mock/packages/flatten-deps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FlattenDeps(Package): diff --git a/var/spack/repos/builtin.mock/packages/garply/package.py b/var/spack/repos/builtin.mock/packages/garply/package.py index bdb36089c9..9efa93b98b 100644 --- a/var/spack/repos/builtin.mock/packages/garply/package.py +++ b/var/spack/repos/builtin.mock/packages/garply/package.py @@ -7,7 +7,7 @@ import os import sys -from spack import * +from spack.package import * class Garply(Package): diff --git a/var/spack/repos/builtin.mock/packages/gcc/package.py b/var/spack/repos/builtin.mock/packages/gcc/package.py index 8a44b1e457..0908431cb6 100644 --- a/var/spack/repos/builtin.mock/packages/gcc/package.py +++ b/var/spack/repos/builtin.mock/packages/gcc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gcc(Package): diff --git a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py index 0f9a1a496e..e19b9bc7c7 100644 --- a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GitSvnTopLevel(Package): diff --git a/var/spack/repos/builtin.mock/packages/git-test-commit/package.py b/var/spack/repos/builtin.mock/packages/git-test-commit/package.py index 0eec7c8b62..8a5c1e7eb7 100644 --- a/var/spack/repos/builtin.mock/packages/git-test-commit/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test-commit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GitTestCommit(Package): diff --git a/var/spack/repos/builtin.mock/packages/git-test/package.py b/var/spack/repos/builtin.mock/packages/git-test/package.py index f9ae590e9a..d46ac339f7 100644 --- a/var/spack/repos/builtin.mock/packages/git-test/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GitTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/git-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-top-level/package.py index daa8dff751..ffdfd96797 100644 --- a/var/spack/repos/builtin.mock/packages/git-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-top-level/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GitTopLevel(Package): diff --git a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py index 21835e333f..d3f03eedf4 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GitUrlSvnTopLevel(Package): diff --git a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py index 5f756a403c..2798bad9f7 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GitUrlTopLevel(Package): diff --git a/var/spack/repos/builtin.mock/packages/gmt/package.py b/var/spack/repos/builtin.mock/packages/gmt/package.py index 4a354fcbc9..74c28fb86a 100644 --- a/var/spack/repos/builtin.mock/packages/gmt/package.py +++ b/var/spack/repos/builtin.mock/packages/gmt/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Gmt(Package): url = "http://www.example.com/" url = "http://www.example.com/2.0.tar.gz" diff --git a/var/spack/repos/builtin.mock/packages/gnuconfig/package.py b/var/spack/repos/builtin.mock/packages/gnuconfig/package.py index e5dd97f449..40465e4dbb 100644 --- a/var/spack/repos/builtin.mock/packages/gnuconfig/package.py +++ b/var/spack/repos/builtin.mock/packages/gnuconfig/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Gnuconfig(Package): diff --git a/var/spack/repos/builtin.mock/packages/hash-test1/package.py b/var/spack/repos/builtin.mock/packages/hash-test1/package.py index 22ffae43d1..14d125a3e0 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test1/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test1/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class HashTest1(Package): diff --git a/var/spack/repos/builtin.mock/packages/hash-test2/package.py b/var/spack/repos/builtin.mock/packages/hash-test2/package.py index fffcc22274..ef9b9f70ce 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test2/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test2/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class HashTest2(Package): diff --git a/var/spack/repos/builtin.mock/packages/hash-test3/package.py b/var/spack/repos/builtin.mock/packages/hash-test3/package.py index 69e9922b79..8a98522975 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test3/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test3/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class HashTest3(Package): diff --git a/var/spack/repos/builtin.mock/packages/hash-test4/package.py b/var/spack/repos/builtin.mock/packages/hash-test4/package.py index 465a9733d0..cd00d8f892 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test4/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HashTest4(Package): diff --git a/var/spack/repos/builtin.mock/packages/hdf5/package.py b/var/spack/repos/builtin.mock/packages/hdf5/package.py index 154ee3531d..1019340e6a 100644 --- a/var/spack/repos/builtin.mock/packages/hdf5/package.py +++ b/var/spack/repos/builtin.mock/packages/hdf5/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hdf5(Package): homepage = "http://www.llnl.gov" url = "http://www.llnl.gov/hdf5-1.0.tar.gz" diff --git a/var/spack/repos/builtin.mock/packages/hg-test/package.py b/var/spack/repos/builtin.mock/packages/hg-test/package.py index fd32f70f38..2afa5b7bb0 100644 --- a/var/spack/repos/builtin.mock/packages/hg-test/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HgTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py index 5838950b78..0ab5bb94d9 100644 --- a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HgTopLevel(Package): diff --git a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py index ccd24541b3..867e186fcc 100644 --- a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py +++ b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hpcviewer(AutotoolsPackage): """Uses version-test-pkg, as a build dependency""" homepage = "http://www.spack.org" diff --git a/var/spack/repos/builtin.mock/packages/hwloc/package.py b/var/spack/repos/builtin.mock/packages/hwloc/package.py index 2cd984f438..bc15bbbf8a 100644 --- a/var/spack/repos/builtin.mock/packages/hwloc/package.py +++ b/var/spack/repos/builtin.mock/packages/hwloc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hwloc(Package): diff --git a/var/spack/repos/builtin.mock/packages/hypre/package.py b/var/spack/repos/builtin.mock/packages/hypre/package.py index d506efd65e..dba7a0cd7a 100644 --- a/var/spack/repos/builtin.mock/packages/hypre/package.py +++ b/var/spack/repos/builtin.mock/packages/hypre/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hypre(Package): diff --git a/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py b/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py index 7fdbeb281d..4bdfa8c3aa 100644 --- a/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py +++ b/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ImpossibleConcretization(Package): """Package that should be impossible to concretize due to a conflict with target ranges. See Issue 19981. diff --git a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py index c7c657b653..1c38bcecf5 100644 --- a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IndirectMpich(Package): diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py index c3b4d67d74..281275a141 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class InstalledDepsA(Package): diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py index 85a593d6d2..de24108c08 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class InstalledDepsB(Package): diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py index 703245d5b8..6d5ce3a5b5 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class InstalledDepsC(Package): diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py index b2e4bb41f8..76eacab2b0 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class InstalledDepsD(Package): diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py index 7ae70d9bd0..a3dfb90d6a 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class InstalledDepsE(Package): diff --git a/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py b/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py index afeb451e48..216ba023ba 100644 --- a/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py +++ b/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class InvalidGithubPatchUrl(Package): diff --git a/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py index 8ea5c24161..ee9397f5e8 100644 --- a/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class LeafAddsVirtual(Package): url = "http://www.example.com/" url = "http://www.example.com/2.0.tar.gz" diff --git a/var/spack/repos/builtin.mock/packages/libdwarf/package.py b/var/spack/repos/builtin.mock/packages/libdwarf/package.py index 3a9e6fbb12..6888229653 100644 --- a/var/spack/repos/builtin.mock/packages/libdwarf/package.py +++ b/var/spack/repos/builtin.mock/packages/libdwarf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * # Only build certain parts of dwarf because the other ones break. dwarf_dirs = ['libdwarf', 'dwarfdump2'] diff --git a/var/spack/repos/builtin.mock/packages/libelf/package.py b/var/spack/repos/builtin.mock/packages/libelf/package.py index 8a4b6abbf1..59a670079b 100644 --- a/var/spack/repos/builtin.mock/packages/libelf/package.py +++ b/var/spack/repos/builtin.mock/packages/libelf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libelf(Package): diff --git a/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py b/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py index c5ee5bbb41..1c7e2afbd8 100644 --- a/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py +++ b/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os.path +from spack.package import * + class LibtoolDeletion(AutotoolsPackage): """Mock AutotoolsPackage to check proper deletion diff --git a/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py b/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py index 46c66865cf..62d2e98d65 100644 --- a/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LowPriorityProvider(Package): diff --git a/var/spack/repos/builtin.mock/packages/maintainers-1/package.py b/var/spack/repos/builtin.mock/packages/maintainers-1/package.py index b9a18d60e3..9a36d3b052 100644 --- a/var/spack/repos/builtin.mock/packages/maintainers-1/package.py +++ b/var/spack/repos/builtin.mock/packages/maintainers-1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Maintainers1(Package): diff --git a/var/spack/repos/builtin.mock/packages/maintainers-2/package.py b/var/spack/repos/builtin.mock/packages/maintainers-2/package.py index 1d0090f7fd..b5c78d9ccc 100644 --- a/var/spack/repos/builtin.mock/packages/maintainers-2/package.py +++ b/var/spack/repos/builtin.mock/packages/maintainers-2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Maintainers2(Package): diff --git a/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py b/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py index 68365f421c..f056c9a65e 100644 --- a/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py +++ b/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ManyVirtualConsumer(Package): """PAckage that depends on many virtual packages""" url = "http://www.example.com/" diff --git a/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py index 936082bb75..990e0807f8 100644 --- a/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class MiddleAddsVirtual(Package): url = "http://www.example.com/" url = "http://www.example.com/2.0.tar.gz" diff --git a/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py index 760e49b4c0..619d432c04 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorGnuBroken(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py b/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py index 1638eb7834..89b58ecec3 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorGnu(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py index ed00384561..558e329ed8 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorSourceforgeBroken(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py index eac7f6ce5a..a012be1477 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorSourceforge(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py index 760e49b4c0..619d432c04 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorGnuBroken(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py index bf8b6ca06f..c2a63e3ab4 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorSourcewareBroken(AutotoolsPackage, SourcewarePackage): diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py index 9e0a71c583..5c314119d8 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorSourceware(AutotoolsPackage, SourcewarePackage): diff --git a/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py index 6d9d46767f..ebc25fb5c8 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorXorgBroken(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py b/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py index dae4631e2c..c48e1a8cf4 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MirrorXorg(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin.mock/packages/missing-dependency/package.py b/var/spack/repos/builtin.mock/packages/missing-dependency/package.py index e745656ba5..a3361a51b3 100644 --- a/var/spack/repos/builtin.mock/packages/missing-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/missing-dependency/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MissingDependency(Package): diff --git a/var/spack/repos/builtin.mock/packages/mixedversions/package.py b/var/spack/repos/builtin.mock/packages/mixedversions/package.py index af086ad4c0..91a8ed8120 100644 --- a/var/spack/repos/builtin.mock/packages/mixedversions/package.py +++ b/var/spack/repos/builtin.mock/packages/mixedversions/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mixedversions(Package): diff --git a/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py b/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py index d2415096a6..fa7fe0e134 100644 --- a/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py +++ b/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ModifiesRunEnv(Package): diff --git a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py index 6029853531..a45fb7f5d0 100644 --- a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py +++ b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ModulePathSeparator(Package): diff --git a/var/spack/repos/builtin.mock/packages/mpich/package.py b/var/spack/repos/builtin.mock/packages/mpich/package.py index 946b7e3f4e..4a6897572e 100644 --- a/var/spack/repos/builtin.mock/packages/mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpich(Package): diff --git a/var/spack/repos/builtin.mock/packages/mpich2/package.py b/var/spack/repos/builtin.mock/packages/mpich2/package.py index d914e37f37..7517c11284 100644 --- a/var/spack/repos/builtin.mock/packages/mpich2/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpich2(Package): diff --git a/var/spack/repos/builtin.mock/packages/mpileaks/package.py b/var/spack/repos/builtin.mock/packages/mpileaks/package.py index 0fe96b419d..21e6a4f1c9 100644 --- a/var/spack/repos/builtin.mock/packages/mpileaks/package.py +++ b/var/spack/repos/builtin.mock/packages/mpileaks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpileaks(Package): diff --git a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py index 4d966227ae..33c1091983 100644 --- a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py +++ b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MultiProviderMpi(Package): diff --git a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py index 5f6891bbdc..8afd85b345 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MultimethodBase(Package): diff --git a/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py b/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py index de081fab34..426fa5094b 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.mock.multimethod_base import MultimethodBase diff --git a/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py b/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py index d8cc6fcee1..fe89d871f7 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py @@ -5,6 +5,7 @@ import spack.pkg.builtin.mock.multimethod_diamond_parent as mp import spack.pkg.builtin.mock.multimethod_inheritor as mi +from spack.package import * class MultimethodDiamond(mi.MultimethodInheritor, mp.MultimethodDiamondParent): diff --git a/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py b/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py index 9371d1763d..fef83f6887 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.mock.multimethod import Multimethod diff --git a/var/spack/repos/builtin.mock/packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py index 9ba88eb18f..4f7cd6eca9 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py @@ -6,7 +6,7 @@ from six import string_types import spack.platforms -from spack import * +from spack.package import * from spack.pkg.builtin.mock.multimethod_base import MultimethodBase diff --git a/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py b/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py index 635801699d..bfe00fad59 100644 --- a/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import spack.pkg.builtin.mock.simple_inheritance as si +from spack.package import * class MultimoduleInheritance(si.BaseWithDirectives): diff --git a/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py index 99cf417168..147e2c84da 100644 --- a/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MultivalueVariant(Package): diff --git a/var/spack/repos/builtin.mock/packages/mvapich2/package.py b/var/spack/repos/builtin.mock/packages/mvapich2/package.py index 38153231dc..e45a493342 100644 --- a/var/spack/repos/builtin.mock/packages/mvapich2/package.py +++ b/var/spack/repos/builtin.mock/packages/mvapich2/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Mvapich2(Package): homepage = "http://www.homepage.org" url = "http://www.someurl" diff --git a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py index 5ffab81e7d..6d7e3c479c 100644 --- a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py +++ b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Mvdefaults(Package): homepage = "http://www.example.com" url = "http://www.example.com/mvdefaults-1.0.tar.gz" diff --git a/var/spack/repos/builtin.mock/packages/needs-relocation/package.py b/var/spack/repos/builtin.mock/packages/needs-relocation/package.py index 484f8dc4ac..46f9e39df5 100644 --- a/var/spack/repos/builtin.mock/packages/needs-relocation/package.py +++ b/var/spack/repos/builtin.mock/packages/needs-relocation/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * def check(condition, msg): diff --git a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py index 8b20835cc7..455c539d33 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NetlibBlas(Package): diff --git a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py index 1f47099183..4d4c8f05c6 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NetlibLapack(Package): diff --git a/var/spack/repos/builtin.mock/packages/ninja/package.py b/var/spack/repos/builtin.mock/packages/ninja/package.py index 3ed308b3c0..e90c0569f7 100644 --- a/var/spack/repos/builtin.mock/packages/ninja/package.py +++ b/var/spack/repos/builtin.mock/packages/ninja/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ninja(Package): diff --git a/var/spack/repos/builtin.mock/packages/nosource-install/package.py b/var/spack/repos/builtin.mock/packages/nosource-install/package.py index 292da3bed5..2e4b6f2795 100644 --- a/var/spack/repos/builtin.mock/packages/nosource-install/package.py +++ b/var/spack/repos/builtin.mock/packages/nosource-install/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NosourceInstall(BundlePackage): diff --git a/var/spack/repos/builtin.mock/packages/nosource/package.py b/var/spack/repos/builtin.mock/packages/nosource/package.py index ed50d8a4db..29bb2d635b 100644 --- a/var/spack/repos/builtin.mock/packages/nosource/package.py +++ b/var/spack/repos/builtin.mock/packages/nosource/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nosource(BundlePackage): diff --git a/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py b/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py index 3d80c78341..2f612a63a1 100644 --- a/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py +++ b/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NoversionBundle(BundlePackage): diff --git a/var/spack/repos/builtin.mock/packages/noversion/package.py b/var/spack/repos/builtin.mock/packages/noversion/package.py index 61a4731be3..d2d987cac0 100644 --- a/var/spack/repos/builtin.mock/packages/noversion/package.py +++ b/var/spack/repos/builtin.mock/packages/noversion/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Noversion(Package): diff --git a/var/spack/repos/builtin.mock/packages/old-external/package.py b/var/spack/repos/builtin.mock/packages/old-external/package.py index 2a28a9b9c1..656c4f9db3 100644 --- a/var/spack/repos/builtin.mock/packages/old-external/package.py +++ b/var/spack/repos/builtin.mock/packages/old-external/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class OldExternal(Package): """A package that has an old version declared in packages.yaml""" diff --git a/var/spack/repos/builtin.mock/packages/old-sbang/package.py b/var/spack/repos/builtin.mock/packages/old-sbang/package.py index 2e9622ebcb..9c65f692d7 100644 --- a/var/spack/repos/builtin.mock/packages/old-sbang/package.py +++ b/var/spack/repos/builtin.mock/packages/old-sbang/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import spack.paths import spack.store -from spack import * +from spack.package import * class OldSbang(Package): diff --git a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py index 7572bb5c83..59036e8091 100644 --- a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OpenblasWithLapack(Package): diff --git a/var/spack/repos/builtin.mock/packages/openblas/package.py b/var/spack/repos/builtin.mock/packages/openblas/package.py index fc745a7403..2bcbece25e 100644 --- a/var/spack/repos/builtin.mock/packages/openblas/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openblas(Package): diff --git a/var/spack/repos/builtin.mock/packages/openmpi/package.py b/var/spack/repos/builtin.mock/packages/openmpi/package.py index 0d02c314a6..38e1f8b24b 100644 --- a/var/spack/repos/builtin.mock/packages/openmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/openmpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openmpi(Package): diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py index 3e81cd93ce..e864967d67 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OptionalDepTest2(Package): diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py index 451cc9390a..c41cfa8cf8 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OptionalDepTest3(Package): diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py index 68409f4f84..5fb92bb23a 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OptionalDepTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/othervirtual/package.py b/var/spack/repos/builtin.mock/packages/othervirtual/package.py index 1a29a9164a..d47e4efeda 100644 --- a/var/spack/repos/builtin.mock/packages/othervirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/othervirtual/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Othervirtual(Package): diff --git a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py index 9776b76000..8cd53e4b0a 100644 --- a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OverrideContextTemplates(Package): diff --git a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py index 5af72278df..d4e3ae9494 100644 --- a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OverrideModuleTemplates(Package): diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py index dcd89ceeaf..c347355b0e 100644 --- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PatchADependency(Package): diff --git a/var/spack/repos/builtin.mock/packages/patch-inheritance/package.py b/var/spack/repos/builtin.mock/packages/patch-inheritance/package.py index eb89a475ad..3b63b45abe 100644 --- a/var/spack/repos/builtin.mock/packages/patch-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-inheritance/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * # noqa: F401 from spack.pkg.builtin.mock.patch import Patch diff --git a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py index f8372c4bed..cb987a112b 100644 --- a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PatchSeveralDependencies(Package): diff --git a/var/spack/repos/builtin.mock/packages/patch/package.py b/var/spack/repos/builtin.mock/packages/patch/package.py index 8f7190c94a..433a53e1f9 100644 --- a/var/spack/repos/builtin.mock/packages/patch/package.py +++ b/var/spack/repos/builtin.mock/packages/patch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Patch(Package): diff --git a/var/spack/repos/builtin.mock/packages/patchelf/package.py b/var/spack/repos/builtin.mock/packages/patchelf/package.py index 24c5e2c6a1..b42a65bff8 100644 --- a/var/spack/repos/builtin.mock/packages/patchelf/package.py +++ b/var/spack/repos/builtin.mock/packages/patchelf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Patchelf(AutotoolsPackage): diff --git a/var/spack/repos/builtin.mock/packages/perl-extension/package.py b/var/spack/repos/builtin.mock/packages/perl-extension/package.py index 676ebb04a7..a0a21b4d52 100644 --- a/var/spack/repos/builtin.mock/packages/perl-extension/package.py +++ b/var/spack/repos/builtin.mock/packages/perl-extension/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os.path -from spack import * +from spack.package import * class PerlExtension(PerlPackage): diff --git a/var/spack/repos/builtin.mock/packages/perl/package.py b/var/spack/repos/builtin.mock/packages/perl/package.py index 3379260f66..c1dc0a8576 100644 --- a/var/spack/repos/builtin.mock/packages/perl/package.py +++ b/var/spack/repos/builtin.mock/packages/perl/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Perl(Package): diff --git a/var/spack/repos/builtin.mock/packages/preferred-test/package.py b/var/spack/repos/builtin.mock/packages/preferred-test/package.py index 5e2e62f74e..5e9fedf7ae 100644 --- a/var/spack/repos/builtin.mock/packages/preferred-test/package.py +++ b/var/spack/repos/builtin.mock/packages/preferred-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PreferredTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/printing-package/package.py b/var/spack/repos/builtin.mock/packages/printing-package/package.py index 3017a3b403..84de889817 100644 --- a/var/spack/repos/builtin.mock/packages/printing-package/package.py +++ b/var/spack/repos/builtin.mock/packages/printing-package/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PrintingPackage(Package): diff --git a/var/spack/repos/builtin.mock/packages/py-extension1/package.py b/var/spack/repos/builtin.mock/packages/py-extension1/package.py index 4c5b12863e..afd644b9bb 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension1/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension1/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os.path -from spack import * +from spack.package import * class PyExtension1(PythonPackage): diff --git a/var/spack/repos/builtin.mock/packages/py-extension2/package.py b/var/spack/repos/builtin.mock/packages/py-extension2/package.py index bcb5609dd7..eb9fe7c776 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension2/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os.path -from spack import * +from spack.package import * class PyExtension2(PythonPackage): diff --git a/var/spack/repos/builtin.mock/packages/py-extension3/package.py b/var/spack/repos/builtin.mock/packages/py-extension3/package.py index 67abd82bdb..89c404899c 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension3/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension3/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyExtension3(Package): """Package with a dependency whose presence is conditional to the version of Python being used. diff --git a/var/spack/repos/builtin.mock/packages/py-pip/package.py b/var/spack/repos/builtin.mock/packages/py-pip/package.py index 6f9cf24cc9..7e0b7d06ce 100644 --- a/var/spack/repos/builtin.mock/packages/py-pip/package.py +++ b/var/spack/repos/builtin.mock/packages/py-pip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPip(Package): diff --git a/var/spack/repos/builtin.mock/packages/py-wheel/package.py b/var/spack/repos/builtin.mock/packages/py-wheel/package.py index 2fad91dab4..54128d5a88 100644 --- a/var/spack/repos/builtin.mock/packages/py-wheel/package.py +++ b/var/spack/repos/builtin.mock/packages/py-wheel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWheel(Package): diff --git a/var/spack/repos/builtin.mock/packages/python/package.py b/var/spack/repos/builtin.mock/packages/python/package.py index 06c9b9212b..4585efc53f 100644 --- a/var/spack/repos/builtin.mock/packages/python/package.py +++ b/var/spack/repos/builtin.mock/packages/python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Python(Package): diff --git a/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py b/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py index aa2178b6c8..49fa1942e6 100644 --- a/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class QuantumEspresso(Package): """Used to test that a few problematic concretization cases with the old concretizer have been solved by the diff --git a/var/spack/repos/builtin.mock/packages/quux/package.py b/var/spack/repos/builtin.mock/packages/quux/package.py index 1af6eed217..e07ca6ee34 100644 --- a/var/spack/repos/builtin.mock/packages/quux/package.py +++ b/var/spack/repos/builtin.mock/packages/quux/package.py @@ -7,7 +7,7 @@ import os import sys -from spack import * +from spack.package import * class Quux(Package): diff --git a/var/spack/repos/builtin.mock/packages/raiser/package.py b/var/spack/repos/builtin.mock/packages/raiser/package.py index 9be6b5083c..daabfc8413 100644 --- a/var/spack/repos/builtin.mock/packages/raiser/package.py +++ b/var/spack/repos/builtin.mock/packages/raiser/package.py @@ -5,7 +5,7 @@ from six.moves import builtins -from spack import * +from spack.package import * class Raiser(Package): diff --git a/var/spack/repos/builtin.mock/packages/requires-virtual/package.py b/var/spack/repos/builtin.mock/packages/requires-virtual/package.py index 66cc2d54eb..5049f2a9b7 100644 --- a/var/spack/repos/builtin.mock/packages/requires-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/requires-virtual/package.py @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RequiresVirtual(Package): """Package that requires a virtual dependency and is registered as an external. diff --git a/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py index 2a483f8baf..3be035ca4d 100644 --- a/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RootAddsVirtual(Package): homepage = "http://www.example.com" url = "http://www.example.com/root-adds-virtual-1.0.tar.gz" diff --git a/var/spack/repos/builtin.mock/packages/root/package.py b/var/spack/repos/builtin.mock/packages/root/package.py index c2abbcb6c4..221f9681e2 100644 --- a/var/spack/repos/builtin.mock/packages/root/package.py +++ b/var/spack/repos/builtin.mock/packages/root/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Root(Package): homepage = "http://www.example.com" url = "http://www.example.com/root-1.0.tar.gz" diff --git a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py index 206de81f54..2461862218 100644 --- a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BaseWithDirectives(Package): diff --git a/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py b/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py index 12ea970ba7..8df83c788e 100644 --- a/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py +++ b/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SimpleStandaloneTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py index 3442d609f6..2bb841a466 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class SinglevalueVariantDependentType(Package): """Simple package with one dependency that has a single-valued variant with values=str""" diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py index 543b0cce9d..6d9bfe26c9 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SinglevalueVariantDependent(Package): diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py index 8dd3b033cf..2440da9bb8 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class SinglevalueVariant(Package): homepage = "http://www.llnl.gov" url = "http://www.llnl.gov/mpileaks-1.0.tar.gz" diff --git a/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py b/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py index 6fa8e91dc7..0a024ae4fb 100644 --- a/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py +++ b/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SomeVirtualMv(Package): diff --git a/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py b/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py index 9d3be711e3..b0b1c9ce17 100644 --- a/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py +++ b/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SomeVirtualPreferred(Package): diff --git a/var/spack/repos/builtin.mock/packages/splice-a/package.py b/var/spack/repos/builtin.mock/packages/splice-a/package.py index ebd37777dd..b8d3dcb243 100644 --- a/var/spack/repos/builtin.mock/packages/splice-a/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-a/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpliceA(Package): diff --git a/var/spack/repos/builtin.mock/packages/splice-h/package.py b/var/spack/repos/builtin.mock/packages/splice-h/package.py index b09c3b667a..ecfd2c8b3a 100644 --- a/var/spack/repos/builtin.mock/packages/splice-h/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-h/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpliceH(Package): diff --git a/var/spack/repos/builtin.mock/packages/splice-t/package.py b/var/spack/repos/builtin.mock/packages/splice-t/package.py index edf373dbf5..9cb4a4a70e 100644 --- a/var/spack/repos/builtin.mock/packages/splice-t/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-t/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpliceT(Package): diff --git a/var/spack/repos/builtin.mock/packages/splice-vh/package.py b/var/spack/repos/builtin.mock/packages/splice-vh/package.py index e4310f0b42..424fb5ddcf 100644 --- a/var/spack/repos/builtin.mock/packages/splice-vh/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-vh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpliceVh(Package): diff --git a/var/spack/repos/builtin.mock/packages/splice-z/package.py b/var/spack/repos/builtin.mock/packages/splice-z/package.py index 793dfd1cfe..c818bc8a2c 100644 --- a/var/spack/repos/builtin.mock/packages/splice-z/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-z/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpliceZ(Package): diff --git a/var/spack/repos/builtin.mock/packages/sticky-variant/package.py b/var/spack/repos/builtin.mock/packages/sticky-variant/package.py index a1fea2d531..e8a8ee24dd 100644 --- a/var/spack/repos/builtin.mock/packages/sticky-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/sticky-variant/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class StickyVariant(AutotoolsPackage): diff --git a/var/spack/repos/builtin.mock/packages/svn-test/package.py b/var/spack/repos/builtin.mock/packages/svn-test/package.py index b14324536c..ffbdf885df 100644 --- a/var/spack/repos/builtin.mock/packages/svn-test/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SvnTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py index 29b6227925..ea88701eb3 100644 --- a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SvnTopLevel(Package): diff --git a/var/spack/repos/builtin.mock/packages/symly/package.py b/var/spack/repos/builtin.mock/packages/symly/package.py index ce3a4696f1..647450dc6d 100644 --- a/var/spack/repos/builtin.mock/packages/symly/package.py +++ b/var/spack/repos/builtin.mock/packages/symly/package.py @@ -7,7 +7,7 @@ import os import sys -from spack import * +from spack.package import * class Symly(Package): diff --git a/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py b/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py index f3504bd1c1..3a60554674 100644 --- a/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py +++ b/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * -from spack.package import run_after +from spack.package import * +from spack.package_base import run_after class TestBuildCallbacks(Package): diff --git a/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py b/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py index e630a3ee09..9746e5315d 100644 --- a/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py +++ b/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TestDepWithImposedConditions(Package): diff --git a/var/spack/repos/builtin.mock/packages/test-dependency/package.py b/var/spack/repos/builtin.mock/packages/test-dependency/package.py index 99886877e5..1bdb4f3f47 100644 --- a/var/spack/repos/builtin.mock/packages/test-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/test-dependency/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class TestDependency(Package): """Represent a dependency that is pulled-in to allow testing other packages. diff --git a/var/spack/repos/builtin.mock/packages/test-error/package.py b/var/spack/repos/builtin.mock/packages/test-error/package.py index b5d48c1d73..783973929e 100644 --- a/var/spack/repos/builtin.mock/packages/test-error/package.py +++ b/var/spack/repos/builtin.mock/packages/test-error/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TestError(Package): diff --git a/var/spack/repos/builtin.mock/packages/test-fail/package.py b/var/spack/repos/builtin.mock/packages/test-fail/package.py index 20e031f737..2571b0e44e 100644 --- a/var/spack/repos/builtin.mock/packages/test-fail/package.py +++ b/var/spack/repos/builtin.mock/packages/test-fail/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TestFail(Package): diff --git a/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py b/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py index 75e851f24c..099d04766d 100644 --- a/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py +++ b/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * -from spack.package import run_after +from spack.package import * +from spack.package_base import run_after class TestInstallCallbacks(Package): diff --git a/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py index 7e690639d0..f0c80a6bc2 100644 --- a/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class TransitiveConditionalVirtualDependency(Package): """Depends on a package with a conditional virtual dependency.""" homepage = "https://dev.null" diff --git a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py index f2e321f42b..a491b164be 100644 --- a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class TriggerExternalNonDefaultVariant(Package): """This ackage depends on an external with a non-default variant""" homepage = "http://www.example.com" diff --git a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py index 467a1631fa..9b251d8e51 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TrivialInstallTestPackage(Package): diff --git a/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py b/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py index 9cb0ad92d0..d99c6f7195 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TrivialPkgWithValidHash(Package): diff --git a/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py b/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py index 90f39bb9ae..9059ad77f4 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TrivialSmokeTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py b/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py index e869b13b3f..654d68e0e2 100644 --- a/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py +++ b/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class UnconstrainableConflict(Package): """Package with a conflict whose trigger cannot constrain its constraint.""" diff --git a/var/spack/repos/builtin.mock/packages/unsat-provider/package.py b/var/spack/repos/builtin.mock/packages/unsat-provider/package.py index 2324bf2fcd..ef280270af 100644 --- a/var/spack/repos/builtin.mock/packages/unsat-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/unsat-provider/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class UnsatProvider(Package): """This package has a dependency on a virtual that cannot be provided""" homepage = "http://www.example.com" diff --git a/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py index 4ad93d6c9d..2c7efbf943 100644 --- a/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class UnsatVirtualDependency(Package): """This package has a dependency on a virtual that cannot be provided""" homepage = "http://www.example.com" diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py index f2cc0f4eaf..88dd1e7787 100644 --- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import spack.paths -from spack import * +from spack.package import * class UrlListTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py index 11c8df1e23..10410eb989 100644 --- a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py +++ b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UrlOnlyOverrideWithGaps(Package): diff --git a/var/spack/repos/builtin.mock/packages/url-only-override/package.py b/var/spack/repos/builtin.mock/packages/url-only-override/package.py index a66a832e6f..0eded4b1cb 100644 --- a/var/spack/repos/builtin.mock/packages/url-only-override/package.py +++ b/var/spack/repos/builtin.mock/packages/url-only-override/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UrlOnlyOverride(Package): diff --git a/var/spack/repos/builtin.mock/packages/url-test/package.py b/var/spack/repos/builtin.mock/packages/url-test/package.py index e30d05cb70..6b3f7136fd 100644 --- a/var/spack/repos/builtin.mock/packages/url-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-test/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UrlTest(Package): diff --git a/var/spack/repos/builtin.mock/packages/url_override/package.py b/var/spack/repos/builtin.mock/packages/url_override/package.py index a8bdf26059..428c09b1cf 100644 --- a/var/spack/repos/builtin.mock/packages/url_override/package.py +++ b/var/spack/repos/builtin.mock/packages/url_override/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UrlOverride(Package): diff --git a/var/spack/repos/builtin.mock/packages/v1-provider/package.py b/var/spack/repos/builtin.mock/packages/v1-provider/package.py index 0ae55df966..0549c80018 100644 --- a/var/spack/repos/builtin.mock/packages/v1-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/v1-provider/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class V1Provider(Package): """Mimic the real netlib-lapack, that may be built on top of an optimized blas. diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py index 21fa9ad64c..9d1bbd0450 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VariantOnDependencyConditionA(Package): """Test that dependencies that are conditional on the state of other dependencies are added correctly, for instance: diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py index 2eaf9ccc3a..744ff93ba6 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VariantOnDependencyConditionB(Package): """Test that dependencies that are conditional on the state of other dependencies are added correctly, for instance: diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py index 7ee81fb9b2..def93d53e1 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VariantOnDependencyConditionRoot(Package): """Test that dependencies that are conditional on the state of other dependencies are added correctly, for instance: diff --git a/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py b/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py index b45efccf1f..925ba9dddd 100644 --- a/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py +++ b/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VdefaultOrExternalRoot(Package): """Test that we don't prefer adding an external to using a default variant value. diff --git a/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py b/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py index a63b2043ea..c1df533e64 100644 --- a/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py +++ b/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VdefaultOrExternal(Package): """Test that we don't prefer adding an external to using a default variant value. diff --git a/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py b/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py index 194c3b604c..811173907f 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VersionTestDependencyPreferred(AutotoolsPackage): """Dependency of version-test-pkg, which has a multi-valued variant with two default values (a very low priority optimization diff --git a/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py b/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py index 81565e260c..92f5dffbba 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VersionTestPkg(AutotoolsPackage): """Mock AutotoolsPackage to check proper version selection by clingo. diff --git a/var/spack/repos/builtin.mock/packages/version-test-root/package.py b/var/spack/repos/builtin.mock/packages/version-test-root/package.py index f84a9c8606..beb052b9c5 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-root/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-root/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VersionTestRoot(AutotoolsPackage): """Uses version-test-pkg, as a build dependency""" homepage = "http://www.spack.org" diff --git a/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py b/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py index b85a81caa4..e0cece6d54 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class ViewDirDir(Package): """Installs a <prefix>/bin/x where x is a dir, in contrast to view-dir-file.""" diff --git a/var/spack/repos/builtin.mock/packages/view-dir-file/package.py b/var/spack/repos/builtin.mock/packages/view-dir-file/package.py index a47e02ca24..f448910c8e 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-file/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-file/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class ViewDirFile(Package): """Installs a <prefix>/bin/x where x is a file, in contrast to view-dir-dir""" diff --git a/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py b/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py index ae0d90541b..3520373e4d 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class ViewDirSymlinkedDir(Package): """Installs <prefix>/bin/x/file_in_symlinked_dir where x -> y is a symlinked dir. diff --git a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py index 0f63969798..f5eb282412 100644 --- a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py +++ b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class VirtualWithVersions(AutotoolsPackage): """Uses version-test-pkg, as a build dependency""" homepage = "http://www.spack.org" diff --git a/var/spack/repos/builtin.mock/packages/when-directives-false/package.py b/var/spack/repos/builtin.mock/packages/when-directives-false/package.py index 5f12675f1e..c366161dca 100644 --- a/var/spack/repos/builtin.mock/packages/when-directives-false/package.py +++ b/var/spack/repos/builtin.mock/packages/when-directives-false/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class WhenDirectivesFalse(Package): diff --git a/var/spack/repos/builtin.mock/packages/when-directives-true/package.py b/var/spack/repos/builtin.mock/packages/when-directives-true/package.py index 5209399ba9..7fa155ec43 100644 --- a/var/spack/repos/builtin.mock/packages/when-directives-true/package.py +++ b/var/spack/repos/builtin.mock/packages/when-directives-true/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class WhenDirectivesTrue(Package): diff --git a/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py b/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py index b433d40861..2ccdd5d0b0 100644 --- a/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py +++ b/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class WithConstraintMet(Package): diff --git a/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py b/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py index c5e6d377a9..0c04cd4606 100644 --- a/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py +++ b/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class WrongVariantInConflicts(Package): """This package has a wrong variant spelled in a conflict.""" diff --git a/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py b/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py index 9e0650d7c6..e771d79766 100644 --- a/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py +++ b/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class WrongVariantInDependsOn(Package): """This package has a wrong variant spelled in a depends_on.""" diff --git a/var/spack/repos/builtin.mock/packages/zlib/package.py b/var/spack/repos/builtin.mock/packages/zlib/package.py index dfc893f294..4af5f065b3 100644 --- a/var/spack/repos/builtin.mock/packages/zlib/package.py +++ b/var/spack/repos/builtin.mock/packages/zlib/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + # Although zlib comes with a configure script, it does not use Autotools # The AutotoolsPackage causes zlib to fail to build with PGI class Zlib(Package): diff --git a/var/spack/repos/builtin.mock/packages/zmpi/package.py b/var/spack/repos/builtin.mock/packages/zmpi/package.py index 37bfbad311..0a673b087d 100644 --- a/var/spack/repos/builtin.mock/packages/zmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/zmpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zmpi(Package): diff --git a/var/spack/repos/builtin/atompaw/package.py b/var/spack/repos/builtin/atompaw/package.py new file mode 100644 index 0000000000..3e2eeea7ce --- /dev/null +++ b/var/spack/repos/builtin/atompaw/package.py @@ -0,0 +1,41 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Atompaw(AutotoolsPackage): + """atompaw generates projector augmented wave (PAW) + potentials for electronics structure calculations.""" + + homepage = "https://users.wfu.edu/natalie/papers/pwpaw/" + url = "https://users.wfu.edu/natalie/papers/pwpaw/atompaw-4.2.0.0.tar.gz" + + version('4.2.0.0', sha256='9ab4f4ab78a720fbcd95bbbc1403e8ff348d15570e7c694932a56be15985e93d') + version('4.1.1.0', sha256='b1ee2b53720066655d98523ef337e54850cb1e68b3a2da04ff5a1576d3893891') + version('4.1.0.6', sha256='42a46c0569367c0b971fbc3dcaf5eaec7020bdff111022b6f320de9f11c41c2c') + + variant('libxc', default=False, description='Compile with libxc') + variant('shared', default=True) + + depends_on('libxc', when='+libxc') + depends_on('blas') + + def configure_args(self): + spec = self.spec + + args = ['--with-linalg-prefix=' + spec['blas'].prefix] + args += ['--with-linalg-libs=' + ' '.join(spec['blas'].libs)] + + if '+libxc' in spec: + args += ['--enable-libxc'] + args += ['--with-libxc-prefix=' + spec['libxc'].prefix] + + if '+shared' in spec: + args += ['--enable-shared'] + else: + args += ['--enable-static'] + + return args diff --git a/var/spack/repos/builtin/packages/3dtk/package.py b/var/spack/repos/builtin/packages/3dtk/package.py index 9d52b83787..84f02ebfe4 100644 --- a/var/spack/repos/builtin/packages/3dtk/package.py +++ b/var/spack/repos/builtin/packages/3dtk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class _3dtk(CMakePackage): diff --git a/var/spack/repos/builtin/packages/3proxy/package.py b/var/spack/repos/builtin/packages/3proxy/package.py index 7069789cc6..d11f619e24 100644 --- a/var/spack/repos/builtin/packages/3proxy/package.py +++ b/var/spack/repos/builtin/packages/3proxy/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * class _3proxy(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/abacus/package.py b/var/spack/repos/builtin/packages/abacus/package.py index d844f7c8a0..450f7ec4d8 100644 --- a/var/spack/repos/builtin/packages/abacus/package.py +++ b/var/spack/repos/builtin/packages/abacus/package.py @@ -6,7 +6,7 @@ import re -from spack import * +from spack.package import * class Abacus(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/abduco/package.py b/var/spack/repos/builtin/packages/abduco/package.py index 662a7906a8..6d763c528f 100644 --- a/var/spack/repos/builtin/packages/abduco/package.py +++ b/var/spack/repos/builtin/packages/abduco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Abduco(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/abi-compliance-checker/package.py b/var/spack/repos/builtin/packages/abi-compliance-checker/package.py index b55f6a0715..be4656d882 100644 --- a/var/spack/repos/builtin/packages/abi-compliance-checker/package.py +++ b/var/spack/repos/builtin/packages/abi-compliance-checker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AbiComplianceChecker(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/abi-dumper/package.py b/var/spack/repos/builtin/packages/abi-dumper/package.py index 17a82bc84f..c6c6cc9c33 100644 --- a/var/spack/repos/builtin/packages/abi-dumper/package.py +++ b/var/spack/repos/builtin/packages/abi-dumper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AbiDumper(Package): diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py index f489ee7809..023663da3c 100644 --- a/var/spack/repos/builtin/packages/abinit/package.py +++ b/var/spack/repos/builtin/packages/abinit/package.py @@ -3,10 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -# Author: Matteo Giantomassi <matteo.giantomassiNOSPAM AT uclouvain.be> -# Date: October 11, 2016 -from spack import * +from spack.package import * class Abinit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/abseil-cpp/package.py b/var/spack/repos/builtin/packages/abseil-cpp/package.py index a3e1b1ed37..8f1f40d84e 100644 --- a/var/spack/repos/builtin/packages/abseil-cpp/package.py +++ b/var/spack/repos/builtin/packages/abseil-cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AbseilCpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/abyss/package.py b/var/spack/repos/builtin/packages/abyss/package.py index efba4eb25e..7052232547 100644 --- a/var/spack/repos/builtin/packages/abyss/package.py +++ b/var/spack/repos/builtin/packages/abyss/package.py @@ -5,7 +5,7 @@ import numbers -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/accfft/package.py b/var/spack/repos/builtin/packages/accfft/package.py index 9b1e7d051b..d3e56d1ca1 100644 --- a/var/spack/repos/builtin/packages/accfft/package.py +++ b/var/spack/repos/builtin/packages/accfft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Accfft(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/acct/package.py b/var/spack/repos/builtin/packages/acct/package.py index 3b1a3b78c0..254377bd07 100644 --- a/var/spack/repos/builtin/packages/acct/package.py +++ b/var/spack/repos/builtin/packages/acct/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Acct(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/accumulo/package.py b/var/spack/repos/builtin/packages/accumulo/package.py index d30da8fb2f..ffef83bf7f 100644 --- a/var/spack/repos/builtin/packages/accumulo/package.py +++ b/var/spack/repos/builtin/packages/accumulo/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Accumulo(MavenPackage): """Apache Accumulo is a sorted, distributed key/value store that provides robust, scalable data storage and retrieval.""" diff --git a/var/spack/repos/builtin/packages/ace/package.py b/var/spack/repos/builtin/packages/ace/package.py index f15b7746ac..cad16b2d4a 100644 --- a/var/spack/repos/builtin/packages/ace/package.py +++ b/var/spack/repos/builtin/packages/ace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ace(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ack/package.py b/var/spack/repos/builtin/packages/ack/package.py index fffe525243..255a2cc4c5 100644 --- a/var/spack/repos/builtin/packages/ack/package.py +++ b/var/spack/repos/builtin/packages/ack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ack(Package): diff --git a/var/spack/repos/builtin/packages/acl/package.py b/var/spack/repos/builtin/packages/acl/package.py index 77d078709c..9129ef9752 100644 --- a/var/spack/repos/builtin/packages/acl/package.py +++ b/var/spack/repos/builtin/packages/acl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Acl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/acpica-tools/package.py b/var/spack/repos/builtin/packages/acpica-tools/package.py index 39f849ab00..025428d3f0 100644 --- a/var/spack/repos/builtin/packages/acpica-tools/package.py +++ b/var/spack/repos/builtin/packages/acpica-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AcpicaTools(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/acpid/package.py b/var/spack/repos/builtin/packages/acpid/package.py index 902c5e8edd..3011f84a50 100644 --- a/var/spack/repos/builtin/packages/acpid/package.py +++ b/var/spack/repos/builtin/packages/acpid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Acpid(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/activeharmony/package.py b/var/spack/repos/builtin/packages/activeharmony/package.py index a00134def3..18767ab7e5 100644 --- a/var/spack/repos/builtin/packages/activeharmony/package.py +++ b/var/spack/repos/builtin/packages/activeharmony/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Activeharmony(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/activemq/package.py b/var/spack/repos/builtin/packages/activemq/package.py index c425fdda87..53e80fef1e 100644 --- a/var/spack/repos/builtin/packages/activemq/package.py +++ b/var/spack/repos/builtin/packages/activemq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Activemq(Package): diff --git a/var/spack/repos/builtin/packages/acts/package.py b/var/spack/repos/builtin/packages/acts/package.py index 33ed2f7c4d..02e1c4045c 100644 --- a/var/spack/repos/builtin/packages/acts/package.py +++ b/var/spack/repos/builtin/packages/acts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Acts(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/addrwatch/package.py b/var/spack/repos/builtin/packages/addrwatch/package.py index 7cd4fdb72a..f5e73cb4f5 100644 --- a/var/spack/repos/builtin/packages/addrwatch/package.py +++ b/var/spack/repos/builtin/packages/addrwatch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Addrwatch(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/adept-utils/package.py b/var/spack/repos/builtin/packages/adept-utils/package.py index f06a059617..642b51c4f2 100644 --- a/var/spack/repos/builtin/packages/adept-utils/package.py +++ b/var/spack/repos/builtin/packages/adept-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AdeptUtils(CMakePackage): diff --git a/var/spack/repos/builtin/packages/adf/package.py b/var/spack/repos/builtin/packages/adf/package.py index 710960da4f..dc153d81dc 100644 --- a/var/spack/repos/builtin/packages/adf/package.py +++ b/var/spack/repos/builtin/packages/adf/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Adf(Package): diff --git a/var/spack/repos/builtin/packages/adiak/package.py b/var/spack/repos/builtin/packages/adiak/package.py index 080de4c31f..eb372a25da 100644 --- a/var/spack/repos/builtin/packages/adiak/package.py +++ b/var/spack/repos/builtin/packages/adiak/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Adiak(CMakePackage): diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index d6c4d76702..bbd6ee69dd 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Adios(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index 9169af460d..b95ea7b745 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Adios2(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/adlbx/package.py b/var/spack/repos/builtin/packages/adlbx/package.py index d3d0a9e241..db821ffa12 100644 --- a/var/spack/repos/builtin/packages/adlbx/package.py +++ b/var/spack/repos/builtin/packages/adlbx/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Adlbx(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/admixtools/package.py b/var/spack/repos/builtin/packages/admixtools/package.py index 9e4eb0e924..83aa7b5daa 100644 --- a/var/spack/repos/builtin/packages/admixtools/package.py +++ b/var/spack/repos/builtin/packages/admixtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Admixtools(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/adms/package.py b/var/spack/repos/builtin/packages/adms/package.py index 4512422c72..b952dc2650 100644 --- a/var/spack/repos/builtin/packages/adms/package.py +++ b/var/spack/repos/builtin/packages/adms/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Adms(AutotoolsPackage): """ADMS is a code generator that converts electrical compact device models specified in high-level description language into ready-to-compile c code diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index 8b888f079f..a303b32968 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AdolC(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/advancecomp/package.py b/var/spack/repos/builtin/packages/advancecomp/package.py index 27efe00888..97cac4df62 100644 --- a/var/spack/repos/builtin/packages/advancecomp/package.py +++ b/var/spack/repos/builtin/packages/advancecomp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Advancecomp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py b/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py index 8da6fd6eea..750550d9ac 100644 --- a/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py +++ b/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AdwaitaIconTheme(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/aegean/package.py b/var/spack/repos/builtin/packages/aegean/package.py index 92397e6a53..921c20cb1b 100644 --- a/var/spack/repos/builtin/packages/aegean/package.py +++ b/var/spack/repos/builtin/packages/aegean/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aegean(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/aeskeyfind/package.py b/var/spack/repos/builtin/packages/aeskeyfind/package.py index 4fadc3ad81..abb33121fc 100644 --- a/var/spack/repos/builtin/packages/aeskeyfind/package.py +++ b/var/spack/repos/builtin/packages/aeskeyfind/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aeskeyfind(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/aespipe/package.py b/var/spack/repos/builtin/packages/aespipe/package.py index 09db854be6..a332cccf88 100644 --- a/var/spack/repos/builtin/packages/aespipe/package.py +++ b/var/spack/repos/builtin/packages/aespipe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aespipe(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/agile/package.py b/var/spack/repos/builtin/packages/agile/package.py index d97444f45f..815f497c19 100644 --- a/var/spack/repos/builtin/packages/agile/package.py +++ b/var/spack/repos/builtin/packages/agile/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Agile(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/agrep/package.py b/var/spack/repos/builtin/packages/agrep/package.py index fd08772202..0e28ed6004 100644 --- a/var/spack/repos/builtin/packages/agrep/package.py +++ b/var/spack/repos/builtin/packages/agrep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Agrep(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/aida/package.py b/var/spack/repos/builtin/packages/aida/package.py index 890aebe184..153b294b73 100644 --- a/var/spack/repos/builtin/packages/aida/package.py +++ b/var/spack/repos/builtin/packages/aida/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aida(Package): diff --git a/var/spack/repos/builtin/packages/akantu/package.py b/var/spack/repos/builtin/packages/akantu/package.py index 55dc467d94..acd139c472 100644 --- a/var/spack/repos/builtin/packages/akantu/package.py +++ b/var/spack/repos/builtin/packages/akantu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/alan/package.py b/var/spack/repos/builtin/packages/alan/package.py index 119fc51a73..f2b9481dc6 100644 --- a/var/spack/repos/builtin/packages/alan/package.py +++ b/var/spack/repos/builtin/packages/alan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Alan(Package): diff --git a/var/spack/repos/builtin/packages/albany/package.py b/var/spack/repos/builtin/packages/albany/package.py index 109bd940a9..d7e99dd83e 100644 --- a/var/spack/repos/builtin/packages/albany/package.py +++ b/var/spack/repos/builtin/packages/albany/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Albany(CMakePackage): diff --git a/var/spack/repos/builtin/packages/albert/package.py b/var/spack/repos/builtin/packages/albert/package.py index 904dac0508..c97e4037e3 100644 --- a/var/spack/repos/builtin/packages/albert/package.py +++ b/var/spack/repos/builtin/packages/albert/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Albert(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/alembic/package.py b/var/spack/repos/builtin/packages/alembic/package.py index a9c2b886a8..02643a62d9 100644 --- a/var/spack/repos/builtin/packages/alembic/package.py +++ b/var/spack/repos/builtin/packages/alembic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Alembic(CMakePackage): diff --git a/var/spack/repos/builtin/packages/alglib/package.py b/var/spack/repos/builtin/packages/alglib/package.py index bf002bd8f6..d6b3bfd1a6 100644 --- a/var/spack/repos/builtin/packages/alglib/package.py +++ b/var/spack/repos/builtin/packages/alglib/package.py @@ -6,6 +6,8 @@ import os import sys +from spack.package import * + class Alglib(MakefilePackage): """ALGLIB is a cross-platform numerical analysis and data processing diff --git a/var/spack/repos/builtin/packages/allpaths-lg/package.py b/var/spack/repos/builtin/packages/allpaths-lg/package.py index ea47d80263..fb79d71a75 100644 --- a/var/spack/repos/builtin/packages/allpaths-lg/package.py +++ b/var/spack/repos/builtin/packages/allpaths-lg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AllpathsLg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/alluxio/package.py b/var/spack/repos/builtin/packages/alluxio/package.py index 32e6e71d5c..ceeb0330dc 100644 --- a/var/spack/repos/builtin/packages/alluxio/package.py +++ b/var/spack/repos/builtin/packages/alluxio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Alluxio(Package): diff --git a/var/spack/repos/builtin/packages/alpaka/package.py b/var/spack/repos/builtin/packages/alpaka/package.py index e02da1308f..f038c6aa3b 100644 --- a/var/spack/repos/builtin/packages/alpaka/package.py +++ b/var/spack/repos/builtin/packages/alpaka/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Alpaka(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/alpgen/package.py b/var/spack/repos/builtin/packages/alpgen/package.py index 74d1eb4fca..d496b08040 100644 --- a/var/spack/repos/builtin/packages/alpgen/package.py +++ b/var/spack/repos/builtin/packages/alpgen/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Alpgen(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/alps/package.py b/var/spack/repos/builtin/packages/alps/package.py index be41be5360..ab1e90cd3d 100644 --- a/var/spack/repos/builtin/packages/alps/package.py +++ b/var/spack/repos/builtin/packages/alps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Alps(CMakePackage): diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index 3ca277d1bf..15194c0f10 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Alquimia(CMakePackage): diff --git a/var/spack/repos/builtin/packages/alsa-lib/package.py b/var/spack/repos/builtin/packages/alsa-lib/package.py index b47761ca01..390bc9befe 100644 --- a/var/spack/repos/builtin/packages/alsa-lib/package.py +++ b/var/spack/repos/builtin/packages/alsa-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AlsaLib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py index 9bfdcaf3d6..4cc34b2981 100644 --- a/var/spack/repos/builtin/packages/aluminum/package.py +++ b/var/spack/repos/builtin/packages/aluminum/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Aluminum(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/ambari/package.py b/var/spack/repos/builtin/packages/ambari/package.py index a47e976f22..31323de2af 100644 --- a/var/spack/repos/builtin/packages/ambari/package.py +++ b/var/spack/repos/builtin/packages/ambari/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ambari(PythonPackage): diff --git a/var/spack/repos/builtin/packages/amber/package.py b/var/spack/repos/builtin/packages/amber/package.py index 26ceba87dc..43912c9bdf 100644 --- a/var/spack/repos/builtin/packages/amber/package.py +++ b/var/spack/repos/builtin/packages/amber/package.py @@ -6,7 +6,7 @@ import os import shutil -from spack import * +from spack.package import * class Amber(Package, CudaPackage): diff --git a/var/spack/repos/builtin/packages/amdblis/package.py b/var/spack/repos/builtin/packages/amdblis/package.py index 8023d0a4ac..b2de302457 100644 --- a/var/spack/repos/builtin/packages/amdblis/package.py +++ b/var/spack/repos/builtin/packages/amdblis/package.py @@ -2,6 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.blis import BlisBase diff --git a/var/spack/repos/builtin/packages/amdfftw/package.py b/var/spack/repos/builtin/packages/amdfftw/package.py index d788654959..d728180ac4 100644 --- a/var/spack/repos/builtin/packages/amdfftw/package.py +++ b/var/spack/repos/builtin/packages/amdfftw/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.fftw import FftwBase diff --git a/var/spack/repos/builtin/packages/amdlibflame/package.py b/var/spack/repos/builtin/packages/amdlibflame/package.py index 7f762f140e..357cd61ab7 100644 --- a/var/spack/repos/builtin/packages/amdlibflame/package.py +++ b/var/spack/repos/builtin/packages/amdlibflame/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) # ----------------------------------------------------------------------------\ +from spack.package import * from spack.pkg.builtin.libflame import LibflameBase diff --git a/var/spack/repos/builtin/packages/amdlibm/package.py b/var/spack/repos/builtin/packages/amdlibm/package.py index b8793488b7..2f4652b6d9 100644 --- a/var/spack/repos/builtin/packages/amdlibm/package.py +++ b/var/spack/repos/builtin/packages/amdlibm/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Amdlibm(SConsPackage): diff --git a/var/spack/repos/builtin/packages/amdscalapack/package.py b/var/spack/repos/builtin/packages/amdscalapack/package.py index eb682b8e59..2495ebf760 100644 --- a/var/spack/repos/builtin/packages/amdscalapack/package.py +++ b/var/spack/repos/builtin/packages/amdscalapack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.netlib_scalapack import ScalapackBase diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py index 2156819f86..0d9199473c 100644 --- a/var/spack/repos/builtin/packages/amg/package.py +++ b/var/spack/repos/builtin/packages/amg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Amg(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/amg2013/package.py b/var/spack/repos/builtin/packages/amg2013/package.py index 4b2c773d32..b4b2182ff5 100644 --- a/var/spack/repos/builtin/packages/amg2013/package.py +++ b/var/spack/repos/builtin/packages/amg2013/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Amg2013(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/amgx/package.py b/var/spack/repos/builtin/packages/amgx/package.py index 136b2b6346..15979c0a58 100644 --- a/var/spack/repos/builtin/packages/amgx/package.py +++ b/var/spack/repos/builtin/packages/amgx/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Amgx(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/aml/package.py b/var/spack/repos/builtin/packages/aml/package.py index da155e7bdf..d1a7168523 100644 --- a/var/spack/repos/builtin/packages/aml/package.py +++ b/var/spack/repos/builtin/packages/aml/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Aml(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/amp/package.py b/var/spack/repos/builtin/packages/amp/package.py index 78bf52e003..05cdc2caca 100644 --- a/var/spack/repos/builtin/packages/amp/package.py +++ b/var/spack/repos/builtin/packages/amp/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/ampl/package.py b/var/spack/repos/builtin/packages/ampl/package.py index 181a2de548..6e59a7e964 100644 --- a/var/spack/repos/builtin/packages/ampl/package.py +++ b/var/spack/repos/builtin/packages/ampl/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Ampl(Package): diff --git a/var/spack/repos/builtin/packages/ampliconnoise/package.py b/var/spack/repos/builtin/packages/ampliconnoise/package.py index d009e333ba..d176c3c56c 100644 --- a/var/spack/repos/builtin/packages/ampliconnoise/package.py +++ b/var/spack/repos/builtin/packages/ampliconnoise/package.py @@ -5,6 +5,8 @@ import os.path +from spack.package import * + class Ampliconnoise(MakefilePackage): """AmpliconNoise is a collection of programs for the removal of noise diff --git a/var/spack/repos/builtin/packages/amr-wind/package.py b/var/spack/repos/builtin/packages/amr-wind/package.py index a525352121..7581562701 100644 --- a/var/spack/repos/builtin/packages/amr-wind/package.py +++ b/var/spack/repos/builtin/packages/amr-wind/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AmrWind(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 429c6fb603..d0d73802d4 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Amrex(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py index daedaf8b42..f10f5719b0 100644 --- a/var/spack/repos/builtin/packages/amrvis/package.py +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Amrvis(MakefilePackage): """Amrvis is a visualization package specifically designed to read and display output and profiling data from codes built diff --git a/var/spack/repos/builtin/packages/anaconda2/package.py b/var/spack/repos/builtin/packages/anaconda2/package.py index ff89356ed6..286ec90193 100644 --- a/var/spack/repos/builtin/packages/anaconda2/package.py +++ b/var/spack/repos/builtin/packages/anaconda2/package.py @@ -5,7 +5,7 @@ from os.path import split -from spack import * +from spack.package import * from spack.util.environment import EnvironmentModifications diff --git a/var/spack/repos/builtin/packages/anaconda3/package.py b/var/spack/repos/builtin/packages/anaconda3/package.py index b7a2aee641..2211e456b9 100644 --- a/var/spack/repos/builtin/packages/anaconda3/package.py +++ b/var/spack/repos/builtin/packages/anaconda3/package.py @@ -5,7 +5,7 @@ from os.path import split -from spack import * +from spack.package import * from spack.util.environment import EnvironmentModifications diff --git a/var/spack/repos/builtin/packages/andi/package.py b/var/spack/repos/builtin/packages/andi/package.py index e940dfe732..f3734f210b 100644 --- a/var/spack/repos/builtin/packages/andi/package.py +++ b/var/spack/repos/builtin/packages/andi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Andi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/angsd/package.py b/var/spack/repos/builtin/packages/angsd/package.py index c27356496c..7d5675f142 100644 --- a/var/spack/repos/builtin/packages/angsd/package.py +++ b/var/spack/repos/builtin/packages/angsd/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Angsd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ant/package.py b/var/spack/repos/builtin/packages/ant/package.py index 2bb5e9f97e..7691bb8ba3 100644 --- a/var/spack/repos/builtin/packages/ant/package.py +++ b/var/spack/repos/builtin/packages/ant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ant(Package): diff --git a/var/spack/repos/builtin/packages/antimony/package.py b/var/spack/repos/builtin/packages/antimony/package.py index b25fc3aa79..77a81c968a 100644 --- a/var/spack/repos/builtin/packages/antimony/package.py +++ b/var/spack/repos/builtin/packages/antimony/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Antimony(CMakePackage): diff --git a/var/spack/repos/builtin/packages/antlr/package.py b/var/spack/repos/builtin/packages/antlr/package.py index 6aa3397e13..d155c5b2d2 100644 --- a/var/spack/repos/builtin/packages/antlr/package.py +++ b/var/spack/repos/builtin/packages/antlr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Antlr(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ants/package.py b/var/spack/repos/builtin/packages/ants/package.py index 0e317bf1fd..3a4b1a8da2 100644 --- a/var/spack/repos/builtin/packages/ants/package.py +++ b/var/spack/repos/builtin/packages/ants/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ants(CMakePackage): diff --git a/var/spack/repos/builtin/packages/aocc/package.py b/var/spack/repos/builtin/packages/aocc/package.py index e5edccbd58..4f455c2ac6 100644 --- a/var/spack/repos/builtin/packages/aocc/package.py +++ b/var/spack/repos/builtin/packages/aocc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aocc(Package): diff --git a/var/spack/repos/builtin/packages/aocl-sparse/package.py b/var/spack/repos/builtin/packages/aocl-sparse/package.py index a0dcde8108..d53ef40d7d 100644 --- a/var/spack/repos/builtin/packages/aocl-sparse/package.py +++ b/var/spack/repos/builtin/packages/aocl-sparse/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class AoclSparse(CMakePackage): diff --git a/var/spack/repos/builtin/packages/aoflagger/package.py b/var/spack/repos/builtin/packages/aoflagger/package.py index db2db74693..1e75b5fe24 100644 --- a/var/spack/repos/builtin/packages/aoflagger/package.py +++ b/var/spack/repos/builtin/packages/aoflagger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/aom/package.py b/var/spack/repos/builtin/packages/aom/package.py index 3d57f2a0c5..956f564f3a 100644 --- a/var/spack/repos/builtin/packages/aom/package.py +++ b/var/spack/repos/builtin/packages/aom/package.py @@ -3,15 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -# Author: Darach Golden <dgolden@tchpc.tcd.ie>, -# Institution: Trinity Centre for High Performance Computing, https://www.tchpc.tcd.ie/ # noqa: E501 -# Date: May 09, 2019 -# Author: Sean McGrath <smcgrat@tchpc.tcd.ie> -# Institution: Trinity Centre for High Performance Computing, https://www.tchpc.tcd.ie/ # noqa: E501 -# Date: May 09, 2019 -# -from spack import * +from spack.package import * class Aom(CMakePackage): diff --git a/var/spack/repos/builtin/packages/aomp/package.py b/var/spack/repos/builtin/packages/aomp/package.py index 599d3d4524..c86c5160fd 100644 --- a/var/spack/repos/builtin/packages/aomp/package.py +++ b/var/spack/repos/builtin/packages/aomp/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * tools_url = 'https://github.com/ROCm-Developer-Tools' compute_url = 'https://github.com/RadeonOpenCompute' @@ -65,7 +65,7 @@ opencl = [ ] versions = ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0'] -versions_dict = dict() +versions_dict = dict() # type: Dict[str, Dict[str, str]] hashes = [aomp, devlib, llvm, flang, extras] hashes_35 = [aomp, devlib, llvm, flang, extras, hip, vdi, opencl] components = ['aomp', 'devlib', 'llvm', 'flang', 'extras'] diff --git a/var/spack/repos/builtin/packages/apachetop/package.py b/var/spack/repos/builtin/packages/apachetop/package.py index 0da87d108d..aad9801c4e 100644 --- a/var/spack/repos/builtin/packages/apachetop/package.py +++ b/var/spack/repos/builtin/packages/apachetop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Apachetop(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/apcomp/package.py b/var/spack/repos/builtin/packages/apcomp/package.py index 157f4c5954..050ff94ee8 100644 --- a/var/spack/repos/builtin/packages/apcomp/package.py +++ b/var/spack/repos/builtin/packages/apcomp/package.py @@ -9,7 +9,7 @@ import socket import llnl.util.tty as tty -from spack import * +from spack.package import * def cmake_cache_entry(name, value, vtype=None): diff --git a/var/spack/repos/builtin/packages/ape/package.py b/var/spack/repos/builtin/packages/ape/package.py index bc83d7075e..a614bf78aa 100644 --- a/var/spack/repos/builtin/packages/ape/package.py +++ b/var/spack/repos/builtin/packages/ape/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ape(Package): diff --git a/var/spack/repos/builtin/packages/aperture-photometry/package.py b/var/spack/repos/builtin/packages/aperture-photometry/package.py index 6d434fe7b1..d709f3eace 100644 --- a/var/spack/repos/builtin/packages/aperture-photometry/package.py +++ b/var/spack/repos/builtin/packages/aperture-photometry/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class AperturePhotometry(Package): diff --git a/var/spack/repos/builtin/packages/apex/package.py b/var/spack/repos/builtin/packages/apex/package.py index dd52935ade..78629c6875 100644 --- a/var/spack/repos/builtin/packages/apex/package.py +++ b/var/spack/repos/builtin/packages/apex/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Apex(CMakePackage): diff --git a/var/spack/repos/builtin/packages/apfel/package.py b/var/spack/repos/builtin/packages/apfel/package.py index f7c12d744a..905fa0c033 100644 --- a/var/spack/repos/builtin/packages/apfel/package.py +++ b/var/spack/repos/builtin/packages/apfel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Apfel(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/apktool/package.py b/var/spack/repos/builtin/packages/apktool/package.py index 8d1f20b2ea..f18c6ffae0 100644 --- a/var/spack/repos/builtin/packages/apktool/package.py +++ b/var/spack/repos/builtin/packages/apktool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Apktool(Package): diff --git a/var/spack/repos/builtin/packages/apple-libunwind/package.py b/var/spack/repos/builtin/packages/apple-libunwind/package.py index f689b0fbe2..02f54bd0fd 100644 --- a/var/spack/repos/builtin/packages/apple-libunwind/package.py +++ b/var/spack/repos/builtin/packages/apple-libunwind/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AppleLibunwind(Package): @@ -41,6 +41,10 @@ class AppleLibunwind(Package): """ raise InstallError(msg) + @fetcher.setter # Since fetcher is read-write, must override both + def fetcher(self): + _ = self.fetcher + def install(self, spec, prefix): # sanity_check_prefix requires something in the install directory mkdirp(prefix.lib) diff --git a/var/spack/repos/builtin/packages/apple-libuuid/package.py b/var/spack/repos/builtin/packages/apple-libuuid/package.py index 4f334bdc6f..e4a8bf3334 100644 --- a/var/spack/repos/builtin/packages/apple-libuuid/package.py +++ b/var/spack/repos/builtin/packages/apple-libuuid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AppleLibuuid(BundlePackage): diff --git a/var/spack/repos/builtin/packages/applewmproto/package.py b/var/spack/repos/builtin/packages/applewmproto/package.py index a1fe1ab566..f9fad5fb1f 100644 --- a/var/spack/repos/builtin/packages/applewmproto/package.py +++ b/var/spack/repos/builtin/packages/applewmproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Applewmproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/appres/package.py b/var/spack/repos/builtin/packages/appres/package.py index e89bf170a8..3a911519cc 100644 --- a/var/spack/repos/builtin/packages/appres/package.py +++ b/var/spack/repos/builtin/packages/appres/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Appres(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/apptainer/package.py b/var/spack/repos/builtin/packages/apptainer/package.py index 7733e75830..2e54089b1d 100644 --- a/var/spack/repos/builtin/packages/apptainer/package.py +++ b/var/spack/repos/builtin/packages/apptainer/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.singularityce import SingularityBase diff --git a/var/spack/repos/builtin/packages/apr-util/package.py b/var/spack/repos/builtin/packages/apr-util/package.py index f68260e8f9..a8c6c7ee95 100644 --- a/var/spack/repos/builtin/packages/apr-util/package.py +++ b/var/spack/repos/builtin/packages/apr-util/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AprUtil(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/apr/package.py b/var/spack/repos/builtin/packages/apr/package.py index d2fbe33ce9..cc623114ff 100644 --- a/var/spack/repos/builtin/packages/apr/package.py +++ b/var/spack/repos/builtin/packages/apr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Apr(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/aragorn/package.py b/var/spack/repos/builtin/packages/aragorn/package.py index 1d012f1387..3b22ea382a 100644 --- a/var/spack/repos/builtin/packages/aragorn/package.py +++ b/var/spack/repos/builtin/packages/aragorn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aragorn(Package): diff --git a/var/spack/repos/builtin/packages/arbor/package.py b/var/spack/repos/builtin/packages/arbor/package.py index 23798c0325..eb6449ac8e 100644 --- a/var/spack/repos/builtin/packages/arbor/package.py +++ b/var/spack/repos/builtin/packages/arbor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Arbor(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/arborx/package.py b/var/spack/repos/builtin/packages/arborx/package.py index e30279c3f2..ac8a3a8d33 100644 --- a/var/spack/repos/builtin/packages/arborx/package.py +++ b/var/spack/repos/builtin/packages/arborx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Arborx(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/archer/package.py b/var/spack/repos/builtin/packages/archer/package.py index ae61387ad0..8d516b51aa 100644 --- a/var/spack/repos/builtin/packages/archer/package.py +++ b/var/spack/repos/builtin/packages/archer/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class Archer(CMakePackage): diff --git a/var/spack/repos/builtin/packages/argobots/package.py b/var/spack/repos/builtin/packages/argobots/package.py index 5c9bee541a..1bd02d9b82 100644 --- a/var/spack/repos/builtin/packages/argobots/package.py +++ b/var/spack/repos/builtin/packages/argobots/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Argobots(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/argon2/package.py b/var/spack/repos/builtin/packages/argon2/package.py index b9b6287041..dafddfb09d 100644 --- a/var/spack/repos/builtin/packages/argon2/package.py +++ b/var/spack/repos/builtin/packages/argon2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Argon2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/argp-standalone/package.py b/var/spack/repos/builtin/packages/argp-standalone/package.py index acd69b94df..1e5ebb4698 100644 --- a/var/spack/repos/builtin/packages/argp-standalone/package.py +++ b/var/spack/repos/builtin/packages/argp-standalone/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ArgpStandalone(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/args/package.py b/var/spack/repos/builtin/packages/args/package.py index af388d7244..292149ebb6 100644 --- a/var/spack/repos/builtin/packages/args/package.py +++ b/var/spack/repos/builtin/packages/args/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Args(CMakePackage): diff --git a/var/spack/repos/builtin/packages/argtable/package.py b/var/spack/repos/builtin/packages/argtable/package.py index 6a18a8a1aa..8017424144 100644 --- a/var/spack/repos/builtin/packages/argtable/package.py +++ b/var/spack/repos/builtin/packages/argtable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Argtable(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/aria2/package.py b/var/spack/repos/builtin/packages/aria2/package.py index 285b410246..7bfaf03c39 100644 --- a/var/spack/repos/builtin/packages/aria2/package.py +++ b/var/spack/repos/builtin/packages/aria2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aria2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/arm-forge/package.py b/var/spack/repos/builtin/packages/arm-forge/package.py index 6ed0b8eca8..125f20f048 100644 --- a/var/spack/repos/builtin/packages/arm-forge/package.py +++ b/var/spack/repos/builtin/packages/arm-forge/package.py @@ -6,7 +6,7 @@ import platform import subprocess -from spack import * +from spack.package import * class ArmForge(Package): diff --git a/var/spack/repos/builtin/packages/arm/package.py b/var/spack/repos/builtin/packages/arm/package.py index a760b4e0d9..6d0ccfe783 100644 --- a/var/spack/repos/builtin/packages/arm/package.py +++ b/var/spack/repos/builtin/packages/arm/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import re -from spack import * +from spack.package import * _os_map = { 'ubuntu18.04': 'Ubuntu-18.04', diff --git a/var/spack/repos/builtin/packages/armadillo/package.py b/var/spack/repos/builtin/packages/armadillo/package.py index 03e4c97eb2..d1052f51a3 100644 --- a/var/spack/repos/builtin/packages/armadillo/package.py +++ b/var/spack/repos/builtin/packages/armadillo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Armadillo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/armpl/package.py b/var/spack/repos/builtin/packages/armpl/package.py index 4928404ba0..9ad2735c5f 100644 --- a/var/spack/repos/builtin/packages/armpl/package.py +++ b/var/spack/repos/builtin/packages/armpl/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * _os_map = { 'ubuntu18.04': 'Ubuntu-18.04', diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index 311c65dcc9..41db8dda0d 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ArpackNg(Package): diff --git a/var/spack/repos/builtin/packages/arrayfire/package.py b/var/spack/repos/builtin/packages/arrayfire/package.py index 8827aa371d..83f83c17a2 100644 --- a/var/spack/repos/builtin/packages/arrayfire/package.py +++ b/var/spack/repos/builtin/packages/arrayfire/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Arrayfire(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py index 29d729d853..c546a404c8 100644 --- a/var/spack/repos/builtin/packages/arrow/package.py +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/asagi/package.py b/var/spack/repos/builtin/packages/asagi/package.py index 8d6193bf99..9248871b54 100644 --- a/var/spack/repos/builtin/packages/asagi/package.py +++ b/var/spack/repos/builtin/packages/asagi/package.py @@ -3,11 +3,11 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # Author: Gilbert Brietzke # Date: July 2, 2019 -from spack import * - class Asagi(CMakePackage): """a pArallel Server for Adaptive GeoInformation.""" diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index ca6c276bab..9330dbbc9c 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -12,7 +12,7 @@ from os import environ as env import llnl.util.tty as tty -from spack import * +from spack.package import * def cmake_cache_entry(name, value, vtype=None): @@ -28,6 +28,16 @@ def cmake_cache_entry(name, value, vtype=None): return 'set({0} "{1}" CACHE {2} "")\n\n'.format(name, value, vtype) +def propagate_cuda_arch(package, spec=None): + if not spec: + spec = '' + for cuda_arch in CudaPackage.cuda_arch_values: + depends_on('{0} +cuda cuda_arch={1}' + .format(package, cuda_arch), + when='{0} +cuda cuda_arch={1}' + .format(spec, cuda_arch)) + + class Ascent(CMakePackage, CudaPackage): """Ascent is an open source many-core capable lightweight in situ visualization and analysis infrastructure for multi-physics HPC @@ -111,15 +121,6 @@ class Ascent(CMakePackage, CudaPackage): ########################################################################## # package dependencies ########################################################################### - def propagate_cuda_arch(package, spec=None): - if not spec: - spec = '' - for cuda_arch in CudaPackage.cuda_arch_values: - depends_on('{0} +cuda cuda_arch={1}' - .format(package, cuda_arch), - when='{0} +cuda cuda_arch={1}' - .format(spec, cuda_arch)) - # Certain CMake versions have been found to break for our use cases depends_on("cmake@3.14.1:3.14,3.18.2:", type='build') diff --git a/var/spack/repos/builtin/packages/asciidoc-py3/package.py b/var/spack/repos/builtin/packages/asciidoc-py3/package.py index 6bc3cf550a..a7dda0a75a 100644 --- a/var/spack/repos/builtin/packages/asciidoc-py3/package.py +++ b/var/spack/repos/builtin/packages/asciidoc-py3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AsciidocPy3(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py index 3345c09c7a..730d9cfe63 100644 --- a/var/spack/repos/builtin/packages/asciidoc/package.py +++ b/var/spack/repos/builtin/packages/asciidoc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Asciidoc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/asdcplib/package.py b/var/spack/repos/builtin/packages/asdcplib/package.py index 70c10edfed..67d31f5c18 100644 --- a/var/spack/repos/builtin/packages/asdcplib/package.py +++ b/var/spack/repos/builtin/packages/asdcplib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Asdcplib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/asdf-cxx/package.py b/var/spack/repos/builtin/packages/asdf-cxx/package.py index 898afbfa2b..eb27445ec7 100644 --- a/var/spack/repos/builtin/packages/asdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/asdf-cxx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AsdfCxx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/asio/package.py b/var/spack/repos/builtin/packages/asio/package.py index babc5ed40b..f3f8c79e4b 100644 --- a/var/spack/repos/builtin/packages/asio/package.py +++ b/var/spack/repos/builtin/packages/asio/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Asio(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/aspa/package.py b/var/spack/repos/builtin/packages/aspa/package.py index 310554aca4..aa75e22bcd 100644 --- a/var/spack/repos/builtin/packages/aspa/package.py +++ b/var/spack/repos/builtin/packages/aspa/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Aspa(MakefilePackage): """A fundamental premise in ExMatEx is that scale-bridging performed in heterogeneous MPMD materials science simulations will place important diff --git a/var/spack/repos/builtin/packages/aspcud/package.py b/var/spack/repos/builtin/packages/aspcud/package.py index 6b2457f9fd..8a1e28eeca 100644 --- a/var/spack/repos/builtin/packages/aspcud/package.py +++ b/var/spack/repos/builtin/packages/aspcud/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aspcud(CMakePackage): diff --git a/var/spack/repos/builtin/packages/aspect/package.py b/var/spack/repos/builtin/packages/aspect/package.py index 5a58d1e987..db430acb90 100644 --- a/var/spack/repos/builtin/packages/aspect/package.py +++ b/var/spack/repos/builtin/packages/aspect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aspect(CMakePackage): diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index 54e4103609..bc9aea616f 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * # See also: AspellDictPackage diff --git a/var/spack/repos/builtin/packages/aspell6-de/package.py b/var/spack/repos/builtin/packages/aspell6-de/package.py index 93bda5e6f5..a30b30f6d0 100644 --- a/var/spack/repos/builtin/packages/aspell6-de/package.py +++ b/var/spack/repos/builtin/packages/aspell6-de/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aspell6De(AspellDictPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/aspell6-en/package.py b/var/spack/repos/builtin/packages/aspell6-en/package.py index e4def32128..b17059083f 100644 --- a/var/spack/repos/builtin/packages/aspell6-en/package.py +++ b/var/spack/repos/builtin/packages/aspell6-en/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aspell6En(AspellDictPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/aspell6-es/package.py b/var/spack/repos/builtin/packages/aspell6-es/package.py index a5a3e0d43c..0839a3f430 100644 --- a/var/spack/repos/builtin/packages/aspell6-es/package.py +++ b/var/spack/repos/builtin/packages/aspell6-es/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Aspell6Es(AspellDictPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/aspera-cli/package.py b/var/spack/repos/builtin/packages/aspera-cli/package.py index 91d7bee3cc..046d89ac86 100644 --- a/var/spack/repos/builtin/packages/aspera-cli/package.py +++ b/var/spack/repos/builtin/packages/aspera-cli/package.py @@ -5,7 +5,7 @@ from glob import glob -from spack import * +from spack.package import * class AsperaCli(Package): diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index 5917e5072a..901de74bb8 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Assimp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/astra/package.py b/var/spack/repos/builtin/packages/astra/package.py index 865be936c9..2148722a77 100644 --- a/var/spack/repos/builtin/packages/astra/package.py +++ b/var/spack/repos/builtin/packages/astra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Astra(Package): diff --git a/var/spack/repos/builtin/packages/astral/package.py b/var/spack/repos/builtin/packages/astral/package.py index 001167cec7..f84f958c65 100644 --- a/var/spack/repos/builtin/packages/astral/package.py +++ b/var/spack/repos/builtin/packages/astral/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Astral(Package): diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py index 7b3920b3e1..1e2a16cdc5 100644 --- a/var/spack/repos/builtin/packages/astyle/package.py +++ b/var/spack/repos/builtin/packages/astyle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Astyle(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/at-spi2-atk/package.py b/var/spack/repos/builtin/packages/at-spi2-atk/package.py index e80f203e9a..57dd162847 100644 --- a/var/spack/repos/builtin/packages/at-spi2-atk/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-atk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AtSpi2Atk(MesonPackage): diff --git a/var/spack/repos/builtin/packages/at-spi2-core/package.py b/var/spack/repos/builtin/packages/at-spi2-core/package.py index e1c27c3e5e..1d1df37fe6 100644 --- a/var/spack/repos/builtin/packages/at-spi2-core/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AtSpi2Core(MesonPackage): diff --git a/var/spack/repos/builtin/packages/atf/package.py b/var/spack/repos/builtin/packages/atf/package.py index 96b03af106..1236db8428 100644 --- a/var/spack/repos/builtin/packages/atf/package.py +++ b/var/spack/repos/builtin/packages/atf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Atf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/athena/package.py b/var/spack/repos/builtin/packages/athena/package.py index fbf3b43bc4..6eb245e787 100644 --- a/var/spack/repos/builtin/packages/athena/package.py +++ b/var/spack/repos/builtin/packages/athena/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Athena(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index 7314193a2c..1db677f784 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Atk(Package): diff --git a/var/spack/repos/builtin/packages/atlas/package.py b/var/spack/repos/builtin/packages/atlas/package.py index 47537f0e47..0126c7a3f2 100644 --- a/var/spack/repos/builtin/packages/atlas/package.py +++ b/var/spack/repos/builtin/packages/atlas/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.package_test import compare_output_file, compile_c_and_execute diff --git a/var/spack/repos/builtin/packages/atmi/package.py b/var/spack/repos/builtin/packages/atmi/package.py index 0dce2f706c..c3cde94d09 100644 --- a/var/spack/repos/builtin/packages/atmi/package.py +++ b/var/spack/repos/builtin/packages/atmi/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Atmi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/atom-dft/package.py b/var/spack/repos/builtin/packages/atom-dft/package.py index f4127c6fcf..5d8e50e4f3 100644 --- a/var/spack/repos/builtin/packages/atom-dft/package.py +++ b/var/spack/repos/builtin/packages/atom-dft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AtomDft(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/atompaw/package.py b/var/spack/repos/builtin/packages/atompaw/package.py index ab0be65094..1ad8c43b71 100644 --- a/var/spack/repos/builtin/packages/atompaw/package.py +++ b/var/spack/repos/builtin/packages/atompaw/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Atompaw(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/atop/package.py b/var/spack/repos/builtin/packages/atop/package.py index 7ca2d89725..8d837d8c4b 100644 --- a/var/spack/repos/builtin/packages/atop/package.py +++ b/var/spack/repos/builtin/packages/atop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Atop(Package): diff --git a/var/spack/repos/builtin/packages/attr/package.py b/var/spack/repos/builtin/packages/attr/package.py index 8048a44f40..982b1614f8 100644 --- a/var/spack/repos/builtin/packages/attr/package.py +++ b/var/spack/repos/builtin/packages/attr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Attr(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/audacious/package.py b/var/spack/repos/builtin/packages/audacious/package.py index 2e4116fdc4..d084f74b1e 100644 --- a/var/spack/repos/builtin/packages/audacious/package.py +++ b/var/spack/repos/builtin/packages/audacious/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Audacious(AutotoolsPackage): """A lightweight and versatile audio player.""" diff --git a/var/spack/repos/builtin/packages/audacity/package.py b/var/spack/repos/builtin/packages/audacity/package.py index 03e21d188d..b2e56e9cad 100644 --- a/var/spack/repos/builtin/packages/audacity/package.py +++ b/var/spack/repos/builtin/packages/audacity/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Audacity(CMakePackage): diff --git a/var/spack/repos/builtin/packages/audit-userspace/package.py b/var/spack/repos/builtin/packages/audit-userspace/package.py index 4bfd96d2f5..720625df54 100644 --- a/var/spack/repos/builtin/packages/audit-userspace/package.py +++ b/var/spack/repos/builtin/packages/audit-userspace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AuditUserspace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index b158c5b346..afac299ac6 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/authd/package.py b/var/spack/repos/builtin/packages/authd/package.py index cf3ac279b0..c015855d3d 100644 --- a/var/spack/repos/builtin/packages/authd/package.py +++ b/var/spack/repos/builtin/packages/authd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Authd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/authselect/package.py b/var/spack/repos/builtin/packages/authselect/package.py index 01afd917bd..6b7d29ff04 100644 --- a/var/spack/repos/builtin/packages/authselect/package.py +++ b/var/spack/repos/builtin/packages/authselect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Authselect(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/autoconf-archive/package.py b/var/spack/repos/builtin/packages/autoconf-archive/package.py index 7924bc36d5..b57ddb07b3 100644 --- a/var/spack/repos/builtin/packages/autoconf-archive/package.py +++ b/var/spack/repos/builtin/packages/autoconf-archive/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class AutoconfArchive(AutotoolsPackage, GNUMirrorPackage): """The GNU Autoconf Archive is a collection of more than 500 macros for GNU Autoconf.""" diff --git a/var/spack/repos/builtin/packages/autoconf/package.py b/var/spack/repos/builtin/packages/autoconf/package.py index edd917c18c..e1e6e9c8dd 100644 --- a/var/spack/repos/builtin/packages/autoconf/package.py +++ b/var/spack/repos/builtin/packages/autoconf/package.py @@ -5,6 +5,8 @@ import re +from spack.package import * + class Autoconf(AutotoolsPackage, GNUMirrorPackage): """Autoconf -- system configuration part of autotools""" diff --git a/var/spack/repos/builtin/packages/autodiff/package.py b/var/spack/repos/builtin/packages/autodiff/package.py index 8eca1b6b1c..d960d44b69 100644 --- a/var/spack/repos/builtin/packages/autodiff/package.py +++ b/var/spack/repos/builtin/packages/autodiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Autodiff(CMakePackage): diff --git a/var/spack/repos/builtin/packages/autodock-gpu/package.py b/var/spack/repos/builtin/packages/autodock-gpu/package.py index fe032b946f..61fc8623f3 100644 --- a/var/spack/repos/builtin/packages/autodock-gpu/package.py +++ b/var/spack/repos/builtin/packages/autodock-gpu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class AutodockGpu(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/autodock-vina/package.py b/var/spack/repos/builtin/packages/autodock-vina/package.py index bc0a2b9ac5..9c141a7244 100644 --- a/var/spack/repos/builtin/packages/autodock-vina/package.py +++ b/var/spack/repos/builtin/packages/autodock-vina/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * class AutodockVina(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/autofact/package.py b/var/spack/repos/builtin/packages/autofact/package.py index 4d3f90daa7..28a14f39b2 100644 --- a/var/spack/repos/builtin/packages/autofact/package.py +++ b/var/spack/repos/builtin/packages/autofact/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * class Autofact(Package): diff --git a/var/spack/repos/builtin/packages/autogen/package.py b/var/spack/repos/builtin/packages/autogen/package.py index 4a95def64e..11b26c21fe 100644 --- a/var/spack/repos/builtin/packages/autogen/package.py +++ b/var/spack/repos/builtin/packages/autogen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Autogen(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/automaded/package.py b/var/spack/repos/builtin/packages/automaded/package.py index b1533ace90..e316c68534 100644 --- a/var/spack/repos/builtin/packages/automaded/package.py +++ b/var/spack/repos/builtin/packages/automaded/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/automake/package.py b/var/spack/repos/builtin/packages/automake/package.py index 2871cf1c97..4172c59b45 100644 --- a/var/spack/repos/builtin/packages/automake/package.py +++ b/var/spack/repos/builtin/packages/automake/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import re +from spack.package import * + class Automake(AutotoolsPackage, GNUMirrorPackage): """Automake -- make file builder part of autotools""" diff --git a/var/spack/repos/builtin/packages/avizo/package.py b/var/spack/repos/builtin/packages/avizo/package.py index cbdf74a56d..0f95a1037e 100644 --- a/var/spack/repos/builtin/packages/avizo/package.py +++ b/var/spack/repos/builtin/packages/avizo/package.py @@ -6,7 +6,7 @@ import os import tarfile -from spack import * +from spack.package import * class Avizo(Package): diff --git a/var/spack/repos/builtin/packages/aws-parallelcluster/package.py b/var/spack/repos/builtin/packages/aws-parallelcluster/package.py index d9a1880cf2..61013ac3d4 100644 --- a/var/spack/repos/builtin/packages/aws-parallelcluster/package.py +++ b/var/spack/repos/builtin/packages/aws-parallelcluster/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class AwsParallelcluster(PythonPackage): diff --git a/var/spack/repos/builtin/packages/awscli/package.py b/var/spack/repos/builtin/packages/awscli/package.py index affb4512fc..e9696432c6 100644 --- a/var/spack/repos/builtin/packages/awscli/package.py +++ b/var/spack/repos/builtin/packages/awscli/package.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Awscli(PythonPackage): diff --git a/var/spack/repos/builtin/packages/axel/package.py b/var/spack/repos/builtin/packages/axel/package.py index a4a9668e8d..e3220d4228 100644 --- a/var/spack/repos/builtin/packages/axel/package.py +++ b/var/spack/repos/builtin/packages/axel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Axel(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py index f9dca2d31f..9d5eaa3dba 100644 --- a/var/spack/repos/builtin/packages/axl/package.py +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * from spack.error import SpackError +from spack.package import * def async_api_validator(pkg_name, variant_name, values): diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index 3bbd896603..cf9788d943 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -7,7 +7,7 @@ import os import socket from os.path import join as pjoin -from spack import * +from spack.package import * def get_spec_path(spec, package_name, path_replacements={}, use_bin=False): diff --git a/var/spack/repos/builtin/packages/babelflow/package.py b/var/spack/repos/builtin/packages/babelflow/package.py index 41cc4bfaa9..f768a8f1d9 100644 --- a/var/spack/repos/builtin/packages/babelflow/package.py +++ b/var/spack/repos/builtin/packages/babelflow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Babelflow(CMakePackage): diff --git a/var/spack/repos/builtin/packages/babeltrace/package.py b/var/spack/repos/builtin/packages/babeltrace/package.py index 1df3f07eb9..7af1dc88ec 100644 --- a/var/spack/repos/builtin/packages/babeltrace/package.py +++ b/var/spack/repos/builtin/packages/babeltrace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Babeltrace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bacio/package.py b/var/spack/repos/builtin/packages/bacio/package.py index 832d2c58e5..961b723886 100644 --- a/var/spack/repos/builtin/packages/bacio/package.py +++ b/var/spack/repos/builtin/packages/bacio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bacio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/backupninja/package.py b/var/spack/repos/builtin/packages/backupninja/package.py index 87ce63bb2c..c40fc5dc66 100644 --- a/var/spack/repos/builtin/packages/backupninja/package.py +++ b/var/spack/repos/builtin/packages/backupninja/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Backupninja(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bam-readcount/package.py b/var/spack/repos/builtin/packages/bam-readcount/package.py index 949a91711b..bd995218bb 100644 --- a/var/spack/repos/builtin/packages/bam-readcount/package.py +++ b/var/spack/repos/builtin/packages/bam-readcount/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BamReadcount(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bamaddrg/package.py b/var/spack/repos/builtin/packages/bamaddrg/package.py index cadb74a08a..0f4a333fff 100644 --- a/var/spack/repos/builtin/packages/bamaddrg/package.py +++ b/var/spack/repos/builtin/packages/bamaddrg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bamaddrg(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bamdst/package.py b/var/spack/repos/builtin/packages/bamdst/package.py index 06efb47351..0dfae3f1c6 100644 --- a/var/spack/repos/builtin/packages/bamdst/package.py +++ b/var/spack/repos/builtin/packages/bamdst/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bamdst(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bamtools/package.py b/var/spack/repos/builtin/packages/bamtools/package.py index ce5845cb15..141b350c54 100644 --- a/var/spack/repos/builtin/packages/bamtools/package.py +++ b/var/spack/repos/builtin/packages/bamtools/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Bamtools(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bamutil/package.py b/var/spack/repos/builtin/packages/bamutil/package.py index af17ee24ca..fb085cd215 100644 --- a/var/spack/repos/builtin/packages/bamutil/package.py +++ b/var/spack/repos/builtin/packages/bamutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bamutil(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/banner/package.py b/var/spack/repos/builtin/packages/banner/package.py index 738b59630f..561bcbd417 100644 --- a/var/spack/repos/builtin/packages/banner/package.py +++ b/var/spack/repos/builtin/packages/banner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Banner(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bannergrab/package.py b/var/spack/repos/builtin/packages/bannergrab/package.py index 51d90b3671..cec6f1aef6 100644 --- a/var/spack/repos/builtin/packages/bannergrab/package.py +++ b/var/spack/repos/builtin/packages/bannergrab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bannergrab(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/barrnap/package.py b/var/spack/repos/builtin/packages/barrnap/package.py index ad68fa323c..64ca1c5033 100644 --- a/var/spack/repos/builtin/packages/barrnap/package.py +++ b/var/spack/repos/builtin/packages/barrnap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Barrnap(Package): diff --git a/var/spack/repos/builtin/packages/bart/package.py b/var/spack/repos/builtin/packages/bart/package.py index 75f932d5ab..7182b7dd39 100644 --- a/var/spack/repos/builtin/packages/bart/package.py +++ b/var/spack/repos/builtin/packages/bart/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bart(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/barvinok/package.py b/var/spack/repos/builtin/packages/barvinok/package.py index 18dd16de33..4548dd2213 100644 --- a/var/spack/repos/builtin/packages/barvinok/package.py +++ b/var/spack/repos/builtin/packages/barvinok/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Barvinok(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py index 6b92d81037..b04f62caff 100644 --- a/var/spack/repos/builtin/packages/bash-completion/package.py +++ b/var/spack/repos/builtin/packages/bash-completion/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BashCompletion(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 8ac95ee577..ca1c6a839a 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -5,6 +5,8 @@ import re +from spack.package import * + class Bash(AutotoolsPackage, GNUMirrorPackage): """The GNU Project's Bourne Again SHell.""" @@ -127,8 +129,8 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): ] # TODO: patches below are not managed by the GNUMirrorPackage base class - for ver, num, checksum in patches: - ver = Version(ver) + for verstr, num, checksum in patches: + ver = Version(verstr) patch('https://ftpmirror.gnu.org/bash/bash-{0}-patches/bash{1}-{2}'.format(ver, ver.joined, num), level=0, when='@{0}'.format(ver), sha256=checksum) diff --git a/var/spack/repos/builtin/packages/bashtop/package.py b/var/spack/repos/builtin/packages/bashtop/package.py index 7f7a9a39d9..af3353c4cb 100644 --- a/var/spack/repos/builtin/packages/bashtop/package.py +++ b/var/spack/repos/builtin/packages/bashtop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bashtop(Package): diff --git a/var/spack/repos/builtin/packages/bat/package.py b/var/spack/repos/builtin/packages/bat/package.py index dc33b15643..b448dd5914 100644 --- a/var/spack/repos/builtin/packages/bat/package.py +++ b/var/spack/repos/builtin/packages/bat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bat(Package): diff --git a/var/spack/repos/builtin/packages/batchedblas/package.py b/var/spack/repos/builtin/packages/batchedblas/package.py index 0c92cedd72..c135c5ecf1 100644 --- a/var/spack/repos/builtin/packages/batchedblas/package.py +++ b/var/spack/repos/builtin/packages/batchedblas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Batchedblas(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/batctl/package.py b/var/spack/repos/builtin/packages/batctl/package.py index a2f08c621e..a810f9cbeb 100644 --- a/var/spack/repos/builtin/packages/batctl/package.py +++ b/var/spack/repos/builtin/packages/batctl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Batctl(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bats/package.py b/var/spack/repos/builtin/packages/bats/package.py index eabff7f2dc..2dc4bca6b9 100644 --- a/var/spack/repos/builtin/packages/bats/package.py +++ b/var/spack/repos/builtin/packages/bats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bats(Package): diff --git a/var/spack/repos/builtin/packages/baurmc/package.py b/var/spack/repos/builtin/packages/baurmc/package.py index fc3305774d..3d2f74ae2d 100644 --- a/var/spack/repos/builtin/packages/baurmc/package.py +++ b/var/spack/repos/builtin/packages/baurmc/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Baurmc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index 7180395cf3..751403faf4 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -5,6 +5,8 @@ import re +from spack.package import * + class Bazel(Package): """Bazel is an open-source build and test tool similar to Make, Maven, and diff --git a/var/spack/repos/builtin/packages/bbcp/package.py b/var/spack/repos/builtin/packages/bbcp/package.py index e0b2d28a32..4fbb6e3d4c 100644 --- a/var/spack/repos/builtin/packages/bbcp/package.py +++ b/var/spack/repos/builtin/packages/bbcp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bbcp(Package): diff --git a/var/spack/repos/builtin/packages/bbmap/package.py b/var/spack/repos/builtin/packages/bbmap/package.py index 62b23d70f1..3a8bb2da8c 100644 --- a/var/spack/repos/builtin/packages/bbmap/package.py +++ b/var/spack/repos/builtin/packages/bbmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bbmap(Package, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/bc/package.py b/var/spack/repos/builtin/packages/bc/package.py index 591fe23822..1c351dfa7f 100644 --- a/var/spack/repos/builtin/packages/bc/package.py +++ b/var/spack/repos/builtin/packages/bc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bc(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/bcache/package.py b/var/spack/repos/builtin/packages/bcache/package.py index 620b7f4732..a2894fdd97 100644 --- a/var/spack/repos/builtin/packages/bcache/package.py +++ b/var/spack/repos/builtin/packages/bcache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bcache(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index 2c1733b094..9a48ac1da5 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Bcftools(AutotoolsPackage): """BCFtools is a set of utilities that manipulate variant calls in the Variant Call Format (VCF) and its binary counterpart BCF. All diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index 52271f1235..433e27fed7 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -8,7 +8,7 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/bdftopcf/package.py b/var/spack/repos/builtin/packages/bdftopcf/package.py index 8c15ec5ef4..b13daad96e 100644 --- a/var/spack/repos/builtin/packages/bdftopcf/package.py +++ b/var/spack/repos/builtin/packages/bdftopcf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bdftopcf(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/bdii/package.py b/var/spack/repos/builtin/packages/bdii/package.py index 17c70e77fc..8885afdd2c 100644 --- a/var/spack/repos/builtin/packages/bdii/package.py +++ b/var/spack/repos/builtin/packages/bdii/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bdii(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bdw-gc/package.py b/var/spack/repos/builtin/packages/bdw-gc/package.py index 94914f8f5c..173ae75b02 100644 --- a/var/spack/repos/builtin/packages/bdw-gc/package.py +++ b/var/spack/repos/builtin/packages/bdw-gc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BdwGc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/beagle/package.py b/var/spack/repos/builtin/packages/beagle/package.py index 1e88d73bc5..467db14fd1 100644 --- a/var/spack/repos/builtin/packages/beagle/package.py +++ b/var/spack/repos/builtin/packages/beagle/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Beagle(Package): diff --git a/var/spack/repos/builtin/packages/beakerlib/package.py b/var/spack/repos/builtin/packages/beakerlib/package.py index 519d358d95..c571924b85 100644 --- a/var/spack/repos/builtin/packages/beakerlib/package.py +++ b/var/spack/repos/builtin/packages/beakerlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Beakerlib(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bear/package.py b/var/spack/repos/builtin/packages/bear/package.py index 64388cb9d5..4669c24fee 100644 --- a/var/spack/repos/builtin/packages/bear/package.py +++ b/var/spack/repos/builtin/packages/bear/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bear(CMakePackage): diff --git a/var/spack/repos/builtin/packages/beast-tracer/package.py b/var/spack/repos/builtin/packages/beast-tracer/package.py index aa23947173..3ce5be9a25 100644 --- a/var/spack/repos/builtin/packages/beast-tracer/package.py +++ b/var/spack/repos/builtin/packages/beast-tracer/package.py @@ -5,7 +5,7 @@ from os import path -from spack import * +from spack.package import * class BeastTracer(Package): diff --git a/var/spack/repos/builtin/packages/beast1/package.py b/var/spack/repos/builtin/packages/beast1/package.py index 5f787e4a1b..00b923b5a6 100644 --- a/var/spack/repos/builtin/packages/beast1/package.py +++ b/var/spack/repos/builtin/packages/beast1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Beast1(Package): diff --git a/var/spack/repos/builtin/packages/beast2/package.py b/var/spack/repos/builtin/packages/beast2/package.py index 2b1dec298a..d61eaefa37 100644 --- a/var/spack/repos/builtin/packages/beast2/package.py +++ b/var/spack/repos/builtin/packages/beast2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Beast2(Package): diff --git a/var/spack/repos/builtin/packages/bedops/package.py b/var/spack/repos/builtin/packages/bedops/package.py index 42ae6388ac..ac0e656c01 100644 --- a/var/spack/repos/builtin/packages/bedops/package.py +++ b/var/spack/repos/builtin/packages/bedops/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bedops(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bedtools2/package.py b/var/spack/repos/builtin/packages/bedtools2/package.py index b1c3b3e3be..cee52a5824 100644 --- a/var/spack/repos/builtin/packages/bedtools2/package.py +++ b/var/spack/repos/builtin/packages/bedtools2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bedtools2(Package): diff --git a/var/spack/repos/builtin/packages/beforelight/package.py b/var/spack/repos/builtin/packages/beforelight/package.py index a2bda58dc3..a19d9b7855 100644 --- a/var/spack/repos/builtin/packages/beforelight/package.py +++ b/var/spack/repos/builtin/packages/beforelight/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Beforelight(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index 74a1877c8e..5014bc2b6f 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Benchmark(CMakePackage): diff --git a/var/spack/repos/builtin/packages/berkeley-db/package.py b/var/spack/repos/builtin/packages/berkeley-db/package.py index 57ced48e8b..5f1e68914f 100644 --- a/var/spack/repos/builtin/packages/berkeley-db/package.py +++ b/var/spack/repos/builtin/packages/berkeley-db/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import re +from spack.package import * + class BerkeleyDb(AutotoolsPackage): """Oracle Berkeley DB""" diff --git a/var/spack/repos/builtin/packages/berkeleygw/package.py b/var/spack/repos/builtin/packages/berkeleygw/package.py index 2a89494d80..dd5e02fe71 100644 --- a/var/spack/repos/builtin/packages/berkeleygw/package.py +++ b/var/spack/repos/builtin/packages/berkeleygw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Berkeleygw(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bertini/package.py b/var/spack/repos/builtin/packages/bertini/package.py index b6fd62cf71..bc62d79094 100644 --- a/var/spack/repos/builtin/packages/bertini/package.py +++ b/var/spack/repos/builtin/packages/bertini/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bertini(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bgpdump/package.py b/var/spack/repos/builtin/packages/bgpdump/package.py index 529ffe6bb1..bc91a04b70 100644 --- a/var/spack/repos/builtin/packages/bgpdump/package.py +++ b/var/spack/repos/builtin/packages/bgpdump/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bgpdump(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bib2xhtml/package.py b/var/spack/repos/builtin/packages/bib2xhtml/package.py index 2235300c70..31fe143a5b 100644 --- a/var/spack/repos/builtin/packages/bib2xhtml/package.py +++ b/var/spack/repos/builtin/packages/bib2xhtml/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Bib2xhtml(Package): """bib2xhtml is a program that converts BibTeX files into HTML.""" homepage = "https://www.spinellis.gr/sw/textproc/bib2xhtml/" diff --git a/var/spack/repos/builtin/packages/bigdft-atlab/package.py b/var/spack/repos/builtin/packages/bigdft-atlab/package.py index fce0127283..2b27738ef7 100644 --- a/var/spack/repos/builtin/packages/bigdft-atlab/package.py +++ b/var/spack/repos/builtin/packages/bigdft-atlab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BigdftAtlab(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bigdft-chess/package.py b/var/spack/repos/builtin/packages/bigdft-chess/package.py index 38428bb182..4df4653cb2 100644 --- a/var/spack/repos/builtin/packages/bigdft-chess/package.py +++ b/var/spack/repos/builtin/packages/bigdft-chess/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BigdftChess(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/bigdft-core/package.py b/var/spack/repos/builtin/packages/bigdft-core/package.py index 6221a47882..539d93a9ae 100644 --- a/var/spack/repos/builtin/packages/bigdft-core/package.py +++ b/var/spack/repos/builtin/packages/bigdft-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BigdftCore(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/bigdft-futile/package.py b/var/spack/repos/builtin/packages/bigdft-futile/package.py index 1abaf48306..cbc0752823 100644 --- a/var/spack/repos/builtin/packages/bigdft-futile/package.py +++ b/var/spack/repos/builtin/packages/bigdft-futile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BigdftFutile(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/bigdft-libabinit/package.py b/var/spack/repos/builtin/packages/bigdft-libabinit/package.py index e6a0dcad62..85fe42648b 100644 --- a/var/spack/repos/builtin/packages/bigdft-libabinit/package.py +++ b/var/spack/repos/builtin/packages/bigdft-libabinit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BigdftLibabinit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bigdft-psolver/package.py b/var/spack/repos/builtin/packages/bigdft-psolver/package.py index 23ab79e679..04e8179c60 100644 --- a/var/spack/repos/builtin/packages/bigdft-psolver/package.py +++ b/var/spack/repos/builtin/packages/bigdft-psolver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BigdftPsolver(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/bigdft-spred/package.py b/var/spack/repos/builtin/packages/bigdft-spred/package.py index 98697a0150..01481cd6cc 100644 --- a/var/spack/repos/builtin/packages/bigdft-spred/package.py +++ b/var/spack/repos/builtin/packages/bigdft-spred/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BigdftSpred(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bigdft-suite/package.py b/var/spack/repos/builtin/packages/bigdft-suite/package.py index a5dd855ea8..0b44a55e46 100644 --- a/var/spack/repos/builtin/packages/bigdft-suite/package.py +++ b/var/spack/repos/builtin/packages/bigdft-suite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BigdftSuite(BundlePackage): diff --git a/var/spack/repos/builtin/packages/bigreqsproto/package.py b/var/spack/repos/builtin/packages/bigreqsproto/package.py index c35396e9da..45bb41c01d 100644 --- a/var/spack/repos/builtin/packages/bigreqsproto/package.py +++ b/var/spack/repos/builtin/packages/bigreqsproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bigreqsproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/bind9/package.py b/var/spack/repos/builtin/packages/bind9/package.py index c8ba3320bc..c507fa25b8 100644 --- a/var/spack/repos/builtin/packages/bind9/package.py +++ b/var/spack/repos/builtin/packages/bind9/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bind9(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 51aa860275..7d7167442c 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import re +from spack.package import * + class Binutils(AutotoolsPackage, GNUMirrorPackage): """GNU binutils, which contain the linker, assembler, objdump and others""" diff --git a/var/spack/repos/builtin/packages/bioawk/package.py b/var/spack/repos/builtin/packages/bioawk/package.py index 811362e54f..373e6a2d1c 100644 --- a/var/spack/repos/builtin/packages/bioawk/package.py +++ b/var/spack/repos/builtin/packages/bioawk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bioawk(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/biobambam2/package.py b/var/spack/repos/builtin/packages/biobambam2/package.py index 274bb34445..2566771889 100644 --- a/var/spack/repos/builtin/packages/biobambam2/package.py +++ b/var/spack/repos/builtin/packages/biobambam2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Biobambam2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/biobloom/package.py b/var/spack/repos/builtin/packages/biobloom/package.py index 7ea0666b12..460c8e89f0 100644 --- a/var/spack/repos/builtin/packages/biobloom/package.py +++ b/var/spack/repos/builtin/packages/biobloom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Biobloom(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/biopieces/package.py b/var/spack/repos/builtin/packages/biopieces/package.py index de814b4bc6..a28e58c5cf 100644 --- a/var/spack/repos/builtin/packages/biopieces/package.py +++ b/var/spack/repos/builtin/packages/biopieces/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Biopieces(Package): diff --git a/var/spack/repos/builtin/packages/bird/package.py b/var/spack/repos/builtin/packages/bird/package.py index a90425c919..ff076a76f6 100644 --- a/var/spack/repos/builtin/packages/bird/package.py +++ b/var/spack/repos/builtin/packages/bird/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bird(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bismark/package.py b/var/spack/repos/builtin/packages/bismark/package.py index 1c5a9af2e2..dd44817a21 100644 --- a/var/spack/repos/builtin/packages/bismark/package.py +++ b/var/spack/repos/builtin/packages/bismark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bismark(Package): diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 4c9a200f0a..39fcae64a5 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -6,8 +6,8 @@ import re import sys -from spack import * from spack.operating_systems.mac_os import macos_version +from spack.package import * class Bison(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/bitlbee/package.py b/var/spack/repos/builtin/packages/bitlbee/package.py index 911f94edeb..c2f07853fd 100644 --- a/var/spack/repos/builtin/packages/bitlbee/package.py +++ b/var/spack/repos/builtin/packages/bitlbee/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bitlbee(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bitmap/package.py b/var/spack/repos/builtin/packages/bitmap/package.py index 2ac5d842a3..28fa34500d 100644 --- a/var/spack/repos/builtin/packages/bitmap/package.py +++ b/var/spack/repos/builtin/packages/bitmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bitmap(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/bitsery/package.py b/var/spack/repos/builtin/packages/bitsery/package.py index 68b46a6ee9..8c55ecec87 100644 --- a/var/spack/repos/builtin/packages/bitsery/package.py +++ b/var/spack/repos/builtin/packages/bitsery/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bitsery(CMakePackage): diff --git a/var/spack/repos/builtin/packages/blackhat/package.py b/var/spack/repos/builtin/packages/blackhat/package.py index 3ad851e12e..fb9be30b69 100644 --- a/var/spack/repos/builtin/packages/blackhat/package.py +++ b/var/spack/repos/builtin/packages/blackhat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Blackhat(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/blaspp/package.py b/var/spack/repos/builtin/packages/blaspp/package.py index fbf91367ae..ee653d5238 100644 --- a/var/spack/repos/builtin/packages/blaspp/package.py +++ b/var/spack/repos/builtin/packages/blaspp/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Blaspp(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/blasr-libcpp/package.py b/var/spack/repos/builtin/packages/blasr-libcpp/package.py index 0db23f62b7..bf7255f07d 100644 --- a/var/spack/repos/builtin/packages/blasr-libcpp/package.py +++ b/var/spack/repos/builtin/packages/blasr-libcpp/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class BlasrLibcpp(Package): diff --git a/var/spack/repos/builtin/packages/blasr/package.py b/var/spack/repos/builtin/packages/blasr/package.py index 25ad0d014d..bc3ae0933f 100644 --- a/var/spack/repos/builtin/packages/blasr/package.py +++ b/var/spack/repos/builtin/packages/blasr/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/blast-legacy/package.py b/var/spack/repos/builtin/packages/blast-legacy/package.py index 38f3643fad..fdb4b2d456 100644 --- a/var/spack/repos/builtin/packages/blast-legacy/package.py +++ b/var/spack/repos/builtin/packages/blast-legacy/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class BlastLegacy(Package): diff --git a/var/spack/repos/builtin/packages/blast-plus/package.py b/var/spack/repos/builtin/packages/blast-plus/package.py index a9f56d938a..e886d0ac3b 100644 --- a/var/spack/repos/builtin/packages/blast-plus/package.py +++ b/var/spack/repos/builtin/packages/blast-plus/package.py @@ -3,18 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -# This is a based largely on the Homebrew science formula: -# https://github.com/Homebrew/homebrew-science/blob/master/blast.rb -# -# There s one tricky bit to be resolved: -# -# - HDF5 builds explode, blast's configure script tries to run a program that -# uses a variable called 'HOST' but some other bit defines a macro called -# HOST that's defined to a string. Hilarity ensues. -# -# -from spack import * +from spack.package import * class BlastPlus(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/blast2go/package.py b/var/spack/repos/builtin/packages/blast2go/package.py index 85e47d579c..2ae56e63eb 100644 --- a/var/spack/repos/builtin/packages/blast2go/package.py +++ b/var/spack/repos/builtin/packages/blast2go/package.py @@ -5,7 +5,7 @@ import archspec -from spack import * +from spack.package import * class Blast2go(Package): diff --git a/var/spack/repos/builtin/packages/blat/package.py b/var/spack/repos/builtin/packages/blat/package.py index bbde090ae2..d4fc510e7e 100644 --- a/var/spack/repos/builtin/packages/blat/package.py +++ b/var/spack/repos/builtin/packages/blat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Blat(Package): diff --git a/var/spack/repos/builtin/packages/blaze/package.py b/var/spack/repos/builtin/packages/blaze/package.py index 7ceb1b8e7f..8b41d06493 100644 --- a/var/spack/repos/builtin/packages/blaze/package.py +++ b/var/spack/repos/builtin/packages/blaze/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Blaze(CMakePackage): diff --git a/var/spack/repos/builtin/packages/blis/package.py b/var/spack/repos/builtin/packages/blis/package.py index 394a6311e7..44cacfbe0b 100644 --- a/var/spack/repos/builtin/packages/blis/package.py +++ b/var/spack/repos/builtin/packages/blis/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # Although this looks like an Autotools package, it's not one. Refer to: # https://github.com/flame/blis/issues/17 # https://github.com/flame/blis/issues/195 diff --git a/var/spack/repos/builtin/packages/bliss/package.py b/var/spack/repos/builtin/packages/bliss/package.py index aed3a86e86..f09dc4a86f 100644 --- a/var/spack/repos/builtin/packages/bliss/package.py +++ b/var/spack/repos/builtin/packages/bliss/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bliss(Package): diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py index 6afa202aed..c0451122f2 100644 --- a/var/spack/repos/builtin/packages/blitz/package.py +++ b/var/spack/repos/builtin/packages/blitz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Blitz(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/blktrace/package.py b/var/spack/repos/builtin/packages/blktrace/package.py index 77fa482ddd..ccb9b54932 100644 --- a/var/spack/repos/builtin/packages/blktrace/package.py +++ b/var/spack/repos/builtin/packages/blktrace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Blktrace(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bloaty/package.py b/var/spack/repos/builtin/packages/bloaty/package.py index 42e04df324..2cbb731b2f 100644 --- a/var/spack/repos/builtin/packages/bloaty/package.py +++ b/var/spack/repos/builtin/packages/bloaty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bloaty(CMakePackage): diff --git a/var/spack/repos/builtin/packages/blogbench/package.py b/var/spack/repos/builtin/packages/blogbench/package.py index de0fa7a0f1..285ecf1b9d 100644 --- a/var/spack/repos/builtin/packages/blogbench/package.py +++ b/var/spack/repos/builtin/packages/blogbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Blogbench(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/blt/package.py b/var/spack/repos/builtin/packages/blt/package.py index 129088def1..3d1b23b9a9 100644 --- a/var/spack/repos/builtin/packages/blt/package.py +++ b/var/spack/repos/builtin/packages/blt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Blt(Package): diff --git a/var/spack/repos/builtin/packages/bmake/package.py b/var/spack/repos/builtin/packages/bmake/package.py index f220697be9..ed451942dc 100644 --- a/var/spack/repos/builtin/packages/bmake/package.py +++ b/var/spack/repos/builtin/packages/bmake/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bmake(Package): diff --git a/var/spack/repos/builtin/packages/bmi/package.py b/var/spack/repos/builtin/packages/bmi/package.py index 3ecaabf8e8..3d5bdbf6a3 100644 --- a/var/spack/repos/builtin/packages/bmi/package.py +++ b/var/spack/repos/builtin/packages/bmi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bmi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py index 135183b3dd..9fafba5a55 100644 --- a/var/spack/repos/builtin/packages/bml/package.py +++ b/var/spack/repos/builtin/packages/bml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bml(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 0e10278dfa..49a159af05 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -7,10 +7,9 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * from spack.package_test import compare_output from spack.pkg.builtin.boost import Boost -from spack.util.executable import Executable class Bohrium(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/boinc-client/package.py b/var/spack/repos/builtin/packages/boinc-client/package.py index fe23277e91..89f0030a41 100644 --- a/var/spack/repos/builtin/packages/boinc-client/package.py +++ b/var/spack/repos/builtin/packages/boinc-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BoincClient(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bolt/package.py b/var/spack/repos/builtin/packages/bolt/package.py index 57b64e45ca..64b8a5f5fc 100644 --- a/var/spack/repos/builtin/packages/bolt/package.py +++ b/var/spack/repos/builtin/packages/bolt/package.py @@ -7,7 +7,7 @@ import os from llnl.util import tty -from spack import * +from spack.package import * class Bolt(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bonniepp/package.py b/var/spack/repos/builtin/packages/bonniepp/package.py index b14343748d..deb957a139 100644 --- a/var/spack/repos/builtin/packages/bonniepp/package.py +++ b/var/spack/repos/builtin/packages/bonniepp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bonniepp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py index 7d1c391bcc..e84d01ecf9 100644 --- a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py +++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BookleafCpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 5ce7caa10b..ae42e4f26b 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Boost(Package): diff --git a/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py b/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py index bee5e798c8..1e4408c1d0 100644 --- a/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py +++ b/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Boostmplcartesianproduct(Package): diff --git a/var/spack/repos/builtin/packages/botan/package.py b/var/spack/repos/builtin/packages/botan/package.py index f067e31350..440b9f9139 100644 --- a/var/spack/repos/builtin/packages/botan/package.py +++ b/var/spack/repos/builtin/packages/botan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Botan(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bowtie/package.py b/var/spack/repos/builtin/packages/bowtie/package.py index eb7c48b6c5..386af9d210 100644 --- a/var/spack/repos/builtin/packages/bowtie/package.py +++ b/var/spack/repos/builtin/packages/bowtie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bowtie(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py index 6b307fba52..43f9c3ba22 100644 --- a/var/spack/repos/builtin/packages/bowtie2/package.py +++ b/var/spack/repos/builtin/packages/bowtie2/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Bowtie2(MakefilePackage): """Bowtie 2 is an ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences""" diff --git a/var/spack/repos/builtin/packages/boxlib/package.py b/var/spack/repos/builtin/packages/boxlib/package.py index 2ef9bdcf33..36e4ddeed1 100644 --- a/var/spack/repos/builtin/packages/boxlib/package.py +++ b/var/spack/repos/builtin/packages/boxlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Boxlib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bpp-core/package.py b/var/spack/repos/builtin/packages/bpp-core/package.py index e091b4fc8f..d654631f8f 100644 --- a/var/spack/repos/builtin/packages/bpp-core/package.py +++ b/var/spack/repos/builtin/packages/bpp-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BppCore(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bpp-phyl-omics/package.py b/var/spack/repos/builtin/packages/bpp-phyl-omics/package.py index 8451ffebc9..588af071df 100644 --- a/var/spack/repos/builtin/packages/bpp-phyl-omics/package.py +++ b/var/spack/repos/builtin/packages/bpp-phyl-omics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BppPhylOmics(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bpp-phyl/package.py b/var/spack/repos/builtin/packages/bpp-phyl/package.py index 0e50ca6091..e668894171 100644 --- a/var/spack/repos/builtin/packages/bpp-phyl/package.py +++ b/var/spack/repos/builtin/packages/bpp-phyl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BppPhyl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bpp-popgen/package.py b/var/spack/repos/builtin/packages/bpp-popgen/package.py index d22e947d9c..ee19838b90 100644 --- a/var/spack/repos/builtin/packages/bpp-popgen/package.py +++ b/var/spack/repos/builtin/packages/bpp-popgen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BppPopgen(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bpp-seq-omics/package.py b/var/spack/repos/builtin/packages/bpp-seq-omics/package.py index 6f15ff147f..cb0a4b6097 100644 --- a/var/spack/repos/builtin/packages/bpp-seq-omics/package.py +++ b/var/spack/repos/builtin/packages/bpp-seq-omics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BppSeqOmics(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bpp-seq/package.py b/var/spack/repos/builtin/packages/bpp-seq/package.py index 8f5a7f97f5..a5749d1849 100644 --- a/var/spack/repos/builtin/packages/bpp-seq/package.py +++ b/var/spack/repos/builtin/packages/bpp-seq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BppSeq(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bpp-suite/package.py b/var/spack/repos/builtin/packages/bpp-suite/package.py index ae24e8c63a..9f0366eb1e 100644 --- a/var/spack/repos/builtin/packages/bpp-suite/package.py +++ b/var/spack/repos/builtin/packages/bpp-suite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class BppSuite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bracken/package.py b/var/spack/repos/builtin/packages/bracken/package.py index 8a4dbc4567..3d26980341 100644 --- a/var/spack/repos/builtin/packages/bracken/package.py +++ b/var/spack/repos/builtin/packages/bracken/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Bracken(Package): diff --git a/var/spack/repos/builtin/packages/braker/package.py b/var/spack/repos/builtin/packages/braker/package.py index 3698d64c32..08c48b7cf6 100644 --- a/var/spack/repos/builtin/packages/braker/package.py +++ b/var/spack/repos/builtin/packages/braker/package.py @@ -5,6 +5,8 @@ import glob +from spack.package import * + class Braker(Package): """BRAKER is a pipeline for unsupervised RNA-Seq-based genome annotation diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py index f5611869df..be6b1d4c40 100644 --- a/var/spack/repos/builtin/packages/branson/package.py +++ b/var/spack/repos/builtin/packages/branson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py index 7d03a05899..53f5fed6df 100644 --- a/var/spack/repos/builtin/packages/breakdancer/package.py +++ b/var/spack/repos/builtin/packages/breakdancer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Breakdancer(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bref3/package.py b/var/spack/repos/builtin/packages/bref3/package.py index 425938baab..a187918502 100644 --- a/var/spack/repos/builtin/packages/bref3/package.py +++ b/var/spack/repos/builtin/packages/bref3/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Bref3(Package): diff --git a/var/spack/repos/builtin/packages/breseq/package.py b/var/spack/repos/builtin/packages/breseq/package.py index e6a6671c51..2adfd2eeb9 100644 --- a/var/spack/repos/builtin/packages/breseq/package.py +++ b/var/spack/repos/builtin/packages/breseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Breseq(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bridger/package.py b/var/spack/repos/builtin/packages/bridger/package.py index 4b3e78d63a..f85fbb99b1 100644 --- a/var/spack/repos/builtin/packages/bridger/package.py +++ b/var/spack/repos/builtin/packages/bridger/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class Bridger(MakefilePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/brigand/package.py b/var/spack/repos/builtin/packages/brigand/package.py index 5149f4f29b..dc48d78340 100644 --- a/var/spack/repos/builtin/packages/brigand/package.py +++ b/var/spack/repos/builtin/packages/brigand/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Brigand(CMakePackage): diff --git a/var/spack/repos/builtin/packages/brltty/package.py b/var/spack/repos/builtin/packages/brltty/package.py index 776db7f890..eef92baac0 100644 --- a/var/spack/repos/builtin/packages/brltty/package.py +++ b/var/spack/repos/builtin/packages/brltty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Brltty(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/brotli/package.py b/var/spack/repos/builtin/packages/brotli/package.py index 3322d22fb4..4893b87df2 100644 --- a/var/spack/repos/builtin/packages/brotli/package.py +++ b/var/spack/repos/builtin/packages/brotli/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Brotli(CMakePackage): diff --git a/var/spack/repos/builtin/packages/brpc/package.py b/var/spack/repos/builtin/packages/brpc/package.py index 50ae8d20ec..ea680029bf 100644 --- a/var/spack/repos/builtin/packages/brpc/package.py +++ b/var/spack/repos/builtin/packages/brpc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Brpc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/brynet/package.py b/var/spack/repos/builtin/packages/brynet/package.py index ee61429427..e2e5b1586d 100644 --- a/var/spack/repos/builtin/packages/brynet/package.py +++ b/var/spack/repos/builtin/packages/brynet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Brynet(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bsseeker2/package.py b/var/spack/repos/builtin/packages/bsseeker2/package.py index 5245029903..31d6ce9b27 100644 --- a/var/spack/repos/builtin/packages/bsseeker2/package.py +++ b/var/spack/repos/builtin/packages/bsseeker2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bsseeker2(Package): diff --git a/var/spack/repos/builtin/packages/bubblewrap/package.py b/var/spack/repos/builtin/packages/bubblewrap/package.py index 7cb4c90dfa..d0ca3253df 100644 --- a/var/spack/repos/builtin/packages/bubblewrap/package.py +++ b/var/spack/repos/builtin/packages/bubblewrap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bubblewrap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bucky/package.py b/var/spack/repos/builtin/packages/bucky/package.py index 015cf0257f..746b017bc9 100644 --- a/var/spack/repos/builtin/packages/bucky/package.py +++ b/var/spack/repos/builtin/packages/bucky/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bucky(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/buddy/package.py b/var/spack/repos/builtin/packages/buddy/package.py index 040226688e..5fcff8914e 100644 --- a/var/spack/repos/builtin/packages/buddy/package.py +++ b/var/spack/repos/builtin/packages/buddy/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * class Buddy(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/bufr/package.py b/var/spack/repos/builtin/packages/bufr/package.py index 56144dd680..aec108852f 100644 --- a/var/spack/repos/builtin/packages/bufr/package.py +++ b/var/spack/repos/builtin/packages/bufr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bufr(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bumpversion/package.py b/var/spack/repos/builtin/packages/bumpversion/package.py index 0be4c6ae6b..212c4d3b5d 100644 --- a/var/spack/repos/builtin/packages/bumpversion/package.py +++ b/var/spack/repos/builtin/packages/bumpversion/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bumpversion(PythonPackage): diff --git a/var/spack/repos/builtin/packages/busco/package.py b/var/spack/repos/builtin/packages/busco/package.py index 1dd4467c45..b6afedb449 100644 --- a/var/spack/repos/builtin/packages/busco/package.py +++ b/var/spack/repos/builtin/packages/busco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Busco(PythonPackage): diff --git a/var/spack/repos/builtin/packages/busybox/package.py b/var/spack/repos/builtin/packages/busybox/package.py index 4716311c61..0a14c6d73f 100644 --- a/var/spack/repos/builtin/packages/busybox/package.py +++ b/var/spack/repos/builtin/packages/busybox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Busybox(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/butter/package.py b/var/spack/repos/builtin/packages/butter/package.py index bcc4709016..e7cd45a42d 100644 --- a/var/spack/repos/builtin/packages/butter/package.py +++ b/var/spack/repos/builtin/packages/butter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Butter(Package): diff --git a/var/spack/repos/builtin/packages/butterflypack/package.py b/var/spack/repos/builtin/packages/butterflypack/package.py index 715f7244cc..ac64479398 100644 --- a/var/spack/repos/builtin/packages/butterflypack/package.py +++ b/var/spack/repos/builtin/packages/butterflypack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Butterflypack(CMakePackage): diff --git a/var/spack/repos/builtin/packages/bwa/package.py b/var/spack/repos/builtin/packages/bwa/package.py index 140b72cdc7..0ff97300a0 100644 --- a/var/spack/repos/builtin/packages/bwa/package.py +++ b/var/spack/repos/builtin/packages/bwa/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * class Bwa(Package): diff --git a/var/spack/repos/builtin/packages/bwtool/package.py b/var/spack/repos/builtin/packages/bwtool/package.py index f8d25f4c2b..c05474625c 100644 --- a/var/spack/repos/builtin/packages/bwtool/package.py +++ b/var/spack/repos/builtin/packages/bwtool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Bwtool(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/byacc/package.py b/var/spack/repos/builtin/packages/byacc/package.py index a20192ffb4..e13fbff1b3 100644 --- a/var/spack/repos/builtin/packages/byacc/package.py +++ b/var/spack/repos/builtin/packages/byacc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Byacc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/byobu/package.py b/var/spack/repos/builtin/packages/byobu/package.py index d2abb4149d..4a89d0216a 100644 --- a/var/spack/repos/builtin/packages/byobu/package.py +++ b/var/spack/repos/builtin/packages/byobu/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Byobu(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/byte-unixbench/package.py b/var/spack/repos/builtin/packages/byte-unixbench/package.py index 98713d2de0..29148774a3 100644 --- a/var/spack/repos/builtin/packages/byte-unixbench/package.py +++ b/var/spack/repos/builtin/packages/byte-unixbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ByteUnixbench(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/byteman/package.py b/var/spack/repos/builtin/packages/byteman/package.py index 462d8cbc1f..0b359e72fa 100644 --- a/var/spack/repos/builtin/packages/byteman/package.py +++ b/var/spack/repos/builtin/packages/byteman/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Byteman(MavenPackage): diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index 6bf700127a..63a0357fc7 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Bzip2(Package, SourcewarePackage): diff --git a/var/spack/repos/builtin/packages/c-ares/package.py b/var/spack/repos/builtin/packages/c-ares/package.py index ed9938e4db..86c3ae6a28 100644 --- a/var/spack/repos/builtin/packages/c-ares/package.py +++ b/var/spack/repos/builtin/packages/c-ares/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CAres(CMakePackage): diff --git a/var/spack/repos/builtin/packages/c-blosc/package.py b/var/spack/repos/builtin/packages/c-blosc/package.py index b3e059dc27..77cb2e559f 100644 --- a/var/spack/repos/builtin/packages/c-blosc/package.py +++ b/var/spack/repos/builtin/packages/c-blosc/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * class CBlosc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/c-blosc2/package.py b/var/spack/repos/builtin/packages/c-blosc2/package.py index 2a8045776c..881ba277e4 100644 --- a/var/spack/repos/builtin/packages/c-blosc2/package.py +++ b/var/spack/repos/builtin/packages/c-blosc2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CBlosc2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/c-lime/package.py b/var/spack/repos/builtin/packages/c-lime/package.py index 4d40bcc332..08b573eadb 100644 --- a/var/spack/repos/builtin/packages/c-lime/package.py +++ b/var/spack/repos/builtin/packages/c-lime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CLime(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/c/package.py b/var/spack/repos/builtin/packages/c/package.py index ccd7e4dd6f..2ca19a8301 100644 --- a/var/spack/repos/builtin/packages/c/package.py +++ b/var/spack/repos/builtin/packages/c/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class C(Package): """Virtual package for C compilers.""" diff --git a/var/spack/repos/builtin/packages/c3d/package.py b/var/spack/repos/builtin/packages/c3d/package.py index e8a8e5926b..3a7d0b7f48 100644 --- a/var/spack/repos/builtin/packages/c3d/package.py +++ b/var/spack/repos/builtin/packages/c3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class C3d(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py b/var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py index ee9fc00018..19f834a86e 100644 --- a/var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py +++ b/var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CaCertificatesMozilla(Package): diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py index dfbec3254c..5f0a58cce9 100644 --- a/var/spack/repos/builtin/packages/cabana/package.py +++ b/var/spack/repos/builtin/packages/cabana/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.kokkos import Kokkos diff --git a/var/spack/repos/builtin/packages/cachefilesd/package.py b/var/spack/repos/builtin/packages/cachefilesd/package.py index 607e4eff98..4f0fe74de3 100644 --- a/var/spack/repos/builtin/packages/cachefilesd/package.py +++ b/var/spack/repos/builtin/packages/cachefilesd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cachefilesd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py index 844e3aba2b..93fa63fa44 100644 --- a/var/spack/repos/builtin/packages/caffe/package.py +++ b/var/spack/repos/builtin/packages/caffe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index 9d0454035d..9a16bd1157 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cairo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cairomm/package.py b/var/spack/repos/builtin/packages/cairomm/package.py index e431977f0a..96ec1311de 100644 --- a/var/spack/repos/builtin/packages/cairomm/package.py +++ b/var/spack/repos/builtin/packages/cairomm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cairomm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index a41b1b685b..e09c9d3bb6 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -8,7 +8,7 @@ import sys from llnl.util import tty -from spack import * +from spack.package import * class Caliper(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/callflow/package.py b/var/spack/repos/builtin/packages/callflow/package.py index c070428432..6b1d9e448a 100644 --- a/var/spack/repos/builtin/packages/callflow/package.py +++ b/var/spack/repos/builtin/packages/callflow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Callflow(PythonPackage): diff --git a/var/spack/repos/builtin/packages/callpath/package.py b/var/spack/repos/builtin/packages/callpath/package.py index 75bff8c2cc..a74a746b6e 100644 --- a/var/spack/repos/builtin/packages/callpath/package.py +++ b/var/spack/repos/builtin/packages/callpath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Callpath(CMakePackage): diff --git a/var/spack/repos/builtin/packages/camellia/package.py b/var/spack/repos/builtin/packages/camellia/package.py index 34af156b24..24eb3bc404 100644 --- a/var/spack/repos/builtin/packages/camellia/package.py +++ b/var/spack/repos/builtin/packages/camellia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Camellia(CMakePackage): diff --git a/var/spack/repos/builtin/packages/camp/package.py b/var/spack/repos/builtin/packages/camp/package.py index b8932d02f3..c76b5da267 100644 --- a/var/spack/repos/builtin/packages/camp/package.py +++ b/var/spack/repos/builtin/packages/camp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Camp(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/camx/package.py b/var/spack/repos/builtin/packages/camx/package.py index 4c44579484..97aaca7987 100644 --- a/var/spack/repos/builtin/packages/camx/package.py +++ b/var/spack/repos/builtin/packages/camx/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Camx(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/canal/package.py b/var/spack/repos/builtin/packages/canal/package.py index 7353098396..115ddf539e 100644 --- a/var/spack/repos/builtin/packages/canal/package.py +++ b/var/spack/repos/builtin/packages/canal/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Canal(MavenPackage): """Alibaba MySQL binlog incremental subscription & consumer components.""" diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index 3e1647884e..594b936a72 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CandleBenchmarks(Package): diff --git a/var/spack/repos/builtin/packages/cans/package.py b/var/spack/repos/builtin/packages/cans/package.py index 0ce728b31d..5aceb26e1d 100644 --- a/var/spack/repos/builtin/packages/cans/package.py +++ b/var/spack/repos/builtin/packages/cans/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cans(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cantera/package.py b/var/spack/repos/builtin/packages/cantera/package.py index ad7824ac88..54ef7076ac 100644 --- a/var/spack/repos/builtin/packages/cantera/package.py +++ b/var/spack/repos/builtin/packages/cantera/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index ca02d7ca85..c4567a26e3 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/cap3/package.py b/var/spack/repos/builtin/packages/cap3/package.py index 7faba6dbde..0d1b201873 100644 --- a/var/spack/repos/builtin/packages/cap3/package.py +++ b/var/spack/repos/builtin/packages/cap3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cap3(Package): diff --git a/var/spack/repos/builtin/packages/capnproto/package.py b/var/spack/repos/builtin/packages/capnproto/package.py index bd7f9dd9ab..031b3a5131 100644 --- a/var/spack/repos/builtin/packages/capnproto/package.py +++ b/var/spack/repos/builtin/packages/capnproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Capnproto(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/capstone/package.py b/var/spack/repos/builtin/packages/capstone/package.py index 734fd80449..d0ffc6270f 100644 --- a/var/spack/repos/builtin/packages/capstone/package.py +++ b/var/spack/repos/builtin/packages/capstone/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Capstone(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cardioid/package.py b/var/spack/repos/builtin/packages/cardioid/package.py index d9f37b355f..ed588e4d6c 100644 --- a/var/spack/repos/builtin/packages/cardioid/package.py +++ b/var/spack/repos/builtin/packages/cardioid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cardioid(CMakePackage): diff --git a/var/spack/repos/builtin/packages/care/package.py b/var/spack/repos/builtin/packages/care/package.py index b2eff2e45d..2e86701cb7 100644 --- a/var/spack/repos/builtin/packages/care/package.py +++ b/var/spack/repos/builtin/packages/care/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Care(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/casacore/package.py b/var/spack/repos/builtin/packages/casacore/package.py index cd067f7f7d..04426a9309 100644 --- a/var/spack/repos/builtin/packages/casacore/package.py +++ b/var/spack/repos/builtin/packages/casacore/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/cask/package.py b/var/spack/repos/builtin/packages/cask/package.py index 728065c230..c97fe476fc 100644 --- a/var/spack/repos/builtin/packages/cask/package.py +++ b/var/spack/repos/builtin/packages/cask/package.py @@ -5,11 +5,7 @@ from glob import glob -# -# Based on Homebrew's formula: -# https://github.com/Homebrew/homebrew-core/blob/master/Formula/cask.rb -# -from spack import * +from spack.package import * class Cask(Package): diff --git a/var/spack/repos/builtin/packages/casper/package.py b/var/spack/repos/builtin/packages/casper/package.py index f841a54629..fd4d68d7a5 100644 --- a/var/spack/repos/builtin/packages/casper/package.py +++ b/var/spack/repos/builtin/packages/casper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Casper(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cassandra/package.py b/var/spack/repos/builtin/packages/cassandra/package.py index 107931a732..101042b708 100644 --- a/var/spack/repos/builtin/packages/cassandra/package.py +++ b/var/spack/repos/builtin/packages/cassandra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cassandra(Package): diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py index 952bddc808..6018b703f5 100644 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -9,7 +9,7 @@ import sys import llnl.util.tty as tty -from spack import * +from spack.package import * class Catalyst(CMakePackage): diff --git a/var/spack/repos/builtin/packages/catch2/package.py b/var/spack/repos/builtin/packages/catch2/package.py index 1792d44e76..fa667056ae 100644 --- a/var/spack/repos/builtin/packages/catch2/package.py +++ b/var/spack/repos/builtin/packages/catch2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Catch2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cbc/package.py b/var/spack/repos/builtin/packages/cbc/package.py index 477a4fae05..ec8081e7c7 100644 --- a/var/spack/repos/builtin/packages/cbc/package.py +++ b/var/spack/repos/builtin/packages/cbc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cbc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cbench/package.py b/var/spack/repos/builtin/packages/cbench/package.py index 091584f3a3..6400429577 100644 --- a/var/spack/repos/builtin/packages/cbench/package.py +++ b/var/spack/repos/builtin/packages/cbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cbench(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cbflib/package.py b/var/spack/repos/builtin/packages/cbflib/package.py index ee072cb79e..c874ee6af9 100644 --- a/var/spack/repos/builtin/packages/cbflib/package.py +++ b/var/spack/repos/builtin/packages/cbflib/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Cbflib(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cblas/package.py b/var/spack/repos/builtin/packages/cblas/package.py index 93981fddae..58eb96da92 100644 --- a/var/spack/repos/builtin/packages/cblas/package.py +++ b/var/spack/repos/builtin/packages/cblas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cblas(Package): diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 1e6a64a82a..73437aad48 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 19934fe3fc..41a9bbf232 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index bd0f045d8d..a48c11141d 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -3,9 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import spack import spack.store -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 44f6b45b42..704fdd9cbf 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CbtfLanl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 13fb91630b..29899251ec 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/cc65/package.py b/var/spack/repos/builtin/packages/cc65/package.py index 46e09ebb88..cdd1b2ed33 100644 --- a/var/spack/repos/builtin/packages/cc65/package.py +++ b/var/spack/repos/builtin/packages/cc65/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cc65(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ccache/package.py b/var/spack/repos/builtin/packages/ccache/package.py index e0eafbcfe3..6c57b183d9 100644 --- a/var/spack/repos/builtin/packages/ccache/package.py +++ b/var/spack/repos/builtin/packages/ccache/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Ccache(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ccfits/package.py b/var/spack/repos/builtin/packages/ccfits/package.py index a17bddc9f7..5ad1d2eaea 100644 --- a/var/spack/repos/builtin/packages/ccfits/package.py +++ b/var/spack/repos/builtin/packages/ccfits/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ccfits(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ccls/package.py b/var/spack/repos/builtin/packages/ccls/package.py index cdd29be05a..71d2da5487 100644 --- a/var/spack/repos/builtin/packages/ccls/package.py +++ b/var/spack/repos/builtin/packages/ccls/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ccls(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ccs-qcd/package.py b/var/spack/repos/builtin/packages/ccs-qcd/package.py index 85e3ab3ced..87cf452a27 100644 --- a/var/spack/repos/builtin/packages/ccs-qcd/package.py +++ b/var/spack/repos/builtin/packages/ccs-qcd/package.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * from spack.error import SpackError +from spack.package import * def class_validator(values): diff --git a/var/spack/repos/builtin/packages/cctools/package.py b/var/spack/repos/builtin/packages/cctools/package.py index c2f2f68975..647ac39809 100644 --- a/var/spack/repos/builtin/packages/cctools/package.py +++ b/var/spack/repos/builtin/packages/cctools/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Cctools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cdbfasta/package.py b/var/spack/repos/builtin/packages/cdbfasta/package.py index f84157bf82..b1c6aaa623 100644 --- a/var/spack/repos/builtin/packages/cdbfasta/package.py +++ b/var/spack/repos/builtin/packages/cdbfasta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cdbfasta(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cdd/package.py b/var/spack/repos/builtin/packages/cdd/package.py index fdbcc66490..cb0d7e4948 100644 --- a/var/spack/repos/builtin/packages/cdd/package.py +++ b/var/spack/repos/builtin/packages/cdd/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cdd(Package): diff --git a/var/spack/repos/builtin/packages/cddlib/package.py b/var/spack/repos/builtin/packages/cddlib/package.py index eee413aa11..be67daf1e3 100644 --- a/var/spack/repos/builtin/packages/cddlib/package.py +++ b/var/spack/repos/builtin/packages/cddlib/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cddlib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cdecimal/package.py b/var/spack/repos/builtin/packages/cdecimal/package.py index fb9efb953a..2a0a79fc3a 100644 --- a/var/spack/repos/builtin/packages/cdecimal/package.py +++ b/var/spack/repos/builtin/packages/cdecimal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cdecimal(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cdhit/package.py b/var/spack/repos/builtin/packages/cdhit/package.py index d775b25725..a6ca22b3c1 100644 --- a/var/spack/repos/builtin/packages/cdhit/package.py +++ b/var/spack/repos/builtin/packages/cdhit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cdhit(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index e2d6aaf6ba..7b14b8a692 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -5,7 +5,7 @@ from collections import defaultdict -from spack import * +from spack.package import * from spack.util.environment import is_system_path diff --git a/var/spack/repos/builtin/packages/ceed/package.py b/var/spack/repos/builtin/packages/ceed/package.py index 3f0d25f06d..1731b4d57f 100644 --- a/var/spack/repos/builtin/packages/ceed/package.py +++ b/var/spack/repos/builtin/packages/ceed/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ceed(BundlePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/cereal/package.py b/var/spack/repos/builtin/packages/cereal/package.py index 8f8c93498b..538e5783ea 100644 --- a/var/spack/repos/builtin/packages/cereal/package.py +++ b/var/spack/repos/builtin/packages/cereal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cereal(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ceres-solver/package.py b/var/spack/repos/builtin/packages/ceres-solver/package.py index 47d14ffd8b..0014b5138d 100644 --- a/var/spack/repos/builtin/packages/ceres-solver/package.py +++ b/var/spack/repos/builtin/packages/ceres-solver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CeresSolver(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py index 9bc938708c..009a86ae02 100644 --- a/var/spack/repos/builtin/packages/cfitsio/package.py +++ b/var/spack/repos/builtin/packages/cfitsio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cfitsio(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py index d4753c6997..b7641ed634 100644 --- a/var/spack/repos/builtin/packages/cgal/package.py +++ b/var/spack/repos/builtin/packages/cgal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cgal(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cgdb/package.py b/var/spack/repos/builtin/packages/cgdb/package.py index a06be6a900..d893216f3a 100644 --- a/var/spack/repos/builtin/packages/cgdb/package.py +++ b/var/spack/repos/builtin/packages/cgdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cgdb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cgdcbxd/package.py b/var/spack/repos/builtin/packages/cgdcbxd/package.py index 327feb44d9..71236390df 100644 --- a/var/spack/repos/builtin/packages/cgdcbxd/package.py +++ b/var/spack/repos/builtin/packages/cgdcbxd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cgdcbxd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cget/package.py b/var/spack/repos/builtin/packages/cget/package.py index b15ee3d41c..392830d618 100644 --- a/var/spack/repos/builtin/packages/cget/package.py +++ b/var/spack/repos/builtin/packages/cget/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cget(PythonPackage): diff --git a/var/spack/repos/builtin/packages/cgl/package.py b/var/spack/repos/builtin/packages/cgl/package.py index 52840902ec..899ca7aacd 100644 --- a/var/spack/repos/builtin/packages/cgl/package.py +++ b/var/spack/repos/builtin/packages/cgl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cgl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cgm/package.py b/var/spack/repos/builtin/packages/cgm/package.py index fc3b375534..605642e7bc 100644 --- a/var/spack/repos/builtin/packages/cgm/package.py +++ b/var/spack/repos/builtin/packages/cgm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cgm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cgns/package.py b/var/spack/repos/builtin/packages/cgns/package.py index 04f6a83b86..4809efe647 100644 --- a/var/spack/repos/builtin/packages/cgns/package.py +++ b/var/spack/repos/builtin/packages/cgns/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Cgns(CMakePackage): diff --git a/var/spack/repos/builtin/packages/chaco/package.py b/var/spack/repos/builtin/packages/chaco/package.py index bd5f26426d..d7a2494c38 100644 --- a/var/spack/repos/builtin/packages/chaco/package.py +++ b/var/spack/repos/builtin/packages/chaco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Chaco(CMakePackage): diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py index bac5fca95e..8a18c8c386 100644 --- a/var/spack/repos/builtin/packages/chai/package.py +++ b/var/spack/repos/builtin/packages/chai/package.py @@ -5,7 +5,7 @@ import socket -from spack import * +from spack.package import * class Chai(CachedCMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/chameleon/package.py b/var/spack/repos/builtin/packages/chameleon/package.py index c6f930ce50..9e5205c295 100644 --- a/var/spack/repos/builtin/packages/chameleon/package.py +++ b/var/spack/repos/builtin/packages/chameleon/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Chameleon(CMakePackage, CudaPackage): """Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs""" homepage = "https://gitlab.inria.fr/solverstack/chameleon" diff --git a/var/spack/repos/builtin/packages/changa/package.py b/var/spack/repos/builtin/packages/changa/package.py index 583c360540..314a85d19a 100644 --- a/var/spack/repos/builtin/packages/changa/package.py +++ b/var/spack/repos/builtin/packages/changa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Changa(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/channelflow/package.py b/var/spack/repos/builtin/packages/channelflow/package.py index 9d9ecedc7f..e3cdd4dfba 100644 --- a/var/spack/repos/builtin/packages/channelflow/package.py +++ b/var/spack/repos/builtin/packages/channelflow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/chaparral/package.py b/var/spack/repos/builtin/packages/chaparral/package.py index 41377b2fc7..66c78696be 100644 --- a/var/spack/repos/builtin/packages/chaparral/package.py +++ b/var/spack/repos/builtin/packages/chaparral/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Chaparral(CMakePackage): diff --git a/var/spack/repos/builtin/packages/chapel/package.py b/var/spack/repos/builtin/packages/chapel/package.py index 1dd6731409..e14f7b20d3 100644 --- a/var/spack/repos/builtin/packages/chapel/package.py +++ b/var/spack/repos/builtin/packages/chapel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Chapel(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/chaplin/package.py b/var/spack/repos/builtin/packages/chaplin/package.py index d3a4a4aee8..1222145bf7 100644 --- a/var/spack/repos/builtin/packages/chaplin/package.py +++ b/var/spack/repos/builtin/packages/chaplin/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Chaplin(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index 47b5e4b74d..d4bcd8b7f8 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Charliecloud(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/charmpp/package.py b/var/spack/repos/builtin/packages/charmpp/package.py index 6d8bda0f37..10146956f0 100644 --- a/var/spack/repos/builtin/packages/charmpp/package.py +++ b/var/spack/repos/builtin/packages/charmpp/package.py @@ -9,7 +9,7 @@ import platform import shutil import sys -from spack import * +from spack.package import * class Charmpp(Package): diff --git a/var/spack/repos/builtin/packages/chatterbug/package.py b/var/spack/repos/builtin/packages/chatterbug/package.py index 0798ccce47..ea968becfc 100644 --- a/var/spack/repos/builtin/packages/chatterbug/package.py +++ b/var/spack/repos/builtin/packages/chatterbug/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Chatterbug(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/check/package.py b/var/spack/repos/builtin/packages/check/package.py index ceed0bfc88..652f16a2e9 100644 --- a/var/spack/repos/builtin/packages/check/package.py +++ b/var/spack/repos/builtin/packages/check/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Check(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/chgcentre/package.py b/var/spack/repos/builtin/packages/chgcentre/package.py index 5a11c3e9a8..02ff04859c 100644 --- a/var/spack/repos/builtin/packages/chgcentre/package.py +++ b/var/spack/repos/builtin/packages/chgcentre/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Chgcentre(CMakePackage): diff --git a/var/spack/repos/builtin/packages/chill/package.py b/var/spack/repos/builtin/packages/chill/package.py index 5954a63940..c6951f6b30 100644 --- a/var/spack/repos/builtin/packages/chill/package.py +++ b/var/spack/repos/builtin/packages/chill/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/chlorop/package.py b/var/spack/repos/builtin/packages/chlorop/package.py index 506b07ccec..1b9a076d9a 100644 --- a/var/spack/repos/builtin/packages/chlorop/package.py +++ b/var/spack/repos/builtin/packages/chlorop/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Chlorop(Package): diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index 03827dd04f..3ae69285cd 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -5,6 +5,8 @@ import glob +from spack.package import * + class Chombo(MakefilePackage): """The Chombo package provides a set of tools for implementing finite diff --git a/var/spack/repos/builtin/packages/chrony/package.py b/var/spack/repos/builtin/packages/chrony/package.py index 2a51ff14f9..2c379870ef 100644 --- a/var/spack/repos/builtin/packages/chrony/package.py +++ b/var/spack/repos/builtin/packages/chrony/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Chrony(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/chrpath/package.py b/var/spack/repos/builtin/packages/chrpath/package.py index b76981e710..2f8d2458ca 100644 --- a/var/spack/repos/builtin/packages/chrpath/package.py +++ b/var/spack/repos/builtin/packages/chrpath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Chrpath(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cinch/package.py b/var/spack/repos/builtin/packages/cinch/package.py index 908c8d7c9c..3796c5e1f6 100644 --- a/var/spack/repos/builtin/packages/cinch/package.py +++ b/var/spack/repos/builtin/packages/cinch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cinch(Package): diff --git a/var/spack/repos/builtin/packages/circos/package.py b/var/spack/repos/builtin/packages/circos/package.py index 608f5a5ca1..68ee499531 100644 --- a/var/spack/repos/builtin/packages/circos/package.py +++ b/var/spack/repos/builtin/packages/circos/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class Circos(Package): diff --git a/var/spack/repos/builtin/packages/cistem/package.py b/var/spack/repos/builtin/packages/cistem/package.py index d221c967b5..b805f7d2f3 100644 --- a/var/spack/repos/builtin/packages/cistem/package.py +++ b/var/spack/repos/builtin/packages/cistem/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cistem(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/citcoms/package.py b/var/spack/repos/builtin/packages/citcoms/package.py index 23dd42858c..2fb39fc4fa 100644 --- a/var/spack/repos/builtin/packages/citcoms/package.py +++ b/var/spack/repos/builtin/packages/citcoms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Citcoms(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cityhash/package.py b/var/spack/repos/builtin/packages/cityhash/package.py index 88e598ebac..3ec5907325 100644 --- a/var/spack/repos/builtin/packages/cityhash/package.py +++ b/var/spack/repos/builtin/packages/cityhash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cityhash(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cjson/package.py b/var/spack/repos/builtin/packages/cjson/package.py index c110268572..8f114b69b3 100644 --- a/var/spack/repos/builtin/packages/cjson/package.py +++ b/var/spack/repos/builtin/packages/cjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cjson(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ck/package.py b/var/spack/repos/builtin/packages/ck/package.py index fab5369db7..288a5bfef4 100644 --- a/var/spack/repos/builtin/packages/ck/package.py +++ b/var/spack/repos/builtin/packages/ck/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ck(MavenPackage): diff --git a/var/spack/repos/builtin/packages/clamav/package.py b/var/spack/repos/builtin/packages/clamav/package.py index 19b151a4c7..8348c8862b 100644 --- a/var/spack/repos/builtin/packages/clamav/package.py +++ b/var/spack/repos/builtin/packages/clamav/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Clamav(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/clamr/package.py b/var/spack/repos/builtin/packages/clamr/package.py index 3902065628..f11224caf0 100644 --- a/var/spack/repos/builtin/packages/clamr/package.py +++ b/var/spack/repos/builtin/packages/clamr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Clamr(CMakePackage): diff --git a/var/spack/repos/builtin/packages/clapack/package.py b/var/spack/repos/builtin/packages/clapack/package.py index cf4bce91ee..d8036a8a71 100644 --- a/var/spack/repos/builtin/packages/clapack/package.py +++ b/var/spack/repos/builtin/packages/clapack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Clapack(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/clara/package.py b/var/spack/repos/builtin/packages/clara/package.py index 67b279ef75..d3e5f60e0e 100644 --- a/var/spack/repos/builtin/packages/clara/package.py +++ b/var/spack/repos/builtin/packages/clara/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Clara(CMakePackage): diff --git a/var/spack/repos/builtin/packages/claw/package.py b/var/spack/repos/builtin/packages/claw/package.py index 8b4de70e6a..628cd8d73d 100644 --- a/var/spack/repos/builtin/packages/claw/package.py +++ b/var/spack/repos/builtin/packages/claw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Claw(CMakePackage): diff --git a/var/spack/repos/builtin/packages/clblast/package.py b/var/spack/repos/builtin/packages/clblast/package.py index 57449b6e92..454e61875d 100644 --- a/var/spack/repos/builtin/packages/clblast/package.py +++ b/var/spack/repos/builtin/packages/clblast/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) # ---------------------------------------------------------------------------- -from spack import * +from spack.package import * class Clblast(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cleaveland4/package.py b/var/spack/repos/builtin/packages/cleaveland4/package.py index 4d2cb3bbf9..4a3d1fca57 100644 --- a/var/spack/repos/builtin/packages/cleaveland4/package.py +++ b/var/spack/repos/builtin/packages/cleaveland4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cleaveland4(Package): diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index 1d5aa842f9..309664f9f9 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/clfft/package.py b/var/spack/repos/builtin/packages/clfft/package.py index 5e415bb399..6d93a62d25 100644 --- a/var/spack/repos/builtin/packages/clfft/package.py +++ b/var/spack/repos/builtin/packages/clfft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index 4f3b457636..2192d91121 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Clhep(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cli11/package.py b/var/spack/repos/builtin/packages/cli11/package.py index 2c0767de32..2df382a5e9 100644 --- a/var/spack/repos/builtin/packages/cli11/package.py +++ b/var/spack/repos/builtin/packages/cli11/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cli11(CMakePackage): diff --git a/var/spack/repos/builtin/packages/clinfo/package.py b/var/spack/repos/builtin/packages/clinfo/package.py index ea52c85e8d..21b02b75c7 100644 --- a/var/spack/repos/builtin/packages/clinfo/package.py +++ b/var/spack/repos/builtin/packages/clinfo/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Clinfo(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index acc627e3bd..990c4be6c4 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import spack.compilers +from spack.package import * from spack.pkg.builtin.clingo import Clingo diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py index b26e083a9b..2f32df4536 100644 --- a/var/spack/repos/builtin/packages/clingo/package.py +++ b/var/spack/repos/builtin/packages/clingo/package.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * from spack.compiler import UnsupportedCompilerFlag +from spack.package import * class Clingo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cln/package.py b/var/spack/repos/builtin/packages/cln/package.py index 4248059bbf..26be3701dd 100644 --- a/var/spack/repos/builtin/packages/cln/package.py +++ b/var/spack/repos/builtin/packages/cln/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class Cln(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cloc/package.py b/var/spack/repos/builtin/packages/cloc/package.py index 2f7a8806cb..9ee42bd620 100644 --- a/var/spack/repos/builtin/packages/cloc/package.py +++ b/var/spack/repos/builtin/packages/cloc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cloc(Package): diff --git a/var/spack/repos/builtin/packages/cloog/package.py b/var/spack/repos/builtin/packages/cloog/package.py index 8c0f1e5fdd..a77691b410 100644 --- a/var/spack/repos/builtin/packages/cloog/package.py +++ b/var/spack/repos/builtin/packages/cloog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cloog(Package): diff --git a/var/spack/repos/builtin/packages/cloverleaf/package.py b/var/spack/repos/builtin/packages/cloverleaf/package.py index a17e4fb2cd..b5d62603e9 100644 --- a/var/spack/repos/builtin/packages/cloverleaf/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Cloverleaf(MakefilePackage): """Proxy Application. CloverLeaf is a miniapp that solves the compressible Euler equations on a Cartesian grid, diff --git a/var/spack/repos/builtin/packages/cloverleaf3d/package.py b/var/spack/repos/builtin/packages/cloverleaf3d/package.py index eed350939d..4740453e33 100644 --- a/var/spack/repos/builtin/packages/cloverleaf3d/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf3d/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Cloverleaf3d(MakefilePackage): """Proxy Application. CloverLeaf3D is 3D version of the CloverLeaf mini-app. CloverLeaf is a mini-app that solves diff --git a/var/spack/repos/builtin/packages/clp/package.py b/var/spack/repos/builtin/packages/clp/package.py index 49e806c64c..3a04479ada 100644 --- a/var/spack/repos/builtin/packages/clp/package.py +++ b/var/spack/repos/builtin/packages/clp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Clp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/clustal-omega/package.py b/var/spack/repos/builtin/packages/clustal-omega/package.py index 503cd867da..e35ec5111a 100644 --- a/var/spack/repos/builtin/packages/clustal-omega/package.py +++ b/var/spack/repos/builtin/packages/clustal-omega/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ClustalOmega(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/clustalw/package.py b/var/spack/repos/builtin/packages/clustalw/package.py index 1896aa5d67..3aa556f896 100644 --- a/var/spack/repos/builtin/packages/clustalw/package.py +++ b/var/spack/repos/builtin/packages/clustalw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Clustalw(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 9e12fbfc3a..f340521070 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -8,7 +8,7 @@ import re import sys import spack.build_environment -from spack import * +from spack.package import * is_windows = sys.platform == 'win32' diff --git a/var/spack/repos/builtin/packages/cmaq/package.py b/var/spack/repos/builtin/packages/cmaq/package.py index ac8f12fb25..c8fa1137ad 100644 --- a/var/spack/repos/builtin/packages/cmaq/package.py +++ b/var/spack/repos/builtin/packages/cmaq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cmaq(Package): diff --git a/var/spack/repos/builtin/packages/cmark/package.py b/var/spack/repos/builtin/packages/cmark/package.py index 7216fcdace..75dd257f27 100644 --- a/var/spack/repos/builtin/packages/cmark/package.py +++ b/var/spack/repos/builtin/packages/cmark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cmark(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cminpack/package.py b/var/spack/repos/builtin/packages/cminpack/package.py index 749ae83b57..04a8fe2fbf 100644 --- a/var/spack/repos/builtin/packages/cminpack/package.py +++ b/var/spack/repos/builtin/packages/cminpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cminpack(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cmocka/package.py b/var/spack/repos/builtin/packages/cmocka/package.py index 80fe186c85..b3d281fb57 100644 --- a/var/spack/repos/builtin/packages/cmocka/package.py +++ b/var/spack/repos/builtin/packages/cmocka/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cmocka(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cmockery/package.py b/var/spack/repos/builtin/packages/cmockery/package.py index 1d0051607b..8ca98f4145 100644 --- a/var/spack/repos/builtin/packages/cmockery/package.py +++ b/var/spack/repos/builtin/packages/cmockery/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cmockery(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py index c378c45bc3..90fc809b9e 100644 --- a/var/spack/repos/builtin/packages/cmor/package.py +++ b/var/spack/repos/builtin/packages/cmor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cmor(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cni-plugins/package.py b/var/spack/repos/builtin/packages/cni-plugins/package.py index f6d82d720d..72bb8ab523 100644 --- a/var/spack/repos/builtin/packages/cni-plugins/package.py +++ b/var/spack/repos/builtin/packages/cni-plugins/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CniPlugins(Package): diff --git a/var/spack/repos/builtin/packages/cnmem/package.py b/var/spack/repos/builtin/packages/cnmem/package.py index d7084fb3a2..85cd91679a 100644 --- a/var/spack/repos/builtin/packages/cnmem/package.py +++ b/var/spack/repos/builtin/packages/cnmem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cnmem(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cnpy/package.py b/var/spack/repos/builtin/packages/cnpy/package.py index 46f57929db..23fb39eca7 100644 --- a/var/spack/repos/builtin/packages/cnpy/package.py +++ b/var/spack/repos/builtin/packages/cnpy/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Cnpy(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cntk/package.py b/var/spack/repos/builtin/packages/cntk/package.py index e2f871d8bb..b92d519cfb 100644 --- a/var/spack/repos/builtin/packages/cntk/package.py +++ b/var/spack/repos/builtin/packages/cntk/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py index ce0a6a02d1..dc3787de08 100644 --- a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py +++ b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py @@ -5,7 +5,7 @@ from os import listdir -from spack import * +from spack.package import * class Cntk1bitsgd(Package): diff --git a/var/spack/repos/builtin/packages/cnvnator/package.py b/var/spack/repos/builtin/packages/cnvnator/package.py index 42ee4fbf03..22311c2fa5 100644 --- a/var/spack/repos/builtin/packages/cnvnator/package.py +++ b/var/spack/repos/builtin/packages/cnvnator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cnvnator(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/codar-cheetah/package.py b/var/spack/repos/builtin/packages/codar-cheetah/package.py index 076f0d72c0..b5a044cba9 100644 --- a/var/spack/repos/builtin/packages/codar-cheetah/package.py +++ b/var/spack/repos/builtin/packages/codar-cheetah/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CodarCheetah(PythonPackage): diff --git a/var/spack/repos/builtin/packages/code-server/package.py b/var/spack/repos/builtin/packages/code-server/package.py index b30777b2e9..ad541017f5 100644 --- a/var/spack/repos/builtin/packages/code-server/package.py +++ b/var/spack/repos/builtin/packages/code-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CodeServer(Package): diff --git a/var/spack/repos/builtin/packages/codec2/package.py b/var/spack/repos/builtin/packages/codec2/package.py index 8065bd2a5b..04017392bc 100644 --- a/var/spack/repos/builtin/packages/codec2/package.py +++ b/var/spack/repos/builtin/packages/codec2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Codec2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/codes/package.py b/var/spack/repos/builtin/packages/codes/package.py index 052d6e5785..0214ea62fb 100644 --- a/var/spack/repos/builtin/packages/codes/package.py +++ b/var/spack/repos/builtin/packages/codes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Codes(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/coevp/package.py b/var/spack/repos/builtin/packages/coevp/package.py index 9b07b1d08e..ba0b56fe16 100644 --- a/var/spack/repos/builtin/packages/coevp/package.py +++ b/var/spack/repos/builtin/packages/coevp/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Coevp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cohmm/package.py b/var/spack/repos/builtin/packages/cohmm/package.py index 58aec4ee7d..52b76282e9 100644 --- a/var/spack/repos/builtin/packages/cohmm/package.py +++ b/var/spack/repos/builtin/packages/cohmm/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Cohmm(MakefilePackage): """An anticipated important use-case for next-generation supercomputing is multiscale modeling, in which continuum equations for large-scale diff --git a/var/spack/repos/builtin/packages/coin3d/package.py b/var/spack/repos/builtin/packages/coin3d/package.py index a5ec006d41..4685aa851c 100644 --- a/var/spack/repos/builtin/packages/coin3d/package.py +++ b/var/spack/repos/builtin/packages/coin3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/coinhsl/package.py b/var/spack/repos/builtin/packages/coinhsl/package.py index 944ce3f77a..f6ac234bf1 100644 --- a/var/spack/repos/builtin/packages/coinhsl/package.py +++ b/var/spack/repos/builtin/packages/coinhsl/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Coinhsl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/coinutils/package.py b/var/spack/repos/builtin/packages/coinutils/package.py index a78104e3c4..c9c8a91e9f 100644 --- a/var/spack/repos/builtin/packages/coinutils/package.py +++ b/var/spack/repos/builtin/packages/coinutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Coinutils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/collectd/package.py b/var/spack/repos/builtin/packages/collectd/package.py index aa81e2ea53..e81511dff5 100644 --- a/var/spack/repos/builtin/packages/collectd/package.py +++ b/var/spack/repos/builtin/packages/collectd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Collectd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/collier/package.py b/var/spack/repos/builtin/packages/collier/package.py index 4da1f6afc2..4050b63543 100644 --- a/var/spack/repos/builtin/packages/collier/package.py +++ b/var/spack/repos/builtin/packages/collier/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Collier(CMakePackage): diff --git a/var/spack/repos/builtin/packages/colm/package.py b/var/spack/repos/builtin/packages/colm/package.py index fa6380a99e..86df039f0b 100644 --- a/var/spack/repos/builtin/packages/colm/package.py +++ b/var/spack/repos/builtin/packages/colm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Colm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/colordiff/package.py b/var/spack/repos/builtin/packages/colordiff/package.py index 35b2f84459..697e7d6a4f 100644 --- a/var/spack/repos/builtin/packages/colordiff/package.py +++ b/var/spack/repos/builtin/packages/colordiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Colordiff(Package): diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index 7314cd18d6..d2873ad513 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Comd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index dd863496a8..d93bfa9c69 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Comgr(CMakePackage): diff --git a/var/spack/repos/builtin/packages/commons-lang/package.py b/var/spack/repos/builtin/packages/commons-lang/package.py index b8746d21c2..ad80e463d1 100644 --- a/var/spack/repos/builtin/packages/commons-lang/package.py +++ b/var/spack/repos/builtin/packages/commons-lang/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CommonsLang(Package): diff --git a/var/spack/repos/builtin/packages/commons-lang3/package.py b/var/spack/repos/builtin/packages/commons-lang3/package.py index 2b542e465f..599eda18ea 100644 --- a/var/spack/repos/builtin/packages/commons-lang3/package.py +++ b/var/spack/repos/builtin/packages/commons-lang3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CommonsLang3(Package): diff --git a/var/spack/repos/builtin/packages/commons-logging/package.py b/var/spack/repos/builtin/packages/commons-logging/package.py index 36904be86d..26df784575 100644 --- a/var/spack/repos/builtin/packages/commons-logging/package.py +++ b/var/spack/repos/builtin/packages/commons-logging/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CommonsLogging(Package): diff --git a/var/spack/repos/builtin/packages/compadre/package.py b/var/spack/repos/builtin/packages/compadre/package.py index 385b13a660..253a962bca 100644 --- a/var/spack/repos/builtin/packages/compadre/package.py +++ b/var/spack/repos/builtin/packages/compadre/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Compadre(CMakePackage): diff --git a/var/spack/repos/builtin/packages/compiz/package.py b/var/spack/repos/builtin/packages/compiz/package.py index 5b1a2adb5d..7e0fc5c186 100644 --- a/var/spack/repos/builtin/packages/compiz/package.py +++ b/var/spack/repos/builtin/packages/compiz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Compiz(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/compose/package.py b/var/spack/repos/builtin/packages/compose/package.py index 0c73114ce5..0aa8a34df1 100644 --- a/var/spack/repos/builtin/packages/compose/package.py +++ b/var/spack/repos/builtin/packages/compose/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Compose(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/compositeproto/package.py b/var/spack/repos/builtin/packages/compositeproto/package.py index e1353e3066..d6a9b98fd0 100644 --- a/var/spack/repos/builtin/packages/compositeproto/package.py +++ b/var/spack/repos/builtin/packages/compositeproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Compositeproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/conda4aarch64/package.py b/var/spack/repos/builtin/packages/conda4aarch64/package.py index f28c5a2632..d92a795c15 100644 --- a/var/spack/repos/builtin/packages/conda4aarch64/package.py +++ b/var/spack/repos/builtin/packages/conda4aarch64/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.util.environment import EnvironmentModifications diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index ce6cee87ac..27ab1c4148 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -11,7 +11,7 @@ from os import environ as env import llnl.util.tty as tty -from spack import * +from spack.package import * def cmake_cache_entry(name, value, vtype=None): diff --git a/var/spack/repos/builtin/packages/conmon/package.py b/var/spack/repos/builtin/packages/conmon/package.py index 992a83a17b..463782580d 100644 --- a/var/spack/repos/builtin/packages/conmon/package.py +++ b/var/spack/repos/builtin/packages/conmon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Conmon(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/connect-proxy/package.py b/var/spack/repos/builtin/packages/connect-proxy/package.py index 00d3272891..52f77dad84 100644 --- a/var/spack/repos/builtin/packages/connect-proxy/package.py +++ b/var/spack/repos/builtin/packages/connect-proxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ConnectProxy(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/conserver/package.py b/var/spack/repos/builtin/packages/conserver/package.py index f4c1a8fac2..3071af3160 100644 --- a/var/spack/repos/builtin/packages/conserver/package.py +++ b/var/spack/repos/builtin/packages/conserver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Conserver(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/console-bridge/package.py b/var/spack/repos/builtin/packages/console-bridge/package.py index bb06d8d1fd..e03b51036b 100644 --- a/var/spack/repos/builtin/packages/console-bridge/package.py +++ b/var/spack/repos/builtin/packages/console-bridge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ConsoleBridge(CMakePackage): diff --git a/var/spack/repos/builtin/packages/constype/package.py b/var/spack/repos/builtin/packages/constype/package.py index 141931c814..31974bfc39 100644 --- a/var/spack/repos/builtin/packages/constype/package.py +++ b/var/spack/repos/builtin/packages/constype/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Constype(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/consul/package.py b/var/spack/repos/builtin/packages/consul/package.py index d6a47fd02d..17752755de 100644 --- a/var/spack/repos/builtin/packages/consul/package.py +++ b/var/spack/repos/builtin/packages/consul/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Consul(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/converge/package.py b/var/spack/repos/builtin/packages/converge/package.py index 9d7f558228..e42d7bfceb 100644 --- a/var/spack/repos/builtin/packages/converge/package.py +++ b/var/spack/repos/builtin/packages/converge/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Converge(Package): diff --git a/var/spack/repos/builtin/packages/cool/package.py b/var/spack/repos/builtin/packages/cool/package.py index 94fecafbb9..6a2dd0696e 100644 --- a/var/spack/repos/builtin/packages/cool/package.py +++ b/var/spack/repos/builtin/packages/cool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cool(CMakePackage): diff --git a/var/spack/repos/builtin/packages/coral/package.py b/var/spack/repos/builtin/packages/coral/package.py index 02f11692da..9358d1054d 100644 --- a/var/spack/repos/builtin/packages/coral/package.py +++ b/var/spack/repos/builtin/packages/coral/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Coral(CMakePackage): diff --git a/var/spack/repos/builtin/packages/corenlp/package.py b/var/spack/repos/builtin/packages/corenlp/package.py index 9547bdaf66..664f3b48e9 100644 --- a/var/spack/repos/builtin/packages/corenlp/package.py +++ b/var/spack/repos/builtin/packages/corenlp/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Corenlp(Package): """Stanford CoreNLP provides a set of human language technology diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py index 0671b0eac5..77ea527e18 100644 --- a/var/spack/repos/builtin/packages/coreutils/package.py +++ b/var/spack/repos/builtin/packages/coreutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Coreutils(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/corset/package.py b/var/spack/repos/builtin/packages/corset/package.py index b647421df3..d355c7849c 100644 --- a/var/spack/repos/builtin/packages/corset/package.py +++ b/var/spack/repos/builtin/packages/corset/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Corset(Package): diff --git a/var/spack/repos/builtin/packages/cosbench/package.py b/var/spack/repos/builtin/packages/cosbench/package.py index 88ea4ad14e..7335841644 100644 --- a/var/spack/repos/builtin/packages/cosbench/package.py +++ b/var/spack/repos/builtin/packages/cosbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cosbench(Package): diff --git a/var/spack/repos/builtin/packages/cosign/package.py b/var/spack/repos/builtin/packages/cosign/package.py index bc4778391a..adb549c803 100644 --- a/var/spack/repos/builtin/packages/cosign/package.py +++ b/var/spack/repos/builtin/packages/cosign/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Cosign(Package): diff --git a/var/spack/repos/builtin/packages/cosma/package.py b/var/spack/repos/builtin/packages/cosma/package.py index 6c11bbfb7a..dc53c17b51 100644 --- a/var/spack/repos/builtin/packages/cosma/package.py +++ b/var/spack/repos/builtin/packages/cosma/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cosma(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cosmoflow-benchmark/package.py b/var/spack/repos/builtin/packages/cosmoflow-benchmark/package.py index 38bc0d3a65..54f553dac9 100644 --- a/var/spack/repos/builtin/packages/cosmoflow-benchmark/package.py +++ b/var/spack/repos/builtin/packages/cosmoflow-benchmark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CosmoflowBenchmark(Package, CudaPackage): diff --git a/var/spack/repos/builtin/packages/cosmomc/package.py b/var/spack/repos/builtin/packages/cosmomc/package.py index 3c7724aa7a..0f31776f08 100644 --- a/var/spack/repos/builtin/packages/cosmomc/package.py +++ b/var/spack/repos/builtin/packages/cosmomc/package.py @@ -7,7 +7,7 @@ import fnmatch import os -from spack import * +from spack.package import * class Cosmomc(Package): diff --git a/var/spack/repos/builtin/packages/cosp2/package.py b/var/spack/repos/builtin/packages/cosp2/package.py index 049b279a1e..3c4826fd33 100644 --- a/var/spack/repos/builtin/packages/cosp2/package.py +++ b/var/spack/repos/builtin/packages/cosp2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cosp2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/costa/package.py b/var/spack/repos/builtin/packages/costa/package.py index 38fb2cf9b9..a16b4c7dfc 100644 --- a/var/spack/repos/builtin/packages/costa/package.py +++ b/var/spack/repos/builtin/packages/costa/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Costa(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cotter/package.py b/var/spack/repos/builtin/packages/cotter/package.py index 2307514f30..6f6bf396e9 100644 --- a/var/spack/repos/builtin/packages/cotter/package.py +++ b/var/spack/repos/builtin/packages/cotter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cotter(CMakePackage): diff --git a/var/spack/repos/builtin/packages/couchdb/package.py b/var/spack/repos/builtin/packages/couchdb/package.py index efa33bd7f6..3682b3bab4 100644 --- a/var/spack/repos/builtin/packages/couchdb/package.py +++ b/var/spack/repos/builtin/packages/couchdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Couchdb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cowsay/package.py b/var/spack/repos/builtin/packages/cowsay/package.py index 271c8de412..813c39dd70 100644 --- a/var/spack/repos/builtin/packages/cowsay/package.py +++ b/var/spack/repos/builtin/packages/cowsay/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cowsay(Package): diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 24765bfe67..e4d5e20eb5 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -7,6 +7,7 @@ import os import os.path import spack.util.environment +from spack.package import * class Cp2k(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/cpio/package.py b/var/spack/repos/builtin/packages/cpio/package.py index e6d793d215..ca0a6fb86c 100644 --- a/var/spack/repos/builtin/packages/cpio/package.py +++ b/var/spack/repos/builtin/packages/cpio/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Cpio(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/cpmd/package.py b/var/spack/repos/builtin/packages/cpmd/package.py index 9f65e2304e..944be0f218 100644 --- a/var/spack/repos/builtin/packages/cpmd/package.py +++ b/var/spack/repos/builtin/packages/cpmd/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Cpmd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cpp-argparse/package.py b/var/spack/repos/builtin/packages/cpp-argparse/package.py index ca2bceb994..4f4f9c466a 100644 --- a/var/spack/repos/builtin/packages/cpp-argparse/package.py +++ b/var/spack/repos/builtin/packages/cpp-argparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CppArgparse(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cpp-httplib/package.py b/var/spack/repos/builtin/packages/cpp-httplib/package.py index 34ec4bf22b..7420bd6417 100644 --- a/var/spack/repos/builtin/packages/cpp-httplib/package.py +++ b/var/spack/repos/builtin/packages/cpp-httplib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CppHttplib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cpp-termcolor/package.py b/var/spack/repos/builtin/packages/cpp-termcolor/package.py index 6016bfd3c5..f876c77b38 100644 --- a/var/spack/repos/builtin/packages/cpp-termcolor/package.py +++ b/var/spack/repos/builtin/packages/cpp-termcolor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CppTermcolor(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py index 91b2ba6a1c..69c3fdb129 100644 --- a/var/spack/repos/builtin/packages/cppad/package.py +++ b/var/spack/repos/builtin/packages/cppad/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cppad(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py index 1010fef99e..c329a80c21 100644 --- a/var/spack/repos/builtin/packages/cppcheck/package.py +++ b/var/spack/repos/builtin/packages/cppcheck/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cppcheck(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cppcoro/package.py b/var/spack/repos/builtin/packages/cppcoro/package.py index c43c46d104..1b55071319 100644 --- a/var/spack/repos/builtin/packages/cppcoro/package.py +++ b/var/spack/repos/builtin/packages/cppcoro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cppcoro(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cppgsl/package.py b/var/spack/repos/builtin/packages/cppgsl/package.py index 97ba39c652..a2967b75cd 100644 --- a/var/spack/repos/builtin/packages/cppgsl/package.py +++ b/var/spack/repos/builtin/packages/cppgsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cppgsl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cpprestsdk/package.py b/var/spack/repos/builtin/packages/cpprestsdk/package.py index 619e9addb2..9d148b619c 100644 --- a/var/spack/repos/builtin/packages/cpprestsdk/package.py +++ b/var/spack/repos/builtin/packages/cpprestsdk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cpprestsdk(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cppunit/package.py b/var/spack/repos/builtin/packages/cppunit/package.py index e2de91a9ba..c233a80071 100644 --- a/var/spack/repos/builtin/packages/cppunit/package.py +++ b/var/spack/repos/builtin/packages/cppunit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cppunit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cppzmq/package.py b/var/spack/repos/builtin/packages/cppzmq/package.py index 24e8540d5d..b402b9fed9 100644 --- a/var/spack/repos/builtin/packages/cppzmq/package.py +++ b/var/spack/repos/builtin/packages/cppzmq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cppzmq(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cpu-features/package.py b/var/spack/repos/builtin/packages/cpu-features/package.py index f09482477a..fc0e6c243c 100644 --- a/var/spack/repos/builtin/packages/cpu-features/package.py +++ b/var/spack/repos/builtin/packages/cpu-features/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CpuFeatures(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cpuinfo/package.py b/var/spack/repos/builtin/packages/cpuinfo/package.py index 045676967e..18c806a9ae 100644 --- a/var/spack/repos/builtin/packages/cpuinfo/package.py +++ b/var/spack/repos/builtin/packages/cpuinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cpuinfo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cqrlib/package.py b/var/spack/repos/builtin/packages/cqrlib/package.py index 6632bbe3fa..4a9119a0ca 100644 --- a/var/spack/repos/builtin/packages/cqrlib/package.py +++ b/var/spack/repos/builtin/packages/cqrlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cqrlib(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cquery/package.py b/var/spack/repos/builtin/packages/cquery/package.py index b0648bc862..c2e44a9589 100644 --- a/var/spack/repos/builtin/packages/cquery/package.py +++ b/var/spack/repos/builtin/packages/cquery/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cquery(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cracklib/package.py b/var/spack/repos/builtin/packages/cracklib/package.py index c3d8724070..45cf9acd51 100644 --- a/var/spack/repos/builtin/packages/cracklib/package.py +++ b/var/spack/repos/builtin/packages/cracklib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cracklib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cradl/package.py b/var/spack/repos/builtin/packages/cradl/package.py index 029eca984b..c699bd9893 100644 --- a/var/spack/repos/builtin/packages/cradl/package.py +++ b/var/spack/repos/builtin/packages/cradl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cradl(Package): diff --git a/var/spack/repos/builtin/packages/cram/package.py b/var/spack/repos/builtin/packages/cram/package.py index fc09a65ff6..289aef1f66 100644 --- a/var/spack/repos/builtin/packages/cram/package.py +++ b/var/spack/repos/builtin/packages/cram/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cram(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cray-fftw/package.py b/var/spack/repos/builtin/packages/cray-fftw/package.py index 56dea3253b..376f154406 100644 --- a/var/spack/repos/builtin/packages/cray-fftw/package.py +++ b/var/spack/repos/builtin/packages/cray-fftw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CrayFftw(Package): diff --git a/var/spack/repos/builtin/packages/cray-libsci/package.py b/var/spack/repos/builtin/packages/cray-libsci/package.py index f9ac97f0e8..fc8fcb5656 100644 --- a/var/spack/repos/builtin/packages/cray-libsci/package.py +++ b/var/spack/repos/builtin/packages/cray-libsci/package.py @@ -2,6 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.util.module_cmd import get_path_args_from_module_line, module diff --git a/var/spack/repos/builtin/packages/cray-mpich/package.py b/var/spack/repos/builtin/packages/cray-mpich/package.py index 1eeadf5422..12d910287e 100644 --- a/var/spack/repos/builtin/packages/cray-mpich/package.py +++ b/var/spack/repos/builtin/packages/cray-mpich/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.util.module_cmd import get_path_args_from_module_line, module diff --git a/var/spack/repos/builtin/packages/cray-mvapich2/package.py b/var/spack/repos/builtin/packages/cray-mvapich2/package.py index 74778e45d1..f6f2739f6d 100644 --- a/var/spack/repos/builtin/packages/cray-mvapich2/package.py +++ b/var/spack/repos/builtin/packages/cray-mvapich2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CrayMvapich2(Package): diff --git a/var/spack/repos/builtin/packages/cray-pmi/package.py b/var/spack/repos/builtin/packages/cray-pmi/package.py index 910e62b5fc..bc7e6b6ef5 100644 --- a/var/spack/repos/builtin/packages/cray-pmi/package.py +++ b/var/spack/repos/builtin/packages/cray-pmi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CrayPmi(Package): diff --git a/var/spack/repos/builtin/packages/creduce/package.py b/var/spack/repos/builtin/packages/creduce/package.py index c263b70900..66779d0912 100644 --- a/var/spack/repos/builtin/packages/creduce/package.py +++ b/var/spack/repos/builtin/packages/creduce/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Creduce(CMakePackage): diff --git a/var/spack/repos/builtin/packages/crmc/package.py b/var/spack/repos/builtin/packages/crmc/package.py index 42d10c45e1..4ace2c932f 100644 --- a/var/spack/repos/builtin/packages/crmc/package.py +++ b/var/spack/repos/builtin/packages/crmc/package.py @@ -3,7 +3,7 @@ #
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-from spack import *
+from spack.package import *
class Crmc(CMakePackage):
diff --git a/var/spack/repos/builtin/packages/cromwell-womtool/package.py b/var/spack/repos/builtin/packages/cromwell-womtool/package.py index bf81d902bd..aca12da441 100644 --- a/var/spack/repos/builtin/packages/cromwell-womtool/package.py +++ b/var/spack/repos/builtin/packages/cromwell-womtool/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class CromwellWomtool(Package): diff --git a/var/spack/repos/builtin/packages/cromwell/package.py b/var/spack/repos/builtin/packages/cromwell/package.py index 9267bdb5c0..9b904c65a4 100644 --- a/var/spack/repos/builtin/packages/cromwell/package.py +++ b/var/spack/repos/builtin/packages/cromwell/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Cromwell(Package): diff --git a/var/spack/repos/builtin/packages/cronie/package.py b/var/spack/repos/builtin/packages/cronie/package.py index bef1aea677..65b0d3bc72 100644 --- a/var/spack/repos/builtin/packages/cronie/package.py +++ b/var/spack/repos/builtin/packages/cronie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cronie(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/crtm/package.py b/var/spack/repos/builtin/packages/crtm/package.py index 6cb4552b58..cdfa1cbd3e 100644 --- a/var/spack/repos/builtin/packages/crtm/package.py +++ b/var/spack/repos/builtin/packages/crtm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Crtm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cryptopp/package.py b/var/spack/repos/builtin/packages/cryptopp/package.py index 093691237f..0637411e51 100644 --- a/var/spack/repos/builtin/packages/cryptopp/package.py +++ b/var/spack/repos/builtin/packages/cryptopp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cryptopp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cryptsetup/package.py b/var/spack/repos/builtin/packages/cryptsetup/package.py index 74f59efa93..51bc04a429 100644 --- a/var/spack/repos/builtin/packages/cryptsetup/package.py +++ b/var/spack/repos/builtin/packages/cryptsetup/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cryptsetup(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/csa-c/package.py b/var/spack/repos/builtin/packages/csa-c/package.py index 325f627da5..6103f495e6 100644 --- a/var/spack/repos/builtin/packages/csa-c/package.py +++ b/var/spack/repos/builtin/packages/csa-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CsaC(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cscope/package.py b/var/spack/repos/builtin/packages/cscope/package.py index a5f8299297..65e0d11a55 100644 --- a/var/spack/repos/builtin/packages/cscope/package.py +++ b/var/spack/repos/builtin/packages/cscope/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cscope(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/csdp/package.py b/var/spack/repos/builtin/packages/csdp/package.py index 906fd112f4..c6be029ac4 100644 --- a/var/spack/repos/builtin/packages/csdp/package.py +++ b/var/spack/repos/builtin/packages/csdp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Csdp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ctffind/package.py b/var/spack/repos/builtin/packages/ctffind/package.py index 379c831c19..55fe2e92cf 100644 --- a/var/spack/repos/builtin/packages/ctffind/package.py +++ b/var/spack/repos/builtin/packages/ctffind/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ctffind(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ctpl/package.py b/var/spack/repos/builtin/packages/ctpl/package.py index d39a746f8f..33003b9226 100644 --- a/var/spack/repos/builtin/packages/ctpl/package.py +++ b/var/spack/repos/builtin/packages/ctpl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ctpl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ctre/package.py b/var/spack/repos/builtin/packages/ctre/package.py index cdc212740b..4c1de7a021 100644 --- a/var/spack/repos/builtin/packages/ctre/package.py +++ b/var/spack/repos/builtin/packages/ctre/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ctre(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cub/package.py b/var/spack/repos/builtin/packages/cub/package.py index 875fbe5b04..c38bccd5aa 100644 --- a/var/spack/repos/builtin/packages/cub/package.py +++ b/var/spack/repos/builtin/packages/cub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cub(Package): diff --git a/var/spack/repos/builtin/packages/cube-blade/package.py b/var/spack/repos/builtin/packages/cube-blade/package.py index 1e55b9ddc5..7464e3050a 100644 --- a/var/spack/repos/builtin/packages/cube-blade/package.py +++ b/var/spack/repos/builtin/packages/cube-blade/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CubeBlade(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index 6e538207fb..5551c6cd59 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cube(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cubelib/package.py b/var/spack/repos/builtin/packages/cubelib/package.py index 39946f8811..8df9ca31fd 100644 --- a/var/spack/repos/builtin/packages/cubelib/package.py +++ b/var/spack/repos/builtin/packages/cubelib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cubelib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cubew/package.py b/var/spack/repos/builtin/packages/cubew/package.py index 24d584bcc3..70c235d9b8 100644 --- a/var/spack/repos/builtin/packages/cubew/package.py +++ b/var/spack/repos/builtin/packages/cubew/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cubew(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cubist/package.py b/var/spack/repos/builtin/packages/cubist/package.py index 0bd21ff6bc..bf86947c0e 100644 --- a/var/spack/repos/builtin/packages/cubist/package.py +++ b/var/spack/repos/builtin/packages/cubist/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cubist(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cuda-memtest/package.py b/var/spack/repos/builtin/packages/cuda-memtest/package.py index d710a47077..41ff914c46 100644 --- a/var/spack/repos/builtin/packages/cuda-memtest/package.py +++ b/var/spack/repos/builtin/packages/cuda-memtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CudaMemtest(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 0458d77599..a30463b741 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -9,9 +9,8 @@ import re from glob import glob import llnl.util.tty as tty -from llnl.util.filesystem import LibraryList -from spack import * +from spack.package import * # FIXME Remove hack for polymorphic versions # This package uses a ugly hack to be able to dispatch, given the same diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index 6940a89e90..c391ab4141 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -6,7 +6,7 @@ import os import platform -from spack import * +from spack.package import * _versions = { # cuDNN 8.3.3 diff --git a/var/spack/repos/builtin/packages/cufflinks/package.py b/var/spack/repos/builtin/packages/cufflinks/package.py index a199a3ab79..305df840ce 100644 --- a/var/spack/repos/builtin/packages/cufflinks/package.py +++ b/var/spack/repos/builtin/packages/cufflinks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cufflinks(Package): diff --git a/var/spack/repos/builtin/packages/cunit/package.py b/var/spack/repos/builtin/packages/cunit/package.py index a8833bf0f3..a2c4f77578 100644 --- a/var/spack/repos/builtin/packages/cunit/package.py +++ b/var/spack/repos/builtin/packages/cunit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cunit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cupla/package.py b/var/spack/repos/builtin/packages/cupla/package.py index 2a543cb134..2bfda4097b 100644 --- a/var/spack/repos/builtin/packages/cupla/package.py +++ b/var/spack/repos/builtin/packages/cupla/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cupla(Package): diff --git a/var/spack/repos/builtin/packages/cups/package.py b/var/spack/repos/builtin/packages/cups/package.py index 1ffe11ac5f..e2e6678195 100644 --- a/var/spack/repos/builtin/packages/cups/package.py +++ b/var/spack/repos/builtin/packages/cups/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cups(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 176ff016c9..465a60dcb9 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -6,7 +6,7 @@ import re import sys -from spack import * +from spack.package import * class Curl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/cusz/package.py b/var/spack/repos/builtin/packages/cusz/package.py index d990920292..f504d1511a 100644 --- a/var/spack/repos/builtin/packages/cusz/package.py +++ b/var/spack/repos/builtin/packages/cusz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cusz(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cutlang/package.py b/var/spack/repos/builtin/packages/cutlang/package.py index 01df7a45f9..5d96efb75a 100644 --- a/var/spack/repos/builtin/packages/cutlang/package.py +++ b/var/spack/repos/builtin/packages/cutlang/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) # ---------------------------------------------------------------------------- -from spack import * +from spack.package import * class Cutlang(Package): diff --git a/var/spack/repos/builtin/packages/cvector/package.py b/var/spack/repos/builtin/packages/cvector/package.py index 9ffc5f2084..6fdf412e7c 100644 --- a/var/spack/repos/builtin/packages/cvector/package.py +++ b/var/spack/repos/builtin/packages/cvector/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cvector(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/cvs/package.py b/var/spack/repos/builtin/packages/cvs/package.py index b7afc94d90..a64717e4b6 100644 --- a/var/spack/repos/builtin/packages/cvs/package.py +++ b/var/spack/repos/builtin/packages/cvs/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Cvs(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/cxx/package.py b/var/spack/repos/builtin/packages/cxx/package.py index e90a80e890..318c5e3393 100644 --- a/var/spack/repos/builtin/packages/cxx/package.py +++ b/var/spack/repos/builtin/packages/cxx/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Cxx(Package): """Virtual package for the C++ language.""" diff --git a/var/spack/repos/builtin/packages/cxxopts/package.py b/var/spack/repos/builtin/packages/cxxopts/package.py index d0430a3fab..88b0e9eb63 100644 --- a/var/spack/repos/builtin/packages/cxxopts/package.py +++ b/var/spack/repos/builtin/packages/cxxopts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cxxopts(CMakePackage): diff --git a/var/spack/repos/builtin/packages/cxxtest/package.py b/var/spack/repos/builtin/packages/cxxtest/package.py index 9c4422974f..a0a65e87f1 100644 --- a/var/spack/repos/builtin/packages/cxxtest/package.py +++ b/var/spack/repos/builtin/packages/cxxtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Cxxtest(Package): diff --git a/var/spack/repos/builtin/packages/cyrus-sasl/package.py b/var/spack/repos/builtin/packages/cyrus-sasl/package.py index ada1605147..27891d513f 100644 --- a/var/spack/repos/builtin/packages/cyrus-sasl/package.py +++ b/var/spack/repos/builtin/packages/cyrus-sasl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class CyrusSasl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/czmq/package.py b/var/spack/repos/builtin/packages/czmq/package.py index e98725a31c..0625f2c818 100644 --- a/var/spack/repos/builtin/packages/czmq/package.py +++ b/var/spack/repos/builtin/packages/czmq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Czmq(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dakota/package.py b/var/spack/repos/builtin/packages/dakota/package.py index a10d0aa0f9..3a27fe8389 100644 --- a/var/spack/repos/builtin/packages/dakota/package.py +++ b/var/spack/repos/builtin/packages/dakota/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/daligner/package.py b/var/spack/repos/builtin/packages/daligner/package.py index 1d73cfe705..246d18f23b 100644 --- a/var/spack/repos/builtin/packages/daligner/package.py +++ b/var/spack/repos/builtin/packages/daligner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Daligner(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dalton/package.py b/var/spack/repos/builtin/packages/dalton/package.py index b74e971f81..1940bb092b 100644 --- a/var/spack/repos/builtin/packages/dalton/package.py +++ b/var/spack/repos/builtin/packages/dalton/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dalton(CMakePackage): diff --git a/var/spack/repos/builtin/packages/damageproto/package.py b/var/spack/repos/builtin/packages/damageproto/package.py index 01633c6483..deff5106a4 100644 --- a/var/spack/repos/builtin/packages/damageproto/package.py +++ b/var/spack/repos/builtin/packages/damageproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Damageproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/damaris/package.py b/var/spack/repos/builtin/packages/damaris/package.py index e87f03e4ee..813b2d8289 100644 --- a/var/spack/repos/builtin/packages/damaris/package.py +++ b/var/spack/repos/builtin/packages/damaris/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Damaris(CMakePackage): diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py index 2882c7aef6..ab6a714d75 100644 --- a/var/spack/repos/builtin/packages/damask-grid/package.py +++ b/var/spack/repos/builtin/packages/damask-grid/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DamaskGrid(CMakePackage): """Grid solver for DAMASK""" diff --git a/var/spack/repos/builtin/packages/damask-mesh/package.py b/var/spack/repos/builtin/packages/damask-mesh/package.py index cad8e34cb1..42157642c9 100644 --- a/var/spack/repos/builtin/packages/damask-mesh/package.py +++ b/var/spack/repos/builtin/packages/damask-mesh/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class DamaskMesh(CMakePackage): """Mesh solver for DAMASK""" diff --git a/var/spack/repos/builtin/packages/damask/package.py b/var/spack/repos/builtin/packages/damask/package.py index f57c7f21b0..e499123084 100644 --- a/var/spack/repos/builtin/packages/damask/package.py +++ b/var/spack/repos/builtin/packages/damask/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Damask(BundlePackage): """ DAMASK - The Duesseldorf Advanced Material Simulation Kit diff --git a/var/spack/repos/builtin/packages/damselfly/package.py b/var/spack/repos/builtin/packages/damselfly/package.py index b0ddff4d4f..649d30be2a 100644 --- a/var/spack/repos/builtin/packages/damselfly/package.py +++ b/var/spack/repos/builtin/packages/damselfly/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Damselfly(CMakePackage): diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index ff27179cf9..0544ac910e 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class DarshanRuntime(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index b9b53f4661..9dd5167dbb 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DarshanUtil(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dash/package.py b/var/spack/repos/builtin/packages/dash/package.py index 4a2a694196..6856795996 100644 --- a/var/spack/repos/builtin/packages/dash/package.py +++ b/var/spack/repos/builtin/packages/dash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dash(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/datamash/package.py b/var/spack/repos/builtin/packages/datamash/package.py index d9da626f63..a046008a51 100644 --- a/var/spack/repos/builtin/packages/datamash/package.py +++ b/var/spack/repos/builtin/packages/datamash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Datamash(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py index 0a02b9344d..5beccc427d 100644 --- a/var/spack/repos/builtin/packages/dataspaces/package.py +++ b/var/spack/repos/builtin/packages/dataspaces/package.py @@ -5,7 +5,7 @@ import six -from spack import * +from spack.package import * def is_string(x): diff --git a/var/spack/repos/builtin/packages/datatransferkit/package.py b/var/spack/repos/builtin/packages/datatransferkit/package.py index d46afe5879..6bccb3c42d 100644 --- a/var/spack/repos/builtin/packages/datatransferkit/package.py +++ b/var/spack/repos/builtin/packages/datatransferkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Datatransferkit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/date/package.py b/var/spack/repos/builtin/packages/date/package.py index 1ddfc62bda..e7f981b2aa 100644 --- a/var/spack/repos/builtin/packages/date/package.py +++ b/var/spack/repos/builtin/packages/date/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Date(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dateutils/package.py b/var/spack/repos/builtin/packages/dateutils/package.py index 5d8215d72b..9b4655ae47 100644 --- a/var/spack/repos/builtin/packages/dateutils/package.py +++ b/var/spack/repos/builtin/packages/dateutils/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dateutils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/davix/package.py b/var/spack/repos/builtin/packages/davix/package.py index 0a470904e5..18fb4fcdb0 100644 --- a/var/spack/repos/builtin/packages/davix/package.py +++ b/var/spack/repos/builtin/packages/davix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Davix(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dbcsr/package.py b/var/spack/repos/builtin/packages/dbcsr/package.py index 40ab0d571f..a0c6716558 100644 --- a/var/spack/repos/builtin/packages/dbcsr/package.py +++ b/var/spack/repos/builtin/packages/dbcsr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dbcsr(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/dbow2/package.py b/var/spack/repos/builtin/packages/dbow2/package.py index a74ab89364..d1c5733761 100644 --- a/var/spack/repos/builtin/packages/dbow2/package.py +++ b/var/spack/repos/builtin/packages/dbow2/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/dbus-glib/package.py b/var/spack/repos/builtin/packages/dbus-glib/package.py index eb56b7173f..a183b1f8c1 100644 --- a/var/spack/repos/builtin/packages/dbus-glib/package.py +++ b/var/spack/repos/builtin/packages/dbus-glib/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DbusGlib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dbus/package.py b/var/spack/repos/builtin/packages/dbus/package.py index 371202da4f..5b8b9bd05f 100644 --- a/var/spack/repos/builtin/packages/dbus/package.py +++ b/var/spack/repos/builtin/packages/dbus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dbus(Package): diff --git a/var/spack/repos/builtin/packages/dbxtool/package.py b/var/spack/repos/builtin/packages/dbxtool/package.py index ba8f524ba7..fb6394eb05 100644 --- a/var/spack/repos/builtin/packages/dbxtool/package.py +++ b/var/spack/repos/builtin/packages/dbxtool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dbxtool(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dcap/package.py b/var/spack/repos/builtin/packages/dcap/package.py index 20308a9254..a5a09f915b 100644 --- a/var/spack/repos/builtin/packages/dcap/package.py +++ b/var/spack/repos/builtin/packages/dcap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dcap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dcm2niix/package.py b/var/spack/repos/builtin/packages/dcm2niix/package.py index 10f2f2c2ce..b641efaf19 100644 --- a/var/spack/repos/builtin/packages/dcm2niix/package.py +++ b/var/spack/repos/builtin/packages/dcm2niix/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dcm2niix(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dcmtk/package.py b/var/spack/repos/builtin/packages/dcmtk/package.py index 2f65978ba1..ee30c73cdc 100644 --- a/var/spack/repos/builtin/packages/dcmtk/package.py +++ b/var/spack/repos/builtin/packages/dcmtk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dcmtk(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dd4hep/package.py b/var/spack/repos/builtin/packages/dd4hep/package.py index 5e144d5d4b..19b1eda647 100644 --- a/var/spack/repos/builtin/packages/dd4hep/package.py +++ b/var/spack/repos/builtin/packages/dd4hep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dd4hep(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ddd/package.py b/var/spack/repos/builtin/packages/ddd/package.py index 63a37a85a9..7f2ccb7db3 100644 --- a/var/spack/repos/builtin/packages/ddd/package.py +++ b/var/spack/repos/builtin/packages/ddd/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Ddd(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py index db85348dda..5583567cef 100644 --- a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py +++ b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DealiiParameterGui(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 7ed644a0ca..c342089ff8 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/debbuild/package.py b/var/spack/repos/builtin/packages/debbuild/package.py index fe73e18817..42528f3712 100644 --- a/var/spack/repos/builtin/packages/debbuild/package.py +++ b/var/spack/repos/builtin/packages/debbuild/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Debbuild(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/debugedit/package.py b/var/spack/repos/builtin/packages/debugedit/package.py index af4d7d9647..c3c756962c 100644 --- a/var/spack/repos/builtin/packages/debugedit/package.py +++ b/var/spack/repos/builtin/packages/debugedit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Debugedit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/decentralized-internet/package.py b/var/spack/repos/builtin/packages/decentralized-internet/package.py index f2acf34ace..db30218b22 100644 --- a/var/spack/repos/builtin/packages/decentralized-internet/package.py +++ b/var/spack/repos/builtin/packages/decentralized-internet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DecentralizedInternet(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/deconseq-standalone/package.py b/var/spack/repos/builtin/packages/deconseq-standalone/package.py index 6b1143448f..58c7d7ed1b 100644 --- a/var/spack/repos/builtin/packages/deconseq-standalone/package.py +++ b/var/spack/repos/builtin/packages/deconseq-standalone/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DeconseqStandalone(Package): diff --git a/var/spack/repos/builtin/packages/dejagnu/package.py b/var/spack/repos/builtin/packages/dejagnu/package.py index 97de1038bc..40ba31495f 100644 --- a/var/spack/repos/builtin/packages/dejagnu/package.py +++ b/var/spack/repos/builtin/packages/dejagnu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dejagnu(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/delly2/package.py b/var/spack/repos/builtin/packages/delly2/package.py index d6fc1d0086..c67581ef4b 100644 --- a/var/spack/repos/builtin/packages/delly2/package.py +++ b/var/spack/repos/builtin/packages/delly2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/delphes/package.py b/var/spack/repos/builtin/packages/delphes/package.py index 61a1d9e67a..b19cb0dc16 100644 --- a/var/spack/repos/builtin/packages/delphes/package.py +++ b/var/spack/repos/builtin/packages/delphes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Delphes(CMakePackage): diff --git a/var/spack/repos/builtin/packages/delta/package.py b/var/spack/repos/builtin/packages/delta/package.py index c1d23bbb22..04dfa76850 100644 --- a/var/spack/repos/builtin/packages/delta/package.py +++ b/var/spack/repos/builtin/packages/delta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Delta(Package): diff --git a/var/spack/repos/builtin/packages/denovogear/package.py b/var/spack/repos/builtin/packages/denovogear/package.py index 581283f033..bb77962cbd 100644 --- a/var/spack/repos/builtin/packages/denovogear/package.py +++ b/var/spack/repos/builtin/packages/denovogear/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Denovogear(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dftbplus/package.py b/var/spack/repos/builtin/packages/dftbplus/package.py index 7b535dc204..21c427c5ff 100644 --- a/var/spack/repos/builtin/packages/dftbplus/package.py +++ b/var/spack/repos/builtin/packages/dftbplus/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Dftbplus(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dftd3-lib/package.py b/var/spack/repos/builtin/packages/dftd3-lib/package.py index f87bf89465..7b0d69c3d3 100644 --- a/var/spack/repos/builtin/packages/dftd3-lib/package.py +++ b/var/spack/repos/builtin/packages/dftd3-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dftd3Lib(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dftd4/package.py b/var/spack/repos/builtin/packages/dftd4/package.py index f2039e23af..99d019af40 100644 --- a/var/spack/repos/builtin/packages/dftd4/package.py +++ b/var/spack/repos/builtin/packages/dftd4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dftd4(MesonPackage): diff --git a/var/spack/repos/builtin/packages/dftfe/package.py b/var/spack/repos/builtin/packages/dftfe/package.py index f711775130..031356da9e 100644 --- a/var/spack/repos/builtin/packages/dftfe/package.py +++ b/var/spack/repos/builtin/packages/dftfe/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dftfe(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dhpmm-f/package.py b/var/spack/repos/builtin/packages/dhpmm-f/package.py index 99b0209ff7..228daecf2b 100644 --- a/var/spack/repos/builtin/packages/dhpmm-f/package.py +++ b/var/spack/repos/builtin/packages/dhpmm-f/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DhpmmF(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dhtest/package.py b/var/spack/repos/builtin/packages/dhtest/package.py index e82b421105..eaf195d11e 100644 --- a/var/spack/repos/builtin/packages/dhtest/package.py +++ b/var/spack/repos/builtin/packages/dhtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dhtest(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index 256588334a..daabd844dc 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dia(Package): diff --git a/var/spack/repos/builtin/packages/dialign-tx/package.py b/var/spack/repos/builtin/packages/dialign-tx/package.py index c95dad770a..b03bbaf89f 100644 --- a/var/spack/repos/builtin/packages/dialign-tx/package.py +++ b/var/spack/repos/builtin/packages/dialign-tx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DialignTx(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dialign/package.py b/var/spack/repos/builtin/packages/dialign/package.py index b9ba48ad3c..90c7969797 100644 --- a/var/spack/repos/builtin/packages/dialign/package.py +++ b/var/spack/repos/builtin/packages/dialign/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dialign(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py index 4054a10792..ab55e3e394 100644 --- a/var/spack/repos/builtin/packages/diamond/package.py +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Diamond(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dicom3tools/package.py b/var/spack/repos/builtin/packages/dicom3tools/package.py index 2086088650..a0e06ed7e7 100644 --- a/var/spack/repos/builtin/packages/dicom3tools/package.py +++ b/var/spack/repos/builtin/packages/dicom3tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dicom3tools(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/diffmark/package.py b/var/spack/repos/builtin/packages/diffmark/package.py index db99d0c184..4f5d456f48 100644 --- a/var/spack/repos/builtin/packages/diffmark/package.py +++ b/var/spack/repos/builtin/packages/diffmark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Diffmark(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/diffsplice/package.py b/var/spack/repos/builtin/packages/diffsplice/package.py index 841cb41f52..a4048d829d 100644 --- a/var/spack/repos/builtin/packages/diffsplice/package.py +++ b/var/spack/repos/builtin/packages/diffsplice/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Diffsplice(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/diffutils/package.py b/var/spack/repos/builtin/packages/diffutils/package.py index 31bf6b4753..9e8e60e0f8 100644 --- a/var/spack/repos/builtin/packages/diffutils/package.py +++ b/var/spack/repos/builtin/packages/diffutils/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Diffutils(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py index 42e84b06ee..cfd14ae805 100644 --- a/var/spack/repos/builtin/packages/dihydrogen/package.py +++ b/var/spack/repos/builtin/packages/dihydrogen/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Dihydrogen(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/dimemas/package.py b/var/spack/repos/builtin/packages/dimemas/package.py index d284d9a590..97956e41f2 100644 --- a/var/spack/repos/builtin/packages/dimemas/package.py +++ b/var/spack/repos/builtin/packages/dimemas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dimemas(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ding-libs/package.py b/var/spack/repos/builtin/packages/ding-libs/package.py index f7805b1f3a..a2a3129ec2 100644 --- a/var/spack/repos/builtin/packages/ding-libs/package.py +++ b/var/spack/repos/builtin/packages/ding-libs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DingLibs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dire/package.py b/var/spack/repos/builtin/packages/dire/package.py index cebdce2a78..0aa7e75cc0 100644 --- a/var/spack/repos/builtin/packages/dire/package.py +++ b/var/spack/repos/builtin/packages/dire/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/direnv/package.py b/var/spack/repos/builtin/packages/direnv/package.py index b7736f7c4e..107bb294fa 100644 --- a/var/spack/repos/builtin/packages/direnv/package.py +++ b/var/spack/repos/builtin/packages/direnv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Direnv(Package): diff --git a/var/spack/repos/builtin/packages/discovar/package.py b/var/spack/repos/builtin/packages/discovar/package.py index d834ba5d8d..2738deb821 100644 --- a/var/spack/repos/builtin/packages/discovar/package.py +++ b/var/spack/repos/builtin/packages/discovar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Discovar(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/discovardenovo/package.py b/var/spack/repos/builtin/packages/discovardenovo/package.py index 0648a8c95a..2d7a715522 100644 --- a/var/spack/repos/builtin/packages/discovardenovo/package.py +++ b/var/spack/repos/builtin/packages/discovardenovo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Discovardenovo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/disktype/package.py b/var/spack/repos/builtin/packages/disktype/package.py index 638fb66351..96bf08d456 100644 --- a/var/spack/repos/builtin/packages/disktype/package.py +++ b/var/spack/repos/builtin/packages/disktype/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Disktype(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dislin/package.py b/var/spack/repos/builtin/packages/dislin/package.py index 6a593675d1..1426a9aff2 100644 --- a/var/spack/repos/builtin/packages/dislin/package.py +++ b/var/spack/repos/builtin/packages/dislin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dislin(Package): diff --git a/var/spack/repos/builtin/packages/distcc/package.py b/var/spack/repos/builtin/packages/distcc/package.py index a9f2b8bea3..ddbf9430f7 100644 --- a/var/spack/repos/builtin/packages/distcc/package.py +++ b/var/spack/repos/builtin/packages/distcc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Distcc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/diy/package.py b/var/spack/repos/builtin/packages/diy/package.py index d08a0cf2e7..79f35eb70d 100644 --- a/var/spack/repos/builtin/packages/diy/package.py +++ b/var/spack/repos/builtin/packages/diy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Diy(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dlib/package.py b/var/spack/repos/builtin/packages/dlib/package.py index 78b60a7034..844c38e565 100644 --- a/var/spack/repos/builtin/packages/dlib/package.py +++ b/var/spack/repos/builtin/packages/dlib/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Dlib(CMakePackage): """DLib is a collection of C++ classes to solve common tasks in C++ programs, as well as to offer additional functionality to use OpenCV diff --git a/var/spack/repos/builtin/packages/dlpack/package.py b/var/spack/repos/builtin/packages/dlpack/package.py index 5d637cecc4..eaf2c222c6 100644 --- a/var/spack/repos/builtin/packages/dlpack/package.py +++ b/var/spack/repos/builtin/packages/dlpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dlpack(Package): diff --git a/var/spack/repos/builtin/packages/dmd/package.py b/var/spack/repos/builtin/packages/dmd/package.py index c8ad1e3c3f..90236bf4c8 100644 --- a/var/spack/repos/builtin/packages/dmd/package.py +++ b/var/spack/repos/builtin/packages/dmd/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Dmd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dmidecode/package.py b/var/spack/repos/builtin/packages/dmidecode/package.py index 88a2473234..df402bd0ff 100644 --- a/var/spack/repos/builtin/packages/dmidecode/package.py +++ b/var/spack/repos/builtin/packages/dmidecode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dmidecode(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dmlc-core/package.py b/var/spack/repos/builtin/packages/dmlc-core/package.py index 4c319acfd1..363d652a79 100644 --- a/var/spack/repos/builtin/packages/dmlc-core/package.py +++ b/var/spack/repos/builtin/packages/dmlc-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DmlcCore(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dmtcp/package.py b/var/spack/repos/builtin/packages/dmtcp/package.py index f5b9c7c8d3..88d2c251dc 100644 --- a/var/spack/repos/builtin/packages/dmtcp/package.py +++ b/var/spack/repos/builtin/packages/dmtcp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dmtcp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dmxproto/package.py b/var/spack/repos/builtin/packages/dmxproto/package.py index 8ef305b2a0..216bfbb451 100644 --- a/var/spack/repos/builtin/packages/dmxproto/package.py +++ b/var/spack/repos/builtin/packages/dmxproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dmxproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/dnsmap/package.py b/var/spack/repos/builtin/packages/dnsmap/package.py index 1eda21372e..960eeb6f94 100644 --- a/var/spack/repos/builtin/packages/dnsmap/package.py +++ b/var/spack/repos/builtin/packages/dnsmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dnsmap(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dnsmasq/package.py b/var/spack/repos/builtin/packages/dnsmasq/package.py index c509f6656a..c32df4e7b6 100644 --- a/var/spack/repos/builtin/packages/dnsmasq/package.py +++ b/var/spack/repos/builtin/packages/dnsmasq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dnsmasq(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dnstop/package.py b/var/spack/repos/builtin/packages/dnstop/package.py index b2b439f1ea..69fd05be3a 100644 --- a/var/spack/repos/builtin/packages/dnstop/package.py +++ b/var/spack/repos/builtin/packages/dnstop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dnstop(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dnstracer/package.py b/var/spack/repos/builtin/packages/dnstracer/package.py index 5943c868e5..8ea9deeca8 100644 --- a/var/spack/repos/builtin/packages/dnstracer/package.py +++ b/var/spack/repos/builtin/packages/dnstracer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dnstracer(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py index 577b49469e..fcffd920b0 100644 --- a/var/spack/repos/builtin/packages/docbook-xml/package.py +++ b/var/spack/repos/builtin/packages/docbook-xml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DocbookXml(Package): diff --git a/var/spack/repos/builtin/packages/docbook-xsl/package.py b/var/spack/repos/builtin/packages/docbook-xsl/package.py index 73dadd2d46..cfa5f6278f 100644 --- a/var/spack/repos/builtin/packages/docbook-xsl/package.py +++ b/var/spack/repos/builtin/packages/docbook-xsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DocbookXsl(Package): diff --git a/var/spack/repos/builtin/packages/dock/package.py b/var/spack/repos/builtin/packages/dock/package.py index 05347f0bb4..5994d1b784 100644 --- a/var/spack/repos/builtin/packages/dock/package.py +++ b/var/spack/repos/builtin/packages/dock/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Dock(Package): diff --git a/var/spack/repos/builtin/packages/dos2unix/package.py b/var/spack/repos/builtin/packages/dos2unix/package.py index 2e53c6a9a3..3cdf13afe0 100644 --- a/var/spack/repos/builtin/packages/dos2unix/package.py +++ b/var/spack/repos/builtin/packages/dos2unix/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Dos2unix(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dosfstools/package.py b/var/spack/repos/builtin/packages/dosfstools/package.py index 34467fb6b9..ba5d86bfab 100644 --- a/var/spack/repos/builtin/packages/dosfstools/package.py +++ b/var/spack/repos/builtin/packages/dosfstools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dosfstools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dotconf/package.py b/var/spack/repos/builtin/packages/dotconf/package.py index 4d9b3e27a9..b134b3873f 100644 --- a/var/spack/repos/builtin/packages/dotconf/package.py +++ b/var/spack/repos/builtin/packages/dotconf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dotconf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py b/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py index deece88cdb..ece424b075 100644 --- a/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py +++ b/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class DotnetCoreSdk(Package): diff --git a/var/spack/repos/builtin/packages/double-conversion/package.py b/var/spack/repos/builtin/packages/double-conversion/package.py index ced879aa1d..9287c501e8 100644 --- a/var/spack/repos/builtin/packages/double-conversion/package.py +++ b/var/spack/repos/builtin/packages/double-conversion/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class DoubleConversion(CMakePackage): diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index a978359b42..b0dfb4d3be 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Doxygen(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dpcpp/package.py b/var/spack/repos/builtin/packages/dpcpp/package.py index c07fc12479..dd68a65dd4 100644 --- a/var/spack/repos/builtin/packages/dpcpp/package.py +++ b/var/spack/repos/builtin/packages/dpcpp/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class Dpcpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dpdk/package.py b/var/spack/repos/builtin/packages/dpdk/package.py index d0798a9d5d..f71c794141 100644 --- a/var/spack/repos/builtin/packages/dpdk/package.py +++ b/var/spack/repos/builtin/packages/dpdk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dpdk(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/draco/package.py b/var/spack/repos/builtin/packages/draco/package.py index b09a79603f..e89bb47c2d 100644 --- a/var/spack/repos/builtin/packages/draco/package.py +++ b/var/spack/repos/builtin/packages/draco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Draco(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dracut/package.py b/var/spack/repos/builtin/packages/dracut/package.py index 4aebce5503..708713173b 100644 --- a/var/spack/repos/builtin/packages/dracut/package.py +++ b/var/spack/repos/builtin/packages/dracut/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dracut(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dramsim2/package.py b/var/spack/repos/builtin/packages/dramsim2/package.py index 5ed7c208f5..e178a44c7d 100644 --- a/var/spack/repos/builtin/packages/dramsim2/package.py +++ b/var/spack/repos/builtin/packages/dramsim2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dramsim2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dramsim3/package.py b/var/spack/repos/builtin/packages/dramsim3/package.py index 9a233ec1e5..10b645f632 100644 --- a/var/spack/repos/builtin/packages/dramsim3/package.py +++ b/var/spack/repos/builtin/packages/dramsim3/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * # Uses Cmake but does not follow a sane convention diff --git a/var/spack/repos/builtin/packages/dray/package.py b/var/spack/repos/builtin/packages/dray/package.py index a26cc566f4..cc074ff71c 100644 --- a/var/spack/repos/builtin/packages/dray/package.py +++ b/var/spack/repos/builtin/packages/dray/package.py @@ -8,7 +8,17 @@ import socket import llnl.util.tty as tty -from spack import * +from spack.package import * + + +def propagate_cuda_arch(package, spec=None): + if not spec: + spec = '' + for cuda_arch in CudaPackage.cuda_arch_values: + depends_on('{0} +cuda cuda_arch={1}' + .format(package, cuda_arch), + when='{0} +cuda cuda_arch={1}' + .format(spec, cuda_arch)) def cmake_cache_entry(name, value, vtype=None): @@ -54,15 +64,6 @@ class Dray(Package, CudaPackage): # set to false for systems that implicitly link mpi variant('blt_find_mpi', default=True, description='Use BLT CMake Find MPI logic') - def propagate_cuda_arch(package, spec=None): - if not spec: - spec = '' - for cuda_arch in CudaPackage.cuda_arch_values: - depends_on('{0} +cuda cuda_arch={1}' - .format(package, cuda_arch), - when='{0} +cuda cuda_arch={1}' - .format(spec, cuda_arch)) - depends_on('mpi', when='+mpi') depends_on('cmake@3.9:', type='build') diff --git a/var/spack/repos/builtin/packages/dri2proto/package.py b/var/spack/repos/builtin/packages/dri2proto/package.py index b33ff8a676..6a9cc184e6 100644 --- a/var/spack/repos/builtin/packages/dri2proto/package.py +++ b/var/spack/repos/builtin/packages/dri2proto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dri2proto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/dri3proto/package.py b/var/spack/repos/builtin/packages/dri3proto/package.py index f2b47feb2f..dec1ec7a7f 100644 --- a/var/spack/repos/builtin/packages/dri3proto/package.py +++ b/var/spack/repos/builtin/packages/dri3proto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dri3proto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/drill/package.py b/var/spack/repos/builtin/packages/drill/package.py index 6ec77c6140..0dcfe84ba1 100644 --- a/var/spack/repos/builtin/packages/drill/package.py +++ b/var/spack/repos/builtin/packages/drill/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Drill(Package): diff --git a/var/spack/repos/builtin/packages/dropwatch/package.py b/var/spack/repos/builtin/packages/dropwatch/package.py index a378db4d33..9753be922a 100644 --- a/var/spack/repos/builtin/packages/dropwatch/package.py +++ b/var/spack/repos/builtin/packages/dropwatch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dropwatch(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/druid/package.py b/var/spack/repos/builtin/packages/druid/package.py index e7357fd1c6..85cabf4345 100644 --- a/var/spack/repos/builtin/packages/druid/package.py +++ b/var/spack/repos/builtin/packages/druid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Druid(MavenPackage): diff --git a/var/spack/repos/builtin/packages/ds/package.py b/var/spack/repos/builtin/packages/ds/package.py index 9a14a5049a..9f8bbb586c 100644 --- a/var/spack/repos/builtin/packages/ds/package.py +++ b/var/spack/repos/builtin/packages/ds/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class Ds(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dsdp/package.py b/var/spack/repos/builtin/packages/dsdp/package.py index 445ef903bc..62376f320a 100644 --- a/var/spack/repos/builtin/packages/dsdp/package.py +++ b/var/spack/repos/builtin/packages/dsdp/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Dsdp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dsfmt/package.py b/var/spack/repos/builtin/packages/dsfmt/package.py index 26b53a671a..4db5b9e469 100644 --- a/var/spack/repos/builtin/packages/dsfmt/package.py +++ b/var/spack/repos/builtin/packages/dsfmt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dsfmt(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dsqss/package.py b/var/spack/repos/builtin/packages/dsqss/package.py index b247406443..2e7d9b89a7 100644 --- a/var/spack/repos/builtin/packages/dsqss/package.py +++ b/var/spack/repos/builtin/packages/dsqss/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * class Dsqss(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dsrc/package.py b/var/spack/repos/builtin/packages/dsrc/package.py index abde2e7e66..7331007917 100644 --- a/var/spack/repos/builtin/packages/dsrc/package.py +++ b/var/spack/repos/builtin/packages/dsrc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dsrc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dssp/package.py b/var/spack/repos/builtin/packages/dssp/package.py index 6c0fcbeaac..cc11502b63 100644 --- a/var/spack/repos/builtin/packages/dssp/package.py +++ b/var/spack/repos/builtin/packages/dssp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/dtc/package.py b/var/spack/repos/builtin/packages/dtc/package.py index 05a54006af..6d02c437fd 100644 --- a/var/spack/repos/builtin/packages/dtc/package.py +++ b/var/spack/repos/builtin/packages/dtc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dtcmp/package.py b/var/spack/repos/builtin/packages/dtcmp/package.py index d4682c7688..32271e68a4 100644 --- a/var/spack/repos/builtin/packages/dtcmp/package.py +++ b/var/spack/repos/builtin/packages/dtcmp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtcmp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/dtf/package.py b/var/spack/repos/builtin/packages/dtf/package.py index a3a9f33965..c390c102fa 100644 --- a/var/spack/repos/builtin/packages/dtf/package.py +++ b/var/spack/repos/builtin/packages/dtf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dtf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/duperemove/package.py b/var/spack/repos/builtin/packages/duperemove/package.py index ce7a2672f5..f212bdded2 100644 --- a/var/spack/repos/builtin/packages/duperemove/package.py +++ b/var/spack/repos/builtin/packages/duperemove/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Duperemove(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/dust/package.py b/var/spack/repos/builtin/packages/dust/package.py index 88c417936e..b8b85e28cb 100644 --- a/var/spack/repos/builtin/packages/dust/package.py +++ b/var/spack/repos/builtin/packages/dust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dust(Package): diff --git a/var/spack/repos/builtin/packages/dwz/package.py b/var/spack/repos/builtin/packages/dwz/package.py index 9b3fbb8ff3..32ba5a9c4a 100644 --- a/var/spack/repos/builtin/packages/dwz/package.py +++ b/var/spack/repos/builtin/packages/dwz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dwz(MakefilePackage, SourcewarePackage): diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 6505199851..4b88328995 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Dyninst(CMakePackage): diff --git a/var/spack/repos/builtin/packages/dysco/package.py b/var/spack/repos/builtin/packages/dysco/package.py index 70357f5124..2bc68d3e2f 100644 --- a/var/spack/repos/builtin/packages/dysco/package.py +++ b/var/spack/repos/builtin/packages/dysco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Dysco(CMakePackage): diff --git a/var/spack/repos/builtin/packages/e2fsprogs/package.py b/var/spack/repos/builtin/packages/e2fsprogs/package.py index 65e5c3ee80..a38c9543c2 100644 --- a/var/spack/repos/builtin/packages/e2fsprogs/package.py +++ b/var/spack/repos/builtin/packages/e2fsprogs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class E2fsprogs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ea-utils/package.py b/var/spack/repos/builtin/packages/ea-utils/package.py index 1e586590be..4a9bbd1365 100644 --- a/var/spack/repos/builtin/packages/ea-utils/package.py +++ b/var/spack/repos/builtin/packages/ea-utils/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class EaUtils(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/eagle/package.py b/var/spack/repos/builtin/packages/eagle/package.py index d320a0ebbf..ff522b406c 100644 --- a/var/spack/repos/builtin/packages/eagle/package.py +++ b/var/spack/repos/builtin/packages/eagle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Eagle(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/earlyoom/package.py b/var/spack/repos/builtin/packages/earlyoom/package.py index 1d8fa06173..9e4fb9f23b 100644 --- a/var/spack/repos/builtin/packages/earlyoom/package.py +++ b/var/spack/repos/builtin/packages/earlyoom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Earlyoom(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/easi/package.py b/var/spack/repos/builtin/packages/easi/package.py index d92b2ed6c7..475e5b77c8 100644 --- a/var/spack/repos/builtin/packages/easi/package.py +++ b/var/spack/repos/builtin/packages/easi/package.py @@ -7,7 +7,7 @@ import os import shutil -from spack import * +from spack.package import * from spack.repo import GitExe diff --git a/var/spack/repos/builtin/packages/easybuild/package.py b/var/spack/repos/builtin/packages/easybuild/package.py index 5e7c8fdca7..25ca703e86 100644 --- a/var/spack/repos/builtin/packages/easybuild/package.py +++ b/var/spack/repos/builtin/packages/easybuild/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Easybuild(PythonPackage): diff --git a/var/spack/repos/builtin/packages/ebms/package.py b/var/spack/repos/builtin/packages/ebms/package.py index 70fc1d33e2..b162dda043 100644 --- a/var/spack/repos/builtin/packages/ebms/package.py +++ b/var/spack/repos/builtin/packages/ebms/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ebms(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ecbuild/package.py b/var/spack/repos/builtin/packages/ecbuild/package.py index 854deac881..b207330dcb 100644 --- a/var/spack/repos/builtin/packages/ecbuild/package.py +++ b/var/spack/repos/builtin/packages/ecbuild/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ecbuild(CMakePackage): diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index bbf0b7f5ec..291b7c2a08 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + _definitions = { # German Meteorological Service (Deutscher Wetterdienst, DWD): 'edzw': { diff --git a/var/spack/repos/builtin/packages/ecdsautils/package.py b/var/spack/repos/builtin/packages/ecdsautils/package.py index 98ae2bbab0..fc5c5fe0be 100644 --- a/var/spack/repos/builtin/packages/ecdsautils/package.py +++ b/var/spack/repos/builtin/packages/ecdsautils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ecdsautils(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ecflow/package.py b/var/spack/repos/builtin/packages/ecflow/package.py index bb61bfa59e..aa2aff292d 100644 --- a/var/spack/repos/builtin/packages/ecflow/package.py +++ b/var/spack/repos/builtin/packages/ecflow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/eckit/package.py b/var/spack/repos/builtin/packages/eckit/package.py index 84c71e5db7..410b9aaf23 100644 --- a/var/spack/repos/builtin/packages/eckit/package.py +++ b/var/spack/repos/builtin/packages/eckit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Eckit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py b/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py index 82e4bfd2a5..2ca6a2c191 100644 --- a/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py +++ b/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class EclipseGcjParser(Package): diff --git a/var/spack/repos/builtin/packages/ecos/package.py b/var/spack/repos/builtin/packages/ecos/package.py index 2599366113..9f34d08670 100644 --- a/var/spack/repos/builtin/packages/ecos/package.py +++ b/var/spack/repos/builtin/packages/ecos/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ecos(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ecoslim/package.py b/var/spack/repos/builtin/packages/ecoslim/package.py index db1a882883..cff8058289 100644 --- a/var/spack/repos/builtin/packages/ecoslim/package.py +++ b/var/spack/repos/builtin/packages/ecoslim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ecoslim(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py index dd32a47586..1ebbe4963f 100644 --- a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py +++ b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py @@ -3,7 +3,54 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * + + +# Wrapper around depends_on to propagate dependency variants +def dav_sdk_depends_on(spec, when=None, propagate=None): + # Do the basic depends_on + depends_on(spec, when=when) + + # Strip spec string to just the base spec name + # ie. A +c ~b -> A + spec = Spec(spec).name + + if '+' in when and len(when.split()) == 1: + when_not = when.replace('+', '~') + # If the package is in the spec tree then it must + # be enabled in the SDK. + conflicts(when_not, '^' + spec) + + # Skip if there is nothing to propagate + if not propagate: + return + + # Map the propagated variants to the dependency variant + if not type(propagate) is dict: + propagate = dict([(v, v) for v in propagate]) + + # Determine the base variant + base_variant = '' + if when: + base_variant = when + + def is_boolean(variant): + return '=' not in variant + + # Propagate variants to dependecy + for v_when, v_then in propagate.items(): + if is_boolean(v_when): + depends_on('{0} +{1}'.format(spec, v_then), + when='{0} +{1}'.format(base_variant, v_when)) + depends_on('{0} ~{1}'.format(spec, v_then), + when='{0} ~{1}'.format(base_variant, v_when)) + else: + depends_on('{0} {1}'.format(spec, v_then), + when='{0} {1}'.format(base_variant, v_when)) + + +def exclude_variants(variants, exclude): + return [variant for variant in variants if variant not in exclude] class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): @@ -42,51 +89,6 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): variant('sensei', default=False, description="Enable Sensei") conflicts('+sensei') - # Wrapper around depends_on to propagate dependency variants - def dav_sdk_depends_on(spec, when=None, propagate=None): - # Do the basic depends_on - depends_on(spec, when=when) - - # Strip spec string to just the base spec name - # ie. A +c ~b -> A - spec = Spec(spec).name - - if '+' in when and len(when.split()) == 1: - when_not = when.replace('+', '~') - # If the package is in the spec tree then it must - # be enabled in the SDK. - conflicts(when_not, '^' + spec) - - # Skip if there is nothing to propagate - if not propagate: - return - - # Map the propagated variants to the dependency variant - if not type(propagate) is dict: - propagate = dict([(v, v) for v in propagate]) - - # Determine the base variant - base_variant = '' - if when: - base_variant = when - - def is_boolean(variant): - return '=' not in variant - - # Propagate variants to dependecy - for v_when, v_then in propagate.items(): - if is_boolean(v_when): - depends_on('{0} +{1}'.format(spec, v_then), - when='{0} +{1}'.format(base_variant, v_when)) - depends_on('{0} ~{1}'.format(spec, v_then), - when='{0} ~{1}'.format(base_variant, v_when)) - else: - depends_on('{0} {1}'.format(spec, v_then), - when='{0} {1}'.format(base_variant, v_when)) - - def exclude_variants(variants, exclude): - return [variant for variant in variants if variant not in exclude] - ############################################################ # Dependencies ############################################################ diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py index 9a18fad825..8ce91e2be9 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class EcpProxyApps(BundlePackage): diff --git a/var/spack/repos/builtin/packages/ed/package.py b/var/spack/repos/builtin/packages/ed/package.py index 6213f609f4..96735c1f08 100644 --- a/var/spack/repos/builtin/packages/ed/package.py +++ b/var/spack/repos/builtin/packages/ed/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ed(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/editline/package.py b/var/spack/repos/builtin/packages/editline/package.py index 0ba9801e0b..f3f0195799 100644 --- a/var/spack/repos/builtin/packages/editline/package.py +++ b/var/spack/repos/builtin/packages/editline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Editline(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/editres/package.py b/var/spack/repos/builtin/packages/editres/package.py index 4f337b3e47..b9ac8e18a6 100644 --- a/var/spack/repos/builtin/packages/editres/package.py +++ b/var/spack/repos/builtin/packages/editres/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Editres(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/edm4hep/package.py b/var/spack/repos/builtin/packages/edm4hep/package.py index fc0bbe7a11..4f72ea790a 100644 --- a/var/spack/repos/builtin/packages/edm4hep/package.py +++ b/var/spack/repos/builtin/packages/edm4hep/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Edm4hep(CMakePackage): """Event data model of Key4hep.""" diff --git a/var/spack/repos/builtin/packages/eem/package.py b/var/spack/repos/builtin/packages/eem/package.py index 16d16ebc13..776190ce79 100644 --- a/var/spack/repos/builtin/packages/eem/package.py +++ b/var/spack/repos/builtin/packages/eem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Eem(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/efivar/package.py b/var/spack/repos/builtin/packages/efivar/package.py index 5e179b2500..25a12aea4a 100644 --- a/var/spack/repos/builtin/packages/efivar/package.py +++ b/var/spack/repos/builtin/packages/efivar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Efivar(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py index d0e7435ede..f5f3117792 100644 --- a/var/spack/repos/builtin/packages/eigen/package.py +++ b/var/spack/repos/builtin/packages/eigen/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Eigen(CMakePackage): """Eigen is a C++ template library for linear algebra matrices, vectors, numerical solvers, and related algorithms. diff --git a/var/spack/repos/builtin/packages/eigenexa/package.py b/var/spack/repos/builtin/packages/eigenexa/package.py index aa78d2fcff..df856700d6 100644 --- a/var/spack/repos/builtin/packages/eigenexa/package.py +++ b/var/spack/repos/builtin/packages/eigenexa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Eigenexa(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/elasticsearch/package.py b/var/spack/repos/builtin/packages/elasticsearch/package.py index e6f4aff5f9..b427cf3d52 100644 --- a/var/spack/repos/builtin/packages/elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/elasticsearch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Elasticsearch(Package): diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index e5a7092a4f..789886bf80 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.spec import UnsupportedCompilerError diff --git a/var/spack/repos/builtin/packages/elfio/package.py b/var/spack/repos/builtin/packages/elfio/package.py index d48caadd2a..7c0b97cadb 100644 --- a/var/spack/repos/builtin/packages/elfio/package.py +++ b/var/spack/repos/builtin/packages/elfio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Elfio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index ee14edfe7c..56c54d0391 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -6,7 +6,7 @@ import glob import os.path -from spack import * +from spack.package import * class Elfutils(AutotoolsPackage, SourcewarePackage): diff --git a/var/spack/repos/builtin/packages/elk/package.py b/var/spack/repos/builtin/packages/elk/package.py index 2d12af8a36..c6457f23da 100644 --- a/var/spack/repos/builtin/packages/elk/package.py +++ b/var/spack/repos/builtin/packages/elk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Elk(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/elmerfem/package.py b/var/spack/repos/builtin/packages/elmerfem/package.py index 576e1e1601..3d8d1a4645 100644 --- a/var/spack/repos/builtin/packages/elmerfem/package.py +++ b/var/spack/repos/builtin/packages/elmerfem/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Elmerfem(CMakePackage): """Elmer is an open source multiphysical simulation software. It includes physical models of fluid dynamics, structural mechanics, diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index 437ab87ff5..a52cf2d9a7 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/elsd/package.py b/var/spack/repos/builtin/packages/elsd/package.py index d084545ae5..1bc84e19e9 100644 --- a/var/spack/repos/builtin/packages/elsd/package.py +++ b/var/spack/repos/builtin/packages/elsd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Elsd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/elsdc/package.py b/var/spack/repos/builtin/packages/elsdc/package.py index fe78f2f827..c335844d04 100644 --- a/var/spack/repos/builtin/packages/elsdc/package.py +++ b/var/spack/repos/builtin/packages/elsdc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Elsdc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/elsi/package.py b/var/spack/repos/builtin/packages/elsi/package.py index 68a4b10850..8fd3cbcd0a 100644 --- a/var/spack/repos/builtin/packages/elsi/package.py +++ b/var/spack/repos/builtin/packages/elsi/package.py @@ -3,11 +3,11 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # See the Spack documentation for more information on packaging. # ---------------------------------------------------------------------------- -from spack import * - class Elsi(CMakePackage): """ELSI provides a unified interface for electronic structure diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 73556e977c..7d9a76af9a 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Emacs(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/ember/package.py b/var/spack/repos/builtin/packages/ember/package.py index 6a66eb2156..9ed80f7c28 100644 --- a/var/spack/repos/builtin/packages/ember/package.py +++ b/var/spack/repos/builtin/packages/ember/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ember(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/emboss/package.py b/var/spack/repos/builtin/packages/emboss/package.py index a48c73f55e..a9289be00e 100644 --- a/var/spack/repos/builtin/packages/emboss/package.py +++ b/var/spack/repos/builtin/packages/emboss/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Emboss(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/embree/package.py b/var/spack/repos/builtin/packages/embree/package.py index 84ac601580..75c1a9cffa 100644 --- a/var/spack/repos/builtin/packages/embree/package.py +++ b/var/spack/repos/builtin/packages/embree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Embree(CMakePackage): diff --git a/var/spack/repos/builtin/packages/enca/package.py b/var/spack/repos/builtin/packages/enca/package.py index 1cab2a9c95..39fe618dfc 100644 --- a/var/spack/repos/builtin/packages/enca/package.py +++ b/var/spack/repos/builtin/packages/enca/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Enca(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/enchant/package.py b/var/spack/repos/builtin/packages/enchant/package.py index a1478a652b..6c12ddcc63 100644 --- a/var/spack/repos/builtin/packages/enchant/package.py +++ b/var/spack/repos/builtin/packages/enchant/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Enchant(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/energyplus/package.py b/var/spack/repos/builtin/packages/energyplus/package.py index 0bfc143dfa..a4b29918c3 100644 --- a/var/spack/repos/builtin/packages/energyplus/package.py +++ b/var/spack/repos/builtin/packages/energyplus/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Energyplus(Package): diff --git a/var/spack/repos/builtin/packages/entrezdirect/package.py b/var/spack/repos/builtin/packages/entrezdirect/package.py index 7cda2fc755..89ed4548e5 100644 --- a/var/spack/repos/builtin/packages/entrezdirect/package.py +++ b/var/spack/repos/builtin/packages/entrezdirect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Entrezdirect(Package): diff --git a/var/spack/repos/builtin/packages/entt/package.py b/var/spack/repos/builtin/packages/entt/package.py index e29d7d261a..a739f91274 100644 --- a/var/spack/repos/builtin/packages/entt/package.py +++ b/var/spack/repos/builtin/packages/entt/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Entt(CMakePackage): """EnTT is a header-only, tiny and easy to use library for game programming and much more written in modern C++, mainly known for its diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py index 656671c07d..8b40c341c3 100644 --- a/var/spack/repos/builtin/packages/environment-modules/package.py +++ b/var/spack/repos/builtin/packages/environment-modules/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class EnvironmentModules(Package): """The Environment Modules package provides for the dynamic modification of a user's environment via module files. diff --git a/var/spack/repos/builtin/packages/enzo/package.py b/var/spack/repos/builtin/packages/enzo/package.py index bd8b23f836..75d0dc2278 100644 --- a/var/spack/repos/builtin/packages/enzo/package.py +++ b/var/spack/repos/builtin/packages/enzo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Enzo(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/enzyme/package.py b/var/spack/repos/builtin/packages/enzyme/package.py index 2eb84fccf4..451afd061e 100644 --- a/var/spack/repos/builtin/packages/enzyme/package.py +++ b/var/spack/repos/builtin/packages/enzyme/package.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Enzyme(CMakePackage): diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py index 483239cc25..c61c0e7c30 100644 --- a/var/spack/repos/builtin/packages/eospac/package.py +++ b/var/spack/repos/builtin/packages/eospac/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Eospac(Package): diff --git a/var/spack/repos/builtin/packages/eq-r/package.py b/var/spack/repos/builtin/packages/eq-r/package.py index 6d26d5d38e..2b5aa3722b 100644 --- a/var/spack/repos/builtin/packages/eq-r/package.py +++ b/var/spack/repos/builtin/packages/eq-r/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class EqR(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py index c55c7866d5..f9143daeb0 100644 --- a/var/spack/repos/builtin/packages/er/package.py +++ b/var/spack/repos/builtin/packages/er/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Er(CMakePackage): diff --git a/var/spack/repos/builtin/packages/erfa/package.py b/var/spack/repos/builtin/packages/erfa/package.py index 0f95f8c0c2..29dc1181e2 100644 --- a/var/spack/repos/builtin/packages/erfa/package.py +++ b/var/spack/repos/builtin/packages/erfa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Erfa(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/erlang/package.py b/var/spack/repos/builtin/packages/erlang/package.py index 51f95e1d2d..2a0d4fd782 100644 --- a/var/spack/repos/builtin/packages/erlang/package.py +++ b/var/spack/repos/builtin/packages/erlang/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Erlang(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ermod/package.py b/var/spack/repos/builtin/packages/ermod/package.py index 51f06a2706..c7a91a0bea 100644 --- a/var/spack/repos/builtin/packages/ermod/package.py +++ b/var/spack/repos/builtin/packages/ermod/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ermod(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/erne/package.py b/var/spack/repos/builtin/packages/erne/package.py index 4933bbdf6a..762df38693 100644 --- a/var/spack/repos/builtin/packages/erne/package.py +++ b/var/spack/repos/builtin/packages/erne/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Erne(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/es-shell/package.py b/var/spack/repos/builtin/packages/es-shell/package.py index 81bdcb1629..966f452407 100644 --- a/var/spack/repos/builtin/packages/es-shell/package.py +++ b/var/spack/repos/builtin/packages/es-shell/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class EsShell(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 141bed0db8..6a577612dc 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Esmf(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/espanso/package.py b/var/spack/repos/builtin/packages/espanso/package.py index 1a77baab72..ef059eda49 100644 --- a/var/spack/repos/builtin/packages/espanso/package.py +++ b/var/spack/repos/builtin/packages/espanso/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Espanso(Package): diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py index 23401abaca..cf3b971f1d 100644 --- a/var/spack/repos/builtin/packages/essl/package.py +++ b/var/spack/repos/builtin/packages/essl/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Essl(BundlePackage): diff --git a/var/spack/repos/builtin/packages/esys-particle/package.py b/var/spack/repos/builtin/packages/esys-particle/package.py index 0a2aa8e72e..4337941a65 100644 --- a/var/spack/repos/builtin/packages/esys-particle/package.py +++ b/var/spack/repos/builtin/packages/esys-particle/package.py @@ -3,9 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from llnl.util.filesystem import find - -from spack import * +from spack.package import * class EsysParticle(CMakePackage): diff --git a/var/spack/repos/builtin/packages/etcd/package.py b/var/spack/repos/builtin/packages/etcd/package.py index 0de2adcedd..a0342039b6 100644 --- a/var/spack/repos/builtin/packages/etcd/package.py +++ b/var/spack/repos/builtin/packages/etcd/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * class Etcd(Package): diff --git a/var/spack/repos/builtin/packages/ethminer/package.py b/var/spack/repos/builtin/packages/ethminer/package.py index 4f6dda8097..94caa2fdf2 100644 --- a/var/spack/repos/builtin/packages/ethminer/package.py +++ b/var/spack/repos/builtin/packages/ethminer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/ethtool/package.py b/var/spack/repos/builtin/packages/ethtool/package.py index ab3f449d02..a3989b5ec8 100644 --- a/var/spack/repos/builtin/packages/ethtool/package.py +++ b/var/spack/repos/builtin/packages/ethtool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ethtool(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/etsf-io/package.py b/var/spack/repos/builtin/packages/etsf-io/package.py index 296597030a..91253d3a38 100644 --- a/var/spack/repos/builtin/packages/etsf-io/package.py +++ b/var/spack/repos/builtin/packages/etsf-io/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class EtsfIo(Package): diff --git a/var/spack/repos/builtin/packages/eve/package.py b/var/spack/repos/builtin/packages/eve/package.py index 8dd73cc1c1..34c34287ab 100644 --- a/var/spack/repos/builtin/packages/eve/package.py +++ b/var/spack/repos/builtin/packages/eve/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Eve(CMakePackage): diff --git a/var/spack/repos/builtin/packages/evemu/package.py b/var/spack/repos/builtin/packages/evemu/package.py index 96aedfa152..6d9872c068 100644 --- a/var/spack/repos/builtin/packages/evemu/package.py +++ b/var/spack/repos/builtin/packages/evemu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Evemu(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/everytrace-example/package.py b/var/spack/repos/builtin/packages/everytrace-example/package.py index 0fb62fe7b1..d3db5fdc00 100644 --- a/var/spack/repos/builtin/packages/everytrace-example/package.py +++ b/var/spack/repos/builtin/packages/everytrace-example/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class EverytraceExample(CMakePackage): diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py index d724a7411a..fb9ac295bf 100644 --- a/var/spack/repos/builtin/packages/everytrace/package.py +++ b/var/spack/repos/builtin/packages/everytrace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Everytrace(CMakePackage): diff --git a/var/spack/repos/builtin/packages/evieext/package.py b/var/spack/repos/builtin/packages/evieext/package.py index 1956b9aaa6..8a6debcd18 100644 --- a/var/spack/repos/builtin/packages/evieext/package.py +++ b/var/spack/repos/builtin/packages/evieext/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Evieext(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/evtgen/package.py b/var/spack/repos/builtin/packages/evtgen/package.py index 92650fbde5..a03fd08abd 100644 --- a/var/spack/repos/builtin/packages/evtgen/package.py +++ b/var/spack/repos/builtin/packages/evtgen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Evtgen(CMakePackage): diff --git a/var/spack/repos/builtin/packages/exa/package.py b/var/spack/repos/builtin/packages/exa/package.py index c8cc83feb6..129f8000a1 100644 --- a/var/spack/repos/builtin/packages/exa/package.py +++ b/var/spack/repos/builtin/packages/exa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exa(Package): diff --git a/var/spack/repos/builtin/packages/exabayes/package.py b/var/spack/repos/builtin/packages/exabayes/package.py index 4bedbb2d16..1c76b1b276 100644 --- a/var/spack/repos/builtin/packages/exabayes/package.py +++ b/var/spack/repos/builtin/packages/exabayes/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Exabayes(AutotoolsPackage): """ExaBayes is a software package for Bayesian tree inference. It is particularly suitable for large-scale analyses on computer clusters.""" diff --git a/var/spack/repos/builtin/packages/exago/package.py b/var/spack/repos/builtin/packages/exago/package.py index 5769d4a471..a212698157 100644 --- a/var/spack/repos/builtin/packages/exago/package.py +++ b/var/spack/repos/builtin/packages/exago/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exago(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py index d4d9f1e787..94644f46d4 100644 --- a/var/spack/repos/builtin/packages/examinimd/package.py +++ b/var/spack/repos/builtin/packages/examinimd/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Examinimd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/examl/package.py b/var/spack/repos/builtin/packages/examl/package.py index 12072a4bef..e01fae95f8 100644 --- a/var/spack/repos/builtin/packages/examl/package.py +++ b/var/spack/repos/builtin/packages/examl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Examl(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/exampm/package.py b/var/spack/repos/builtin/packages/exampm/package.py index 209140ae68..3bafd7d4bd 100644 --- a/var/spack/repos/builtin/packages/exampm/package.py +++ b/var/spack/repos/builtin/packages/exampm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exampm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/exasp2/package.py b/var/spack/repos/builtin/packages/exasp2/package.py index 15da94ba4e..8c682747dd 100644 --- a/var/spack/repos/builtin/packages/exasp2/package.py +++ b/var/spack/repos/builtin/packages/exasp2/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Exasp2(MakefilePackage): """ExaSP2 is a reference implementation of typical linear algebra algorithms and workloads for a quantum molecular dynamics (QMD) electronic structure diff --git a/var/spack/repos/builtin/packages/exawind/package.py b/var/spack/repos/builtin/packages/exawind/package.py index f08c1ed407..f3c5622a5e 100644 --- a/var/spack/repos/builtin/packages/exawind/package.py +++ b/var/spack/repos/builtin/packages/exawind/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exawind(CMakePackage): diff --git a/var/spack/repos/builtin/packages/exaworks/package.py b/var/spack/repos/builtin/packages/exaworks/package.py index dd8688a975..873f271d40 100644 --- a/var/spack/repos/builtin/packages/exaworks/package.py +++ b/var/spack/repos/builtin/packages/exaworks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exaworks(BundlePackage): diff --git a/var/spack/repos/builtin/packages/exciting/package.py b/var/spack/repos/builtin/packages/exciting/package.py index eb64d131c3..dcca64be80 100644 --- a/var/spack/repos/builtin/packages/exciting/package.py +++ b/var/spack/repos/builtin/packages/exciting/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exciting(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/exempi/package.py b/var/spack/repos/builtin/packages/exempi/package.py index 04d81f79f3..333c636cd8 100644 --- a/var/spack/repos/builtin/packages/exempi/package.py +++ b/var/spack/repos/builtin/packages/exempi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exempi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/exiv2/package.py b/var/spack/repos/builtin/packages/exiv2/package.py index b6e530e2e7..ff0647fa4c 100644 --- a/var/spack/repos/builtin/packages/exiv2/package.py +++ b/var/spack/repos/builtin/packages/exiv2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exiv2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/exmcutils/package.py b/var/spack/repos/builtin/packages/exmcutils/package.py index 0d5175a90b..8243c19ffc 100644 --- a/var/spack/repos/builtin/packages/exmcutils/package.py +++ b/var/spack/repos/builtin/packages/exmcutils/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exmcutils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py index a96b364112..5906ca88d6 100644 --- a/var/spack/repos/builtin/packages/exodusii/package.py +++ b/var/spack/repos/builtin/packages/exodusii/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * # TODO: Add support for a C++11 enabled installation that filters out the # TODO: "C++11-Disabled" flag (but only if the spec compiler supports C++11). diff --git a/var/spack/repos/builtin/packages/exonerate-gff3/package.py b/var/spack/repos/builtin/packages/exonerate-gff3/package.py index c75dd53b90..5a08f013ca 100644 --- a/var/spack/repos/builtin/packages/exonerate-gff3/package.py +++ b/var/spack/repos/builtin/packages/exonerate-gff3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ExonerateGff3(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/exonerate/package.py b/var/spack/repos/builtin/packages/exonerate/package.py index 82f46c4f53..f82d24aaeb 100644 --- a/var/spack/repos/builtin/packages/exonerate/package.py +++ b/var/spack/repos/builtin/packages/exonerate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Exonerate(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py index d037474892..e06544675f 100644 --- a/var/spack/repos/builtin/packages/expat/package.py +++ b/var/spack/repos/builtin/packages/expat/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Expat(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/expect/package.py b/var/spack/repos/builtin/packages/expect/package.py index 6d1a8a851d..2d8febdb61 100644 --- a/var/spack/repos/builtin/packages/expect/package.py +++ b/var/spack/repos/builtin/packages/expect/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Expect(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py index c5ab4cb658..76d076a439 100644 --- a/var/spack/repos/builtin/packages/express/package.py +++ b/var/spack/repos/builtin/packages/express/package.py @@ -6,7 +6,7 @@ import glob import os.path -from spack import * +from spack.package import * class Express(CMakePackage): diff --git a/var/spack/repos/builtin/packages/extrae/package.py b/var/spack/repos/builtin/packages/extrae/package.py index 0abf2cdb2b..e49cc6a329 100644 --- a/var/spack/repos/builtin/packages/extrae/package.py +++ b/var/spack/repos/builtin/packages/extrae/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost # typical working line with extrae 3.0.1 diff --git a/var/spack/repos/builtin/packages/exuberant-ctags/package.py b/var/spack/repos/builtin/packages/exuberant-ctags/package.py index 3ad583dc33..b1efe842c0 100644 --- a/var/spack/repos/builtin/packages/exuberant-ctags/package.py +++ b/var/spack/repos/builtin/packages/exuberant-ctags/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ExuberantCtags(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/eztrace/package.py b/var/spack/repos/builtin/packages/eztrace/package.py index b610beb29a..61f6e6e2e9 100644 --- a/var/spack/repos/builtin/packages/eztrace/package.py +++ b/var/spack/repos/builtin/packages/eztrace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Eztrace(Package): diff --git a/var/spack/repos/builtin/packages/f2c/package.py b/var/spack/repos/builtin/packages/f2c/package.py index 573fff09ba..12a9ae9b1f 100644 --- a/var/spack/repos/builtin/packages/f2c/package.py +++ b/var/spack/repos/builtin/packages/f2c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class F2c(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/f3d/package.py b/var/spack/repos/builtin/packages/f3d/package.py index 8da157b277..61bda7863f 100644 --- a/var/spack/repos/builtin/packages/f3d/package.py +++ b/var/spack/repos/builtin/packages/f3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class F3d(CMakePackage): diff --git a/var/spack/repos/builtin/packages/f77-zmq/package.py b/var/spack/repos/builtin/packages/f77-zmq/package.py index 7a19080e29..6a71244840 100644 --- a/var/spack/repos/builtin/packages/f77-zmq/package.py +++ b/var/spack/repos/builtin/packages/f77-zmq/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class F77Zmq(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/f90cache/package.py b/var/spack/repos/builtin/packages/f90cache/package.py index b3bca82a17..ef352bf5d1 100644 --- a/var/spack/repos/builtin/packages/f90cache/package.py +++ b/var/spack/repos/builtin/packages/f90cache/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class F90cache(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fabtests/package.py b/var/spack/repos/builtin/packages/fabtests/package.py index a4fb556bef..40ea2479be 100644 --- a/var/spack/repos/builtin/packages/fabtests/package.py +++ b/var/spack/repos/builtin/packages/fabtests/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fabtests(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fairlogger/package.py b/var/spack/repos/builtin/packages/fairlogger/package.py index 8f7dc95bd9..d6318653b9 100644 --- a/var/spack/repos/builtin/packages/fairlogger/package.py +++ b/var/spack/repos/builtin/packages/fairlogger/package.py @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/faiss/package.py b/var/spack/repos/builtin/packages/faiss/package.py index 4bde6f0fbc..a1e27f9617 100644 --- a/var/spack/repos/builtin/packages/faiss/package.py +++ b/var/spack/repos/builtin/packages/faiss/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Faiss(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/fakechroot/package.py b/var/spack/repos/builtin/packages/fakechroot/package.py index 9eb5099a33..48265cce7e 100644 --- a/var/spack/repos/builtin/packages/fakechroot/package.py +++ b/var/spack/repos/builtin/packages/fakechroot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fakechroot(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fakexrandr/package.py b/var/spack/repos/builtin/packages/fakexrandr/package.py index b0876ff877..e51a15addb 100644 --- a/var/spack/repos/builtin/packages/fakexrandr/package.py +++ b/var/spack/repos/builtin/packages/fakexrandr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fakexrandr(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/falcon/package.py b/var/spack/repos/builtin/packages/falcon/package.py index b888965a73..61a9b151e3 100644 --- a/var/spack/repos/builtin/packages/falcon/package.py +++ b/var/spack/repos/builtin/packages/falcon/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Falcon(PythonPackage): diff --git a/var/spack/repos/builtin/packages/fann/package.py b/var/spack/repos/builtin/packages/fann/package.py index a5bb4f0656..02e7539f53 100644 --- a/var/spack/repos/builtin/packages/fann/package.py +++ b/var/spack/repos/builtin/packages/fann/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fann(CMakePackage): diff --git a/var/spack/repos/builtin/packages/faodel/package.py b/var/spack/repos/builtin/packages/faodel/package.py index 12df7c2f54..8cf5420da8 100644 --- a/var/spack/repos/builtin/packages/faodel/package.py +++ b/var/spack/repos/builtin/packages/faodel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Faodel(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fasd/package.py b/var/spack/repos/builtin/packages/fasd/package.py index 3411c7f2a8..912e465a36 100644 --- a/var/spack/repos/builtin/packages/fasd/package.py +++ b/var/spack/repos/builtin/packages/fasd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fasd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fast-global-file-status/package.py b/var/spack/repos/builtin/packages/fast-global-file-status/package.py index 88d2bf0d7f..513baef564 100644 --- a/var/spack/repos/builtin/packages/fast-global-file-status/package.py +++ b/var/spack/repos/builtin/packages/fast-global-file-status/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FastGlobalFileStatus(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fasta/package.py b/var/spack/repos/builtin/packages/fasta/package.py index ce9821acd1..d7eadc1db7 100644 --- a/var/spack/repos/builtin/packages/fasta/package.py +++ b/var/spack/repos/builtin/packages/fasta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fasta(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fastdb/package.py b/var/spack/repos/builtin/packages/fastdb/package.py index 2c23a6d930..b46c9e20ea 100644 --- a/var/spack/repos/builtin/packages/fastdb/package.py +++ b/var/spack/repos/builtin/packages/fastdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastdb(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fastdfs/package.py b/var/spack/repos/builtin/packages/fastdfs/package.py index 0748044131..b72e9570a2 100644 --- a/var/spack/repos/builtin/packages/fastdfs/package.py +++ b/var/spack/repos/builtin/packages/fastdfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastdfs(Package): diff --git a/var/spack/repos/builtin/packages/fastjar/package.py b/var/spack/repos/builtin/packages/fastjar/package.py index da47a3a47c..4de5b7d0ed 100644 --- a/var/spack/repos/builtin/packages/fastjar/package.py +++ b/var/spack/repos/builtin/packages/fastjar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastjar(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fastjet/package.py b/var/spack/repos/builtin/packages/fastjet/package.py index de9fd106fb..afcb6da4af 100644 --- a/var/spack/repos/builtin/packages/fastjet/package.py +++ b/var/spack/repos/builtin/packages/fastjet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastjet(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fastjson/package.py b/var/spack/repos/builtin/packages/fastjson/package.py index 1e76d7d73a..53d402920e 100644 --- a/var/spack/repos/builtin/packages/fastjson/package.py +++ b/var/spack/repos/builtin/packages/fastjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastjson(MavenPackage): diff --git a/var/spack/repos/builtin/packages/fastmath/package.py b/var/spack/repos/builtin/packages/fastmath/package.py index 0848a46558..6ef2605b93 100644 --- a/var/spack/repos/builtin/packages/fastmath/package.py +++ b/var/spack/repos/builtin/packages/fastmath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastmath(BundlePackage): diff --git a/var/spack/repos/builtin/packages/fastme/package.py b/var/spack/repos/builtin/packages/fastme/package.py index 70a04cc84a..82ed9becb2 100644 --- a/var/spack/repos/builtin/packages/fastme/package.py +++ b/var/spack/repos/builtin/packages/fastme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastme(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fastp/package.py b/var/spack/repos/builtin/packages/fastp/package.py index 3fb3629f21..50969ba97e 100644 --- a/var/spack/repos/builtin/packages/fastp/package.py +++ b/var/spack/repos/builtin/packages/fastp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fastphase/package.py b/var/spack/repos/builtin/packages/fastphase/package.py index 941bf40e87..82e5ddc5a2 100644 --- a/var/spack/repos/builtin/packages/fastphase/package.py +++ b/var/spack/repos/builtin/packages/fastphase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastphase(Package): diff --git a/var/spack/repos/builtin/packages/fastq-screen/package.py b/var/spack/repos/builtin/packages/fastq-screen/package.py index 692a447fc4..8f96caaaf4 100644 --- a/var/spack/repos/builtin/packages/fastq-screen/package.py +++ b/var/spack/repos/builtin/packages/fastq-screen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FastqScreen(Package): diff --git a/var/spack/repos/builtin/packages/fastqc/package.py b/var/spack/repos/builtin/packages/fastqc/package.py index 59e4fd075c..a58aed19e1 100644 --- a/var/spack/repos/builtin/packages/fastqc/package.py +++ b/var/spack/repos/builtin/packages/fastqc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastqc(Package): diff --git a/var/spack/repos/builtin/packages/fastqvalidator/package.py b/var/spack/repos/builtin/packages/fastqvalidator/package.py index ba72767692..424c3314dc 100644 --- a/var/spack/repos/builtin/packages/fastqvalidator/package.py +++ b/var/spack/repos/builtin/packages/fastqvalidator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fastqvalidator(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fasttext/package.py b/var/spack/repos/builtin/packages/fasttext/package.py index 2ec521ceff..30b03c2977 100644 --- a/var/spack/repos/builtin/packages/fasttext/package.py +++ b/var/spack/repos/builtin/packages/fasttext/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fasttext(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fasttransforms/package.py b/var/spack/repos/builtin/packages/fasttransforms/package.py index 9195a2b4d0..8258684bf6 100644 --- a/var/spack/repos/builtin/packages/fasttransforms/package.py +++ b/var/spack/repos/builtin/packages/fasttransforms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fasttransforms(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fasttree/package.py b/var/spack/repos/builtin/packages/fasttree/package.py index 75ff08847a..69b5d4eba3 100644 --- a/var/spack/repos/builtin/packages/fasttree/package.py +++ b/var/spack/repos/builtin/packages/fasttree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fasttree(Package): diff --git a/var/spack/repos/builtin/packages/fastx-toolkit/package.py b/var/spack/repos/builtin/packages/fastx-toolkit/package.py index 0fa8cf141f..918d0fe33f 100644 --- a/var/spack/repos/builtin/packages/fastx-toolkit/package.py +++ b/var/spack/repos/builtin/packages/fastx-toolkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FastxToolkit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/faust/package.py b/var/spack/repos/builtin/packages/faust/package.py index dee3c729c9..8e23ce7da0 100644 --- a/var/spack/repos/builtin/packages/faust/package.py +++ b/var/spack/repos/builtin/packages/faust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Faust(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fbgemm/package.py b/var/spack/repos/builtin/packages/fbgemm/package.py index 4a115a1568..928cccb45a 100644 --- a/var/spack/repos/builtin/packages/fbgemm/package.py +++ b/var/spack/repos/builtin/packages/fbgemm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fbgemm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fca/package.py b/var/spack/repos/builtin/packages/fca/package.py index fcc5eeedbc..620ae2d749 100644 --- a/var/spack/repos/builtin/packages/fca/package.py +++ b/var/spack/repos/builtin/packages/fca/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fca(Package): diff --git a/var/spack/repos/builtin/packages/fcgi/package.py b/var/spack/repos/builtin/packages/fcgi/package.py index 8dce1d681c..1e42130bf6 100644 --- a/var/spack/repos/builtin/packages/fcgi/package.py +++ b/var/spack/repos/builtin/packages/fcgi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fcgi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fd-find/package.py b/var/spack/repos/builtin/packages/fd-find/package.py index de2300946d..8e35a51b8f 100644 --- a/var/spack/repos/builtin/packages/fd-find/package.py +++ b/var/spack/repos/builtin/packages/fd-find/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FdFind(Package): diff --git a/var/spack/repos/builtin/packages/fdb/package.py b/var/spack/repos/builtin/packages/fdb/package.py index 4baa8884ee..a949cdb941 100644 --- a/var/spack/repos/builtin/packages/fdb/package.py +++ b/var/spack/repos/builtin/packages/fdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fdb(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fdupes/package.py b/var/spack/repos/builtin/packages/fdupes/package.py index 90d6c73b32..3e0648f1ad 100644 --- a/var/spack/repos/builtin/packages/fdupes/package.py +++ b/var/spack/repos/builtin/packages/fdupes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fdupes(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/feh/package.py b/var/spack/repos/builtin/packages/feh/package.py index 5325ca81b3..1723f82a6a 100644 --- a/var/spack/repos/builtin/packages/feh/package.py +++ b/var/spack/repos/builtin/packages/feh/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Feh(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py index 78ca708655..cdfcc189c0 100644 --- a/var/spack/repos/builtin/packages/fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/fenics-basix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FenicsBasix(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index 6987e0a689..57bf98d826 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FenicsDolfinx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fenics-ufcx/package.py b/var/spack/repos/builtin/packages/fenics-ufcx/package.py index c426ec5c39..24f0685a35 100644 --- a/var/spack/repos/builtin/packages/fenics-ufcx/package.py +++ b/var/spack/repos/builtin/packages/fenics-ufcx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FenicsUfcx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py index b6c6dddc9a..1a927d6a55 100644 --- a/var/spack/repos/builtin/packages/fenics/package.py +++ b/var/spack/repos/builtin/packages/fenics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/feq-parse/package.py b/var/spack/repos/builtin/packages/feq-parse/package.py index 5140649acc..ad4f612a5f 100644 --- a/var/spack/repos/builtin/packages/feq-parse/package.py +++ b/var/spack/repos/builtin/packages/feq-parse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FeqParse(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fermi/package.py b/var/spack/repos/builtin/packages/fermi/package.py index 6a50c775d0..07a2ddc434 100644 --- a/var/spack/repos/builtin/packages/fermi/package.py +++ b/var/spack/repos/builtin/packages/fermi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fermi(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fermikit/package.py b/var/spack/repos/builtin/packages/fermikit/package.py index fe10b97daa..e92cc9e5fc 100644 --- a/var/spack/repos/builtin/packages/fermikit/package.py +++ b/var/spack/repos/builtin/packages/fermikit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fermikit(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fermisciencetools/package.py b/var/spack/repos/builtin/packages/fermisciencetools/package.py index 71f36506a8..a39697fa8f 100644 --- a/var/spack/repos/builtin/packages/fermisciencetools/package.py +++ b/var/spack/repos/builtin/packages/fermisciencetools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fermisciencetools(Package): diff --git a/var/spack/repos/builtin/packages/ferret/package.py b/var/spack/repos/builtin/packages/ferret/package.py index 50a8d2b5f8..a6dd10c6ad 100644 --- a/var/spack/repos/builtin/packages/ferret/package.py +++ b/var/spack/repos/builtin/packages/ferret/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class Ferret(Package): diff --git a/var/spack/repos/builtin/packages/ffb/package.py b/var/spack/repos/builtin/packages/ffb/package.py index 5afdc990c8..9eb87a4376 100644 --- a/var/spack/repos/builtin/packages/ffb/package.py +++ b/var/spack/repos/builtin/packages/ffb/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Ffb(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index 537921d2d7..4720837fa2 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ffmpeg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ffr/package.py b/var/spack/repos/builtin/packages/ffr/package.py index 22d5e9c355..825ad9f2c2 100644 --- a/var/spack/repos/builtin/packages/ffr/package.py +++ b/var/spack/repos/builtin/packages/ffr/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Ffr(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ffsb/package.py b/var/spack/repos/builtin/packages/ffsb/package.py index 578e9f6e52..6a8c5c9e1a 100644 --- a/var/spack/repos/builtin/packages/ffsb/package.py +++ b/var/spack/repos/builtin/packages/ffsb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ffsb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ffte/package.py b/var/spack/repos/builtin/packages/ffte/package.py index 563305ab17..6f4cde513e 100644 --- a/var/spack/repos/builtin/packages/ffte/package.py +++ b/var/spack/repos/builtin/packages/ffte/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * class Ffte(Package): diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 58ce1a3244..9d8fb69936 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -8,7 +8,7 @@ import os.path import llnl.util.lang -from spack import * +from spack.package import * class FftwBase(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fftx/package.py b/var/spack/repos/builtin/packages/fftx/package.py index ca002c3eff..fc2ce2d2bb 100644 --- a/var/spack/repos/builtin/packages/fftx/package.py +++ b/var/spack/repos/builtin/packages/fftx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fftx(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/fgsl/package.py b/var/spack/repos/builtin/packages/fgsl/package.py index 3c05473ee1..21d3280e35 100644 --- a/var/spack/repos/builtin/packages/fgsl/package.py +++ b/var/spack/repos/builtin/packages/fgsl/package.py @@ -3,12 +3,12 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # # Author: Gilbert Brietzke # Date: June 18, 2019 -from spack import * - class Fgsl(AutotoolsPackage): """Fortran interface to the GNU Scientific Library""" diff --git a/var/spack/repos/builtin/packages/fides/package.py b/var/spack/repos/builtin/packages/fides/package.py index bb93cdb38f..4b099d5951 100644 --- a/var/spack/repos/builtin/packages/fides/package.py +++ b/var/spack/repos/builtin/packages/fides/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fides(CMakePackage): diff --git a/var/spack/repos/builtin/packages/figlet/package.py b/var/spack/repos/builtin/packages/figlet/package.py index 175caaba72..1bfd6624cf 100644 --- a/var/spack/repos/builtin/packages/figlet/package.py +++ b/var/spack/repos/builtin/packages/figlet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Figlet(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/figtree/package.py b/var/spack/repos/builtin/packages/figtree/package.py index 52c064f3e3..d876232fab 100644 --- a/var/spack/repos/builtin/packages/figtree/package.py +++ b/var/spack/repos/builtin/packages/figtree/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Figtree(Package): diff --git a/var/spack/repos/builtin/packages/file/package.py b/var/spack/repos/builtin/packages/file/package.py index fb6ef2c6c4..ac8fb31c6d 100644 --- a/var/spack/repos/builtin/packages/file/package.py +++ b/var/spack/repos/builtin/packages/file/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class File(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/filebench/package.py b/var/spack/repos/builtin/packages/filebench/package.py index 7dfa9edda5..deb4c080f9 100644 --- a/var/spack/repos/builtin/packages/filebench/package.py +++ b/var/spack/repos/builtin/packages/filebench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Filebench(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/filo/package.py b/var/spack/repos/builtin/packages/filo/package.py index 59891d6618..e00d1e1087 100644 --- a/var/spack/repos/builtin/packages/filo/package.py +++ b/var/spack/repos/builtin/packages/filo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Filo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/filtlong/package.py b/var/spack/repos/builtin/packages/filtlong/package.py index 037145e94d..3fd96879ac 100644 --- a/var/spack/repos/builtin/packages/filtlong/package.py +++ b/var/spack/repos/builtin/packages/filtlong/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Filtlong(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fimpute/package.py b/var/spack/repos/builtin/packages/fimpute/package.py index beef215e1f..e0ea35f18b 100644 --- a/var/spack/repos/builtin/packages/fimpute/package.py +++ b/var/spack/repos/builtin/packages/fimpute/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fimpute(Package): diff --git a/var/spack/repos/builtin/packages/find-circ/package.py b/var/spack/repos/builtin/packages/find-circ/package.py index f48e944edd..ef60b9599d 100644 --- a/var/spack/repos/builtin/packages/find-circ/package.py +++ b/var/spack/repos/builtin/packages/find-circ/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FindCirc(Package): diff --git a/var/spack/repos/builtin/packages/findbugs/package.py b/var/spack/repos/builtin/packages/findbugs/package.py index 4ccb8eba2b..2f72819c95 100644 --- a/var/spack/repos/builtin/packages/findbugs/package.py +++ b/var/spack/repos/builtin/packages/findbugs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Findbugs(Package): diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py index ec4ac0c102..4cf4210d67 100644 --- a/var/spack/repos/builtin/packages/findutils/package.py +++ b/var/spack/repos/builtin/packages/findutils/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Findutils(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/fio/package.py b/var/spack/repos/builtin/packages/fio/package.py index a4e3336c2d..308d8244ab 100644 --- a/var/spack/repos/builtin/packages/fio/package.py +++ b/var/spack/repos/builtin/packages/fio/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Fio(AutotoolsPackage): """Flexible I/O Tester. diff --git a/var/spack/repos/builtin/packages/fipscheck/package.py b/var/spack/repos/builtin/packages/fipscheck/package.py index 4f348a282d..548b96ee5f 100644 --- a/var/spack/repos/builtin/packages/fipscheck/package.py +++ b/var/spack/repos/builtin/packages/fipscheck/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fipscheck(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py index b6572688ad..e8f24869c1 100644 --- a/var/spack/repos/builtin/packages/fish/package.py +++ b/var/spack/repos/builtin/packages/fish/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Fish(CMakePackage): """fish is a smart and user-friendly command line shell for OS X, Linux, and the rest of the family. diff --git a/var/spack/repos/builtin/packages/fixesproto/package.py b/var/spack/repos/builtin/packages/fixesproto/package.py index 6801b83590..e98d53db3d 100644 --- a/var/spack/repos/builtin/packages/fixesproto/package.py +++ b/var/spack/repos/builtin/packages/fixesproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fixesproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/fj/package.py b/var/spack/repos/builtin/packages/fj/package.py index 26f4aa9b05..9931ee1298 100644 --- a/var/spack/repos/builtin/packages/fj/package.py +++ b/var/spack/repos/builtin/packages/fj/package.py @@ -8,6 +8,7 @@ import llnl.util.tty as tty import spack.compiler import spack.util.executable +from spack.package import * class Fj(Package): diff --git a/var/spack/repos/builtin/packages/fjcontrib/package.py b/var/spack/repos/builtin/packages/fjcontrib/package.py index 5acc68ef02..b09edf778a 100644 --- a/var/spack/repos/builtin/packages/fjcontrib/package.py +++ b/var/spack/repos/builtin/packages/fjcontrib/package.py @@ -5,7 +5,7 @@ import inspect -from spack import * +from spack.package import * class Fjcontrib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fl/package.py b/var/spack/repos/builtin/packages/fl/package.py index 0973077139..44c7433f91 100644 --- a/var/spack/repos/builtin/packages/fl/package.py +++ b/var/spack/repos/builtin/packages/fl/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * _versions = { '0.79.47': { diff --git a/var/spack/repos/builtin/packages/flac/package.py b/var/spack/repos/builtin/packages/flac/package.py index dd61729e89..b2e738c1cf 100644 --- a/var/spack/repos/builtin/packages/flac/package.py +++ b/var/spack/repos/builtin/packages/flac/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flac(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/flann/package.py b/var/spack/repos/builtin/packages/flann/package.py index d6a7a33274..17fbaec932 100644 --- a/var/spack/repos/builtin/packages/flann/package.py +++ b/var/spack/repos/builtin/packages/flann/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flann(CMakePackage): diff --git a/var/spack/repos/builtin/packages/flap/package.py b/var/spack/repos/builtin/packages/flap/package.py index 7381142ed9..99e4dff13b 100644 --- a/var/spack/repos/builtin/packages/flap/package.py +++ b/var/spack/repos/builtin/packages/flap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flap(CMakePackage): diff --git a/var/spack/repos/builtin/packages/flash/package.py b/var/spack/repos/builtin/packages/flash/package.py index 75542208ec..a53eea83bc 100644 --- a/var/spack/repos/builtin/packages/flash/package.py +++ b/var/spack/repos/builtin/packages/flash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flash(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/flashdimmsim/package.py b/var/spack/repos/builtin/packages/flashdimmsim/package.py index 7f7d56a076..1174478686 100644 --- a/var/spack/repos/builtin/packages/flashdimmsim/package.py +++ b/var/spack/repos/builtin/packages/flashdimmsim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flashdimmsim(Package): diff --git a/var/spack/repos/builtin/packages/flatbuffers/package.py b/var/spack/repos/builtin/packages/flatbuffers/package.py index e358aae862..ee91b3d317 100644 --- a/var/spack/repos/builtin/packages/flatbuffers/package.py +++ b/var/spack/repos/builtin/packages/flatbuffers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flatbuffers(CMakePackage): diff --git a/var/spack/repos/builtin/packages/flatcc/package.py b/var/spack/repos/builtin/packages/flatcc/package.py index 6fe59d020e..285adae9af 100644 --- a/var/spack/repos/builtin/packages/flatcc/package.py +++ b/var/spack/repos/builtin/packages/flatcc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flatcc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/flcl/package.py b/var/spack/repos/builtin/packages/flcl/package.py index c0c4610f64..61eab32b2a 100644 --- a/var/spack/repos/builtin/packages/flcl/package.py +++ b/var/spack/repos/builtin/packages/flcl/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flcl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/flecsale/package.py b/var/spack/repos/builtin/packages/flecsale/package.py index 4f1374a21e..609806cc2a 100644 --- a/var/spack/repos/builtin/packages/flecsale/package.py +++ b/var/spack/repos/builtin/packages/flecsale/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 333e0b277b..bc961bf108 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flecsi(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/flecsph/package.py b/var/spack/repos/builtin/packages/flecsph/package.py index 2aee1a099d..c4347d1880 100644 --- a/var/spack/repos/builtin/packages/flecsph/package.py +++ b/var/spack/repos/builtin/packages/flecsph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/fleur/package.py b/var/spack/repos/builtin/packages/fleur/package.py index 5e0e78cbc9..0ac3f202bb 100644 --- a/var/spack/repos/builtin/packages/fleur/package.py +++ b/var/spack/repos/builtin/packages/fleur/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fleur(Package): diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index b70df84b0d..fb0d53cb52 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class Flex(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/flexi/package.py b/var/spack/repos/builtin/packages/flexi/package.py index 36fd01fe96..f083ea34d9 100644 --- a/var/spack/repos/builtin/packages/flexi/package.py +++ b/var/spack/repos/builtin/packages/flexi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flexi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/flexiblas/package.py b/var/spack/repos/builtin/packages/flexiblas/package.py index f864ce27bf..e7887593f9 100644 --- a/var/spack/repos/builtin/packages/flexiblas/package.py +++ b/var/spack/repos/builtin/packages/flexiblas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flexiblas(CMakePackage): diff --git a/var/spack/repos/builtin/packages/flibcpp/package.py b/var/spack/repos/builtin/packages/flibcpp/package.py index e67d28e788..b955dc1d1c 100644 --- a/var/spack/repos/builtin/packages/flibcpp/package.py +++ b/var/spack/repos/builtin/packages/flibcpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flibcpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/flink/package.py b/var/spack/repos/builtin/packages/flink/package.py index 2bbac15e14..b637c1d7ef 100644 --- a/var/spack/repos/builtin/packages/flink/package.py +++ b/var/spack/repos/builtin/packages/flink/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flink(Package): diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py index ff4fd09d82..e9f641e44d 100644 --- a/var/spack/repos/builtin/packages/flint/package.py +++ b/var/spack/repos/builtin/packages/flint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flint(Package): diff --git a/var/spack/repos/builtin/packages/flit/package.py b/var/spack/repos/builtin/packages/flit/package.py index 1c3dee89e4..bb2822836d 100644 --- a/var/spack/repos/builtin/packages/flit/package.py +++ b/var/spack/repos/builtin/packages/flit/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flit(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fltk/package.py b/var/spack/repos/builtin/packages/fltk/package.py index 8ec114879b..d551139e75 100644 --- a/var/spack/repos/builtin/packages/fltk/package.py +++ b/var/spack/repos/builtin/packages/fltk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fltk(Package): diff --git a/var/spack/repos/builtin/packages/flume/package.py b/var/spack/repos/builtin/packages/flume/package.py index 0f89a78544..5f3b00249a 100644 --- a/var/spack/repos/builtin/packages/flume/package.py +++ b/var/spack/repos/builtin/packages/flume/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Flume(Package): diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index f4becfa0d0..7867b9f16a 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class FluxCore(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/flux-pmix/package.py b/var/spack/repos/builtin/packages/flux-pmix/package.py index 7d9e0808f0..68709a1367 100644 --- a/var/spack/repos/builtin/packages/flux-pmix/package.py +++ b/var/spack/repos/builtin/packages/flux-pmix/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class FluxPmix(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 6a9e4f30a3..741a293f9e 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class FluxSched(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fluxbox/package.py b/var/spack/repos/builtin/packages/fluxbox/package.py index cd236729b9..5abdc02d0c 100644 --- a/var/spack/repos/builtin/packages/fluxbox/package.py +++ b/var/spack/repos/builtin/packages/fluxbox/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class Fluxbox(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fms/package.py b/var/spack/repos/builtin/packages/fms/package.py index 3f8e8f1500..5c4ecdede3 100644 --- a/var/spack/repos/builtin/packages/fms/package.py +++ b/var/spack/repos/builtin/packages/fms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fms(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fmt/package.py b/var/spack/repos/builtin/packages/fmt/package.py index 62f50d97bc..3b51d18493 100644 --- a/var/spack/repos/builtin/packages/fmt/package.py +++ b/var/spack/repos/builtin/packages/fmt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fmt(CMakePackage): diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index cd29f8638f..9c720e01d6 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -35,7 +35,7 @@ import re import llnl.util.tty as tty -from spack import * +from spack.package import * from spack.pkg.builtin.openfoam import ( OpenfoamArch, add_extra_files, @@ -95,7 +95,7 @@ class FoamExtend(Package): # General patches common = ['spack-Allwmake', 'README-spack'] - assets = [] + assets = [] # type: List[str] # Some user config settings config = { @@ -107,10 +107,10 @@ class FoamExtend(Package): _foam_arch = None # Content for etc/prefs.{csh,sh} - etc_prefs = {} + etc_prefs = {} # type: Dict[str, str] # Content for etc/config.{csh,sh}/ files - etc_config = {} + etc_config = {} # type: Dict[str, str] phases = ['configure', 'build', 'install'] build_script = './spack-Allwmake' # <- Added by patch() method. diff --git a/var/spack/repos/builtin/packages/folly/package.py b/var/spack/repos/builtin/packages/folly/package.py index ca84efed63..87a77e2bf7 100644 --- a/var/spack/repos/builtin/packages/folly/package.py +++ b/var/spack/repos/builtin/packages/folly/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Folly(CMakePackage): diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py index e31ff28554..5c7eb27ade 100644 --- a/var/spack/repos/builtin/packages/font-util/package.py +++ b/var/spack/repos/builtin/packages/font-util/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FontUtil(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/fontcacheproto/package.py b/var/spack/repos/builtin/packages/fontcacheproto/package.py index 06d37826c1..9bc3c3a984 100644 --- a/var/spack/repos/builtin/packages/fontcacheproto/package.py +++ b/var/spack/repos/builtin/packages/fontcacheproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fontcacheproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/fontconfig/package.py b/var/spack/repos/builtin/packages/fontconfig/package.py index c9b41186d1..73ea3a8916 100644 --- a/var/spack/repos/builtin/packages/fontconfig/package.py +++ b/var/spack/repos/builtin/packages/fontconfig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fontconfig(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fontsproto/package.py b/var/spack/repos/builtin/packages/fontsproto/package.py index 81e84668b4..154ab16e7d 100644 --- a/var/spack/repos/builtin/packages/fontsproto/package.py +++ b/var/spack/repos/builtin/packages/fontsproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fontsproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/fonttosfnt/package.py b/var/spack/repos/builtin/packages/fonttosfnt/package.py index e9d2e8477b..f42a07382b 100644 --- a/var/spack/repos/builtin/packages/fonttosfnt/package.py +++ b/var/spack/repos/builtin/packages/fonttosfnt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fonttosfnt(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/form/package.py b/var/spack/repos/builtin/packages/form/package.py index 1058a11700..3cffdd727d 100644 --- a/var/spack/repos/builtin/packages/form/package.py +++ b/var/spack/repos/builtin/packages/form/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Form(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/formetis/package.py b/var/spack/repos/builtin/packages/formetis/package.py index 8e9340335b..24421e37c9 100644 --- a/var/spack/repos/builtin/packages/formetis/package.py +++ b/var/spack/repos/builtin/packages/formetis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Formetis(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fortran/package.py b/var/spack/repos/builtin/packages/fortran/package.py index e5b4283986..9e272b6712 100644 --- a/var/spack/repos/builtin/packages/fortran/package.py +++ b/var/spack/repos/builtin/packages/fortran/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Fortran(Package): """Virtual package for the Fortran language.""" diff --git a/var/spack/repos/builtin/packages/fortrilinos/package.py b/var/spack/repos/builtin/packages/fortrilinos/package.py index d6faea264c..c0129f2f1c 100644 --- a/var/spack/repos/builtin/packages/fortrilinos/package.py +++ b/var/spack/repos/builtin/packages/fortrilinos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fortrilinos(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fossil/package.py b/var/spack/repos/builtin/packages/fossil/package.py index 8863ade169..6ead6fff57 100644 --- a/var/spack/repos/builtin/packages/fossil/package.py +++ b/var/spack/repos/builtin/packages/fossil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fossil(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/foundationdb/package.py b/var/spack/repos/builtin/packages/foundationdb/package.py index 5d1cd06fbf..e565b5dbc0 100644 --- a/var/spack/repos/builtin/packages/foundationdb/package.py +++ b/var/spack/repos/builtin/packages/foundationdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/fox/package.py b/var/spack/repos/builtin/packages/fox/package.py index 340951515c..94dd539048 100644 --- a/var/spack/repos/builtin/packages/fox/package.py +++ b/var/spack/repos/builtin/packages/fox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fox(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fp16/package.py b/var/spack/repos/builtin/packages/fp16/package.py index 45445545ef..3ded0d8a75 100644 --- a/var/spack/repos/builtin/packages/fp16/package.py +++ b/var/spack/repos/builtin/packages/fp16/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fp16(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fpc/package.py b/var/spack/repos/builtin/packages/fpc/package.py index da6249658a..ae22e1d2a9 100644 --- a/var/spack/repos/builtin/packages/fpc/package.py +++ b/var/spack/repos/builtin/packages/fpc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fpc(Package): diff --git a/var/spack/repos/builtin/packages/fpchecker/package.py b/var/spack/repos/builtin/packages/fpchecker/package.py index 722be1a3e1..ff1f66a2ba 100644 --- a/var/spack/repos/builtin/packages/fpchecker/package.py +++ b/var/spack/repos/builtin/packages/fpchecker/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fpchecker(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fping/package.py b/var/spack/repos/builtin/packages/fping/package.py index ede9d43611..a514788b4a 100644 --- a/var/spack/repos/builtin/packages/fping/package.py +++ b/var/spack/repos/builtin/packages/fping/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fping(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fplll/package.py b/var/spack/repos/builtin/packages/fplll/package.py index 4bed5d17d5..6c5e34b5ac 100644 --- a/var/spack/repos/builtin/packages/fplll/package.py +++ b/var/spack/repos/builtin/packages/fplll/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fplll(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fpm/package.py b/var/spack/repos/builtin/packages/fpm/package.py index e2784ea726..44f6ed861b 100644 --- a/var/spack/repos/builtin/packages/fpm/package.py +++ b/var/spack/repos/builtin/packages/fpm/package.py @@ -6,7 +6,7 @@ import os import stat -from spack import * +from spack.package import * class Fpm(Package): diff --git a/var/spack/repos/builtin/packages/fpocket/package.py b/var/spack/repos/builtin/packages/fpocket/package.py index 80f287adbb..3eaa73f74c 100644 --- a/var/spack/repos/builtin/packages/fpocket/package.py +++ b/var/spack/repos/builtin/packages/fpocket/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fpocket(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fqtrim/package.py b/var/spack/repos/builtin/packages/fqtrim/package.py index 90dc590315..9f2a1a599c 100644 --- a/var/spack/repos/builtin/packages/fqtrim/package.py +++ b/var/spack/repos/builtin/packages/fqtrim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fqtrim(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/fr-hit/package.py b/var/spack/repos/builtin/packages/fr-hit/package.py index 96e4cd1317..37db4f3363 100644 --- a/var/spack/repos/builtin/packages/fr-hit/package.py +++ b/var/spack/repos/builtin/packages/fr-hit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FrHit(Package): diff --git a/var/spack/repos/builtin/packages/fraggenescan/package.py b/var/spack/repos/builtin/packages/fraggenescan/package.py index 90ae121fe1..1e75b80587 100644 --- a/var/spack/repos/builtin/packages/fraggenescan/package.py +++ b/var/spack/repos/builtin/packages/fraggenescan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fraggenescan(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/freebayes/package.py b/var/spack/repos/builtin/packages/freebayes/package.py index 2121af5e98..e1b3023930 100644 --- a/var/spack/repos/builtin/packages/freebayes/package.py +++ b/var/spack/repos/builtin/packages/freebayes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Freebayes(MesonPackage): diff --git a/var/spack/repos/builtin/packages/freefem/package.py b/var/spack/repos/builtin/packages/freefem/package.py index 6e8365a2b3..7d5eb41612 100644 --- a/var/spack/repos/builtin/packages/freefem/package.py +++ b/var/spack/repos/builtin/packages/freefem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Freefem(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/freeglut/package.py b/var/spack/repos/builtin/packages/freeglut/package.py index 2497153875..41831151c1 100644 --- a/var/spack/repos/builtin/packages/freeglut/package.py +++ b/var/spack/repos/builtin/packages/freeglut/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Freeglut(CMakePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/freeimage/package.py b/var/spack/repos/builtin/packages/freeimage/package.py index f20d7d018f..abd8cf94e3 100644 --- a/var/spack/repos/builtin/packages/freeimage/package.py +++ b/var/spack/repos/builtin/packages/freeimage/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Freeimage(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/freeipmi/package.py b/var/spack/repos/builtin/packages/freeipmi/package.py index 3df867d9c8..3228b9238c 100644 --- a/var/spack/repos/builtin/packages/freeipmi/package.py +++ b/var/spack/repos/builtin/packages/freeipmi/package.py @@ -5,7 +5,7 @@ import llnl.util.tty as tty -from spack import * +from spack.package import * class Freeipmi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 3e463ae749..8837f23a90 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Freetype(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/freexl/package.py b/var/spack/repos/builtin/packages/freexl/package.py index 3c61044f6a..eeadc6ba66 100644 --- a/var/spack/repos/builtin/packages/freexl/package.py +++ b/var/spack/repos/builtin/packages/freexl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Freexl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fribidi/package.py b/var/spack/repos/builtin/packages/fribidi/package.py index 13baeda95b..5ed6eaf05e 100644 --- a/var/spack/repos/builtin/packages/fribidi/package.py +++ b/var/spack/repos/builtin/packages/fribidi/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fribidi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/frontier-client/package.py b/var/spack/repos/builtin/packages/frontier-client/package.py index 65cfe31aad..923f58e438 100644 --- a/var/spack/repos/builtin/packages/frontier-client/package.py +++ b/var/spack/repos/builtin/packages/frontier-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FrontierClient(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/frontistr/package.py b/var/spack/repos/builtin/packages/frontistr/package.py index f2ba22f2c2..0cd05404d7 100644 --- a/var/spack/repos/builtin/packages/frontistr/package.py +++ b/var/spack/repos/builtin/packages/frontistr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FrontistrBase(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fseq/package.py b/var/spack/repos/builtin/packages/fseq/package.py index 30c13ef801..d816c3887e 100644 --- a/var/spack/repos/builtin/packages/fseq/package.py +++ b/var/spack/repos/builtin/packages/fseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fseq(Package): diff --git a/var/spack/repos/builtin/packages/fsl/package.py b/var/spack/repos/builtin/packages/fsl/package.py index c2decb66b9..e5df50f058 100644 --- a/var/spack/repos/builtin/packages/fsl/package.py +++ b/var/spack/repos/builtin/packages/fsl/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * from spack.util.environment import EnvironmentModifications diff --git a/var/spack/repos/builtin/packages/fslsfonts/package.py b/var/spack/repos/builtin/packages/fslsfonts/package.py index 679f53a704..f39ddcc912 100644 --- a/var/spack/repos/builtin/packages/fslsfonts/package.py +++ b/var/spack/repos/builtin/packages/fslsfonts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fslsfonts(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/fstobdf/package.py b/var/spack/repos/builtin/packages/fstobdf/package.py index ce0cbc2d0c..28c1a726b7 100644 --- a/var/spack/repos/builtin/packages/fstobdf/package.py +++ b/var/spack/repos/builtin/packages/fstobdf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fstobdf(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/fstrack/package.py b/var/spack/repos/builtin/packages/fstrack/package.py index f8f39d36be..6dae0acdad 100644 --- a/var/spack/repos/builtin/packages/fstrack/package.py +++ b/var/spack/repos/builtin/packages/fstrack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fstrack(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ftgl/package.py b/var/spack/repos/builtin/packages/ftgl/package.py index d5f6aff889..caefcb0d00 100644 --- a/var/spack/repos/builtin/packages/ftgl/package.py +++ b/var/spack/repos/builtin/packages/ftgl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ftgl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ftjam/package.py b/var/spack/repos/builtin/packages/ftjam/package.py index 8563f70cf6..44d2a5da8c 100644 --- a/var/spack/repos/builtin/packages/ftjam/package.py +++ b/var/spack/repos/builtin/packages/ftjam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ftjam(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ftk/package.py b/var/spack/repos/builtin/packages/ftk/package.py index 7ccb8912d5..041eb64284 100644 --- a/var/spack/repos/builtin/packages/ftk/package.py +++ b/var/spack/repos/builtin/packages/ftk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ftk(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ftobjectlibrary/package.py b/var/spack/repos/builtin/packages/ftobjectlibrary/package.py index 02bd34cda8..6c1301a868 100644 --- a/var/spack/repos/builtin/packages/ftobjectlibrary/package.py +++ b/var/spack/repos/builtin/packages/ftobjectlibrary/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ftobjectlibrary(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ftxui/package.py b/var/spack/repos/builtin/packages/ftxui/package.py index a520128fb0..12527a79e9 100644 --- a/var/spack/repos/builtin/packages/ftxui/package.py +++ b/var/spack/repos/builtin/packages/ftxui/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ftxui(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fujitsu-fftw/package.py b/var/spack/repos/builtin/packages/fujitsu-fftw/package.py index 2a75f3ffdb..993286b0e4 100644 --- a/var/spack/repos/builtin/packages/fujitsu-fftw/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-fftw/package.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * from spack.error import SpackError +from spack.package import * from spack.pkg.builtin.fftw import FftwBase diff --git a/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py b/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py index 0efc12d308..1116478499 100644 --- a/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.frontistr import FrontistrBase diff --git a/var/spack/repos/builtin/packages/fujitsu-mpi/package.py b/var/spack/repos/builtin/packages/fujitsu-mpi/package.py index ae004dec6c..f06df12e62 100644 --- a/var/spack/repos/builtin/packages/fujitsu-mpi/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-mpi/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class FujitsuMpi(Package): diff --git a/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py b/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py index 40a0d3dadf..011cfbcaab 100644 --- a/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FujitsuSsl2(Package): diff --git a/var/spack/repos/builtin/packages/fullock/package.py b/var/spack/repos/builtin/packages/fullock/package.py index d450d99f11..f3ea02e16d 100644 --- a/var/spack/repos/builtin/packages/fullock/package.py +++ b/var/spack/repos/builtin/packages/fullock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fullock(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/funhpc/package.py b/var/spack/repos/builtin/packages/funhpc/package.py index dad3e94329..d8cded7c94 100644 --- a/var/spack/repos/builtin/packages/funhpc/package.py +++ b/var/spack/repos/builtin/packages/funhpc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Funhpc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fuse-overlayfs/package.py b/var/spack/repos/builtin/packages/fuse-overlayfs/package.py index 32758bc180..bc7ec00dd2 100644 --- a/var/spack/repos/builtin/packages/fuse-overlayfs/package.py +++ b/var/spack/repos/builtin/packages/fuse-overlayfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class FuseOverlayfs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fxdiv/package.py b/var/spack/repos/builtin/packages/fxdiv/package.py index 8104b29652..78973fd10c 100644 --- a/var/spack/repos/builtin/packages/fxdiv/package.py +++ b/var/spack/repos/builtin/packages/fxdiv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fxdiv(CMakePackage): diff --git a/var/spack/repos/builtin/packages/fxt/package.py b/var/spack/repos/builtin/packages/fxt/package.py index cbd7657922..313007967b 100644 --- a/var/spack/repos/builtin/packages/fxt/package.py +++ b/var/spack/repos/builtin/packages/fxt/package.py @@ -5,6 +5,8 @@ import os import subprocess +from spack.package import * + class Fxt(AutotoolsPackage): """Fast User/Kernel Tracing diff --git a/var/spack/repos/builtin/packages/fyba/package.py b/var/spack/repos/builtin/packages/fyba/package.py index eb743f9c10..87586d718c 100644 --- a/var/spack/repos/builtin/packages/fyba/package.py +++ b/var/spack/repos/builtin/packages/fyba/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Fyba(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/fzf/package.py b/var/spack/repos/builtin/packages/fzf/package.py index 1f24147dac..1ebdc5fe28 100644 --- a/var/spack/repos/builtin/packages/fzf/package.py +++ b/var/spack/repos/builtin/packages/fzf/package.py @@ -6,6 +6,8 @@ import os import re import shutil +from spack.package import * + class Fzf(MakefilePackage): """fzf is a general-purpose command-line fuzzy finder.""" diff --git a/var/spack/repos/builtin/packages/g2/package.py b/var/spack/repos/builtin/packages/g2/package.py index 86b3048cb6..63b9d705f2 100644 --- a/var/spack/repos/builtin/packages/g2/package.py +++ b/var/spack/repos/builtin/packages/g2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/g2c/package.py b/var/spack/repos/builtin/packages/g2c/package.py index c8abe0061d..d15adb90d7 100644 --- a/var/spack/repos/builtin/packages/g2c/package.py +++ b/var/spack/repos/builtin/packages/g2c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G2c(CMakePackage): diff --git a/var/spack/repos/builtin/packages/g2o/package.py b/var/spack/repos/builtin/packages/g2o/package.py index c8dc2205e2..1c6fa4b400 100644 --- a/var/spack/repos/builtin/packages/g2o/package.py +++ b/var/spack/repos/builtin/packages/g2o/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class G2o(CMakePackage): """g2o is an open-source C++ framework for optimizing graph-based nonlinear error functions. diff --git a/var/spack/repos/builtin/packages/g2tmpl/package.py b/var/spack/repos/builtin/packages/g2tmpl/package.py index 07dc35622b..e9fcb9858b 100644 --- a/var/spack/repos/builtin/packages/g2tmpl/package.py +++ b/var/spack/repos/builtin/packages/g2tmpl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G2tmpl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/g4abla/package.py b/var/spack/repos/builtin/packages/g4abla/package.py index b0d28060ea..91af672830 100644 --- a/var/spack/repos/builtin/packages/g4abla/package.py +++ b/var/spack/repos/builtin/packages/g4abla/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4abla(Package): diff --git a/var/spack/repos/builtin/packages/g4emlow/package.py b/var/spack/repos/builtin/packages/g4emlow/package.py index ae45594544..5c129a09e9 100644 --- a/var/spack/repos/builtin/packages/g4emlow/package.py +++ b/var/spack/repos/builtin/packages/g4emlow/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4emlow(Package): diff --git a/var/spack/repos/builtin/packages/g4ensdfstate/package.py b/var/spack/repos/builtin/packages/g4ensdfstate/package.py index 7d037a6fef..e077bc488b 100644 --- a/var/spack/repos/builtin/packages/g4ensdfstate/package.py +++ b/var/spack/repos/builtin/packages/g4ensdfstate/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4ensdfstate(Package): diff --git a/var/spack/repos/builtin/packages/g4incl/package.py b/var/spack/repos/builtin/packages/g4incl/package.py index 37202f254f..d81d62dc62 100644 --- a/var/spack/repos/builtin/packages/g4incl/package.py +++ b/var/spack/repos/builtin/packages/g4incl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4incl(Package): diff --git a/var/spack/repos/builtin/packages/g4ndl/package.py b/var/spack/repos/builtin/packages/g4ndl/package.py index 80909b495f..d5ed753744 100644 --- a/var/spack/repos/builtin/packages/g4ndl/package.py +++ b/var/spack/repos/builtin/packages/g4ndl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4ndl(Package): diff --git a/var/spack/repos/builtin/packages/g4neutronxs/package.py b/var/spack/repos/builtin/packages/g4neutronxs/package.py index a3dc74c539..182c3b9b61 100644 --- a/var/spack/repos/builtin/packages/g4neutronxs/package.py +++ b/var/spack/repos/builtin/packages/g4neutronxs/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4neutronxs(Package): diff --git a/var/spack/repos/builtin/packages/g4particlexs/package.py b/var/spack/repos/builtin/packages/g4particlexs/package.py index 09c6d0f5e0..14b6f0f896 100644 --- a/var/spack/repos/builtin/packages/g4particlexs/package.py +++ b/var/spack/repos/builtin/packages/g4particlexs/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4particlexs(Package): diff --git a/var/spack/repos/builtin/packages/g4photonevaporation/package.py b/var/spack/repos/builtin/packages/g4photonevaporation/package.py index 2ae45d7671..8285152686 100644 --- a/var/spack/repos/builtin/packages/g4photonevaporation/package.py +++ b/var/spack/repos/builtin/packages/g4photonevaporation/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4photonevaporation(Package): diff --git a/var/spack/repos/builtin/packages/g4pii/package.py b/var/spack/repos/builtin/packages/g4pii/package.py index 94c512901d..e81de9c867 100644 --- a/var/spack/repos/builtin/packages/g4pii/package.py +++ b/var/spack/repos/builtin/packages/g4pii/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4pii(Package): diff --git a/var/spack/repos/builtin/packages/g4radioactivedecay/package.py b/var/spack/repos/builtin/packages/g4radioactivedecay/package.py index 2d2cee062b..a27420cfa4 100644 --- a/var/spack/repos/builtin/packages/g4radioactivedecay/package.py +++ b/var/spack/repos/builtin/packages/g4radioactivedecay/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4radioactivedecay(Package): diff --git a/var/spack/repos/builtin/packages/g4realsurface/package.py b/var/spack/repos/builtin/packages/g4realsurface/package.py index 7171e4e99e..882959bf1e 100644 --- a/var/spack/repos/builtin/packages/g4realsurface/package.py +++ b/var/spack/repos/builtin/packages/g4realsurface/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4realsurface(Package): diff --git a/var/spack/repos/builtin/packages/g4saiddata/package.py b/var/spack/repos/builtin/packages/g4saiddata/package.py index 16c4f11339..0086a0d4f9 100644 --- a/var/spack/repos/builtin/packages/g4saiddata/package.py +++ b/var/spack/repos/builtin/packages/g4saiddata/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4saiddata(Package): diff --git a/var/spack/repos/builtin/packages/g4tendl/package.py b/var/spack/repos/builtin/packages/g4tendl/package.py index 90dfdd5e72..63c60c7359 100644 --- a/var/spack/repos/builtin/packages/g4tendl/package.py +++ b/var/spack/repos/builtin/packages/g4tendl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class G4tendl(Package): diff --git a/var/spack/repos/builtin/packages/gamess-ri-mp2-miniapp/package.py b/var/spack/repos/builtin/packages/gamess-ri-mp2-miniapp/package.py index 4b4c212ddc..823cd51cd8 100644 --- a/var/spack/repos/builtin/packages/gamess-ri-mp2-miniapp/package.py +++ b/var/spack/repos/builtin/packages/gamess-ri-mp2-miniapp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GamessRiMp2Miniapp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/gams/package.py b/var/spack/repos/builtin/packages/gams/package.py index 7d3daad357..7dfdaf0eea 100644 --- a/var/spack/repos/builtin/packages/gams/package.py +++ b/var/spack/repos/builtin/packages/gams/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Gams(Package): diff --git a/var/spack/repos/builtin/packages/ganglia/package.py b/var/spack/repos/builtin/packages/ganglia/package.py index 7e3127a6d8..18818816e5 100644 --- a/var/spack/repos/builtin/packages/ganglia/package.py +++ b/var/spack/repos/builtin/packages/ganglia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ganglia(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gapbs/package.py b/var/spack/repos/builtin/packages/gapbs/package.py index a3bb994cca..453b33c253 100644 --- a/var/spack/repos/builtin/packages/gapbs/package.py +++ b/var/spack/repos/builtin/packages/gapbs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gapbs(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/gapcloser/package.py b/var/spack/repos/builtin/packages/gapcloser/package.py index 0f20623f36..12b5257789 100644 --- a/var/spack/repos/builtin/packages/gapcloser/package.py +++ b/var/spack/repos/builtin/packages/gapcloser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gapcloser(Package): diff --git a/var/spack/repos/builtin/packages/gapfiller/package.py b/var/spack/repos/builtin/packages/gapfiller/package.py index ae64c2475e..620e438e7a 100644 --- a/var/spack/repos/builtin/packages/gapfiller/package.py +++ b/var/spack/repos/builtin/packages/gapfiller/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Gapfiller(Package): diff --git a/var/spack/repos/builtin/packages/garfieldpp/package.py b/var/spack/repos/builtin/packages/garfieldpp/package.py index 8566a8e5bc..3f5ba70f01 100644 --- a/var/spack/repos/builtin/packages/garfieldpp/package.py +++ b/var/spack/repos/builtin/packages/garfieldpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Garfieldpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py index a886d75270..bf790af879 100644 --- a/var/spack/repos/builtin/packages/gasnet/package.py +++ b/var/spack/repos/builtin/packages/gasnet/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Gasnet(Package, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/gatb-core/package.py b/var/spack/repos/builtin/packages/gatb-core/package.py index bc0ff3e90a..abff41c7d4 100644 --- a/var/spack/repos/builtin/packages/gatb-core/package.py +++ b/var/spack/repos/builtin/packages/gatb-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GatbCore(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gate/package.py b/var/spack/repos/builtin/packages/gate/package.py index 0d20b2242f..b7f3ca1e11 100644 --- a/var/spack/repos/builtin/packages/gate/package.py +++ b/var/spack/repos/builtin/packages/gate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gate(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gatepet2stir/package.py b/var/spack/repos/builtin/packages/gatepet2stir/package.py index d039388077..6305d93f5b 100644 --- a/var/spack/repos/builtin/packages/gatepet2stir/package.py +++ b/var/spack/repos/builtin/packages/gatepet2stir/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gatepet2stir(QMakePackage): diff --git a/var/spack/repos/builtin/packages/gatetools/package.py b/var/spack/repos/builtin/packages/gatetools/package.py index b4d88bdbc6..3f718faf45 100644 --- a/var/spack/repos/builtin/packages/gatetools/package.py +++ b/var/spack/repos/builtin/packages/gatetools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gatetools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py index 5e5c3b8bd7..e662b65d59 100644 --- a/var/spack/repos/builtin/packages/gatk/package.py +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -5,6 +5,8 @@ import os.path +from spack.package import * + class Gatk(Package): """ diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index 74a07df7de..1733552a81 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/gaussian-src/package.py b/var/spack/repos/builtin/packages/gaussian-src/package.py index bd83854f34..87b5e39346 100644 --- a/var/spack/repos/builtin/packages/gaussian-src/package.py +++ b/var/spack/repos/builtin/packages/gaussian-src/package.py @@ -7,7 +7,7 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * class GaussianSrc(Package): diff --git a/var/spack/repos/builtin/packages/gaussian-view/package.py b/var/spack/repos/builtin/packages/gaussian-view/package.py index f0fcec10d5..24fe7175f5 100644 --- a/var/spack/repos/builtin/packages/gaussian-view/package.py +++ b/var/spack/repos/builtin/packages/gaussian-view/package.py @@ -8,7 +8,7 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * class GaussianView(Package): diff --git a/var/spack/repos/builtin/packages/gaussian/package.py b/var/spack/repos/builtin/packages/gaussian/package.py index 69960e5dc7..b70ae79c54 100644 --- a/var/spack/repos/builtin/packages/gaussian/package.py +++ b/var/spack/repos/builtin/packages/gaussian/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class Gaussian(Package): diff --git a/var/spack/repos/builtin/packages/gawk/package.py b/var/spack/repos/builtin/packages/gawk/package.py index f5d3639cf1..c93dfe23aa 100644 --- a/var/spack/repos/builtin/packages/gawk/package.py +++ b/var/spack/repos/builtin/packages/gawk/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import re +from spack.package import * + class Gawk(AutotoolsPackage, GNUMirrorPackage): """If you are like many computer users, you would frequently like to make diff --git a/var/spack/repos/builtin/packages/gbl/package.py b/var/spack/repos/builtin/packages/gbl/package.py index 83dc307227..51d761996c 100644 --- a/var/spack/repos/builtin/packages/gbl/package.py +++ b/var/spack/repos/builtin/packages/gbl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gbl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gblocks/package.py b/var/spack/repos/builtin/packages/gblocks/package.py index c5f8f8ad2d..1cca60ca69 100644 --- a/var/spack/repos/builtin/packages/gblocks/package.py +++ b/var/spack/repos/builtin/packages/gblocks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gblocks(Package): diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 359e7663fc..9e8a080aec 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -16,6 +16,7 @@ import spack.platforms import spack.util.executable from spack.build_environment import dso_suffix from spack.operating_systems.mac_os import macos_sdk_path, macos_version +from spack.package import * class Gcc(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gccmakedep/package.py b/var/spack/repos/builtin/packages/gccmakedep/package.py index 1efbfca0e7..637f146f52 100644 --- a/var/spack/repos/builtin/packages/gccmakedep/package.py +++ b/var/spack/repos/builtin/packages/gccmakedep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gccmakedep(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/gccxml/package.py b/var/spack/repos/builtin/packages/gccxml/package.py index 2a91c27943..243faac3e6 100644 --- a/var/spack/repos/builtin/packages/gccxml/package.py +++ b/var/spack/repos/builtin/packages/gccxml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gccxml(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gchp/package.py b/var/spack/repos/builtin/packages/gchp/package.py index e49b9e002d..e2fbc2d777 100644 --- a/var/spack/repos/builtin/packages/gchp/package.py +++ b/var/spack/repos/builtin/packages/gchp/package.py @@ -5,7 +5,7 @@ import shutil -from spack import * +from spack.package import * class Gchp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gconf/package.py b/var/spack/repos/builtin/packages/gconf/package.py index f6b80c6c5e..6c86e51012 100644 --- a/var/spack/repos/builtin/packages/gconf/package.py +++ b/var/spack/repos/builtin/packages/gconf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gconf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gcta/package.py b/var/spack/repos/builtin/packages/gcta/package.py index 76cbfc265b..6cf9146260 100644 --- a/var/spack/repos/builtin/packages/gcta/package.py +++ b/var/spack/repos/builtin/packages/gcta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gcta(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 65116a1261..34f768d95f 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -6,6 +6,7 @@ import os import sys +from spack.package import * from spack.util.environment import filter_system_paths diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index d15890b37a..91a6f6ff08 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Gdb(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index 94cbfe9c46..c82553b03b 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class Gdbm(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index 05b244e637..2057ece001 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GdkPixbuf(Package): diff --git a/var/spack/repos/builtin/packages/gdl/package.py b/var/spack/repos/builtin/packages/gdl/package.py index 95d45ffacc..a6a470af4b 100644 --- a/var/spack/repos/builtin/packages/gdl/package.py +++ b/var/spack/repos/builtin/packages/gdl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class Gdl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gdrcopy/package.py b/var/spack/repos/builtin/packages/gdrcopy/package.py index d5579636e4..6fa88d87dc 100644 --- a/var/spack/repos/builtin/packages/gdrcopy/package.py +++ b/var/spack/repos/builtin/packages/gdrcopy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gdrcopy(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/geant4-data/package.py b/var/spack/repos/builtin/packages/geant4-data/package.py index e9c3ac269e..4ed5187363 100644 --- a/var/spack/repos/builtin/packages/geant4-data/package.py +++ b/var/spack/repos/builtin/packages/geant4-data/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Geant4Data(BundlePackage): diff --git a/var/spack/repos/builtin/packages/geant4-vmc/package.py b/var/spack/repos/builtin/packages/geant4-vmc/package.py index 3e1fc4eb2c..f21d406941 100644 --- a/var/spack/repos/builtin/packages/geant4-vmc/package.py +++ b/var/spack/repos/builtin/packages/geant4-vmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Geant4Vmc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index 9549005306..611bc04e8f 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Geant4(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py index 3d2bc53f08..2d59d2cf9e 100644 --- a/var/spack/repos/builtin/packages/gearshifft/package.py +++ b/var/spack/repos/builtin/packages/gearshifft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gearshifft(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gemmlowp/package.py b/var/spack/repos/builtin/packages/gemmlowp/package.py index cbb12a6256..6d122cc3e3 100644 --- a/var/spack/repos/builtin/packages/gemmlowp/package.py +++ b/var/spack/repos/builtin/packages/gemmlowp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gemmlowp(Package): diff --git a/var/spack/repos/builtin/packages/genemark-et/package.py b/var/spack/repos/builtin/packages/genemark-et/package.py index f3cb3d3cb6..fbac4c4e58 100644 --- a/var/spack/repos/builtin/packages/genemark-et/package.py +++ b/var/spack/repos/builtin/packages/genemark-et/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class GenemarkEt(Package): diff --git a/var/spack/repos/builtin/packages/genesis/package.py b/var/spack/repos/builtin/packages/genesis/package.py index 8a91fd8e0b..424570b5bc 100644 --- a/var/spack/repos/builtin/packages/genesis/package.py +++ b/var/spack/repos/builtin/packages/genesis/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Genesis(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/genfit/package.py b/var/spack/repos/builtin/packages/genfit/package.py index c48ad1451b..a2b454e3bc 100644 --- a/var/spack/repos/builtin/packages/genfit/package.py +++ b/var/spack/repos/builtin/packages/genfit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Genfit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gengeo/package.py b/var/spack/repos/builtin/packages/gengeo/package.py index 13b6f24ceb..fbd7e4702c 100644 --- a/var/spack/repos/builtin/packages/gengeo/package.py +++ b/var/spack/repos/builtin/packages/gengeo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gengeo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gengetopt/package.py b/var/spack/repos/builtin/packages/gengetopt/package.py index 66731604a7..1b6ea55780 100644 --- a/var/spack/repos/builtin/packages/gengetopt/package.py +++ b/var/spack/repos/builtin/packages/gengetopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gengetopt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/genie/package.py b/var/spack/repos/builtin/packages/genie/package.py index af660362f1..f945bc72ae 100644 --- a/var/spack/repos/builtin/packages/genie/package.py +++ b/var/spack/repos/builtin/packages/genie/package.py @@ -6,9 +6,7 @@ import os -from spack.directives import depends_on, patch, variant, version -from spack.package import Package -from spack.util.executable import Executable +from spack.package import * from spack.version import Version diff --git a/var/spack/repos/builtin/packages/genomefinisher/package.py b/var/spack/repos/builtin/packages/genomefinisher/package.py index 310badf732..e903b9c01b 100644 --- a/var/spack/repos/builtin/packages/genomefinisher/package.py +++ b/var/spack/repos/builtin/packages/genomefinisher/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Genomefinisher(Package): diff --git a/var/spack/repos/builtin/packages/genometools/package.py b/var/spack/repos/builtin/packages/genometools/package.py index 3474f349a6..6c88a3f89d 100644 --- a/var/spack/repos/builtin/packages/genometools/package.py +++ b/var/spack/repos/builtin/packages/genometools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Genometools(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/genomeworks/package.py b/var/spack/repos/builtin/packages/genomeworks/package.py index 65170c93b0..9b925f6d13 100644 --- a/var/spack/repos/builtin/packages/genomeworks/package.py +++ b/var/spack/repos/builtin/packages/genomeworks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Genomeworks(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/genrich/package.py b/var/spack/repos/builtin/packages/genrich/package.py index b3bd965103..609c9a7f16 100644 --- a/var/spack/repos/builtin/packages/genrich/package.py +++ b/var/spack/repos/builtin/packages/genrich/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Genrich(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/geode/package.py b/var/spack/repos/builtin/packages/geode/package.py index ca8da85a3e..8c817ed338 100644 --- a/var/spack/repos/builtin/packages/geode/package.py +++ b/var/spack/repos/builtin/packages/geode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Geode(Package): diff --git a/var/spack/repos/builtin/packages/geoip-api-c/package.py b/var/spack/repos/builtin/packages/geoip-api-c/package.py index c91b64b3db..efa059db2b 100644 --- a/var/spack/repos/builtin/packages/geoip-api-c/package.py +++ b/var/spack/repos/builtin/packages/geoip-api-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GeoipApiC(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/geoip/package.py b/var/spack/repos/builtin/packages/geoip/package.py index 41d8578390..1bedd40f1c 100644 --- a/var/spack/repos/builtin/packages/geoip/package.py +++ b/var/spack/repos/builtin/packages/geoip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Geoip(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/geopm/package.py b/var/spack/repos/builtin/packages/geopm/package.py index 6ba191e2ba..06c51367e3 100644 --- a/var/spack/repos/builtin/packages/geopm/package.py +++ b/var/spack/repos/builtin/packages/geopm/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Geopm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/geos/package.py b/var/spack/repos/builtin/packages/geos/package.py index 58a05bc09d..e4665e38ba 100644 --- a/var/spack/repos/builtin/packages/geos/package.py +++ b/var/spack/repos/builtin/packages/geos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Geos(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index 9f3025d1bc..7048e640ab 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Gettext(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gflags/package.py b/var/spack/repos/builtin/packages/gflags/package.py index c9883b304b..982176d838 100644 --- a/var/spack/repos/builtin/packages/gflags/package.py +++ b/var/spack/repos/builtin/packages/gflags/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gflags(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gfsio/package.py b/var/spack/repos/builtin/packages/gfsio/package.py index 2b034670a3..6a8cc28418 100644 --- a/var/spack/repos/builtin/packages/gfsio/package.py +++ b/var/spack/repos/builtin/packages/gfsio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gfsio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gh/package.py b/var/spack/repos/builtin/packages/gh/package.py index 09ef4b768e..0fb853aa7d 100644 --- a/var/spack/repos/builtin/packages/gh/package.py +++ b/var/spack/repos/builtin/packages/gh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gh(Package): diff --git a/var/spack/repos/builtin/packages/ghost/package.py b/var/spack/repos/builtin/packages/ghost/package.py index fe2e0a8d67..f0d491d971 100644 --- a/var/spack/repos/builtin/packages/ghost/package.py +++ b/var/spack/repos/builtin/packages/ghost/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ghost(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py index dc4160037d..fed7f463be 100644 --- a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py +++ b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * class GhostscriptFonts(Package): diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index 31380f2df1..1ad043a643 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -6,7 +6,7 @@ import re import shutil -from spack import * +from spack.package import * class Ghostscript(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/giblib/package.py b/var/spack/repos/builtin/packages/giblib/package.py index 30c652d1c3..12a2b88949 100644 --- a/var/spack/repos/builtin/packages/giblib/package.py +++ b/var/spack/repos/builtin/packages/giblib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Giblib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/giflib/package.py b/var/spack/repos/builtin/packages/giflib/package.py index 4338a2f8bf..3b6a59a584 100644 --- a/var/spack/repos/builtin/packages/giflib/package.py +++ b/var/spack/repos/builtin/packages/giflib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Giflib(MakefilePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/ginac/package.py b/var/spack/repos/builtin/packages/ginac/package.py index 6ea8360f1c..74e8e53e57 100644 --- a/var/spack/repos/builtin/packages/ginac/package.py +++ b/var/spack/repos/builtin/packages/ginac/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ginac(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ginkgo/package.py b/var/spack/repos/builtin/packages/ginkgo/package.py index dc7fed6bd4..593f3aa159 100644 --- a/var/spack/repos/builtin/packages/ginkgo/package.py +++ b/var/spack/repos/builtin/packages/ginkgo/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/giraph/package.py b/var/spack/repos/builtin/packages/giraph/package.py index 7484f1a0e2..6bbd609828 100644 --- a/var/spack/repos/builtin/packages/giraph/package.py +++ b/var/spack/repos/builtin/packages/giraph/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Giraph(MavenPackage): """Apache Giraph is an iterative graph processing system built for high scalability.""" diff --git a/var/spack/repos/builtin/packages/git-annex/package.py b/var/spack/repos/builtin/packages/git-annex/package.py index 40f77c6731..267007b80b 100644 --- a/var/spack/repos/builtin/packages/git-annex/package.py +++ b/var/spack/repos/builtin/packages/git-annex/package.py @@ -7,7 +7,7 @@ import os import platform import re -from spack import * +from spack.package import * class GitAnnex(Package): diff --git a/var/spack/repos/builtin/packages/git-fat-git/package.py b/var/spack/repos/builtin/packages/git-fat-git/package.py index fa96f7fada..3cbd78138e 100644 --- a/var/spack/repos/builtin/packages/git-fat-git/package.py +++ b/var/spack/repos/builtin/packages/git-fat-git/package.py @@ -3,10 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -# Author: Matteo Giantomassi <matteo.giantomassiNOSPAM AT uclouvain.be> -# Date: October 11, 2016 -from spack import * +from spack.package import * class GitFatGit(Package): diff --git a/var/spack/repos/builtin/packages/git-imerge/package.py b/var/spack/repos/builtin/packages/git-imerge/package.py index 8b13519bf7..cbb7251cae 100644 --- a/var/spack/repos/builtin/packages/git-imerge/package.py +++ b/var/spack/repos/builtin/packages/git-imerge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GitImerge(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/git-lfs/package.py b/var/spack/repos/builtin/packages/git-lfs/package.py index 3cdceb2ce0..4cdcb5307e 100644 --- a/var/spack/repos/builtin/packages/git-lfs/package.py +++ b/var/spack/repos/builtin/packages/git-lfs/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class GitLfs(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 5f53851ed3..b805c7b540 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class Git(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gitconddb/package.py b/var/spack/repos/builtin/packages/gitconddb/package.py index 7c8c11cfc0..6035d5aaeb 100644 --- a/var/spack/repos/builtin/packages/gitconddb/package.py +++ b/var/spack/repos/builtin/packages/gitconddb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gitconddb(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gl2ps/package.py b/var/spack/repos/builtin/packages/gl2ps/package.py index 6ef255461e..f11552debb 100644 --- a/var/spack/repos/builtin/packages/gl2ps/package.py +++ b/var/spack/repos/builtin/packages/gl2ps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gl2ps(CMakePackage): diff --git a/var/spack/repos/builtin/packages/glew/package.py b/var/spack/repos/builtin/packages/glew/package.py index 6202f89da6..8d47dd9eeb 100644 --- a/var/spack/repos/builtin/packages/glew/package.py +++ b/var/spack/repos/builtin/packages/glew/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Glew(CMakePackage): """The OpenGL Extension Wrangler Library.""" diff --git a/var/spack/repos/builtin/packages/glfmultiples/package.py b/var/spack/repos/builtin/packages/glfmultiples/package.py index 9e892e7d4c..c68fb1ab99 100644 --- a/var/spack/repos/builtin/packages/glfmultiples/package.py +++ b/var/spack/repos/builtin/packages/glfmultiples/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glfmultiples(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/glfw/package.py b/var/spack/repos/builtin/packages/glfw/package.py index 83dd74ad45..38c6f346a5 100644 --- a/var/spack/repos/builtin/packages/glfw/package.py +++ b/var/spack/repos/builtin/packages/glfw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glfw(CMakePackage): diff --git a/var/spack/repos/builtin/packages/glib-networking/package.py b/var/spack/repos/builtin/packages/glib-networking/package.py index b781563867..54ae4bc58b 100644 --- a/var/spack/repos/builtin/packages/glib-networking/package.py +++ b/var/spack/repos/builtin/packages/glib-networking/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GlibNetworking(MesonPackage): diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index c6af502b12..40f8f248a2 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Glib(Package): diff --git a/var/spack/repos/builtin/packages/glibmm/package.py b/var/spack/repos/builtin/packages/glibmm/package.py index f28ede0554..dffb67f9a6 100644 --- a/var/spack/repos/builtin/packages/glibmm/package.py +++ b/var/spack/repos/builtin/packages/glibmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glibmm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/glimmer/package.py b/var/spack/repos/builtin/packages/glimmer/package.py index d0838d7dd0..5bfcd398b7 100644 --- a/var/spack/repos/builtin/packages/glimmer/package.py +++ b/var/spack/repos/builtin/packages/glimmer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glimmer(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/glm/package.py b/var/spack/repos/builtin/packages/glm/package.py index 23dcb4a5f4..17bb22b8ea 100644 --- a/var/spack/repos/builtin/packages/glm/package.py +++ b/var/spack/repos/builtin/packages/glm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/global/package.py b/var/spack/repos/builtin/packages/global/package.py index 9c9ff23e54..6b29507319 100644 --- a/var/spack/repos/builtin/packages/global/package.py +++ b/var/spack/repos/builtin/packages/global/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Global(Package): diff --git a/var/spack/repos/builtin/packages/globalarrays/package.py b/var/spack/repos/builtin/packages/globalarrays/package.py index 44ab13067b..a0e60fb600 100644 --- a/var/spack/repos/builtin/packages/globalarrays/package.py +++ b/var/spack/repos/builtin/packages/globalarrays/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os.path +from spack.package import * + class Globalarrays(AutotoolsPackage): """Global Arrays (GA) is a Partitioned Global Address Space (PGAS) diff --git a/var/spack/repos/builtin/packages/glog/package.py b/var/spack/repos/builtin/packages/glog/package.py index b38960c207..6c4942f807 100644 --- a/var/spack/repos/builtin/packages/glog/package.py +++ b/var/spack/repos/builtin/packages/glog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glog(Package): diff --git a/var/spack/repos/builtin/packages/gloo/package.py b/var/spack/repos/builtin/packages/gloo/package.py index 14ddc04e6f..7e82a5b61b 100644 --- a/var/spack/repos/builtin/packages/gloo/package.py +++ b/var/spack/repos/builtin/packages/gloo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gloo(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/glpk/package.py b/var/spack/repos/builtin/packages/glpk/package.py index dd296eea30..8a2fddb778 100644 --- a/var/spack/repos/builtin/packages/glpk/package.py +++ b/var/spack/repos/builtin/packages/glpk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glpk(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/glproto/package.py b/var/spack/repos/builtin/packages/glproto/package.py index d6c0a2fcf9..12c371da73 100644 --- a/var/spack/repos/builtin/packages/glproto/package.py +++ b/var/spack/repos/builtin/packages/glproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/gluegen/package.py b/var/spack/repos/builtin/packages/gluegen/package.py index d6f1eeb942..979e509a55 100644 --- a/var/spack/repos/builtin/packages/gluegen/package.py +++ b/var/spack/repos/builtin/packages/gluegen/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Gluegen(Package): diff --git a/var/spack/repos/builtin/packages/glusterfs/package.py b/var/spack/repos/builtin/packages/glusterfs/package.py index 9c0163a515..c797b3d086 100644 --- a/var/spack/repos/builtin/packages/glusterfs/package.py +++ b/var/spack/repos/builtin/packages/glusterfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glusterfs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py index 8e86f289ad..fe27eddb95 100644 --- a/var/spack/repos/builtin/packages/glvis/package.py +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Glvis(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index 02576a78eb..9e85aa6317 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -5,6 +5,8 @@ import re +from spack.package import * + class Gmake(AutotoolsPackage, GNUMirrorPackage): """GNU Make is a tool which controls the generation of executables and diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index 2a550e367b..0223167767 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GmapGsnap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gmime/package.py b/var/spack/repos/builtin/packages/gmime/package.py index 5efc91a73e..c18891a350 100644 --- a/var/spack/repos/builtin/packages/gmime/package.py +++ b/var/spack/repos/builtin/packages/gmime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gmime(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gmodel/package.py b/var/spack/repos/builtin/packages/gmodel/package.py index 62fc46d67c..20d398edd8 100644 --- a/var/spack/repos/builtin/packages/gmodel/package.py +++ b/var/spack/repos/builtin/packages/gmodel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gmodel(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index e20489f55f..bb097bb4a4 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gmp(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index 8a833cb67d..4e0a481fca 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gmsh(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gmt/package.py b/var/spack/repos/builtin/packages/gmt/package.py index 7426ba526d..e7a7d3e1a9 100644 --- a/var/spack/repos/builtin/packages/gmt/package.py +++ b/var/spack/repos/builtin/packages/gmt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gmt(Package): diff --git a/var/spack/repos/builtin/packages/gmtsar/package.py b/var/spack/repos/builtin/packages/gmtsar/package.py index 76f02e88c8..ba78df721e 100644 --- a/var/spack/repos/builtin/packages/gmtsar/package.py +++ b/var/spack/repos/builtin/packages/gmtsar/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gmtsar(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gnat/package.py b/var/spack/repos/builtin/packages/gnat/package.py index 72fb2a2be7..5e0f471eeb 100644 --- a/var/spack/repos/builtin/packages/gnat/package.py +++ b/var/spack/repos/builtin/packages/gnat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gnat(Package): diff --git a/var/spack/repos/builtin/packages/gnds/package.py b/var/spack/repos/builtin/packages/gnds/package.py index c841c78992..0e0d0faf37 100644 --- a/var/spack/repos/builtin/packages/gnds/package.py +++ b/var/spack/repos/builtin/packages/gnds/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gnds(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gnome-common/package.py b/var/spack/repos/builtin/packages/gnome-common/package.py index 03ac99d90c..88e09bc14b 100644 --- a/var/spack/repos/builtin/packages/gnome-common/package.py +++ b/var/spack/repos/builtin/packages/gnome-common/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GnomeCommon(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gnuconfig/package.py b/var/spack/repos/builtin/packages/gnuconfig/package.py index fcec642892..7b84d28ce8 100644 --- a/var/spack/repos/builtin/packages/gnuconfig/package.py +++ b/var/spack/repos/builtin/packages/gnuconfig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gnuconfig(Package): diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index 63c81ac0ca..1847075979 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gnupg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index 8833bfec8d..6e080f03fa 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Gnuplot(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gnuradio/package.py b/var/spack/repos/builtin/packages/gnuradio/package.py index 5ae88b66c9..b11ea0e4d2 100644 --- a/var/spack/repos/builtin/packages/gnuradio/package.py +++ b/var/spack/repos/builtin/packages/gnuradio/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index 0016155f7e..30f475a384 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gnutls(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index ec10c89ee5..3358bd750e 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * # THIS PACKAGE SHOULD NOT EXIST # it exists to make up for the inability to: diff --git a/var/spack/repos/builtin/packages/go-md2man/package.py b/var/spack/repos/builtin/packages/go-md2man/package.py index c0cd712725..c52b5f07d1 100644 --- a/var/spack/repos/builtin/packages/go-md2man/package.py +++ b/var/spack/repos/builtin/packages/go-md2man/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GoMd2man(Package): diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index f7c0fc1f41..6596265389 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -9,7 +9,7 @@ import re import llnl.util.tty as tty -from spack import * +from spack.package import * # - vanilla CentOS 7, and possibly other systems, fail a test: # TestCloneNEWUSERAndRemapRootDisableSetgroups diff --git a/var/spack/repos/builtin/packages/gobject-introspection/package.py b/var/spack/repos/builtin/packages/gobject-introspection/package.py index 6388ec44c6..f34e3755c9 100644 --- a/var/spack/repos/builtin/packages/gobject-introspection/package.py +++ b/var/spack/repos/builtin/packages/gobject-introspection/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import spack.hooks.sbang as sbang -from spack import * +from spack.package import * class GobjectIntrospection(MesonPackage): diff --git a/var/spack/repos/builtin/packages/goblin-hmc-sim/package.py b/var/spack/repos/builtin/packages/goblin-hmc-sim/package.py index ad698e8eb2..607f4a57f0 100644 --- a/var/spack/repos/builtin/packages/goblin-hmc-sim/package.py +++ b/var/spack/repos/builtin/packages/goblin-hmc-sim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GoblinHmcSim(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/goma/package.py b/var/spack/repos/builtin/packages/goma/package.py index 5730fbced2..53c9913adb 100644 --- a/var/spack/repos/builtin/packages/goma/package.py +++ b/var/spack/repos/builtin/packages/goma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Goma(CMakePackage): diff --git a/var/spack/repos/builtin/packages/google-crc32c/package.py b/var/spack/repos/builtin/packages/google-crc32c/package.py index a7f172be33..82cf2d40c6 100644 --- a/var/spack/repos/builtin/packages/google-crc32c/package.py +++ b/var/spack/repos/builtin/packages/google-crc32c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GoogleCrc32c(CMakePackage): diff --git a/var/spack/repos/builtin/packages/googletest/package.py b/var/spack/repos/builtin/packages/googletest/package.py index ee39dcf3d2..356c8c80f5 100644 --- a/var/spack/repos/builtin/packages/googletest/package.py +++ b/var/spack/repos/builtin/packages/googletest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Googletest(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gosam-contrib/package.py b/var/spack/repos/builtin/packages/gosam-contrib/package.py index c364830068..0f4ce1ee91 100644 --- a/var/spack/repos/builtin/packages/gosam-contrib/package.py +++ b/var/spack/repos/builtin/packages/gosam-contrib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GosamContrib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/goshimmer/package.py b/var/spack/repos/builtin/packages/goshimmer/package.py index 50dd69aa8a..3177f28ccd 100644 --- a/var/spack/repos/builtin/packages/goshimmer/package.py +++ b/var/spack/repos/builtin/packages/goshimmer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Goshimmer(Package): diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py index 8bd6a638a4..559d72c46a 100644 --- a/var/spack/repos/builtin/packages/gotcha/package.py +++ b/var/spack/repos/builtin/packages/gotcha/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gotcha(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gource/package.py b/var/spack/repos/builtin/packages/gource/package.py index 1c719637e2..3e6c8a0b1d 100644 --- a/var/spack/repos/builtin/packages/gource/package.py +++ b/var/spack/repos/builtin/packages/gource/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/gpdb/package.py b/var/spack/repos/builtin/packages/gpdb/package.py index b332dd6f7c..5f6780a56d 100644 --- a/var/spack/repos/builtin/packages/gpdb/package.py +++ b/var/spack/repos/builtin/packages/gpdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gpdb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gperf/package.py b/var/spack/repos/builtin/packages/gperf/package.py index 41dc2d7704..d330a41ac1 100644 --- a/var/spack/repos/builtin/packages/gperf/package.py +++ b/var/spack/repos/builtin/packages/gperf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gperf(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gperftools/package.py b/var/spack/repos/builtin/packages/gperftools/package.py index 2f70dc545c..6523df8636 100644 --- a/var/spack/repos/builtin/packages/gperftools/package.py +++ b/var/spack/repos/builtin/packages/gperftools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gperftools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gpgme/package.py b/var/spack/repos/builtin/packages/gpgme/package.py index 371c6c9f25..519a3b9d1b 100644 --- a/var/spack/repos/builtin/packages/gpgme/package.py +++ b/var/spack/repos/builtin/packages/gpgme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gpgme(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gpi-2/package.py b/var/spack/repos/builtin/packages/gpi-2/package.py index 7ea200fed8..6d8075c75b 100644 --- a/var/spack/repos/builtin/packages/gpi-2/package.py +++ b/var/spack/repos/builtin/packages/gpi-2/package.py @@ -5,7 +5,7 @@ from os import environ -from spack import * +from spack.package import * class Gpi2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gpi-space/package.py b/var/spack/repos/builtin/packages/gpi-space/package.py index 095fcf99ec..01ffcd8c8b 100644 --- a/var/spack/repos/builtin/packages/gpi-space/package.py +++ b/var/spack/repos/builtin/packages/gpi-space/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GpiSpace(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gplates/package.py b/var/spack/repos/builtin/packages/gplates/package.py index d5faf7e410..3d5f19a89e 100644 --- a/var/spack/repos/builtin/packages/gplates/package.py +++ b/var/spack/repos/builtin/packages/gplates/package.py @@ -2,10 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - import os -from spack import * +from spack.package import * class Gplates(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gprolog/package.py b/var/spack/repos/builtin/packages/gprolog/package.py index 5b08850c61..fe71438e96 100644 --- a/var/spack/repos/builtin/packages/gprolog/package.py +++ b/var/spack/repos/builtin/packages/gprolog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gprolog(Package): diff --git a/var/spack/repos/builtin/packages/gptl/package.py b/var/spack/repos/builtin/packages/gptl/package.py index daaae1df43..b13e174651 100644 --- a/var/spack/repos/builtin/packages/gptl/package.py +++ b/var/spack/repos/builtin/packages/gptl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) # ---------------------------------------------------------------------------- -from spack import * +from spack.package import * class Gptl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gptune/package.py b/var/spack/repos/builtin/packages/gptune/package.py index 15c202b64c..dafae71ea3 100644 --- a/var/spack/repos/builtin/packages/gptune/package.py +++ b/var/spack/repos/builtin/packages/gptune/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gptune(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gpu-burn/package.py b/var/spack/repos/builtin/packages/gpu-burn/package.py index ea50c7f529..7e5d626159 100644 --- a/var/spack/repos/builtin/packages/gpu-burn/package.py +++ b/var/spack/repos/builtin/packages/gpu-burn/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class GpuBurn(MakefilePackage, CudaPackage): """Multi-GPU CUDA stress test.""" diff --git a/var/spack/repos/builtin/packages/gqrx/package.py b/var/spack/repos/builtin/packages/gqrx/package.py index 5e87da9ba3..4334f36527 100644 --- a/var/spack/repos/builtin/packages/gqrx/package.py +++ b/var/spack/repos/builtin/packages/gqrx/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Gqrx(CMakePackage): """Gqrx is an open source software defined radio (SDR) receiver implemented using GNU Radio and the Qt GUI toolkit. Currently it diff --git a/var/spack/repos/builtin/packages/gr-osmosdr/package.py b/var/spack/repos/builtin/packages/gr-osmosdr/package.py index fe774b44c1..3da6014af3 100644 --- a/var/spack/repos/builtin/packages/gr-osmosdr/package.py +++ b/var/spack/repos/builtin/packages/gr-osmosdr/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class GrOsmosdr(CMakePackage): """While primarily being developed for the OsmoSDR hardware, this block as well supports: diff --git a/var/spack/repos/builtin/packages/grabix/package.py b/var/spack/repos/builtin/packages/grabix/package.py index 3dd369e95b..9736571841 100644 --- a/var/spack/repos/builtin/packages/grabix/package.py +++ b/var/spack/repos/builtin/packages/grabix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grabix(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/grace/package.py b/var/spack/repos/builtin/packages/grace/package.py index e96efec9c7..d7a887dc96 100644 --- a/var/spack/repos/builtin/packages/grace/package.py +++ b/var/spack/repos/builtin/packages/grace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/grackle/package.py b/var/spack/repos/builtin/packages/grackle/package.py index a5fd2a2c75..ef4d9eb243 100644 --- a/var/spack/repos/builtin/packages/grackle/package.py +++ b/var/spack/repos/builtin/packages/grackle/package.py @@ -6,7 +6,7 @@ import inspect import os.path -from spack import * +from spack.package import * class Grackle(Package): diff --git a/var/spack/repos/builtin/packages/gradle/package.py b/var/spack/repos/builtin/packages/gradle/package.py index 4b54683dde..7054e15fc5 100644 --- a/var/spack/repos/builtin/packages/gradle/package.py +++ b/var/spack/repos/builtin/packages/gradle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gradle(Package): diff --git a/var/spack/repos/builtin/packages/grads/package.py b/var/spack/repos/builtin/packages/grads/package.py index 998bdf2c90..b12dc4ca11 100644 --- a/var/spack/repos/builtin/packages/grads/package.py +++ b/var/spack/repos/builtin/packages/grads/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grads(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/grafana/package.py b/var/spack/repos/builtin/packages/grafana/package.py index c1e8a13680..420bf2323a 100644 --- a/var/spack/repos/builtin/packages/grafana/package.py +++ b/var/spack/repos/builtin/packages/grafana/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grafana(Package): diff --git a/var/spack/repos/builtin/packages/grandr/package.py b/var/spack/repos/builtin/packages/grandr/package.py index 00900eb9b4..9c6c6d3541 100644 --- a/var/spack/repos/builtin/packages/grandr/package.py +++ b/var/spack/repos/builtin/packages/grandr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grandr(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/graph500/package.py b/var/spack/repos/builtin/packages/graph500/package.py index 3de3bdb099..ba22d7838a 100644 --- a/var/spack/repos/builtin/packages/graph500/package.py +++ b/var/spack/repos/builtin/packages/graph500/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Graph500(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/graphblast/package.py b/var/spack/repos/builtin/packages/graphblast/package.py index bfdb090ec1..1eacd96d83 100644 --- a/var/spack/repos/builtin/packages/graphblast/package.py +++ b/var/spack/repos/builtin/packages/graphblast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/graphicsmagick/package.py b/var/spack/repos/builtin/packages/graphicsmagick/package.py index 5acf3a57a7..58e97bac8a 100644 --- a/var/spack/repos/builtin/packages/graphicsmagick/package.py +++ b/var/spack/repos/builtin/packages/graphicsmagick/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Graphicsmagick(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/graphite2/package.py b/var/spack/repos/builtin/packages/graphite2/package.py index 5d342128a8..038ca9abc2 100644 --- a/var/spack/repos/builtin/packages/graphite2/package.py +++ b/var/spack/repos/builtin/packages/graphite2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Graphite2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/graphlib/package.py b/var/spack/repos/builtin/packages/graphlib/package.py index 5e5fe7acfb..feb3a84fa2 100644 --- a/var/spack/repos/builtin/packages/graphlib/package.py +++ b/var/spack/repos/builtin/packages/graphlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Graphlib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/graphmap/package.py b/var/spack/repos/builtin/packages/graphmap/package.py index 933651f859..5ac28fd800 100644 --- a/var/spack/repos/builtin/packages/graphmap/package.py +++ b/var/spack/repos/builtin/packages/graphmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Graphmap(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 8dbdfcd58d..29e854f857 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -6,8 +6,8 @@ import os import sys -from spack import * from spack.operating_systems.mac_os import macos_version +from spack.package import * MACOS_VERSION = macos_version() if sys.platform == 'darwin' else None diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py index 724c9c506f..6f948dcb6a 100644 --- a/var/spack/repos/builtin/packages/grass/package.py +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grass(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/graylog2-server/package.py b/var/spack/repos/builtin/packages/graylog2-server/package.py index 3d3e6fa589..c46fc18283 100644 --- a/var/spack/repos/builtin/packages/graylog2-server/package.py +++ b/var/spack/repos/builtin/packages/graylog2-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Graylog2Server(Package): diff --git a/var/spack/repos/builtin/packages/grep/package.py b/var/spack/repos/builtin/packages/grep/package.py index cbf02a65f1..03d3f923f5 100644 --- a/var/spack/repos/builtin/packages/grep/package.py +++ b/var/spack/repos/builtin/packages/grep/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grep(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/grib-api/package.py b/var/spack/repos/builtin/packages/grib-api/package.py index f89be7dc99..dab6757a9e 100644 --- a/var/spack/repos/builtin/packages/grib-api/package.py +++ b/var/spack/repos/builtin/packages/grib-api/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GribApi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/grib-util/package.py b/var/spack/repos/builtin/packages/grib-util/package.py index 8594a06944..9ce60cab95 100644 --- a/var/spack/repos/builtin/packages/grib-util/package.py +++ b/var/spack/repos/builtin/packages/grib-util/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GribUtil(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gridlab-d/package.py b/var/spack/repos/builtin/packages/gridlab-d/package.py index 6ef6965a39..4575123f37 100644 --- a/var/spack/repos/builtin/packages/gridlab-d/package.py +++ b/var/spack/repos/builtin/packages/gridlab-d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GridlabD(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/grnboost/package.py b/var/spack/repos/builtin/packages/grnboost/package.py index fe85379e0b..99795b447f 100644 --- a/var/spack/repos/builtin/packages/grnboost/package.py +++ b/var/spack/repos/builtin/packages/grnboost/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grnboost(Package): diff --git a/var/spack/repos/builtin/packages/groff/package.py b/var/spack/repos/builtin/packages/groff/package.py index 2e03233e81..5c47858928 100644 --- a/var/spack/repos/builtin/packages/groff/package.py +++ b/var/spack/repos/builtin/packages/groff/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Groff(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py b/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py index 8ef5e20e02..7e805f2dea 100644 --- a/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py +++ b/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.gromacs import Gromacs diff --git a/var/spack/repos/builtin/packages/gromacs-swaxs/package.py b/var/spack/repos/builtin/packages/gromacs-swaxs/package.py index b97169a1ad..33f4316ff5 100644 --- a/var/spack/repos/builtin/packages/gromacs-swaxs/package.py +++ b/var/spack/repos/builtin/packages/gromacs-swaxs/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.gromacs import Gromacs diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index e8b48a39a5..e883722229 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Gromacs(CMakePackage): """GROMACS (GROningen MAchine for Chemical Simulations) is a molecular diff --git a/var/spack/repos/builtin/packages/grpc/package.py b/var/spack/repos/builtin/packages/grpc/package.py index da232a4a53..8027697e06 100644 --- a/var/spack/repos/builtin/packages/grpc/package.py +++ b/var/spack/repos/builtin/packages/grpc/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Grpc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gsettings-desktop-schemas/package.py b/var/spack/repos/builtin/packages/gsettings-desktop-schemas/package.py index 37dd430104..4f357dbb56 100644 --- a/var/spack/repos/builtin/packages/gsettings-desktop-schemas/package.py +++ b/var/spack/repos/builtin/packages/gsettings-desktop-schemas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GsettingsDesktopSchemas(MesonPackage): diff --git a/var/spack/repos/builtin/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py index 655b4aac39..9234b6c236 100644 --- a/var/spack/repos/builtin/packages/gsl/package.py +++ b/var/spack/repos/builtin/packages/gsl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gsl(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py index 1ccc205ed5..1681994c53 100644 --- a/var/spack/repos/builtin/packages/gslib/package.py +++ b/var/spack/repos/builtin/packages/gslib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gslib(Package): diff --git a/var/spack/repos/builtin/packages/gtk-doc/package.py b/var/spack/repos/builtin/packages/gtk-doc/package.py index 3811bce4a8..6ce60f7e41 100644 --- a/var/spack/repos/builtin/packages/gtk-doc/package.py +++ b/var/spack/repos/builtin/packages/gtk-doc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GtkDoc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gtkmm/package.py b/var/spack/repos/builtin/packages/gtkmm/package.py index c4a758372a..881f1d6fbf 100644 --- a/var/spack/repos/builtin/packages/gtkmm/package.py +++ b/var/spack/repos/builtin/packages/gtkmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gtkmm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py index 657f88e45c..49df43a789 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GtkorvoAtl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py index 8a60f7dee1..f5528c3d10 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GtkorvoCercsEnv(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py index 59857cd295..572497aaff 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GtkorvoDill(CMakePackage): diff --git a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py index 8d3d22e455..3af2e44075 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GtkorvoEnet(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index 81625add2a..f2bcc812ee 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gtkplus(MesonPackage): diff --git a/var/spack/repos/builtin/packages/gtksourceview/package.py b/var/spack/repos/builtin/packages/gtksourceview/package.py index 11be800182..15732bc2c6 100644 --- a/var/spack/repos/builtin/packages/gtksourceview/package.py +++ b/var/spack/repos/builtin/packages/gtksourceview/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gtksourceview(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/gts/package.py b/var/spack/repos/builtin/packages/gts/package.py index 2afd259692..58c27beee9 100644 --- a/var/spack/repos/builtin/packages/gts/package.py +++ b/var/spack/repos/builtin/packages/gts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gts(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/guacamole-client/package.py b/var/spack/repos/builtin/packages/guacamole-client/package.py index 5e390ef582..06fca71bc6 100644 --- a/var/spack/repos/builtin/packages/guacamole-client/package.py +++ b/var/spack/repos/builtin/packages/guacamole-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GuacamoleClient(MavenPackage): diff --git a/var/spack/repos/builtin/packages/guacamole-server/package.py b/var/spack/repos/builtin/packages/guacamole-server/package.py index 962c5b172c..83fa244af6 100644 --- a/var/spack/repos/builtin/packages/guacamole-server/package.py +++ b/var/spack/repos/builtin/packages/guacamole-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class GuacamoleServer(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/guidance/package.py b/var/spack/repos/builtin/packages/guidance/package.py index d007d8547d..b7c835d6af 100644 --- a/var/spack/repos/builtin/packages/guidance/package.py +++ b/var/spack/repos/builtin/packages/guidance/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * class Guidance(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 50f6404117..6cbfd08b0a 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Guile(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/gunrock/package.py b/var/spack/repos/builtin/packages/gunrock/package.py index b64df72c2d..6c4d1de56a 100644 --- a/var/spack/repos/builtin/packages/gunrock/package.py +++ b/var/spack/repos/builtin/packages/gunrock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/gurobi/package.py b/var/spack/repos/builtin/packages/gurobi/package.py index 3c0b9a792f..02cbf53e41 100644 --- a/var/spack/repos/builtin/packages/gurobi/package.py +++ b/var/spack/repos/builtin/packages/gurobi/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Gurobi(Package): diff --git a/var/spack/repos/builtin/packages/gxsview/package.py b/var/spack/repos/builtin/packages/gxsview/package.py index 67f1ce44f9..4ebf335d32 100644 --- a/var/spack/repos/builtin/packages/gxsview/package.py +++ b/var/spack/repos/builtin/packages/gxsview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gxsview(QMakePackage): diff --git a/var/spack/repos/builtin/packages/gzip/package.py b/var/spack/repos/builtin/packages/gzip/package.py index f072cf98c7..4c2cd7d12f 100644 --- a/var/spack/repos/builtin/packages/gzip/package.py +++ b/var/spack/repos/builtin/packages/gzip/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Gzip(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/h2database/package.py b/var/spack/repos/builtin/packages/h2database/package.py index 21b2eee4dc..9b86b36e5d 100644 --- a/var/spack/repos/builtin/packages/h2database/package.py +++ b/var/spack/repos/builtin/packages/h2database/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class H2database(MavenPackage): """H2 is an embeddable RDBMS written in Java.""" diff --git a/var/spack/repos/builtin/packages/h5bench/package.py b/var/spack/repos/builtin/packages/h5bench/package.py index f24d3a3401..fb031e6c53 100644 --- a/var/spack/repos/builtin/packages/h5bench/package.py +++ b/var/spack/repos/builtin/packages/h5bench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class H5bench(CMakePackage): diff --git a/var/spack/repos/builtin/packages/h5cpp/package.py b/var/spack/repos/builtin/packages/h5cpp/package.py index a2ec8a2b5e..208701781b 100644 --- a/var/spack/repos/builtin/packages/h5cpp/package.py +++ b/var/spack/repos/builtin/packages/h5cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class H5cpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/h5hut/package.py b/var/spack/repos/builtin/packages/h5hut/package.py index ef700a419c..0879f8ed14 100644 --- a/var/spack/repos/builtin/packages/h5hut/package.py +++ b/var/spack/repos/builtin/packages/h5hut/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class H5hut(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/h5part/package.py b/var/spack/repos/builtin/packages/h5part/package.py index 898bd8d8f0..a922dd947f 100644 --- a/var/spack/repos/builtin/packages/h5part/package.py +++ b/var/spack/repos/builtin/packages/h5part/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class H5part(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/h5utils/package.py b/var/spack/repos/builtin/packages/h5utils/package.py index c744ae6113..86fe6ed1f1 100644 --- a/var/spack/repos/builtin/packages/h5utils/package.py +++ b/var/spack/repos/builtin/packages/h5utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class H5utils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/h5z-zfp/package.py b/var/spack/repos/builtin/packages/h5z-zfp/package.py index 70820a629b..e9728bcd15 100644 --- a/var/spack/repos/builtin/packages/h5z-zfp/package.py +++ b/var/spack/repos/builtin/packages/h5z-zfp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class H5zZfp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hacckernels/package.py b/var/spack/repos/builtin/packages/hacckernels/package.py index 83b4feaae6..85a782a8f8 100644 --- a/var/spack/repos/builtin/packages/hacckernels/package.py +++ b/var/spack/repos/builtin/packages/hacckernels/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hacckernels(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hackrf-host/package.py b/var/spack/repos/builtin/packages/hackrf-host/package.py index 1d6d2c4451..2888187677 100644 --- a/var/spack/repos/builtin/packages/hackrf-host/package.py +++ b/var/spack/repos/builtin/packages/hackrf-host/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class HackrfHost(CMakePackage): """Software for HackRF, a low cost, open source Software Defined Radio platform.""" diff --git a/var/spack/repos/builtin/packages/hadoop-xrootd/package.py b/var/spack/repos/builtin/packages/hadoop-xrootd/package.py index 1a7838d6a6..c0d14f6a71 100644 --- a/var/spack/repos/builtin/packages/hadoop-xrootd/package.py +++ b/var/spack/repos/builtin/packages/hadoop-xrootd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HadoopXrootd(MavenPackage): diff --git a/var/spack/repos/builtin/packages/hadoop/package.py b/var/spack/repos/builtin/packages/hadoop/package.py index 99301b7427..1e7fa3fd35 100644 --- a/var/spack/repos/builtin/packages/hadoop/package.py +++ b/var/spack/repos/builtin/packages/hadoop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hadoop(Package): diff --git a/var/spack/repos/builtin/packages/hal/package.py b/var/spack/repos/builtin/packages/hal/package.py index b598c127f3..c8ecc641d5 100644 --- a/var/spack/repos/builtin/packages/hal/package.py +++ b/var/spack/repos/builtin/packages/hal/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hal(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/halc/package.py b/var/spack/repos/builtin/packages/halc/package.py index 530afa74b1..b1e19273a0 100644 --- a/var/spack/repos/builtin/packages/halc/package.py +++ b/var/spack/repos/builtin/packages/halc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Halc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/half/package.py b/var/spack/repos/builtin/packages/half/package.py index 0181e54779..5a9d4d8100 100644 --- a/var/spack/repos/builtin/packages/half/package.py +++ b/var/spack/repos/builtin/packages/half/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Half(Package): diff --git a/var/spack/repos/builtin/packages/hama/package.py b/var/spack/repos/builtin/packages/hama/package.py index 0d35b3c158..9eeb3dd0cc 100644 --- a/var/spack/repos/builtin/packages/hama/package.py +++ b/var/spack/repos/builtin/packages/hama/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hama(Package): diff --git a/var/spack/repos/builtin/packages/hapcut2/package.py b/var/spack/repos/builtin/packages/hapcut2/package.py index beae641608..363455c78f 100644 --- a/var/spack/repos/builtin/packages/hapcut2/package.py +++ b/var/spack/repos/builtin/packages/hapcut2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hapcut2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hapdip/package.py b/var/spack/repos/builtin/packages/hapdip/package.py index e66ad4420a..27af3d5694 100644 --- a/var/spack/repos/builtin/packages/hapdip/package.py +++ b/var/spack/repos/builtin/packages/hapdip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hapdip(Package): diff --git a/var/spack/repos/builtin/packages/haploview/package.py b/var/spack/repos/builtin/packages/haploview/package.py index b73a1edb88..7ed3fc0a9d 100644 --- a/var/spack/repos/builtin/packages/haploview/package.py +++ b/var/spack/repos/builtin/packages/haploview/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Haploview(Package): diff --git a/var/spack/repos/builtin/packages/haproxy/package.py b/var/spack/repos/builtin/packages/haproxy/package.py index 7342a10eb0..6fcd97fdf9 100644 --- a/var/spack/repos/builtin/packages/haproxy/package.py +++ b/var/spack/repos/builtin/packages/haproxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Haproxy(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hardlink/package.py b/var/spack/repos/builtin/packages/hardlink/package.py index a601a73981..32672614b5 100644 --- a/var/spack/repos/builtin/packages/hardlink/package.py +++ b/var/spack/repos/builtin/packages/hardlink/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hardlink(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py index ddb37df257..b9a54e59af 100644 --- a/var/spack/repos/builtin/packages/harfbuzz/package.py +++ b/var/spack/repos/builtin/packages/harfbuzz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Harfbuzz(MesonPackage): diff --git a/var/spack/repos/builtin/packages/harminv/package.py b/var/spack/repos/builtin/packages/harminv/package.py index 8950e7519c..a508c61e2f 100644 --- a/var/spack/repos/builtin/packages/harminv/package.py +++ b/var/spack/repos/builtin/packages/harminv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Harminv(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hashcat/package.py b/var/spack/repos/builtin/packages/hashcat/package.py index 05bca07dfe..167b926c2c 100644 --- a/var/spack/repos/builtin/packages/hashcat/package.py +++ b/var/spack/repos/builtin/packages/hashcat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hashcat(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/haveged/package.py b/var/spack/repos/builtin/packages/haveged/package.py index 3e16ba7373..19d18021c1 100644 --- a/var/spack/repos/builtin/packages/haveged/package.py +++ b/var/spack/repos/builtin/packages/haveged/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Haveged(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hazelcast/package.py b/var/spack/repos/builtin/packages/hazelcast/package.py index f1aa091448..e7367a8f2a 100644 --- a/var/spack/repos/builtin/packages/hazelcast/package.py +++ b/var/spack/repos/builtin/packages/hazelcast/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hazelcast(MavenPackage): """Hazelcast is an open-source distributed in-memory data store and computation platform. It provides a wide variety diff --git a/var/spack/repos/builtin/packages/hbase/package.py b/var/spack/repos/builtin/packages/hbase/package.py index cb430f0402..10ff3814fa 100644 --- a/var/spack/repos/builtin/packages/hbase/package.py +++ b/var/spack/repos/builtin/packages/hbase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hbase(Package): diff --git a/var/spack/repos/builtin/packages/hbm-dramsim2/package.py b/var/spack/repos/builtin/packages/hbm-dramsim2/package.py index ac8c53bca8..601111acd0 100644 --- a/var/spack/repos/builtin/packages/hbm-dramsim2/package.py +++ b/var/spack/repos/builtin/packages/hbm-dramsim2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HbmDramsim2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hc/package.py b/var/spack/repos/builtin/packages/hc/package.py index a443ac5169..3018351116 100644 --- a/var/spack/repos/builtin/packages/hc/package.py +++ b/var/spack/repos/builtin/packages/hc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hcoll/package.py b/var/spack/repos/builtin/packages/hcoll/package.py index 23a1f198c3..43f2e130c9 100644 --- a/var/spack/repos/builtin/packages/hcoll/package.py +++ b/var/spack/repos/builtin/packages/hcoll/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hcoll(Package): diff --git a/var/spack/repos/builtin/packages/hdf-eos2/package.py b/var/spack/repos/builtin/packages/hdf-eos2/package.py index 6af7484fb4..d260c22ee3 100644 --- a/var/spack/repos/builtin/packages/hdf-eos2/package.py +++ b/var/spack/repos/builtin/packages/hdf-eos2/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class HdfEos2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hdf-eos5/package.py b/var/spack/repos/builtin/packages/hdf-eos5/package.py index 96be231832..0941d0c9a1 100644 --- a/var/spack/repos/builtin/packages/hdf-eos5/package.py +++ b/var/spack/repos/builtin/packages/hdf-eos5/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class HdfEos5(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py index 6503af6ece..fdb4e7746e 100644 --- a/var/spack/repos/builtin/packages/hdf/package.py +++ b/var/spack/repos/builtin/packages/hdf/package.py @@ -6,6 +6,8 @@ import os import sys +from spack.package import * + class Hdf(AutotoolsPackage): """HDF4 (also known as HDF) is a library and multi-object diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py index 930fd79d0a..f3d93eb35e 100644 --- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py +++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py @@ -7,7 +7,7 @@ import os import shutil import sys -from spack import * +from spack.package import * def _install_shlib(name, src, dst): diff --git a/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py b/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py index b40c37bcaa..6f4a34318e 100644 --- a/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hdf5VfdGds(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/hdf5-vol-async/package.py b/var/spack/repos/builtin/packages/hdf5-vol-async/package.py index 92684783c4..6c50c7204a 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-async/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-async/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hdf5VolAsync(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hdf5-vol-external-passthrough/package.py b/var/spack/repos/builtin/packages/hdf5-vol-external-passthrough/package.py index c9b4e6180b..639e470f34 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-external-passthrough/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-external-passthrough/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hdf5VolExternalPassthrough(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hdf5-vol-log/package.py b/var/spack/repos/builtin/packages/hdf5-vol-log/package.py index edd8420ec8..7d400bc266 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-log/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-log/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hdf5VolLog(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index b59b29f6c9..dd94d938d7 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -8,6 +8,8 @@ import shutil import llnl.util.tty as tty +from spack.package import * + class Hdf5(CMakePackage): """HDF5 is a data model, library, and file format for storing and managing diff --git a/var/spack/repos/builtin/packages/hdfview/package.py b/var/spack/repos/builtin/packages/hdfview/package.py index 2a784dceb8..9a880219e8 100644 --- a/var/spack/repos/builtin/packages/hdfview/package.py +++ b/var/spack/repos/builtin/packages/hdfview/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Hdfview(Package): diff --git a/var/spack/repos/builtin/packages/healpix-cxx/package.py b/var/spack/repos/builtin/packages/healpix-cxx/package.py index 5e472083bf..6a0279f17e 100644 --- a/var/spack/repos/builtin/packages/healpix-cxx/package.py +++ b/var/spack/repos/builtin/packages/healpix-cxx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HealpixCxx(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/heaptrack/package.py b/var/spack/repos/builtin/packages/heaptrack/package.py index 59fc1504ca..0b5a8d8b1f 100644 --- a/var/spack/repos/builtin/packages/heaptrack/package.py +++ b/var/spack/repos/builtin/packages/heaptrack/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Heaptrack(CMakePackage): diff --git a/var/spack/repos/builtin/packages/heasoft/package.py b/var/spack/repos/builtin/packages/heasoft/package.py index 3b52ddcd59..bc8299df6b 100644 --- a/var/spack/repos/builtin/packages/heasoft/package.py +++ b/var/spack/repos/builtin/packages/heasoft/package.py @@ -7,7 +7,7 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * from spack.util.environment import EnvironmentModifications diff --git a/var/spack/repos/builtin/packages/heffte/package.py b/var/spack/repos/builtin/packages/heffte/package.py index 25fd70f0a3..743e4b0828 100644 --- a/var/spack/repos/builtin/packages/heffte/package.py +++ b/var/spack/repos/builtin/packages/heffte/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Heffte(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/helib/package.py b/var/spack/repos/builtin/packages/helib/package.py index 30c10b09f6..f9036b32ca 100644 --- a/var/spack/repos/builtin/packages/helib/package.py +++ b/var/spack/repos/builtin/packages/helib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Helib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/helics/package.py b/var/spack/repos/builtin/packages/helics/package.py index 3c6883b3cc..7e10386e00 100644 --- a/var/spack/repos/builtin/packages/helics/package.py +++ b/var/spack/repos/builtin/packages/helics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/help2man/package.py b/var/spack/repos/builtin/packages/help2man/package.py index eae2daa2fd..3dc3756b83 100644 --- a/var/spack/repos/builtin/packages/help2man/package.py +++ b/var/spack/repos/builtin/packages/help2man/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Help2man(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/henson/package.py b/var/spack/repos/builtin/packages/henson/package.py index 60e77fa984..8d1a17cef1 100644 --- a/var/spack/repos/builtin/packages/henson/package.py +++ b/var/spack/repos/builtin/packages/henson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Henson(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hepmc/package.py b/var/spack/repos/builtin/packages/hepmc/package.py index b2579caf03..8f3f370fcf 100644 --- a/var/spack/repos/builtin/packages/hepmc/package.py +++ b/var/spack/repos/builtin/packages/hepmc/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hepmc(CMakePackage): """The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation.""" diff --git a/var/spack/repos/builtin/packages/hepmc3/package.py b/var/spack/repos/builtin/packages/hepmc3/package.py index 15b3ae7f1f..f09a63850b 100644 --- a/var/spack/repos/builtin/packages/hepmc3/package.py +++ b/var/spack/repos/builtin/packages/hepmc3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hepmc3(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hepmcanalysis/package.py b/var/spack/repos/builtin/packages/hepmcanalysis/package.py index 168316f894..5e14a9e242 100644 --- a/var/spack/repos/builtin/packages/hepmcanalysis/package.py +++ b/var/spack/repos/builtin/packages/hepmcanalysis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hepmcanalysis(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/heppdt/package.py b/var/spack/repos/builtin/packages/heppdt/package.py index e1a25c3c9e..7348f755d4 100644 --- a/var/spack/repos/builtin/packages/heppdt/package.py +++ b/var/spack/repos/builtin/packages/heppdt/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Heppdt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/heputils/package.py b/var/spack/repos/builtin/packages/heputils/package.py index 9345f0f80b..7dc474411e 100644 --- a/var/spack/repos/builtin/packages/heputils/package.py +++ b/var/spack/repos/builtin/packages/heputils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Heputils(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hercules/package.py b/var/spack/repos/builtin/packages/hercules/package.py index eec234979a..5701ece58c 100644 --- a/var/spack/repos/builtin/packages/hercules/package.py +++ b/var/spack/repos/builtin/packages/hercules/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hercules(MakefilePackage): """Hercules is an amazingly fast and highly customizable Git repository analysis engine written in Go.""" diff --git a/var/spack/repos/builtin/packages/hermes/package.py b/var/spack/repos/builtin/packages/hermes/package.py index cb1500a86d..f99c5c748f 100644 --- a/var/spack/repos/builtin/packages/hermes/package.py +++ b/var/spack/repos/builtin/packages/hermes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hermes(CMakePackage): diff --git a/var/spack/repos/builtin/packages/herwig3/package.py b/var/spack/repos/builtin/packages/herwig3/package.py index 277cff8930..12c3e0171a 100644 --- a/var/spack/repos/builtin/packages/herwig3/package.py +++ b/var/spack/repos/builtin/packages/herwig3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/herwigpp/package.py b/var/spack/repos/builtin/packages/herwigpp/package.py index 32f3f3cf14..db43e981e3 100644 --- a/var/spack/repos/builtin/packages/herwigpp/package.py +++ b/var/spack/repos/builtin/packages/herwigpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/hevea/package.py b/var/spack/repos/builtin/packages/hevea/package.py index 3fb5bab024..94c33d94c4 100644 --- a/var/spack/repos/builtin/packages/hevea/package.py +++ b/var/spack/repos/builtin/packages/hevea/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hevea(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hibench/package.py b/var/spack/repos/builtin/packages/hibench/package.py index 2da1af7d16..470f7c8ff6 100644 --- a/var/spack/repos/builtin/packages/hibench/package.py +++ b/var/spack/repos/builtin/packages/hibench/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hibench(MavenPackage): """HiBench is a big data benchmark suite that helps evaluate different big data frameworks in terms of speed, throughput and system resource diff --git a/var/spack/repos/builtin/packages/hic-pro/package.py b/var/spack/repos/builtin/packages/hic-pro/package.py index 4b2ad991ce..a93b2abadf 100644 --- a/var/spack/repos/builtin/packages/hic-pro/package.py +++ b/var/spack/repos/builtin/packages/hic-pro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HicPro(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hicolor-icon-theme/package.py b/var/spack/repos/builtin/packages/hicolor-icon-theme/package.py index ad7adeff6a..d829f881a5 100644 --- a/var/spack/repos/builtin/packages/hicolor-icon-theme/package.py +++ b/var/spack/repos/builtin/packages/hicolor-icon-theme/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class HicolorIconTheme(AutotoolsPackage): """icon-theme contains the standard also references the default icon theme called hicolor.""" diff --git a/var/spack/repos/builtin/packages/hicops/package.py b/var/spack/repos/builtin/packages/hicops/package.py index 136cb3ae37..42e9e866c6 100644 --- a/var/spack/repos/builtin/packages/hicops/package.py +++ b/var/spack/repos/builtin/packages/hicops/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hicops(CMakePackage): diff --git a/var/spack/repos/builtin/packages/highfive/package.py b/var/spack/repos/builtin/packages/highfive/package.py index 63d373ab2a..c79d7628a7 100644 --- a/var/spack/repos/builtin/packages/highfive/package.py +++ b/var/spack/repos/builtin/packages/highfive/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/highwayhash/package.py b/var/spack/repos/builtin/packages/highwayhash/package.py index 1e4658eb3b..9900b0dc7c 100644 --- a/var/spack/repos/builtin/packages/highwayhash/package.py +++ b/var/spack/repos/builtin/packages/highwayhash/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Highwayhash(MakefilePackage): """Strong (well-distributed and unpredictable) hashes: diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index 1f0e78a39e..c80065d389 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -7,7 +7,7 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * class Hiop(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py index 60c674cbe9..38dc8dc285 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HipRocclr(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 1f94c027c3..fccbb3acaf 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -6,6 +6,7 @@ import os from spack.hooks.sbang import filter_shebang +from spack.package import * from spack.util.prefix import Prefix diff --git a/var/spack/repos/builtin/packages/hipace/package.py b/var/spack/repos/builtin/packages/hipace/package.py index c0dd7b84dc..17ef14ed86 100644 --- a/var/spack/repos/builtin/packages/hipace/package.py +++ b/var/spack/repos/builtin/packages/hipace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hipace(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hipblas/package.py b/var/spack/repos/builtin/packages/hipblas/package.py index e61b2d6bca..faf9300126 100644 --- a/var/spack/repos/builtin/packages/hipblas/package.py +++ b/var/spack/repos/builtin/packages/hipblas/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Hipblas(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hipcub/package.py b/var/spack/repos/builtin/packages/hipcub/package.py index b1bff14b9a..ea1d62bc8b 100644 --- a/var/spack/repos/builtin/packages/hipcub/package.py +++ b/var/spack/repos/builtin/packages/hipcub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hipcub(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index 24d4c54a45..d4d77d2d07 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hipfft(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hipfort/package.py b/var/spack/repos/builtin/packages/hipfort/package.py index 31efe898af..6f45807513 100644 --- a/var/spack/repos/builtin/packages/hipfort/package.py +++ b/var/spack/repos/builtin/packages/hipfort/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hipfort(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hipify-clang/package.py b/var/spack/repos/builtin/packages/hipify-clang/package.py index d5942078ad..0501dbe53b 100644 --- a/var/spack/repos/builtin/packages/hipify-clang/package.py +++ b/var/spack/repos/builtin/packages/hipify-clang/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HipifyClang(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hipsolver/package.py b/var/spack/repos/builtin/packages/hipsolver/package.py index 7100b2918e..ec6bd45136 100644 --- a/var/spack/repos/builtin/packages/hipsolver/package.py +++ b/var/spack/repos/builtin/packages/hipsolver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hipsolver(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index 9a63650f9a..d4ff746bba 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hipsparse(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hipsycl/package.py b/var/spack/repos/builtin/packages/hipsycl/package.py index 3161c6ebf3..5e16d84abf 100644 --- a/var/spack/repos/builtin/packages/hipsycl/package.py +++ b/var/spack/repos/builtin/packages/hipsycl/package.py @@ -8,7 +8,7 @@ from os import path from llnl.util import filesystem -from spack import * +from spack.package import * class Hipsycl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hiredis/package.py b/var/spack/repos/builtin/packages/hiredis/package.py index c6824465a8..3129c1c0af 100644 --- a/var/spack/repos/builtin/packages/hiredis/package.py +++ b/var/spack/repos/builtin/packages/hiredis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hiredis(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hisat2/package.py b/var/spack/repos/builtin/packages/hisat2/package.py index f88a5fd8e9..c8d51d2b64 100644 --- a/var/spack/repos/builtin/packages/hisat2/package.py +++ b/var/spack/repos/builtin/packages/hisat2/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hisat2(MakefilePackage): """HISAT2 is a fast and sensitive alignment program for mapping next-generation sequencing reads (whole-genome, transcriptome, and diff --git a/var/spack/repos/builtin/packages/hisea/package.py b/var/spack/repos/builtin/packages/hisea/package.py index 25f566fa66..66b4e8db2f 100644 --- a/var/spack/repos/builtin/packages/hisea/package.py +++ b/var/spack/repos/builtin/packages/hisea/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/hive/package.py b/var/spack/repos/builtin/packages/hive/package.py index 217ea9942b..33542f1980 100644 --- a/var/spack/repos/builtin/packages/hive/package.py +++ b/var/spack/repos/builtin/packages/hive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hive(Package): diff --git a/var/spack/repos/builtin/packages/hivex/package.py b/var/spack/repos/builtin/packages/hivex/package.py index b2e62ae914..326f86e80d 100644 --- a/var/spack/repos/builtin/packages/hivex/package.py +++ b/var/spack/repos/builtin/packages/hivex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hivex(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hmmer/package.py b/var/spack/repos/builtin/packages/hmmer/package.py index fc18be00fe..3bc803e06b 100644 --- a/var/spack/repos/builtin/packages/hmmer/package.py +++ b/var/spack/repos/builtin/packages/hmmer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hmmer(Package): diff --git a/var/spack/repos/builtin/packages/hohqmesh/package.py b/var/spack/repos/builtin/packages/hohqmesh/package.py index 298044e645..9dd3c84254 100644 --- a/var/spack/repos/builtin/packages/hohqmesh/package.py +++ b/var/spack/repos/builtin/packages/hohqmesh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hohqmesh(CMakePackage): diff --git a/var/spack/repos/builtin/packages/homer/package.py b/var/spack/repos/builtin/packages/homer/package.py index c07badebf3..81a94b72de 100644 --- a/var/spack/repos/builtin/packages/homer/package.py +++ b/var/spack/repos/builtin/packages/homer/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class Homer(Package): diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index a3a46deec3..45accddd09 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class HoomdBlue(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hoppet/package.py b/var/spack/repos/builtin/packages/hoppet/package.py index b3f46a8640..cea92b53fc 100644 --- a/var/spack/repos/builtin/packages/hoppet/package.py +++ b/var/spack/repos/builtin/packages/hoppet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hoppet(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hotspot/package.py b/var/spack/repos/builtin/packages/hotspot/package.py index 763680f06d..e8484045c5 100644 --- a/var/spack/repos/builtin/packages/hotspot/package.py +++ b/var/spack/repos/builtin/packages/hotspot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hotspot(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hpcc/package.py b/var/spack/repos/builtin/packages/hpcc/package.py index a97e1699de..ceeb3a343e 100644 --- a/var/spack/repos/builtin/packages/hpcc/package.py +++ b/var/spack/repos/builtin/packages/hpcc/package.py @@ -7,7 +7,7 @@ import os import platform import re -from spack import * +from spack.package import * class Hpcc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hpccg/package.py b/var/spack/repos/builtin/packages/hpccg/package.py index c33adb9c3f..8d78f6e2c8 100644 --- a/var/spack/repos/builtin/packages/hpccg/package.py +++ b/var/spack/repos/builtin/packages/hpccg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hpccg(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hpcg/package.py b/var/spack/repos/builtin/packages/hpcg/package.py index 99111059f9..4c446c2445 100644 --- a/var/spack/repos/builtin/packages/hpcg/package.py +++ b/var/spack/repos/builtin/packages/hpcg/package.py @@ -6,7 +6,7 @@ import os import platform -from spack import * +from spack.package import * class Hpcg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index a8fc247abe..95bd356d1f 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -5,7 +5,7 @@ import llnl.util.tty as tty -from spack import * +from spack.package import * class Hpctoolkit(AutotoolsPackage): @@ -232,8 +232,8 @@ class Hpctoolkit(AutotoolsPackage): # Build tests (spack install --run-tests). Disable the default # spack tests and run autotools 'make check', but only from the # tests directory. - build_time_test_callbacks = [] - install_time_test_callbacks = [] + build_time_test_callbacks = [] # type: List[str] + install_time_test_callbacks = [] # type: List[str] @run_after('install') @on_package_attributes(run_tests=True) diff --git a/var/spack/repos/builtin/packages/hpcviewer/package.py b/var/spack/repos/builtin/packages/hpcviewer/package.py index 2514f1280f..818dac6295 100644 --- a/var/spack/repos/builtin/packages/hpcviewer/package.py +++ b/var/spack/repos/builtin/packages/hpcviewer/package.py @@ -7,7 +7,7 @@ import os import os.path import platform -from spack import * +from spack.package import * # The viewer and trace viewer tar files and sha256sum depend on the diff --git a/var/spack/repos/builtin/packages/hpcx-mpi/package.py b/var/spack/repos/builtin/packages/hpcx-mpi/package.py index 3908a77f0a..c8bd8c6720 100644 --- a/var/spack/repos/builtin/packages/hpcx-mpi/package.py +++ b/var/spack/repos/builtin/packages/hpcx-mpi/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class HpcxMpi(Package): """The HPC-X MPI implementation from NVIDIA/Mellanox based on OpenMPI. diff --git a/var/spack/repos/builtin/packages/hpddm/package.py b/var/spack/repos/builtin/packages/hpddm/package.py index 9508a4c3a2..3c9f488c56 100644 --- a/var/spack/repos/builtin/packages/hpddm/package.py +++ b/var/spack/repos/builtin/packages/hpddm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hpddm(Package): diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py index 043b4c47e9..f769fb2e71 100644 --- a/var/spack/repos/builtin/packages/hpgmg/package.py +++ b/var/spack/repos/builtin/packages/hpgmg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hpgmg(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hping/package.py b/var/spack/repos/builtin/packages/hping/package.py index bc1e315950..2e00ec0108 100644 --- a/var/spack/repos/builtin/packages/hping/package.py +++ b/var/spack/repos/builtin/packages/hping/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hping(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hpl/package.py b/var/spack/repos/builtin/packages/hpl/package.py index a76acdeec2..a1e3ff80ab 100644 --- a/var/spack/repos/builtin/packages/hpl/package.py +++ b/var/spack/repos/builtin/packages/hpl/package.py @@ -6,7 +6,7 @@ import os import platform -from spack import * +from spack.package import * class Hpl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hpx-kokkos/package.py b/var/spack/repos/builtin/packages/hpx-kokkos/package.py index 5c3ed3aeea..291816597f 100644 --- a/var/spack/repos/builtin/packages/hpx-kokkos/package.py +++ b/var/spack/repos/builtin/packages/hpx-kokkos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HpxKokkos(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py index 7a50fb5f7b..335cbfeafe 100644 --- a/var/spack/repos/builtin/packages/hpx/package.py +++ b/var/spack/repos/builtin/packages/hpx/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/hpx5/package.py b/var/spack/repos/builtin/packages/hpx5/package.py index 25240eb369..d6807ed09c 100644 --- a/var/spack/repos/builtin/packages/hpx5/package.py +++ b/var/spack/repos/builtin/packages/hpx5/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hpx5(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py index 5c34f93a44..e4f00860f4 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class HsaRocrDev(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py index dbab5c6108..1d5d21a3db 100644 --- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py +++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HsakmtRoct(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hsakmt/package.py b/var/spack/repos/builtin/packages/hsakmt/package.py index a5cdf46ce1..05d13a474c 100644 --- a/var/spack/repos/builtin/packages/hsakmt/package.py +++ b/var/spack/repos/builtin/packages/hsakmt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hsakmt(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/hsf-cmaketools/package.py b/var/spack/repos/builtin/packages/hsf-cmaketools/package.py index 3d46a3f9aa..f0cb46755f 100644 --- a/var/spack/repos/builtin/packages/hsf-cmaketools/package.py +++ b/var/spack/repos/builtin/packages/hsf-cmaketools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HsfCmaketools(Package): diff --git a/var/spack/repos/builtin/packages/hssp/package.py b/var/spack/repos/builtin/packages/hssp/package.py index 82403e7e00..ee9a37c05d 100644 --- a/var/spack/repos/builtin/packages/hssp/package.py +++ b/var/spack/repos/builtin/packages/hssp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/hstr/package.py b/var/spack/repos/builtin/packages/hstr/package.py index b6fc5690f4..df7d2612bb 100644 --- a/var/spack/repos/builtin/packages/hstr/package.py +++ b/var/spack/repos/builtin/packages/hstr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hstr(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hto4l/package.py b/var/spack/repos/builtin/packages/hto4l/package.py index b100acd39c..e1e7e32ac2 100644 --- a/var/spack/repos/builtin/packages/hto4l/package.py +++ b/var/spack/repos/builtin/packages/hto4l/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hto4l(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/htop/package.py b/var/spack/repos/builtin/packages/htop/package.py index 655cb064c2..d3c029f75b 100644 --- a/var/spack/repos/builtin/packages/htop/package.py +++ b/var/spack/repos/builtin/packages/htop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Htop(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index e887b36f60..82e8e11a2d 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Htslib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/http-get/package.py b/var/spack/repos/builtin/packages/http-get/package.py index fc81ac1ce4..b00682062b 100644 --- a/var/spack/repos/builtin/packages/http-get/package.py +++ b/var/spack/repos/builtin/packages/http-get/package.py @@ -5,7 +5,7 @@ import datetime -from spack import * +from spack.package import * class HttpGet(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/http-load/package.py b/var/spack/repos/builtin/packages/http-load/package.py index 9aa4905587..1eac4acc55 100644 --- a/var/spack/repos/builtin/packages/http-load/package.py +++ b/var/spack/repos/builtin/packages/http-load/package.py @@ -5,7 +5,7 @@ import datetime -from spack import * +from spack.package import * class HttpLoad(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/http-parser/package.py b/var/spack/repos/builtin/packages/http-parser/package.py index 641995f12d..40db1623db 100644 --- a/var/spack/repos/builtin/packages/http-parser/package.py +++ b/var/spack/repos/builtin/packages/http-parser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HttpParser(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/http-ping/package.py b/var/spack/repos/builtin/packages/http-ping/package.py index 8fddb67d49..e3a26bd963 100644 --- a/var/spack/repos/builtin/packages/http-ping/package.py +++ b/var/spack/repos/builtin/packages/http-ping/package.py @@ -5,7 +5,7 @@ import datetime -from spack import * +from spack.package import * class HttpPing(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/http-post/package.py b/var/spack/repos/builtin/packages/http-post/package.py index 12ae566c1b..908c8a019d 100644 --- a/var/spack/repos/builtin/packages/http-post/package.py +++ b/var/spack/repos/builtin/packages/http-post/package.py @@ -5,7 +5,7 @@ import datetime -from spack import * +from spack.package import * class HttpPost(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/httpd/package.py b/var/spack/repos/builtin/packages/httpd/package.py index 4acfe00bc0..a457864ff8 100644 --- a/var/spack/repos/builtin/packages/httpd/package.py +++ b/var/spack/repos/builtin/packages/httpd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Httpd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/httperf/package.py b/var/spack/repos/builtin/packages/httperf/package.py index f175d8c402..299066a0b3 100644 --- a/var/spack/repos/builtin/packages/httperf/package.py +++ b/var/spack/repos/builtin/packages/httperf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Httperf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/httpie/package.py b/var/spack/repos/builtin/packages/httpie/package.py index 44589bc280..cc0775e16e 100644 --- a/var/spack/repos/builtin/packages/httpie/package.py +++ b/var/spack/repos/builtin/packages/httpie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Httpie(PythonPackage): diff --git a/var/spack/repos/builtin/packages/httping/package.py b/var/spack/repos/builtin/packages/httping/package.py index 7881e0b42d..7e18ddb025 100644 --- a/var/spack/repos/builtin/packages/httping/package.py +++ b/var/spack/repos/builtin/packages/httping/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Httping(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/httpress/package.py b/var/spack/repos/builtin/packages/httpress/package.py index 4c7f97e19d..1b125b9fdb 100644 --- a/var/spack/repos/builtin/packages/httpress/package.py +++ b/var/spack/repos/builtin/packages/httpress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Httpress(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hub/package.py b/var/spack/repos/builtin/packages/hub/package.py index e85eab8727..fb8426aa89 100644 --- a/var/spack/repos/builtin/packages/hub/package.py +++ b/var/spack/repos/builtin/packages/hub/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Hub(Package): diff --git a/var/spack/repos/builtin/packages/hudi/package.py b/var/spack/repos/builtin/packages/hudi/package.py index 3777d9d07e..0747711db4 100644 --- a/var/spack/repos/builtin/packages/hudi/package.py +++ b/var/spack/repos/builtin/packages/hudi/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hudi(MavenPackage): """Apache Hudi stands for Hadoop Upserts Deletes and Incrementals. Hudi manages the storage of large analytical datasets on DFS.""" diff --git a/var/spack/repos/builtin/packages/hugo/package.py b/var/spack/repos/builtin/packages/hugo/package.py index ba4848a0c9..8484f6787e 100644 --- a/var/spack/repos/builtin/packages/hugo/package.py +++ b/var/spack/repos/builtin/packages/hugo/package.py @@ -5,8 +5,7 @@ import re -from spack import * -from spack.util.executable import which +from spack.package import * class Hugo(Package): diff --git a/var/spack/repos/builtin/packages/hunspell/package.py b/var/spack/repos/builtin/packages/hunspell/package.py index e42a1d6043..ee8208d533 100644 --- a/var/spack/repos/builtin/packages/hunspell/package.py +++ b/var/spack/repos/builtin/packages/hunspell/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hunspell(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hw-probe/package.py b/var/spack/repos/builtin/packages/hw-probe/package.py index 40193c3e38..41e21ed2d5 100644 --- a/var/spack/repos/builtin/packages/hw-probe/package.py +++ b/var/spack/repos/builtin/packages/hw-probe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class HwProbe(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hwdata/package.py b/var/spack/repos/builtin/packages/hwdata/package.py index ec333ae4b7..00452e0b97 100644 --- a/var/spack/repos/builtin/packages/hwdata/package.py +++ b/var/spack/repos/builtin/packages/hwdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hwdata(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 0f412b4a12..2854fa9b7c 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -5,6 +5,8 @@ import re import sys +from spack.package import * + class Hwloc(AutotoolsPackage): """The Hardware Locality (hwloc) software project. diff --git a/var/spack/repos/builtin/packages/hybpiper/package.py b/var/spack/repos/builtin/packages/hybpiper/package.py index 07c62b427b..7d671e5b02 100644 --- a/var/spack/repos/builtin/packages/hybpiper/package.py +++ b/var/spack/repos/builtin/packages/hybpiper/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Hybpiper(Package): """HybPiper was designed for targeted sequence capture, in which DNA sequencing libraries are enriched for gene regions of interest, diff --git a/var/spack/repos/builtin/packages/hybrid-lambda/package.py b/var/spack/repos/builtin/packages/hybrid-lambda/package.py index 3ae4ded6bb..0b8cb13ceb 100644 --- a/var/spack/repos/builtin/packages/hybrid-lambda/package.py +++ b/var/spack/repos/builtin/packages/hybrid-lambda/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/hybridsim/package.py b/var/spack/repos/builtin/packages/hybridsim/package.py index e67233fac9..e6ab618d32 100644 --- a/var/spack/repos/builtin/packages/hybridsim/package.py +++ b/var/spack/repos/builtin/packages/hybridsim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hybridsim(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/hydra/package.py b/var/spack/repos/builtin/packages/hydra/package.py index 4dbc1b752f..01b643ba17 100644 --- a/var/spack/repos/builtin/packages/hydra/package.py +++ b/var/spack/repos/builtin/packages/hydra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hydra(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index 1ed9fb2c69..907cd9652c 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Hydrogen(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/hyperfine/package.py b/var/spack/repos/builtin/packages/hyperfine/package.py index 1bfdf008a8..990a943bb1 100644 --- a/var/spack/repos/builtin/packages/hyperfine/package.py +++ b/var/spack/repos/builtin/packages/hyperfine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hyperfine(Package): diff --git a/var/spack/repos/builtin/packages/hyperscan/package.py b/var/spack/repos/builtin/packages/hyperscan/package.py index 9317e484b0..9386229cb4 100644 --- a/var/spack/repos/builtin/packages/hyperscan/package.py +++ b/var/spack/repos/builtin/packages/hyperscan/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * _versions = { 'v5.2.1': { diff --git a/var/spack/repos/builtin/packages/hyphen/package.py b/var/spack/repos/builtin/packages/hyphen/package.py index eec2eccb69..4974c8674b 100644 --- a/var/spack/repos/builtin/packages/hyphen/package.py +++ b/var/spack/repos/builtin/packages/hyphen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hyphen(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hyphy/package.py b/var/spack/repos/builtin/packages/hyphy/package.py index 5eea5eae9d..7f6797e8a0 100644 --- a/var/spack/repos/builtin/packages/hyphy/package.py +++ b/var/spack/repos/builtin/packages/hyphy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hyphy(CMakePackage): diff --git a/var/spack/repos/builtin/packages/hypre-cmake/package.py b/var/spack/repos/builtin/packages/hypre-cmake/package.py index 7221f7be2e..ee70c986ba 100644 --- a/var/spack/repos/builtin/packages/hypre-cmake/package.py +++ b/var/spack/repos/builtin/packages/hypre-cmake/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class HypreCmake(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 6668c87baf..b38ae55ab0 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Hypre(AutotoolsPackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/hztool/package.py b/var/spack/repos/builtin/packages/hztool/package.py index ccbcaec935..835113c83f 100644 --- a/var/spack/repos/builtin/packages/hztool/package.py +++ b/var/spack/repos/builtin/packages/hztool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Hztool(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/i3/package.py b/var/spack/repos/builtin/packages/i3/package.py index 286ad8e579..36a70838cb 100644 --- a/var/spack/repos/builtin/packages/i3/package.py +++ b/var/spack/repos/builtin/packages/i3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class I3(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ibm-databroker/package.py b/var/spack/repos/builtin/packages/ibm-databroker/package.py index 6af67f84f1..ee5bf77998 100644 --- a/var/spack/repos/builtin/packages/ibm-databroker/package.py +++ b/var/spack/repos/builtin/packages/ibm-databroker/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IbmDatabroker(CMakePackage, PythonPackage): diff --git a/var/spack/repos/builtin/packages/ibm-java/package.py b/var/spack/repos/builtin/packages/ibm-java/package.py index 3f6f1e2904..c2c65c27a8 100644 --- a/var/spack/repos/builtin/packages/ibm-java/package.py +++ b/var/spack/repos/builtin/packages/ibm-java/package.py @@ -6,7 +6,7 @@ import os import platform -from spack import * +from spack.package import * class IbmJava(Package): diff --git a/var/spack/repos/builtin/packages/ibmisc/package.py b/var/spack/repos/builtin/packages/ibmisc/package.py index 1242517616..8e30a026e3 100644 --- a/var/spack/repos/builtin/packages/ibmisc/package.py +++ b/var/spack/repos/builtin/packages/ibmisc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/icarus/package.py b/var/spack/repos/builtin/packages/icarus/package.py index 7bd8bc006c..874c89374c 100644 --- a/var/spack/repos/builtin/packages/icarus/package.py +++ b/var/spack/repos/builtin/packages/icarus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Icarus(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/iceauth/package.py b/var/spack/repos/builtin/packages/iceauth/package.py index c98c09ab05..cfd07ad1fe 100644 --- a/var/spack/repos/builtin/packages/iceauth/package.py +++ b/var/spack/repos/builtin/packages/iceauth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Iceauth(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index aab5a57629..1cfac3640b 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Icedtea(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/icet/package.py b/var/spack/repos/builtin/packages/icet/package.py index 0684942fd0..a077b66fcc 100644 --- a/var/spack/repos/builtin/packages/icet/package.py +++ b/var/spack/repos/builtin/packages/icet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Icet(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ico/package.py b/var/spack/repos/builtin/packages/ico/package.py index 3dc5cdfe4e..e7f8bf22b3 100644 --- a/var/spack/repos/builtin/packages/ico/package.py +++ b/var/spack/repos/builtin/packages/ico/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ico(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index abd09a6229..c97d76895a 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Icu4c(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/id3lib/package.py b/var/spack/repos/builtin/packages/id3lib/package.py index 0b981b59e9..9293481cfe 100644 --- a/var/spack/repos/builtin/packages/id3lib/package.py +++ b/var/spack/repos/builtin/packages/id3lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Id3lib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/idba/package.py b/var/spack/repos/builtin/packages/idba/package.py index 257f01eb3c..3405e3d9b7 100644 --- a/var/spack/repos/builtin/packages/idba/package.py +++ b/var/spack/repos/builtin/packages/idba/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Idba(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/idl/package.py b/var/spack/repos/builtin/packages/idl/package.py index ecd5512f93..190c7fb54a 100644 --- a/var/spack/repos/builtin/packages/idl/package.py +++ b/var/spack/repos/builtin/packages/idl/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Idl(Package): diff --git a/var/spack/repos/builtin/packages/iegenlib/package.py b/var/spack/repos/builtin/packages/iegenlib/package.py index 33ba0196d1..866d13acab 100644 --- a/var/spack/repos/builtin/packages/iegenlib/package.py +++ b/var/spack/repos/builtin/packages/iegenlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Iegenlib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ignite/package.py b/var/spack/repos/builtin/packages/ignite/package.py index e8c2b2cb36..952adeedd2 100644 --- a/var/spack/repos/builtin/packages/ignite/package.py +++ b/var/spack/repos/builtin/packages/ignite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ignite(Package): diff --git a/var/spack/repos/builtin/packages/igprof/package.py b/var/spack/repos/builtin/packages/igprof/package.py index 35b983acc5..880dcea6b8 100644 --- a/var/spack/repos/builtin/packages/igprof/package.py +++ b/var/spack/repos/builtin/packages/igprof/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Igprof(CMakePackage): diff --git a/var/spack/repos/builtin/packages/igraph/package.py b/var/spack/repos/builtin/packages/igraph/package.py index f53efffa69..d6a3f83447 100644 --- a/var/spack/repos/builtin/packages/igraph/package.py +++ b/var/spack/repos/builtin/packages/igraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Igraph(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/igv/package.py b/var/spack/repos/builtin/packages/igv/package.py index 18d44b8acb..b1cc2205ac 100644 --- a/var/spack/repos/builtin/packages/igv/package.py +++ b/var/spack/repos/builtin/packages/igv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Igv(Package): diff --git a/var/spack/repos/builtin/packages/igvtools/package.py b/var/spack/repos/builtin/packages/igvtools/package.py index aee14f7061..028f140b09 100644 --- a/var/spack/repos/builtin/packages/igvtools/package.py +++ b/var/spack/repos/builtin/packages/igvtools/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Igvtools(Package): diff --git a/var/spack/repos/builtin/packages/ike-scan/package.py b/var/spack/repos/builtin/packages/ike-scan/package.py index 91fcfab472..d44339a77e 100644 --- a/var/spack/repos/builtin/packages/ike-scan/package.py +++ b/var/spack/repos/builtin/packages/ike-scan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IkeScan(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ilmbase/package.py b/var/spack/repos/builtin/packages/ilmbase/package.py index 5751175e1c..1fde411d74 100644 --- a/var/spack/repos/builtin/packages/ilmbase/package.py +++ b/var/spack/repos/builtin/packages/ilmbase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ilmbase(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ima-evm-utils/package.py b/var/spack/repos/builtin/packages/ima-evm-utils/package.py index 13bb24d070..c20f56124a 100644 --- a/var/spack/repos/builtin/packages/ima-evm-utils/package.py +++ b/var/spack/repos/builtin/packages/ima-evm-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ImaEvmUtils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/imagemagick/package.py b/var/spack/repos/builtin/packages/imagemagick/package.py index c922fbd55a..51ef216441 100644 --- a/var/spack/repos/builtin/packages/imagemagick/package.py +++ b/var/spack/repos/builtin/packages/imagemagick/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Imagemagick(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/imake/package.py b/var/spack/repos/builtin/packages/imake/package.py index 4554baf5c8..bd00dc90a6 100644 --- a/var/spack/repos/builtin/packages/imake/package.py +++ b/var/spack/repos/builtin/packages/imake/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Imake(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/imgui/package.py b/var/spack/repos/builtin/packages/imgui/package.py index e8ed17af4e..efbc80c5d5 100644 --- a/var/spack/repos/builtin/packages/imgui/package.py +++ b/var/spack/repos/builtin/packages/imgui/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Imgui(Package): diff --git a/var/spack/repos/builtin/packages/imlib2/package.py b/var/spack/repos/builtin/packages/imlib2/package.py index 7da975bf03..8115caaee1 100644 --- a/var/spack/repos/builtin/packages/imlib2/package.py +++ b/var/spack/repos/builtin/packages/imlib2/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Imlib2(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/imp/package.py b/var/spack/repos/builtin/packages/imp/package.py index 8ba8ff661d..36dd37ad8f 100644 --- a/var/spack/repos/builtin/packages/imp/package.py +++ b/var/spack/repos/builtin/packages/imp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/impalajit-llvm/package.py b/var/spack/repos/builtin/packages/impalajit-llvm/package.py index b812da1a4f..da3591eff7 100644 --- a/var/spack/repos/builtin/packages/impalajit-llvm/package.py +++ b/var/spack/repos/builtin/packages/impalajit-llvm/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ImpalajitLlvm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/impute2/package.py b/var/spack/repos/builtin/packages/impute2/package.py index 6b9edfe025..816fbd8b3e 100644 --- a/var/spack/repos/builtin/packages/impute2/package.py +++ b/var/spack/repos/builtin/packages/impute2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Impute2(Package): diff --git a/var/spack/repos/builtin/packages/infernal/package.py b/var/spack/repos/builtin/packages/infernal/package.py index 14da6954e6..273f8e1132 100644 --- a/var/spack/repos/builtin/packages/infernal/package.py +++ b/var/spack/repos/builtin/packages/infernal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Infernal(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/influxdb/package.py b/var/spack/repos/builtin/packages/influxdb/package.py index fc4ced6bfc..39294d71f5 100644 --- a/var/spack/repos/builtin/packages/influxdb/package.py +++ b/var/spack/repos/builtin/packages/influxdb/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * _versions = { '1.8.1': { diff --git a/var/spack/repos/builtin/packages/iniparser/package.py b/var/spack/repos/builtin/packages/iniparser/package.py index eb44eb5894..dbfc17827b 100644 --- a/var/spack/repos/builtin/packages/iniparser/package.py +++ b/var/spack/repos/builtin/packages/iniparser/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Iniparser(MakefilePackage): """This modules offers parsing of ini files from the C level.""" diff --git a/var/spack/repos/builtin/packages/inputproto/package.py b/var/spack/repos/builtin/packages/inputproto/package.py index 2ee7dc5fd3..5e5cb2f80a 100644 --- a/var/spack/repos/builtin/packages/inputproto/package.py +++ b/var/spack/repos/builtin/packages/inputproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Inputproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index d0d87927b3..efa8fef638 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IntelDaal(IntelPackage): diff --git a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py index 0c181ecbde..42d17f2e34 100644 --- a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py +++ b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class IntelGpuTools(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/intel-gtpin/package.py b/var/spack/repos/builtin/packages/intel-gtpin/package.py index 6b9ea61736..9631bb4c06 100644 --- a/var/spack/repos/builtin/packages/intel-gtpin/package.py +++ b/var/spack/repos/builtin/packages/intel-gtpin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IntelGtpin(Package): diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index e1e9d57050..2ef75242b4 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IntelIpp(IntelPackage): diff --git a/var/spack/repos/builtin/packages/intel-llvm/package.py b/var/spack/repos/builtin/packages/intel-llvm/package.py index c2e9979a9e..b28ee8a53d 100644 --- a/var/spack/repos/builtin/packages/intel-llvm/package.py +++ b/var/spack/repos/builtin/packages/intel-llvm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IntelLlvm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 6df7ed243a..e5dca9dfe2 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class IntelMkl(IntelPackage): diff --git a/var/spack/repos/builtin/packages/intel-mpi-benchmarks/package.py b/var/spack/repos/builtin/packages/intel-mpi-benchmarks/package.py index bee4bccb0b..863d58e89d 100644 --- a/var/spack/repos/builtin/packages/intel-mpi-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi-benchmarks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IntelMpiBenchmarks(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index a2cca8ac62..49a6433e6a 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IntelMpi(IntelPackage): diff --git a/var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py b/var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py index 30ff29c737..441fe1f83e 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py index 8f605f619c..b1778719f9 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py index b46e072795..aeb9482e4c 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py @@ -8,7 +8,7 @@ import platform import subprocess from os import path -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py index 73738f6989..c101db5dc5 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py @@ -6,7 +6,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py index 2644adb804..95c37d6055 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py @@ -6,7 +6,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py index 4a0419f993..ca6ef530dc 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py @@ -6,7 +6,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-inspector/package.py b/var/spack/repos/builtin/packages/intel-oneapi-inspector/package.py index 5a7039e0ed..9fff62fcb0 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-inspector/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-inspector/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py b/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py index 4975fa6f24..8c9992e356 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-ippcp/package.py b/var/spack/repos/builtin/packages/intel-oneapi-ippcp/package.py index 149958e094..0b7bfe2a73 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-ippcp/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-ippcp/package.py @@ -6,7 +6,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py index 52473ee2ae..3b41efbdf8 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py @@ -6,7 +6,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py index cb155e4fae..7d39db8c03 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py @@ -6,7 +6,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py b/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py index da9fa22259..012c201a1b 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py @@ -6,7 +6,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-vpl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-vpl/package.py index 71eec9d7e1..17c2ec3a50 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-vpl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-vpl/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py b/var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py index d4d9004e16..8a104c75f2 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * @IntelOneApiPackage.update_description diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index 5554d8f5f1..4ecc89d1b8 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IntelParallelStudio(IntelPackage): diff --git a/var/spack/repos/builtin/packages/intel-pin/package.py b/var/spack/repos/builtin/packages/intel-pin/package.py index 0b539f7d01..aee8775e31 100644 --- a/var/spack/repos/builtin/packages/intel-pin/package.py +++ b/var/spack/repos/builtin/packages/intel-pin/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class IntelPin(Package): diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index ab465ff2f6..1ed0b60445 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -8,7 +8,7 @@ import inspect import platform import sys -from spack import * +from spack.package import * class IntelTbb(CMakePackage): diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py index 2fe76b932d..4d70d9ec8a 100644 --- a/var/spack/repos/builtin/packages/intel-xed/package.py +++ b/var/spack/repos/builtin/packages/intel-xed/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class IntelXed(Package): """The Intel X86 Encoder Decoder library for encoding and decoding x86 @@ -46,7 +48,7 @@ class IntelXed(Package): conflicts('target=ppc64le:', msg='intel-xed only runs on x86') conflicts('target=aarch64:', msg='intel-xed only runs on x86') - mycflags = [] + mycflags = [] # type: List[str] # Save CFLAGS for use in install. def flag_handler(self, name, flags): diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py index 301bfa0768..839d732bf8 100644 --- a/var/spack/repos/builtin/packages/intel/package.py +++ b/var/spack/repos/builtin/packages/intel/package.py @@ -6,6 +6,8 @@ import re import llnl.util.tty as tty +from spack.package import * + class Intel(IntelPackage): """Intel Compilers.""" diff --git a/var/spack/repos/builtin/packages/interproscan/package.py b/var/spack/repos/builtin/packages/interproscan/package.py index d407f1f4b1..a5cb81bbaa 100644 --- a/var/spack/repos/builtin/packages/interproscan/package.py +++ b/var/spack/repos/builtin/packages/interproscan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Interproscan(Package): diff --git a/var/spack/repos/builtin/packages/intltool/package.py b/var/spack/repos/builtin/packages/intltool/package.py index 263e9d0c26..7314933d69 100644 --- a/var/spack/repos/builtin/packages/intltool/package.py +++ b/var/spack/repos/builtin/packages/intltool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Intltool(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ioapi/package.py b/var/spack/repos/builtin/packages/ioapi/package.py index 9ac8bd8477..02897f4dfd 100644 --- a/var/spack/repos/builtin/packages/ioapi/package.py +++ b/var/spack/repos/builtin/packages/ioapi/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Ioapi(MakefilePackage): """Models-3/EDSS Input/Output Applications Programming Interface.""" diff --git a/var/spack/repos/builtin/packages/ior/package.py b/var/spack/repos/builtin/packages/ior/package.py index a4ed34922d..5ef417223e 100644 --- a/var/spack/repos/builtin/packages/ior/package.py +++ b/var/spack/repos/builtin/packages/ior/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ior(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/iozone/package.py b/var/spack/repos/builtin/packages/iozone/package.py index 7980d88fea..fb90c697e2 100644 --- a/var/spack/repos/builtin/packages/iozone/package.py +++ b/var/spack/repos/builtin/packages/iozone/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Iozone(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ip/package.py b/var/spack/repos/builtin/packages/ip/package.py index de5145835c..9348656bb5 100644 --- a/var/spack/repos/builtin/packages/ip/package.py +++ b/var/spack/repos/builtin/packages/ip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ip(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ip2/package.py b/var/spack/repos/builtin/packages/ip2/package.py index 56bfedd5d2..c89536e903 100644 --- a/var/spack/repos/builtin/packages/ip2/package.py +++ b/var/spack/repos/builtin/packages/ip2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ip2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ipcalc/package.py b/var/spack/repos/builtin/packages/ipcalc/package.py index cec3b0b81a..84bfc080cd 100644 --- a/var/spack/repos/builtin/packages/ipcalc/package.py +++ b/var/spack/repos/builtin/packages/ipcalc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ipcalc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/iperf2/package.py b/var/spack/repos/builtin/packages/iperf2/package.py index c993ba648f..1a85bea0f9 100644 --- a/var/spack/repos/builtin/packages/iperf2/package.py +++ b/var/spack/repos/builtin/packages/iperf2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Iperf2(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/iperf3/package.py b/var/spack/repos/builtin/packages/iperf3/package.py index b65667af68..8fcf5699e4 100644 --- a/var/spack/repos/builtin/packages/iperf3/package.py +++ b/var/spack/repos/builtin/packages/iperf3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Iperf3(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index 8f33d85916..44a5b8a2ed 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ipopt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/iproute2/package.py b/var/spack/repos/builtin/packages/iproute2/package.py index e035228450..fe41246339 100644 --- a/var/spack/repos/builtin/packages/iproute2/package.py +++ b/var/spack/repos/builtin/packages/iproute2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Iproute2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/iptraf-ng/package.py b/var/spack/repos/builtin/packages/iptraf-ng/package.py index afe37766e6..1b42b8bb37 100644 --- a/var/spack/repos/builtin/packages/iptraf-ng/package.py +++ b/var/spack/repos/builtin/packages/iptraf-ng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IptrafNg(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/iq-tree/package.py b/var/spack/repos/builtin/packages/iq-tree/package.py index 97b5ecd0a4..27d5fed746 100644 --- a/var/spack/repos/builtin/packages/iq-tree/package.py +++ b/var/spack/repos/builtin/packages/iq-tree/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IqTree(CMakePackage): diff --git a/var/spack/repos/builtin/packages/irep/package.py b/var/spack/repos/builtin/packages/irep/package.py index b2b3f12019..596f19f0fc 100644 --- a/var/spack/repos/builtin/packages/irep/package.py +++ b/var/spack/repos/builtin/packages/irep/package.py @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Irep(CMakePackage): """IREP is a tool that enables mixed-language simulation codes to use a common, Lua-based format for their input decks. Essentially, the input diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index 40317e9e09..a1d24573a0 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IsaacServer(CMakePackage): diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py index f8aa01dd21..b90029c19e 100644 --- a/var/spack/repos/builtin/packages/isaac/package.py +++ b/var/spack/repos/builtin/packages/isaac/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Isaac(CMakePackage): diff --git a/var/spack/repos/builtin/packages/isc-dhcp/package.py b/var/spack/repos/builtin/packages/isc-dhcp/package.py index 81653c546d..9c35299f14 100644 --- a/var/spack/repos/builtin/packages/isc-dhcp/package.py +++ b/var/spack/repos/builtin/packages/isc-dhcp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IscDhcp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/isescan/package.py b/var/spack/repos/builtin/packages/isescan/package.py index 8882fcbbab..2896d87e00 100644 --- a/var/spack/repos/builtin/packages/isescan/package.py +++ b/var/spack/repos/builtin/packages/isescan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Isescan(Package): diff --git a/var/spack/repos/builtin/packages/isl/package.py b/var/spack/repos/builtin/packages/isl/package.py index fe21cc09fe..fa16c84374 100644 --- a/var/spack/repos/builtin/packages/isl/package.py +++ b/var/spack/repos/builtin/packages/isl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Isl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/iso-codes/package.py b/var/spack/repos/builtin/packages/iso-codes/package.py index fbb9704f9d..c9339f3d6b 100644 --- a/var/spack/repos/builtin/packages/iso-codes/package.py +++ b/var/spack/repos/builtin/packages/iso-codes/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class IsoCodes(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ispc/package.py b/var/spack/repos/builtin/packages/ispc/package.py index 522072945c..397e081788 100644 --- a/var/spack/repos/builtin/packages/ispc/package.py +++ b/var/spack/repos/builtin/packages/ispc/package.py @@ -4,13 +4,12 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# ispc requires <gnu/stubs-32.h>, e.g. from -# glibc-devel.i686 (CentoOS) or libc6-dev-i386 and g++-multilib (Ubuntu) - - import re -from spack import * +from spack.package import * + +# ispc requires <gnu/stubs-32.h>, e.g. from +# glibc-devel.i686 (CentoOS) or libc6-dev-i386 and g++-multilib (Ubuntu) class Ispc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/istio/package.py b/var/spack/repos/builtin/packages/istio/package.py index d684c8e393..f1dd73ad5a 100644 --- a/var/spack/repos/builtin/packages/istio/package.py +++ b/var/spack/repos/builtin/packages/istio/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * _versions = { '1.6.7': { diff --git a/var/spack/repos/builtin/packages/itensor/package.py b/var/spack/repos/builtin/packages/itensor/package.py index 7b8b783977..b4b4a0cd8c 100644 --- a/var/spack/repos/builtin/packages/itensor/package.py +++ b/var/spack/repos/builtin/packages/itensor/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Itensor(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/itk/package.py b/var/spack/repos/builtin/packages/itk/package.py index 1a916dfc65..0f304d452d 100644 --- a/var/spack/repos/builtin/packages/itk/package.py +++ b/var/spack/repos/builtin/packages/itk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Itk(CMakePackage): diff --git a/var/spack/repos/builtin/packages/itstool/package.py b/var/spack/repos/builtin/packages/itstool/package.py index 8d240452b2..47ad0a58a4 100644 --- a/var/spack/repos/builtin/packages/itstool/package.py +++ b/var/spack/repos/builtin/packages/itstool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Itstool(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/itsx/package.py b/var/spack/repos/builtin/packages/itsx/package.py index e8fac4ed3d..9dbd285899 100644 --- a/var/spack/repos/builtin/packages/itsx/package.py +++ b/var/spack/repos/builtin/packages/itsx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Itsx(Package): diff --git a/var/spack/repos/builtin/packages/iwyu/package.py b/var/spack/repos/builtin/packages/iwyu/package.py index 6ab395f8bc..763d25ea05 100644 --- a/var/spack/repos/builtin/packages/iwyu/package.py +++ b/var/spack/repos/builtin/packages/iwyu/package.py @@ -5,6 +5,8 @@ import archspec +from spack.package import * + class Iwyu(CMakePackage): """include-what-you-use: A tool for use with clang to analyze #includes in diff --git a/var/spack/repos/builtin/packages/jackcess/package.py b/var/spack/repos/builtin/packages/jackcess/package.py index 5d7e4d3928..46ad746b3e 100644 --- a/var/spack/repos/builtin/packages/jackcess/package.py +++ b/var/spack/repos/builtin/packages/jackcess/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jackcess(Package): diff --git a/var/spack/repos/builtin/packages/jafka/package.py b/var/spack/repos/builtin/packages/jafka/package.py index 791c222c11..b7a5f31712 100644 --- a/var/spack/repos/builtin/packages/jafka/package.py +++ b/var/spack/repos/builtin/packages/jafka/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jafka(Package): diff --git a/var/spack/repos/builtin/packages/jags/package.py b/var/spack/repos/builtin/packages/jags/package.py index 3f2e1b9c7f..000490231a 100644 --- a/var/spack/repos/builtin/packages/jags/package.py +++ b/var/spack/repos/builtin/packages/jags/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jags(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/jali/package.py b/var/spack/repos/builtin/packages/jali/package.py index f34b2349ad..b07f56da26 100644 --- a/var/spack/repos/builtin/packages/jali/package.py +++ b/var/spack/repos/builtin/packages/jali/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/jansi-native/package.py b/var/spack/repos/builtin/packages/jansi-native/package.py index 29eea9dfd4..39ef54ebec 100644 --- a/var/spack/repos/builtin/packages/jansi-native/package.py +++ b/var/spack/repos/builtin/packages/jansi-native/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class JansiNative(MavenPackage): diff --git a/var/spack/repos/builtin/packages/jansi/package.py b/var/spack/repos/builtin/packages/jansi/package.py index e0b587fc76..2a05e9249f 100644 --- a/var/spack/repos/builtin/packages/jansi/package.py +++ b/var/spack/repos/builtin/packages/jansi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jansi(MavenPackage): diff --git a/var/spack/repos/builtin/packages/jansson/package.py b/var/spack/repos/builtin/packages/jansson/package.py index cb413cd7d2..2fc634cb74 100644 --- a/var/spack/repos/builtin/packages/jansson/package.py +++ b/var/spack/repos/builtin/packages/jansson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jansson(CMakePackage): diff --git a/var/spack/repos/builtin/packages/jasper/package.py b/var/spack/repos/builtin/packages/jasper/package.py index e818f8dc0a..f9c974307c 100644 --- a/var/spack/repos/builtin/packages/jasper/package.py +++ b/var/spack/repos/builtin/packages/jasper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jasper(Package): diff --git a/var/spack/repos/builtin/packages/jbigkit/package.py b/var/spack/repos/builtin/packages/jbigkit/package.py index 3c53c54436..0edeba7d5c 100644 --- a/var/spack/repos/builtin/packages/jbigkit/package.py +++ b/var/spack/repos/builtin/packages/jbigkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jbigkit(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/jblob/package.py b/var/spack/repos/builtin/packages/jblob/package.py index c5e6d96c5f..464a4d0189 100644 --- a/var/spack/repos/builtin/packages/jblob/package.py +++ b/var/spack/repos/builtin/packages/jblob/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jblob(Package): diff --git a/var/spack/repos/builtin/packages/jchronoss/package.py b/var/spack/repos/builtin/packages/jchronoss/package.py index 599d1a94a1..6b234e5633 100644 --- a/var/spack/repos/builtin/packages/jchronoss/package.py +++ b/var/spack/repos/builtin/packages/jchronoss/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jchronoss(CMakePackage): diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 6c8c920638..506df98ec9 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -8,6 +8,7 @@ import re import llnl.util.tty as tty +from spack.package import * from spack.util.prefix import Prefix diff --git a/var/spack/repos/builtin/packages/jellyfish/package.py b/var/spack/repos/builtin/packages/jellyfish/package.py index 89a97cbe74..2b7ef95cc6 100644 --- a/var/spack/repos/builtin/packages/jellyfish/package.py +++ b/var/spack/repos/builtin/packages/jellyfish/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jellyfish(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/jemalloc/package.py b/var/spack/repos/builtin/packages/jemalloc/package.py index 55061f2408..695fd221ef 100644 --- a/var/spack/repos/builtin/packages/jemalloc/package.py +++ b/var/spack/repos/builtin/packages/jemalloc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jemalloc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/jetty-project/package.py b/var/spack/repos/builtin/packages/jetty-project/package.py index e0d9adfea4..28bc3e4f11 100644 --- a/var/spack/repos/builtin/packages/jetty-project/package.py +++ b/var/spack/repos/builtin/packages/jetty-project/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class JettyProject(MavenPackage): diff --git a/var/spack/repos/builtin/packages/jhpcn-df/package.py b/var/spack/repos/builtin/packages/jhpcn-df/package.py index b7f5585dfc..2605fe58f9 100644 --- a/var/spack/repos/builtin/packages/jhpcn-df/package.py +++ b/var/spack/repos/builtin/packages/jhpcn-df/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class JhpcnDf(CMakePackage): diff --git a/var/spack/repos/builtin/packages/jimtcl/package.py b/var/spack/repos/builtin/packages/jimtcl/package.py index 0c60f95bdd..5b085fd0ef 100644 --- a/var/spack/repos/builtin/packages/jimtcl/package.py +++ b/var/spack/repos/builtin/packages/jimtcl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jimtcl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/jline3/package.py b/var/spack/repos/builtin/packages/jline3/package.py index 6998285cb6..1b377f605d 100644 --- a/var/spack/repos/builtin/packages/jline3/package.py +++ b/var/spack/repos/builtin/packages/jline3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jline3(MavenPackage): diff --git a/var/spack/repos/builtin/packages/jmol/package.py b/var/spack/repos/builtin/packages/jmol/package.py index a3a81e3056..b970a47172 100644 --- a/var/spack/repos/builtin/packages/jmol/package.py +++ b/var/spack/repos/builtin/packages/jmol/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Jmol(Package): diff --git a/var/spack/repos/builtin/packages/jogl/package.py b/var/spack/repos/builtin/packages/jogl/package.py index 1f351f2e61..337bd9408c 100644 --- a/var/spack/repos/builtin/packages/jogl/package.py +++ b/var/spack/repos/builtin/packages/jogl/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Jogl(Package): diff --git a/var/spack/repos/builtin/packages/jose/package.py b/var/spack/repos/builtin/packages/jose/package.py index 9e069c4b8f..8a1485464e 100644 --- a/var/spack/repos/builtin/packages/jose/package.py +++ b/var/spack/repos/builtin/packages/jose/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jose(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/jpegoptim/package.py b/var/spack/repos/builtin/packages/jpegoptim/package.py index 71b7fe0742..aae5b866a3 100644 --- a/var/spack/repos/builtin/packages/jpegoptim/package.py +++ b/var/spack/repos/builtin/packages/jpegoptim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jpegoptim(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/jq/package.py b/var/spack/repos/builtin/packages/jq/package.py index 22592de434..055299ba05 100644 --- a/var/spack/repos/builtin/packages/jq/package.py +++ b/var/spack/repos/builtin/packages/jq/package.py @@ -6,8 +6,8 @@ import os.path import sys -from spack import * from spack.operating_systems.mac_os import macos_version +from spack.package import * class Jq(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/json-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py index c7c046f638..6ffc76f89a 100644 --- a/var/spack/repos/builtin/packages/json-c/package.py +++ b/var/spack/repos/builtin/packages/json-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class JsonC(CMakePackage): diff --git a/var/spack/repos/builtin/packages/json-cwx/package.py b/var/spack/repos/builtin/packages/json-cwx/package.py index 2beb717654..e1dd91c55b 100644 --- a/var/spack/repos/builtin/packages/json-cwx/package.py +++ b/var/spack/repos/builtin/packages/json-cwx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class JsonCwx(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/json-fortran/package.py b/var/spack/repos/builtin/packages/json-fortran/package.py index 95dcd269e8..3acf173576 100644 --- a/var/spack/repos/builtin/packages/json-fortran/package.py +++ b/var/spack/repos/builtin/packages/json-fortran/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class JsonFortran(CMakePackage): diff --git a/var/spack/repos/builtin/packages/json-glib/package.py b/var/spack/repos/builtin/packages/json-glib/package.py index 9b5939ce25..187fcd20b0 100644 --- a/var/spack/repos/builtin/packages/json-glib/package.py +++ b/var/spack/repos/builtin/packages/json-glib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class JsonGlib(MesonPackage): diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py index ed35fe8278..c9a77d4408 100644 --- a/var/spack/repos/builtin/packages/jsoncpp/package.py +++ b/var/spack/repos/builtin/packages/jsoncpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jsoncpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/jsonnet/package.py b/var/spack/repos/builtin/packages/jsonnet/package.py index 53b2767f97..5455ca32c0 100644 --- a/var/spack/repos/builtin/packages/jsonnet/package.py +++ b/var/spack/repos/builtin/packages/jsonnet/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jsonnet(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/jstorm/package.py b/var/spack/repos/builtin/packages/jstorm/package.py index 8728097855..261cb79cac 100644 --- a/var/spack/repos/builtin/packages/jstorm/package.py +++ b/var/spack/repos/builtin/packages/jstorm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jstorm(Package): diff --git a/var/spack/repos/builtin/packages/jube/package.py b/var/spack/repos/builtin/packages/jube/package.py index f8e54f95f0..ebaed0d327 100644 --- a/var/spack/repos/builtin/packages/jube/package.py +++ b/var/spack/repos/builtin/packages/jube/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Jube(PythonPackage): diff --git a/var/spack/repos/builtin/packages/judy/package.py b/var/spack/repos/builtin/packages/judy/package.py index 08495b5287..549d7c7d7d 100644 --- a/var/spack/repos/builtin/packages/judy/package.py +++ b/var/spack/repos/builtin/packages/judy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Judy(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/julea/package.py b/var/spack/repos/builtin/packages/julea/package.py index 2f3a42df2a..0d05845b82 100644 --- a/var/spack/repos/builtin/packages/julea/package.py +++ b/var/spack/repos/builtin/packages/julea/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Julea(MesonPackage): diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 6ef36a421b..98e64bf783 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.version import ver diff --git a/var/spack/repos/builtin/packages/junit4/package.py b/var/spack/repos/builtin/packages/junit4/package.py index 5d79bcd312..8a02a5e68f 100644 --- a/var/spack/repos/builtin/packages/junit4/package.py +++ b/var/spack/repos/builtin/packages/junit4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Junit4(MavenPackage): diff --git a/var/spack/repos/builtin/packages/k8/package.py b/var/spack/repos/builtin/packages/k8/package.py index 322dc075a0..6af391ac4e 100644 --- a/var/spack/repos/builtin/packages/k8/package.py +++ b/var/spack/repos/builtin/packages/k8/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class K8(Package): diff --git a/var/spack/repos/builtin/packages/kadath/package.py b/var/spack/repos/builtin/packages/kadath/package.py index 00b2704afc..5f1e9eedc8 100644 --- a/var/spack/repos/builtin/packages/kadath/package.py +++ b/var/spack/repos/builtin/packages/kadath/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Kadath(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kafka/package.py b/var/spack/repos/builtin/packages/kafka/package.py index 42a7e59325..0221a19e95 100644 --- a/var/spack/repos/builtin/packages/kafka/package.py +++ b/var/spack/repos/builtin/packages/kafka/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kafka(Package): diff --git a/var/spack/repos/builtin/packages/kahip/package.py b/var/spack/repos/builtin/packages/kahip/package.py index ecedfb5412..25539bd416 100644 --- a/var/spack/repos/builtin/packages/kahip/package.py +++ b/var/spack/repos/builtin/packages/kahip/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class Kahip(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kaiju/package.py b/var/spack/repos/builtin/packages/kaiju/package.py index b548beafdf..5c64fbb58b 100644 --- a/var/spack/repos/builtin/packages/kaiju/package.py +++ b/var/spack/repos/builtin/packages/kaiju/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kaiju(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/kakoune/package.py b/var/spack/repos/builtin/packages/kakoune/package.py index ef406214f4..1414c3e131 100644 --- a/var/spack/repos/builtin/packages/kakoune/package.py +++ b/var/spack/repos/builtin/packages/kakoune/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kakoune(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/kaks-calculator/package.py b/var/spack/repos/builtin/packages/kaks-calculator/package.py index 8002458944..51d2f675d1 100644 --- a/var/spack/repos/builtin/packages/kaks-calculator/package.py +++ b/var/spack/repos/builtin/packages/kaks-calculator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class KaksCalculator(MakefilePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index 037506a91c..a6a5d269e5 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -7,7 +7,7 @@ import os from fnmatch import fnmatch from os.path import join -from spack import * +from spack.package import * class Kaldi(Package): # Does not use Autotools diff --git a/var/spack/repos/builtin/packages/kallisto/package.py b/var/spack/repos/builtin/packages/kallisto/package.py index dabdd4ce94..8a47df16d3 100644 --- a/var/spack/repos/builtin/packages/kallisto/package.py +++ b/var/spack/repos/builtin/packages/kallisto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kallisto(CMakePackage): diff --git a/var/spack/repos/builtin/packages/karma/package.py b/var/spack/repos/builtin/packages/karma/package.py index d655090ffd..71392322d8 100644 --- a/var/spack/repos/builtin/packages/karma/package.py +++ b/var/spack/repos/builtin/packages/karma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Karma(Package): diff --git a/var/spack/repos/builtin/packages/kassiopeia/package.py b/var/spack/repos/builtin/packages/kassiopeia/package.py index 1010b769e6..1c761753c7 100644 --- a/var/spack/repos/builtin/packages/kassiopeia/package.py +++ b/var/spack/repos/builtin/packages/kassiopeia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kassiopeia(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kbd/package.py b/var/spack/repos/builtin/packages/kbd/package.py index 66a196e557..a668c5131c 100644 --- a/var/spack/repos/builtin/packages/kbd/package.py +++ b/var/spack/repos/builtin/packages/kbd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kbd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/kbproto/package.py b/var/spack/repos/builtin/packages/kbproto/package.py index 86a027aecd..9da7d772c1 100644 --- a/var/spack/repos/builtin/packages/kbproto/package.py +++ b/var/spack/repos/builtin/packages/kbproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kbproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/kcov/package.py b/var/spack/repos/builtin/packages/kcov/package.py index a525337354..9e21767a9c 100644 --- a/var/spack/repos/builtin/packages/kcov/package.py +++ b/var/spack/repos/builtin/packages/kcov/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kcov(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kdiff3/package.py b/var/spack/repos/builtin/packages/kdiff3/package.py index ac4588d610..9991008fc2 100644 --- a/var/spack/repos/builtin/packages/kdiff3/package.py +++ b/var/spack/repos/builtin/packages/kdiff3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kdiff3(Package): diff --git a/var/spack/repos/builtin/packages/kea/package.py b/var/spack/repos/builtin/packages/kea/package.py index 4563501608..9df910aba3 100644 --- a/var/spack/repos/builtin/packages/kea/package.py +++ b/var/spack/repos/builtin/packages/kea/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index 88694bfcd1..e2ad87916e 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kealib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/keepalived/package.py b/var/spack/repos/builtin/packages/keepalived/package.py index bc8520e60d..2fbf0f706a 100644 --- a/var/spack/repos/builtin/packages/keepalived/package.py +++ b/var/spack/repos/builtin/packages/keepalived/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Keepalived(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/keepassxc/package.py b/var/spack/repos/builtin/packages/keepassxc/package.py index d4c956e4c4..c94252d488 100644 --- a/var/spack/repos/builtin/packages/keepassxc/package.py +++ b/var/spack/repos/builtin/packages/keepassxc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Keepassxc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kentutils/package.py b/var/spack/repos/builtin/packages/kentutils/package.py index f15739767d..1fbf8e633a 100644 --- a/var/spack/repos/builtin/packages/kentutils/package.py +++ b/var/spack/repos/builtin/packages/kentutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kentutils(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/keyutils/package.py b/var/spack/repos/builtin/packages/keyutils/package.py index 8142a02efa..c8e6f2633c 100644 --- a/var/spack/repos/builtin/packages/keyutils/package.py +++ b/var/spack/repos/builtin/packages/keyutils/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Keyutils(MakefilePackage): """These tools are used to control the key management system built into the Linux kernel.""" diff --git a/var/spack/repos/builtin/packages/kibana/package.py b/var/spack/repos/builtin/packages/kibana/package.py index c669ad49b6..01640bdfff 100644 --- a/var/spack/repos/builtin/packages/kibana/package.py +++ b/var/spack/repos/builtin/packages/kibana/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kibana(Package): diff --git a/var/spack/repos/builtin/packages/kicad/package.py b/var/spack/repos/builtin/packages/kicad/package.py index e2bca15c3b..e2ecd7bf68 100644 --- a/var/spack/repos/builtin/packages/kicad/package.py +++ b/var/spack/repos/builtin/packages/kicad/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/kim-api/package.py b/var/spack/repos/builtin/packages/kim-api/package.py index 906bc63e97..e54fa237a6 100644 --- a/var/spack/repos/builtin/packages/kim-api/package.py +++ b/var/spack/repos/builtin/packages/kim-api/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class KimApi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kinesis/package.py b/var/spack/repos/builtin/packages/kinesis/package.py index d0176ae029..368fd61778 100644 --- a/var/spack/repos/builtin/packages/kinesis/package.py +++ b/var/spack/repos/builtin/packages/kinesis/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Kinesis(MavenPackage): """The Amazon Kinesis Client Library for Java (Amazon KCL) enables Java developers to easily consume and process data from Amazon Kinesis.""" diff --git a/var/spack/repos/builtin/packages/kineto/package.py b/var/spack/repos/builtin/packages/kineto/package.py index 833263bef6..9de3453c0d 100644 --- a/var/spack/repos/builtin/packages/kineto/package.py +++ b/var/spack/repos/builtin/packages/kineto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kineto(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kitty/package.py b/var/spack/repos/builtin/packages/kitty/package.py index 2302ed6d4a..ceb33aa66c 100644 --- a/var/spack/repos/builtin/packages/kitty/package.py +++ b/var/spack/repos/builtin/packages/kitty/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * # NOTE: This package uses a setup.py file, but does not use distutils/setuptools or any diff --git a/var/spack/repos/builtin/packages/kmergenie/package.py b/var/spack/repos/builtin/packages/kmergenie/package.py index aa7dd00d89..ac035dac4b 100644 --- a/var/spack/repos/builtin/packages/kmergenie/package.py +++ b/var/spack/repos/builtin/packages/kmergenie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kmergenie(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/kmod/package.py b/var/spack/repos/builtin/packages/kmod/package.py index 41b5ea736a..e7ac2473a5 100644 --- a/var/spack/repos/builtin/packages/kmod/package.py +++ b/var/spack/repos/builtin/packages/kmod/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kmod(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/knem/package.py b/var/spack/repos/builtin/packages/knem/package.py index 3ad066b7e7..a6bec70353 100644 --- a/var/spack/repos/builtin/packages/knem/package.py +++ b/var/spack/repos/builtin/packages/knem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Knem(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/kokkos-kernels-legacy/package.py b/var/spack/repos/builtin/packages/kokkos-kernels-legacy/package.py index f5fc4f1514..21663d71d4 100644 --- a/var/spack/repos/builtin/packages/kokkos-kernels-legacy/package.py +++ b/var/spack/repos/builtin/packages/kokkos-kernels-legacy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class KokkosKernelsLegacy(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/package.py b/var/spack/repos/builtin/packages/kokkos-kernels/package.py index e936f16dc2..4edc7599c0 100644 --- a/var/spack/repos/builtin/packages/kokkos-kernels/package.py +++ b/var/spack/repos/builtin/packages/kokkos-kernels/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class KokkosKernels(CMakePackage, CudaPackage): @@ -57,8 +57,8 @@ class KokkosKernels(CMakePackage, CudaPackage): } for backend in backends: - deflt, descr = backends[backend] - variant(backend.lower(), default=deflt, description=descr) + deflt_bool, descr = backends[backend] + variant(backend.lower(), default=deflt_bool, description=descr) depends_on("kokkos+%s" % backend.lower(), when="+%s" % backend.lower()) space_etis = { @@ -101,8 +101,8 @@ class KokkosKernels(CMakePackage, CudaPackage): } for tpl in tpls: - deflt, spackname, rootname, descr = tpls[tpl] - variant(tpl, default=deflt, description=descr) + deflt_bool, spackname, rootname, descr = tpls[tpl] + variant(tpl, default=deflt_bool, description=descr) depends_on(spackname, when="+%s" % tpl) variant('shared', default=True, description='Build shared libraries') diff --git a/var/spack/repos/builtin/packages/kokkos-legacy/package.py b/var/spack/repos/builtin/packages/kokkos-legacy/package.py index 222c247d17..4921c66b73 100644 --- a/var/spack/repos/builtin/packages/kokkos-legacy/package.py +++ b/var/spack/repos/builtin/packages/kokkos-legacy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class KokkosLegacy(Package): diff --git a/var/spack/repos/builtin/packages/kokkos-nvcc-wrapper/package.py b/var/spack/repos/builtin/packages/kokkos-nvcc-wrapper/package.py index 8b875a75f3..d415c302a0 100644 --- a/var/spack/repos/builtin/packages/kokkos-nvcc-wrapper/package.py +++ b/var/spack/repos/builtin/packages/kokkos-nvcc-wrapper/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class KokkosNvccWrapper(Package): diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 9c624aa76a..7d1397f966 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -6,7 +6,7 @@ import os.path from llnl.util import tty -from spack import * +from spack.package import * class Kokkos(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/kraken/package.py b/var/spack/repos/builtin/packages/kraken/package.py index e490d87972..93ecff4281 100644 --- a/var/spack/repos/builtin/packages/kraken/package.py +++ b/var/spack/repos/builtin/packages/kraken/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Kraken(Package): diff --git a/var/spack/repos/builtin/packages/kraken2/package.py b/var/spack/repos/builtin/packages/kraken2/package.py index 0a17a1d6f3..7c1322f4f0 100644 --- a/var/spack/repos/builtin/packages/kraken2/package.py +++ b/var/spack/repos/builtin/packages/kraken2/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Kraken2(Package): diff --git a/var/spack/repos/builtin/packages/krb5/package.py b/var/spack/repos/builtin/packages/krb5/package.py index 04b9a065d6..483f6a7bfe 100644 --- a/var/spack/repos/builtin/packages/krb5/package.py +++ b/var/spack/repos/builtin/packages/krb5/package.py @@ -5,6 +5,8 @@ import re +from spack.package import * + class Krb5(AutotoolsPackage): """Network authentication protocol""" diff --git a/var/spack/repos/builtin/packages/krims/package.py b/var/spack/repos/builtin/packages/krims/package.py index 59519e68a5..87e7dd711e 100644 --- a/var/spack/repos/builtin/packages/krims/package.py +++ b/var/spack/repos/builtin/packages/krims/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Krims(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kripke/package.py b/var/spack/repos/builtin/packages/kripke/package.py index db1f21b989..ed1018573f 100644 --- a/var/spack/repos/builtin/packages/kripke/package.py +++ b/var/spack/repos/builtin/packages/kripke/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kripke(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kubernetes/package.py b/var/spack/repos/builtin/packages/kubernetes/package.py index 631ebe4123..0e030cd520 100644 --- a/var/spack/repos/builtin/packages/kubernetes/package.py +++ b/var/spack/repos/builtin/packages/kubernetes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kubernetes(Package): diff --git a/var/spack/repos/builtin/packages/kvasir-mpl/package.py b/var/spack/repos/builtin/packages/kvasir-mpl/package.py index 238fa3aa3e..9bfb970f31 100644 --- a/var/spack/repos/builtin/packages/kvasir-mpl/package.py +++ b/var/spack/repos/builtin/packages/kvasir-mpl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class KvasirMpl(Package): diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py index 3aa6d8e03c..59601a7873 100644 --- a/var/spack/repos/builtin/packages/kvtree/package.py +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kvtree(CMakePackage): diff --git a/var/spack/repos/builtin/packages/kylin/package.py b/var/spack/repos/builtin/packages/kylin/package.py index 6481b0759e..7c29b4d42e 100644 --- a/var/spack/repos/builtin/packages/kylin/package.py +++ b/var/spack/repos/builtin/packages/kylin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Kylin(MavenPackage): diff --git a/var/spack/repos/builtin/packages/ladot/package.py b/var/spack/repos/builtin/packages/ladot/package.py index 133af2e0a8..beea99ecaf 100644 --- a/var/spack/repos/builtin/packages/ladot/package.py +++ b/var/spack/repos/builtin/packages/ladot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ladot(Package): diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 4251763af3..a1bed15d2a 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Laghos(MakefilePackage): @@ -64,4 +64,4 @@ class Laghos(MakefilePackage): mkdirp(prefix.bin) install('laghos', prefix.bin) - install_time_test_callbacks = [] + install_time_test_callbacks = [] # type: List[str] diff --git a/var/spack/repos/builtin/packages/lame/package.py b/var/spack/repos/builtin/packages/lame/package.py index ba0fb4a4da..61e4119ba8 100644 --- a/var/spack/repos/builtin/packages/lame/package.py +++ b/var/spack/repos/builtin/packages/lame/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lame(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index adcd018eac..5824ee8069 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import datetime as dt -from spack import * +from spack.package import * class Lammps(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/landsfcutil/package.py b/var/spack/repos/builtin/packages/landsfcutil/package.py index 9a6a3d1115..850a5f5919 100644 --- a/var/spack/repos/builtin/packages/landsfcutil/package.py +++ b/var/spack/repos/builtin/packages/landsfcutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Landsfcutil(CMakePackage): diff --git a/var/spack/repos/builtin/packages/lanl-cmake-modules/package.py b/var/spack/repos/builtin/packages/lanl-cmake-modules/package.py index 37c5fd3bc0..5bd21808ed 100644 --- a/var/spack/repos/builtin/packages/lanl-cmake-modules/package.py +++ b/var/spack/repos/builtin/packages/lanl-cmake-modules/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LanlCmakeModules(CMakePackage): diff --git a/var/spack/repos/builtin/packages/lapackpp/package.py b/var/spack/repos/builtin/packages/lapackpp/package.py index ba3e14f736..c6a8e11dc1 100644 --- a/var/spack/repos/builtin/packages/lapackpp/package.py +++ b/var/spack/repos/builtin/packages/lapackpp/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * # Each LAPACK++ version requires a specific BLAS++ version _versions = [ diff --git a/var/spack/repos/builtin/packages/last/package.py b/var/spack/repos/builtin/packages/last/package.py index be21c7cc92..85679b7be5 100644 --- a/var/spack/repos/builtin/packages/last/package.py +++ b/var/spack/repos/builtin/packages/last/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Last(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lastz/package.py b/var/spack/repos/builtin/packages/lastz/package.py index 114dd2faca..60ceee323e 100644 --- a/var/spack/repos/builtin/packages/lastz/package.py +++ b/var/spack/repos/builtin/packages/lastz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lastz(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/laszip/package.py b/var/spack/repos/builtin/packages/laszip/package.py index 9e1c1b8293..c75e58ffd4 100644 --- a/var/spack/repos/builtin/packages/laszip/package.py +++ b/var/spack/repos/builtin/packages/laszip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Laszip(CMakePackage): diff --git a/var/spack/repos/builtin/packages/latex2html/package.py b/var/spack/repos/builtin/packages/latex2html/package.py index ff0e0025f4..381756cd41 100644 --- a/var/spack/repos/builtin/packages/latex2html/package.py +++ b/var/spack/repos/builtin/packages/latex2html/package.py @@ -6,7 +6,7 @@ import os import platform -from spack import * +from spack.package import * class Latex2html(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index 712f949edf..9aa3424069 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Latte(CMakePackage): diff --git a/var/spack/repos/builtin/packages/launchmon/package.py b/var/spack/repos/builtin/packages/launchmon/package.py index f846d50339..18d9ab8799 100644 --- a/var/spack/repos/builtin/packages/launchmon/package.py +++ b/var/spack/repos/builtin/packages/launchmon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Launchmon(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lazyten/package.py b/var/spack/repos/builtin/packages/lazyten/package.py index 7c602f9ee5..2644621c91 100644 --- a/var/spack/repos/builtin/packages/lazyten/package.py +++ b/var/spack/repos/builtin/packages/lazyten/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Lazyten(CMakePackage): diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 45b99fc78f..e252d35253 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Lbann(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/lbxproxy/package.py b/var/spack/repos/builtin/packages/lbxproxy/package.py index 0d73e2b734..fe465ded54 100644 --- a/var/spack/repos/builtin/packages/lbxproxy/package.py +++ b/var/spack/repos/builtin/packages/lbxproxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lbxproxy(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/lbzip2/package.py b/var/spack/repos/builtin/packages/lbzip2/package.py index 165aa6cb65..f18a9d5b8b 100644 --- a/var/spack/repos/builtin/packages/lbzip2/package.py +++ b/var/spack/repos/builtin/packages/lbzip2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lbzip2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lcals/package.py b/var/spack/repos/builtin/packages/lcals/package.py index 6d0d8524b0..8f79c7039a 100644 --- a/var/spack/repos/builtin/packages/lcals/package.py +++ b/var/spack/repos/builtin/packages/lcals/package.py @@ -6,7 +6,7 @@ import platform -from spack import * +from spack.package import * class Lcals(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lcgenv/package.py b/var/spack/repos/builtin/packages/lcgenv/package.py index a6ecda4a67..705dff869d 100644 --- a/var/spack/repos/builtin/packages/lcgenv/package.py +++ b/var/spack/repos/builtin/packages/lcgenv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lcgenv(Package): diff --git a/var/spack/repos/builtin/packages/lcio/package.py b/var/spack/repos/builtin/packages/lcio/package.py index f7d00645d6..cff4c71e5c 100644 --- a/var/spack/repos/builtin/packages/lcio/package.py +++ b/var/spack/repos/builtin/packages/lcio/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lcio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/lcms/package.py b/var/spack/repos/builtin/packages/lcms/package.py index 7ceed7fae9..8915894ba0 100644 --- a/var/spack/repos/builtin/packages/lcms/package.py +++ b/var/spack/repos/builtin/packages/lcms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lcms(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lcov/package.py b/var/spack/repos/builtin/packages/lcov/package.py index bf7c25fe2e..8da049db6d 100644 --- a/var/spack/repos/builtin/packages/lcov/package.py +++ b/var/spack/repos/builtin/packages/lcov/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lcov(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ldak/package.py b/var/spack/repos/builtin/packages/ldak/package.py index 0eac3f6339..f68c62acc9 100644 --- a/var/spack/repos/builtin/packages/ldak/package.py +++ b/var/spack/repos/builtin/packages/ldak/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ldak(Package): diff --git a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py index aed0d01611..a80333cf60 100644 --- a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LdcBootstrap(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ldc/package.py b/var/spack/repos/builtin/packages/ldc/package.py index d0176f5945..b0bc892baa 100644 --- a/var/spack/repos/builtin/packages/ldc/package.py +++ b/var/spack/repos/builtin/packages/ldc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ldc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py index ff6b7d6ecf..087f19005b 100644 --- a/var/spack/repos/builtin/packages/legion/package.py +++ b/var/spack/repos/builtin/packages/legion/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Legion(CMakePackage): diff --git a/var/spack/repos/builtin/packages/lemon/package.py b/var/spack/repos/builtin/packages/lemon/package.py index 3e79be87b2..08f437ed71 100644 --- a/var/spack/repos/builtin/packages/lemon/package.py +++ b/var/spack/repos/builtin/packages/lemon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lemon(CMakePackage): diff --git a/var/spack/repos/builtin/packages/leptonica/package.py b/var/spack/repos/builtin/packages/leptonica/package.py index 794415d53f..df2d5e946b 100644 --- a/var/spack/repos/builtin/packages/leptonica/package.py +++ b/var/spack/repos/builtin/packages/leptonica/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Leptonica(CMakePackage): diff --git a/var/spack/repos/builtin/packages/lerc/package.py b/var/spack/repos/builtin/packages/lerc/package.py index 4d87ae514f..243820f0f6 100644 --- a/var/spack/repos/builtin/packages/lerc/package.py +++ b/var/spack/repos/builtin/packages/lerc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lerc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/less/package.py b/var/spack/repos/builtin/packages/less/package.py index 8c6f23f4c9..7606d967b5 100644 --- a/var/spack/repos/builtin/packages/less/package.py +++ b/var/spack/repos/builtin/packages/less/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Less(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lesstif/package.py b/var/spack/repos/builtin/packages/lesstif/package.py index 45a282e701..bbdfa14112 100644 --- a/var/spack/repos/builtin/packages/lesstif/package.py +++ b/var/spack/repos/builtin/packages/lesstif/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lesstif(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/leveldb/package.py b/var/spack/repos/builtin/packages/leveldb/package.py index 23efb3d4fe..a40ad402c2 100644 --- a/var/spack/repos/builtin/packages/leveldb/package.py +++ b/var/spack/repos/builtin/packages/leveldb/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Leveldb(CMakePackage): """LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.""" diff --git a/var/spack/repos/builtin/packages/lftp/package.py b/var/spack/repos/builtin/packages/lftp/package.py index 500a6da0e7..0e88b0d832 100644 --- a/var/spack/repos/builtin/packages/lftp/package.py +++ b/var/spack/repos/builtin/packages/lftp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lftp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lhapdf/package.py b/var/spack/repos/builtin/packages/lhapdf/package.py index 5c5f08912d..def9ab23ce 100644 --- a/var/spack/repos/builtin/packages/lhapdf/package.py +++ b/var/spack/repos/builtin/packages/lhapdf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lhapdf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lhapdf5/package.py b/var/spack/repos/builtin/packages/lhapdf5/package.py index 2e587db8e2..669dd8cf75 100644 --- a/var/spack/repos/builtin/packages/lhapdf5/package.py +++ b/var/spack/repos/builtin/packages/lhapdf5/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lhapdf5(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lhapdfsets/package.py b/var/spack/repos/builtin/packages/lhapdfsets/package.py index 6f2f1b1909..c7645bc42c 100644 --- a/var/spack/repos/builtin/packages/lhapdfsets/package.py +++ b/var/spack/repos/builtin/packages/lhapdfsets/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Lhapdfsets(BundlePackage): diff --git a/var/spack/repos/builtin/packages/libabigail/package.py b/var/spack/repos/builtin/packages/libabigail/package.py index d95e690587..7d8020c567 100644 --- a/var/spack/repos/builtin/packages/libabigail/package.py +++ b/var/spack/repos/builtin/packages/libabigail/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libabigail(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libaec/package.py b/var/spack/repos/builtin/packages/libaec/package.py index 54be98043f..05987ee191 100644 --- a/var/spack/repos/builtin/packages/libaec/package.py +++ b/var/spack/repos/builtin/packages/libaec/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libaec(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libaio/package.py b/var/spack/repos/builtin/packages/libaio/package.py index 0fee25ba14..baeeece86d 100644 --- a/var/spack/repos/builtin/packages/libaio/package.py +++ b/var/spack/repos/builtin/packages/libaio/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libaio(MakefilePackage): """Linux native Asynchronous I/O interface library. diff --git a/var/spack/repos/builtin/packages/libao/package.py b/var/spack/repos/builtin/packages/libao/package.py index 66b7451d6a..b8fd5502b3 100644 --- a/var/spack/repos/builtin/packages/libao/package.py +++ b/var/spack/repos/builtin/packages/libao/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libao(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libapplewm/package.py b/var/spack/repos/builtin/packages/libapplewm/package.py index 05bd6dc2b4..6d588736f7 100644 --- a/var/spack/repos/builtin/packages/libapplewm/package.py +++ b/var/spack/repos/builtin/packages/libapplewm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libapplewm(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libapreq2/package.py b/var/spack/repos/builtin/packages/libapreq2/package.py index a3174bd816..93f2866aa3 100644 --- a/var/spack/repos/builtin/packages/libapreq2/package.py +++ b/var/spack/repos/builtin/packages/libapreq2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libapreq2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index cf9e3f02ea..b1c0407654 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libarchive(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libasr/package.py b/var/spack/repos/builtin/packages/libasr/package.py index 7af0df0ad1..a5ed986428 100644 --- a/var/spack/repos/builtin/packages/libasr/package.py +++ b/var/spack/repos/builtin/packages/libasr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libasr(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libassuan/package.py b/var/spack/repos/builtin/packages/libassuan/package.py index 2fa0a5c993..fd655b18cb 100644 --- a/var/spack/repos/builtin/packages/libassuan/package.py +++ b/var/spack/repos/builtin/packages/libassuan/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libassuan(AutotoolsPackage): """Libassuan is a small library implementing the so-called Assuan protocol. diff --git a/var/spack/repos/builtin/packages/libatasmart/package.py b/var/spack/repos/builtin/packages/libatasmart/package.py index 2022e5e271..ba054328bc 100644 --- a/var/spack/repos/builtin/packages/libatasmart/package.py +++ b/var/spack/repos/builtin/packages/libatasmart/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libatasmart(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libatomic-ops/package.py b/var/spack/repos/builtin/packages/libatomic-ops/package.py index 5c19c81821..0cb2995d92 100644 --- a/var/spack/repos/builtin/packages/libatomic-ops/package.py +++ b/var/spack/repos/builtin/packages/libatomic-ops/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibatomicOps(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libbacktrace/package.py b/var/spack/repos/builtin/packages/libbacktrace/package.py index 68c1b263a3..53dcd9c71d 100644 --- a/var/spack/repos/builtin/packages/libbacktrace/package.py +++ b/var/spack/repos/builtin/packages/libbacktrace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libbacktrace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libbeagle/package.py b/var/spack/repos/builtin/packages/libbeagle/package.py index 0325a212dd..5d68b2eb0d 100644 --- a/var/spack/repos/builtin/packages/libbeagle/package.py +++ b/var/spack/repos/builtin/packages/libbeagle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libbeagle(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/libbeato/package.py b/var/spack/repos/builtin/packages/libbeato/package.py index a966dbd4bf..aa74fbd679 100644 --- a/var/spack/repos/builtin/packages/libbeato/package.py +++ b/var/spack/repos/builtin/packages/libbeato/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libbeato(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libbinio/package.py b/var/spack/repos/builtin/packages/libbinio/package.py index d6e2403396..1e78c0715f 100644 --- a/var/spack/repos/builtin/packages/libbinio/package.py +++ b/var/spack/repos/builtin/packages/libbinio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libbinio(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libblastrampoline/package.py b/var/spack/repos/builtin/packages/libblastrampoline/package.py index 4d70ad1acc..6457bccbc4 100644 --- a/var/spack/repos/builtin/packages/libblastrampoline/package.py +++ b/var/spack/repos/builtin/packages/libblastrampoline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libblastrampoline(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libbsd/package.py b/var/spack/repos/builtin/packages/libbsd/package.py index b88c366e35..5dc351ff9e 100644 --- a/var/spack/repos/builtin/packages/libbsd/package.py +++ b/var/spack/repos/builtin/packages/libbsd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libbsd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py index 3b13f66a46..3e3fd66756 100644 --- a/var/spack/repos/builtin/packages/libbson/package.py +++ b/var/spack/repos/builtin/packages/libbson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libbson(Package): diff --git a/var/spack/repos/builtin/packages/libbytesize/package.py b/var/spack/repos/builtin/packages/libbytesize/package.py index ab17fb4899..de94e884d8 100644 --- a/var/spack/repos/builtin/packages/libbytesize/package.py +++ b/var/spack/repos/builtin/packages/libbytesize/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libbytesize(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libc/package.py b/var/spack/repos/builtin/packages/libc/package.py index 7fb511d5b2..43cf21c9db 100644 --- a/var/spack/repos/builtin/packages/libc/package.py +++ b/var/spack/repos/builtin/packages/libc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from llnl.util.filesystem import LibraryList +from spack.package import * class Libc(BundlePackage): diff --git a/var/spack/repos/builtin/packages/libcanberra/package.py b/var/spack/repos/builtin/packages/libcanberra/package.py index 1b5dfeceb6..17498554df 100644 --- a/var/spack/repos/builtin/packages/libcanberra/package.py +++ b/var/spack/repos/builtin/packages/libcanberra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcanberra(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libcap-ng/package.py b/var/spack/repos/builtin/packages/libcap-ng/package.py index 1c880ae9a8..c4a6894ae4 100644 --- a/var/spack/repos/builtin/packages/libcap-ng/package.py +++ b/var/spack/repos/builtin/packages/libcap-ng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibcapNg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libcap/package.py b/var/spack/repos/builtin/packages/libcap/package.py index 91fafc8e13..4fcebe7f20 100644 --- a/var/spack/repos/builtin/packages/libcap/package.py +++ b/var/spack/repos/builtin/packages/libcap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcap(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libcatalyst/package.py b/var/spack/repos/builtin/packages/libcatalyst/package.py index 808d3541f9..6c68ea5d3d 100644 --- a/var/spack/repos/builtin/packages/libcatalyst/package.py +++ b/var/spack/repos/builtin/packages/libcatalyst/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcatalyst(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libceed/package.py b/var/spack/repos/builtin/packages/libceed/package.py index b11276c7a7..9af0033b33 100644 --- a/var/spack/repos/builtin/packages/libceed/package.py +++ b/var/spack/repos/builtin/packages/libceed/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libceed(MakefilePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/libcerf/package.py b/var/spack/repos/builtin/packages/libcerf/package.py index 8defbeccb8..38adec762d 100644 --- a/var/spack/repos/builtin/packages/libcerf/package.py +++ b/var/spack/repos/builtin/packages/libcerf/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcerf(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/libcgroup/package.py b/var/spack/repos/builtin/packages/libcgroup/package.py index a76620d914..d94d0176a8 100644 --- a/var/spack/repos/builtin/packages/libcgroup/package.py +++ b/var/spack/repos/builtin/packages/libcgroup/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcgroup(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py index 4ec088ff83..a264af0fdd 100644 --- a/var/spack/repos/builtin/packages/libcint/package.py +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcint(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libcircle/package.py b/var/spack/repos/builtin/packages/libcircle/package.py index 51f8468ab6..03defab88f 100644 --- a/var/spack/repos/builtin/packages/libcircle/package.py +++ b/var/spack/repos/builtin/packages/libcircle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcircle(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libconfig/package.py b/var/spack/repos/builtin/packages/libconfig/package.py index d991a6eb42..cfeb1b8d21 100644 --- a/var/spack/repos/builtin/packages/libconfig/package.py +++ b/var/spack/repos/builtin/packages/libconfig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libconfig(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libconfuse/package.py b/var/spack/repos/builtin/packages/libconfuse/package.py index 9b376a2a52..b9459d340b 100644 --- a/var/spack/repos/builtin/packages/libconfuse/package.py +++ b/var/spack/repos/builtin/packages/libconfuse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libconfuse(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libcroco/package.py b/var/spack/repos/builtin/packages/libcroco/package.py index 94f9f2b9cb..4b26e515be 100644 --- a/var/spack/repos/builtin/packages/libcroco/package.py +++ b/var/spack/repos/builtin/packages/libcroco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcroco(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libctl/package.py b/var/spack/repos/builtin/packages/libctl/package.py index 4fd727a37e..b5e5a66184 100644 --- a/var/spack/repos/builtin/packages/libctl/package.py +++ b/var/spack/repos/builtin/packages/libctl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libctl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libcudf/package.py b/var/spack/repos/builtin/packages/libcudf/package.py index d32e6f03e8..034613a04d 100644 --- a/var/spack/repos/builtin/packages/libcudf/package.py +++ b/var/spack/repos/builtin/packages/libcudf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/libcuml/package.py b/var/spack/repos/builtin/packages/libcuml/package.py index 17a6ded081..d95a9b8bd7 100644 --- a/var/spack/repos/builtin/packages/libcuml/package.py +++ b/var/spack/repos/builtin/packages/libcuml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcuml(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libcumlprims/package.py b/var/spack/repos/builtin/packages/libcumlprims/package.py index a4827dda8a..bae4230312 100644 --- a/var/spack/repos/builtin/packages/libcumlprims/package.py +++ b/var/spack/repos/builtin/packages/libcumlprims/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcumlprims(Package): diff --git a/var/spack/repos/builtin/packages/libcxxwrap-julia/package.py b/var/spack/repos/builtin/packages/libcxxwrap-julia/package.py index e95abb92e4..00c3a38d78 100644 --- a/var/spack/repos/builtin/packages/libcxxwrap-julia/package.py +++ b/var/spack/repos/builtin/packages/libcxxwrap-julia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibcxxwrapJulia(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libcyaml/package.py b/var/spack/repos/builtin/packages/libcyaml/package.py index 800fd315f7..75104a75b8 100644 --- a/var/spack/repos/builtin/packages/libcyaml/package.py +++ b/var/spack/repos/builtin/packages/libcyaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libcyaml(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libdaemon/package.py b/var/spack/repos/builtin/packages/libdaemon/package.py index af4c467df9..586621af42 100644 --- a/var/spack/repos/builtin/packages/libdaemon/package.py +++ b/var/spack/repos/builtin/packages/libdaemon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libdaemon(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libdap4/package.py b/var/spack/repos/builtin/packages/libdap4/package.py index 87f28371ae..063483eced 100644 --- a/var/spack/repos/builtin/packages/libdap4/package.py +++ b/var/spack/repos/builtin/packages/libdap4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libdap4(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libdatrie/package.py b/var/spack/repos/builtin/packages/libdatrie/package.py index 66ccbfdc3a..b84fff15b6 100644 --- a/var/spack/repos/builtin/packages/libdatrie/package.py +++ b/var/spack/repos/builtin/packages/libdatrie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libdatrie(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libdc1394/package.py b/var/spack/repos/builtin/packages/libdc1394/package.py index ebdffa195e..c982820dab 100644 --- a/var/spack/repos/builtin/packages/libdc1394/package.py +++ b/var/spack/repos/builtin/packages/libdc1394/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libdc1394(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libdeflate/package.py b/var/spack/repos/builtin/packages/libdeflate/package.py index 14d352d67f..1cfc7a7865 100644 --- a/var/spack/repos/builtin/packages/libdeflate/package.py +++ b/var/spack/repos/builtin/packages/libdeflate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libdeflate(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libdivsufsort/package.py b/var/spack/repos/builtin/packages/libdivsufsort/package.py index fa6c9fce3b..13f3b912cf 100644 --- a/var/spack/repos/builtin/packages/libdivsufsort/package.py +++ b/var/spack/repos/builtin/packages/libdivsufsort/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libdivsufsort(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libdmx/package.py b/var/spack/repos/builtin/packages/libdmx/package.py index 7c7f6a779e..ad440f3577 100644 --- a/var/spack/repos/builtin/packages/libdmx/package.py +++ b/var/spack/repos/builtin/packages/libdmx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libdmx(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py index 8d94031fbb..55884e4cee 100644 --- a/var/spack/repos/builtin/packages/libdrm/package.py +++ b/var/spack/repos/builtin/packages/libdrm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libdrm(Package): diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index 6c531f4208..572a5e23ed 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * # Only build certain parts of dwarf because the other ones break. dwarf_dirs = ['libdwarf', 'dwarfdump2'] diff --git a/var/spack/repos/builtin/packages/libeatmydata/package.py b/var/spack/repos/builtin/packages/libeatmydata/package.py index 2819e3a527..5daa147a6a 100644 --- a/var/spack/repos/builtin/packages/libeatmydata/package.py +++ b/var/spack/repos/builtin/packages/libeatmydata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libeatmydata(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libecpint/package.py b/var/spack/repos/builtin/packages/libecpint/package.py index 50ab6ab6f5..78ed5631c4 100644 --- a/var/spack/repos/builtin/packages/libecpint/package.py +++ b/var/spack/repos/builtin/packages/libecpint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libecpint(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libedit/package.py b/var/spack/repos/builtin/packages/libedit/package.py index f6b2109745..b215c4f295 100644 --- a/var/spack/repos/builtin/packages/libedit/package.py +++ b/var/spack/repos/builtin/packages/libedit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libedit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libefence/package.py b/var/spack/repos/builtin/packages/libefence/package.py index 516bfd3311..24c326b502 100644 --- a/var/spack/repos/builtin/packages/libefence/package.py +++ b/var/spack/repos/builtin/packages/libefence/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libefence(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libelf/package.py b/var/spack/repos/builtin/packages/libelf/package.py index 48814a2559..85158e5dfc 100644 --- a/var/spack/repos/builtin/packages/libelf/package.py +++ b/var/spack/repos/builtin/packages/libelf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libelf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libemos/package.py b/var/spack/repos/builtin/packages/libemos/package.py index 4d0d828d7e..1686809373 100644 --- a/var/spack/repos/builtin/packages/libemos/package.py +++ b/var/spack/repos/builtin/packages/libemos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libemos(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libepoxy/package.py b/var/spack/repos/builtin/packages/libepoxy/package.py index 430b12f2d0..c4f55affa3 100644 --- a/var/spack/repos/builtin/packages/libepoxy/package.py +++ b/var/spack/repos/builtin/packages/libepoxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libepoxy(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libestr/package.py b/var/spack/repos/builtin/packages/libestr/package.py index 25cd7988a3..28e2090fef 100644 --- a/var/spack/repos/builtin/packages/libestr/package.py +++ b/var/spack/repos/builtin/packages/libestr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libestr(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py index 769a6e09c8..a94b01e26d 100644 --- a/var/spack/repos/builtin/packages/libev/package.py +++ b/var/spack/repos/builtin/packages/libev/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libev(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libevdev/package.py b/var/spack/repos/builtin/packages/libevdev/package.py index 5032fc1373..366b98c103 100644 --- a/var/spack/repos/builtin/packages/libevdev/package.py +++ b/var/spack/repos/builtin/packages/libevdev/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libevdev(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libevent/package.py b/var/spack/repos/builtin/packages/libevent/package.py index 24c91d35df..1b192b73ed 100644 --- a/var/spack/repos/builtin/packages/libevent/package.py +++ b/var/spack/repos/builtin/packages/libevent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libevent(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libevpath/package.py b/var/spack/repos/builtin/packages/libevpath/package.py index 72156ecaec..bb303e5eeb 100644 --- a/var/spack/repos/builtin/packages/libevpath/package.py +++ b/var/spack/repos/builtin/packages/libevpath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libevpath(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libexif/package.py b/var/spack/repos/builtin/packages/libexif/package.py index f5fc774d5b..7328ef941b 100644 --- a/var/spack/repos/builtin/packages/libexif/package.py +++ b/var/spack/repos/builtin/packages/libexif/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libexif(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index 5bed7c50f3..c76a1c2a4c 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libfabric(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libfastcommon/package.py b/var/spack/repos/builtin/packages/libfastcommon/package.py index 8049111e4b..4f8d5165a3 100644 --- a/var/spack/repos/builtin/packages/libfastcommon/package.py +++ b/var/spack/repos/builtin/packages/libfastcommon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libfastcommon(Package): diff --git a/var/spack/repos/builtin/packages/libfastjson/package.py b/var/spack/repos/builtin/packages/libfastjson/package.py index de694453ef..621ff9a223 100644 --- a/var/spack/repos/builtin/packages/libfastjson/package.py +++ b/var/spack/repos/builtin/packages/libfastjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libfastjson(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libffi/package.py b/var/spack/repos/builtin/packages/libffi/package.py index 963f44b37b..94f10d1c44 100644 --- a/var/spack/repos/builtin/packages/libffi/package.py +++ b/var/spack/repos/builtin/packages/libffi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libffi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libffs/package.py b/var/spack/repos/builtin/packages/libffs/package.py index 8410b480fb..6fdc1b6080 100644 --- a/var/spack/repos/builtin/packages/libffs/package.py +++ b/var/spack/repos/builtin/packages/libffs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libffs(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libfive/package.py b/var/spack/repos/builtin/packages/libfive/package.py index f1c9bb77de..ecc90524a0 100644 --- a/var/spack/repos/builtin/packages/libfive/package.py +++ b/var/spack/repos/builtin/packages/libfive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/libflame/package.py b/var/spack/repos/builtin/packages/libflame/package.py index 6b8e14b296..7a9705e35c 100644 --- a/var/spack/repos/builtin/packages/libflame/package.py +++ b/var/spack/repos/builtin/packages/libflame/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibflameBase(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libfms/package.py b/var/spack/repos/builtin/packages/libfms/package.py index 0637e7b86a..354c11312d 100644 --- a/var/spack/repos/builtin/packages/libfms/package.py +++ b/var/spack/repos/builtin/packages/libfms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libfms(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libfontenc/package.py b/var/spack/repos/builtin/packages/libfontenc/package.py index a0933fa33a..2d8af7c718 100644 --- a/var/spack/repos/builtin/packages/libfontenc/package.py +++ b/var/spack/repos/builtin/packages/libfontenc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libfontenc(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libfs/package.py b/var/spack/repos/builtin/packages/libfs/package.py index 86d733c588..c1c80bbe1c 100644 --- a/var/spack/repos/builtin/packages/libfs/package.py +++ b/var/spack/repos/builtin/packages/libfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libfs(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libfuse/package.py b/var/spack/repos/builtin/packages/libfuse/package.py index a8242f97d2..5d1faab077 100644 --- a/var/spack/repos/builtin/packages/libfuse/package.py +++ b/var/spack/repos/builtin/packages/libfuse/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class Libfuse(MesonPackage): diff --git a/var/spack/repos/builtin/packages/libfyaml/package.py b/var/spack/repos/builtin/packages/libfyaml/package.py index 825f4b4e36..2e0aaa6c1a 100644 --- a/var/spack/repos/builtin/packages/libfyaml/package.py +++ b/var/spack/repos/builtin/packages/libfyaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libfyaml(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libgain/package.py b/var/spack/repos/builtin/packages/libgain/package.py index 30a6ebeabf..c796dd5f98 100644 --- a/var/spack/repos/builtin/packages/libgain/package.py +++ b/var/spack/repos/builtin/packages/libgain/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgain(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libgcrypt/package.py b/var/spack/repos/builtin/packages/libgcrypt/package.py index 455da9586f..66d27f1da6 100644 --- a/var/spack/repos/builtin/packages/libgcrypt/package.py +++ b/var/spack/repos/builtin/packages/libgcrypt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgcrypt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py index 24d8455829..6e873f4805 100644 --- a/var/spack/repos/builtin/packages/libgd/package.py +++ b/var/spack/repos/builtin/packages/libgd/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libgeotiff/package.py b/var/spack/repos/builtin/packages/libgeotiff/package.py index a376fe399e..f94b997362 100644 --- a/var/spack/repos/builtin/packages/libgeotiff/package.py +++ b/var/spack/repos/builtin/packages/libgeotiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgeotiff(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libgff/package.py b/var/spack/repos/builtin/packages/libgff/package.py index 2ada8149d3..9bfc39bac5 100644 --- a/var/spack/repos/builtin/packages/libgff/package.py +++ b/var/spack/repos/builtin/packages/libgff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgff(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py index 26434adf2c..99df5cea6f 100644 --- a/var/spack/repos/builtin/packages/libgit2/package.py +++ b/var/spack/repos/builtin/packages/libgit2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgit2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libgpg-error/package.py b/var/spack/repos/builtin/packages/libgpg-error/package.py index 0eda5fe04b..effd1ef2b9 100644 --- a/var/spack/repos/builtin/packages/libgpg-error/package.py +++ b/var/spack/repos/builtin/packages/libgpg-error/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibgpgError(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libgpuarray/package.py b/var/spack/repos/builtin/packages/libgpuarray/package.py index 3f748f5b48..cda4189ae2 100644 --- a/var/spack/repos/builtin/packages/libgpuarray/package.py +++ b/var/spack/repos/builtin/packages/libgpuarray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgpuarray(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libgridxc/package.py b/var/spack/repos/builtin/packages/libgridxc/package.py index 59a87f79d3..f32a1f3e5c 100644 --- a/var/spack/repos/builtin/packages/libgridxc/package.py +++ b/var/spack/repos/builtin/packages/libgridxc/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Libgridxc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libgssglue/package.py b/var/spack/repos/builtin/packages/libgssglue/package.py index 20943206d9..246758fb50 100644 --- a/var/spack/repos/builtin/packages/libgssglue/package.py +++ b/var/spack/repos/builtin/packages/libgssglue/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgssglue(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libgtextutils/package.py b/var/spack/repos/builtin/packages/libgtextutils/package.py index 9fe20ad31b..30323b380c 100644 --- a/var/spack/repos/builtin/packages/libgtextutils/package.py +++ b/var/spack/repos/builtin/packages/libgtextutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libgtextutils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index 3118c54cec..74a3e57ad5 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Libharu(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libhbaapi/package.py b/var/spack/repos/builtin/packages/libhbaapi/package.py index 81772bbbd0..42adf25b19 100644 --- a/var/spack/repos/builtin/packages/libhbaapi/package.py +++ b/var/spack/repos/builtin/packages/libhbaapi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libhbaapi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index f6f3c819e4..6da09fad60 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libhio(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libhugetlbfs/package.py b/var/spack/repos/builtin/packages/libhugetlbfs/package.py index c877346776..7e09d35ce3 100644 --- a/var/spack/repos/builtin/packages/libhugetlbfs/package.py +++ b/var/spack/repos/builtin/packages/libhugetlbfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libhugetlbfs(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libiberty/package.py b/var/spack/repos/builtin/packages/libiberty/package.py index a1c3e079da..ff78c57663 100644 --- a/var/spack/repos/builtin/packages/libiberty/package.py +++ b/var/spack/repos/builtin/packages/libiberty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * # Libiberty has two homes: binutils and gcc. This package uses the # binutils tarfile but only builds the libiberty subdirectory. This diff --git a/var/spack/repos/builtin/packages/libibumad/package.py b/var/spack/repos/builtin/packages/libibumad/package.py index b547fcb2a4..21001593cc 100644 --- a/var/spack/repos/builtin/packages/libibumad/package.py +++ b/var/spack/repos/builtin/packages/libibumad/package.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libibumad(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libical/package.py b/var/spack/repos/builtin/packages/libical/package.py index 7e66e539c9..190acb7654 100644 --- a/var/spack/repos/builtin/packages/libical/package.py +++ b/var/spack/repos/builtin/packages/libical/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libical(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libice/package.py b/var/spack/repos/builtin/packages/libice/package.py index 5863954064..b3ba192c60 100644 --- a/var/spack/repos/builtin/packages/libice/package.py +++ b/var/spack/repos/builtin/packages/libice/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libice(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py index e90f8dcea0..9b53ba4a9d 100644 --- a/var/spack/repos/builtin/packages/libiconv/package.py +++ b/var/spack/repos/builtin/packages/libiconv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libiconv(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/libid3tag/package.py b/var/spack/repos/builtin/packages/libid3tag/package.py index 7dcfdc4a1a..48ccc5e569 100644 --- a/var/spack/repos/builtin/packages/libid3tag/package.py +++ b/var/spack/repos/builtin/packages/libid3tag/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class Libid3tag(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libidl/package.py b/var/spack/repos/builtin/packages/libidl/package.py index d05283aae9..b81b6c1c7f 100644 --- a/var/spack/repos/builtin/packages/libidl/package.py +++ b/var/spack/repos/builtin/packages/libidl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libidl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libidn2/package.py b/var/spack/repos/builtin/packages/libidn2/package.py index 3ee025a69a..7d66913e66 100644 --- a/var/spack/repos/builtin/packages/libidn2/package.py +++ b/var/spack/repos/builtin/packages/libidn2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libidn2(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/libimagequant/package.py b/var/spack/repos/builtin/packages/libimagequant/package.py index c0d5e94635..d35a1d7432 100644 --- a/var/spack/repos/builtin/packages/libimagequant/package.py +++ b/var/spack/repos/builtin/packages/libimagequant/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libimagequant(MakefilePackage): """Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images. diff --git a/var/spack/repos/builtin/packages/libimobiledevice/package.py b/var/spack/repos/builtin/packages/libimobiledevice/package.py index a5db279738..28a7867ad9 100644 --- a/var/spack/repos/builtin/packages/libimobiledevice/package.py +++ b/var/spack/repos/builtin/packages/libimobiledevice/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libimobiledevice(AutotoolsPackage): """Library to communicate with iOS devices natively.""" diff --git a/var/spack/repos/builtin/packages/libinih/package.py b/var/spack/repos/builtin/packages/libinih/package.py index c833849382..196181e728 100644 --- a/var/spack/repos/builtin/packages/libinih/package.py +++ b/var/spack/repos/builtin/packages/libinih/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libinih(MesonPackage): diff --git a/var/spack/repos/builtin/packages/libint/package.py b/var/spack/repos/builtin/packages/libint/package.py index 65cbc98074..67c970bf68 100644 --- a/var/spack/repos/builtin/packages/libint/package.py +++ b/var/spack/repos/builtin/packages/libint/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost TUNE_VARIANTS = ( diff --git a/var/spack/repos/builtin/packages/libisal/package.py b/var/spack/repos/builtin/packages/libisal/package.py index f363ef0e9a..5fa545f23c 100644 --- a/var/spack/repos/builtin/packages/libisal/package.py +++ b/var/spack/repos/builtin/packages/libisal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libisal(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libiscsi/package.py b/var/spack/repos/builtin/packages/libiscsi/package.py index 965c85f99b..36e868cbae 100644 --- a/var/spack/repos/builtin/packages/libiscsi/package.py +++ b/var/spack/repos/builtin/packages/libiscsi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libiscsi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py index bf8055b0f8..a81cd6192f 100644 --- a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py +++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibjpegTurbo(Package): diff --git a/var/spack/repos/builtin/packages/libjpeg/package.py b/var/spack/repos/builtin/packages/libjpeg/package.py index e5014a0061..9df1137757 100644 --- a/var/spack/repos/builtin/packages/libjpeg/package.py +++ b/var/spack/repos/builtin/packages/libjpeg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libjpeg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libjson/package.py b/var/spack/repos/builtin/packages/libjson/package.py index 6cdb610788..d9b3012c2b 100644 --- a/var/spack/repos/builtin/packages/libjson/package.py +++ b/var/spack/repos/builtin/packages/libjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libjson(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libjwt/package.py b/var/spack/repos/builtin/packages/libjwt/package.py index 41cc65a5d2..e07b7bf734 100644 --- a/var/spack/repos/builtin/packages/libjwt/package.py +++ b/var/spack/repos/builtin/packages/libjwt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libjwt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libkcapi/package.py b/var/spack/repos/builtin/packages/libkcapi/package.py index dc2c671ba5..519af0b446 100644 --- a/var/spack/repos/builtin/packages/libkcapi/package.py +++ b/var/spack/repos/builtin/packages/libkcapi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libkcapi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libkml/package.py b/var/spack/repos/builtin/packages/libkml/package.py index 6f06cfdbd5..640c952a23 100644 --- a/var/spack/repos/builtin/packages/libkml/package.py +++ b/var/spack/repos/builtin/packages/libkml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/libksba/package.py b/var/spack/repos/builtin/packages/libksba/package.py index 63f8be4a8d..224c0eb328 100644 --- a/var/spack/repos/builtin/packages/libksba/package.py +++ b/var/spack/repos/builtin/packages/libksba/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libksba(AutotoolsPackage): """Libksba is a library to make the tasks of working with X.509 certificates, CMS data and related objects easier. diff --git a/var/spack/repos/builtin/packages/liblas/package.py b/var/spack/repos/builtin/packages/liblas/package.py index d5284d8b75..a02db90782 100644 --- a/var/spack/repos/builtin/packages/liblas/package.py +++ b/var/spack/repos/builtin/packages/liblas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Liblas(CMakePackage): diff --git a/var/spack/repos/builtin/packages/liblbfgs/package.py b/var/spack/repos/builtin/packages/liblbfgs/package.py index 77802de127..faabb53063 100644 --- a/var/spack/repos/builtin/packages/liblbfgs/package.py +++ b/var/spack/repos/builtin/packages/liblbfgs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Liblbfgs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/liblbxutil/package.py b/var/spack/repos/builtin/packages/liblbxutil/package.py index 193c18593a..a6fd7ef979 100644 --- a/var/spack/repos/builtin/packages/liblbxutil/package.py +++ b/var/spack/repos/builtin/packages/liblbxutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Liblbxutil(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/liblockfile/package.py b/var/spack/repos/builtin/packages/liblockfile/package.py index 85b42516ea..7e66571f88 100644 --- a/var/spack/repos/builtin/packages/liblockfile/package.py +++ b/var/spack/repos/builtin/packages/liblockfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Liblockfile(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/liblognorm/package.py b/var/spack/repos/builtin/packages/liblognorm/package.py index 5951a222ff..85b5918653 100644 --- a/var/spack/repos/builtin/packages/liblognorm/package.py +++ b/var/spack/repos/builtin/packages/liblognorm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Liblognorm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/liblouis/package.py b/var/spack/repos/builtin/packages/liblouis/package.py index b70e3c7e6e..181ee9b779 100644 --- a/var/spack/repos/builtin/packages/liblouis/package.py +++ b/var/spack/repos/builtin/packages/liblouis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Liblouis(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libluv/package.py b/var/spack/repos/builtin/packages/libluv/package.py index 5a8b1e17d3..433ff1c136 100644 --- a/var/spack/repos/builtin/packages/libluv/package.py +++ b/var/spack/repos/builtin/packages/libluv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libluv(CMakePackage): diff --git a/var/spack/repos/builtin/packages/liblzf/package.py b/var/spack/repos/builtin/packages/liblzf/package.py index e7218d16a5..f58ade1d89 100644 --- a/var/spack/repos/builtin/packages/liblzf/package.py +++ b/var/spack/repos/builtin/packages/liblzf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Liblzf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmacaroons/package.py b/var/spack/repos/builtin/packages/libmacaroons/package.py index a7b7b904dd..0c690b28e3 100644 --- a/var/spack/repos/builtin/packages/libmacaroons/package.py +++ b/var/spack/repos/builtin/packages/libmacaroons/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmacaroons(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmad/package.py b/var/spack/repos/builtin/packages/libmad/package.py index a717506fee..a02a5368e4 100644 --- a/var/spack/repos/builtin/packages/libmad/package.py +++ b/var/spack/repos/builtin/packages/libmad/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmad(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmatheval/package.py b/var/spack/repos/builtin/packages/libmatheval/package.py index 5d3629c68d..412ed31afa 100644 --- a/var/spack/repos/builtin/packages/libmatheval/package.py +++ b/var/spack/repos/builtin/packages/libmatheval/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmatheval(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/libmaus2/package.py b/var/spack/repos/builtin/packages/libmaus2/package.py index af62cd8253..3a4c818c7b 100644 --- a/var/spack/repos/builtin/packages/libmaus2/package.py +++ b/var/spack/repos/builtin/packages/libmaus2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmaus2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmaxminddb/package.py b/var/spack/repos/builtin/packages/libmaxminddb/package.py index fca3fcde7a..149025eaeb 100644 --- a/var/spack/repos/builtin/packages/libmaxminddb/package.py +++ b/var/spack/repos/builtin/packages/libmaxminddb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmaxminddb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmbim/package.py b/var/spack/repos/builtin/packages/libmbim/package.py index 3491f965c9..9e480afb2a 100644 --- a/var/spack/repos/builtin/packages/libmbim/package.py +++ b/var/spack/repos/builtin/packages/libmbim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmbim(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmcrypt/package.py b/var/spack/repos/builtin/packages/libmcrypt/package.py index 32eec256a5..f2c00a0620 100644 --- a/var/spack/repos/builtin/packages/libmcrypt/package.py +++ b/var/spack/repos/builtin/packages/libmcrypt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmcrypt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmd/package.py b/var/spack/repos/builtin/packages/libmd/package.py index bc64502df4..235e2786d7 100644 --- a/var/spack/repos/builtin/packages/libmd/package.py +++ b/var/spack/repos/builtin/packages/libmd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmesh/package.py b/var/spack/repos/builtin/packages/libmesh/package.py index 9c567e6484..727d471187 100644 --- a/var/spack/repos/builtin/packages/libmesh/package.py +++ b/var/spack/repos/builtin/packages/libmesh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/libmetalink/package.py b/var/spack/repos/builtin/packages/libmetalink/package.py index b8376a3944..c9bc6b568d 100644 --- a/var/spack/repos/builtin/packages/libmetalink/package.py +++ b/var/spack/repos/builtin/packages/libmetalink/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmetalink(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmicrodns/package.py b/var/spack/repos/builtin/packages/libmicrodns/package.py index 51452c1d37..36e120bfc9 100644 --- a/var/spack/repos/builtin/packages/libmicrodns/package.py +++ b/var/spack/repos/builtin/packages/libmicrodns/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmicrodns(MesonPackage): diff --git a/var/spack/repos/builtin/packages/libmicrohttpd/package.py b/var/spack/repos/builtin/packages/libmicrohttpd/package.py index 473c4ce4b0..3c8ba409b9 100644 --- a/var/spack/repos/builtin/packages/libmicrohttpd/package.py +++ b/var/spack/repos/builtin/packages/libmicrohttpd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmicrohttpd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmmtf-cpp/package.py b/var/spack/repos/builtin/packages/libmmtf-cpp/package.py index 8bdaeddba7..8e5241473c 100644 --- a/var/spack/repos/builtin/packages/libmmtf-cpp/package.py +++ b/var/spack/repos/builtin/packages/libmmtf-cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibmmtfCpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libmng/package.py b/var/spack/repos/builtin/packages/libmng/package.py index 62959159ba..2369684dc8 100644 --- a/var/spack/repos/builtin/packages/libmng/package.py +++ b/var/spack/repos/builtin/packages/libmng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmng(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libmnl/package.py b/var/spack/repos/builtin/packages/libmnl/package.py index 49e5285bae..2247251fa9 100644 --- a/var/spack/repos/builtin/packages/libmnl/package.py +++ b/var/spack/repos/builtin/packages/libmnl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmnl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmo-unpack/package.py b/var/spack/repos/builtin/packages/libmo-unpack/package.py index 6cbc6c99ef..3b1f2a190d 100644 --- a/var/spack/repos/builtin/packages/libmo-unpack/package.py +++ b/var/spack/repos/builtin/packages/libmo-unpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibmoUnpack(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libmodbus/package.py b/var/spack/repos/builtin/packages/libmodbus/package.py index 667ce9643a..34f5618767 100644 --- a/var/spack/repos/builtin/packages/libmodbus/package.py +++ b/var/spack/repos/builtin/packages/libmodbus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmodbus(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py index 3f5b0f4869..ee48dcd1ad 100644 --- a/var/spack/repos/builtin/packages/libmonitor/package.py +++ b/var/spack/repos/builtin/packages/libmonitor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmonitor(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libmpdclient/package.py b/var/spack/repos/builtin/packages/libmpdclient/package.py index 3f2d429c5c..4a1bdbb015 100644 --- a/var/spack/repos/builtin/packages/libmpdclient/package.py +++ b/var/spack/repos/builtin/packages/libmpdclient/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libmpdclient(MesonPackage): diff --git a/var/spack/repos/builtin/packages/libnbc/package.py b/var/spack/repos/builtin/packages/libnbc/package.py index e6d523eada..18d83ee0af 100644 --- a/var/spack/repos/builtin/packages/libnbc/package.py +++ b/var/spack/repos/builtin/packages/libnbc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnbc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libndp/package.py b/var/spack/repos/builtin/packages/libndp/package.py index 062e742a73..1f4029bd04 100644 --- a/var/spack/repos/builtin/packages/libndp/package.py +++ b/var/spack/repos/builtin/packages/libndp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libndp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnet/package.py b/var/spack/repos/builtin/packages/libnet/package.py index 524aab910d..8f39a25abd 100644 --- a/var/spack/repos/builtin/packages/libnet/package.py +++ b/var/spack/repos/builtin/packages/libnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnet(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnetfilter-conntrack/package.py b/var/spack/repos/builtin/packages/libnetfilter-conntrack/package.py index 8a097d23dd..951dae83b2 100644 --- a/var/spack/repos/builtin/packages/libnetfilter-conntrack/package.py +++ b/var/spack/repos/builtin/packages/libnetfilter-conntrack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibnetfilterConntrack(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnetfilter-cthelper/package.py b/var/spack/repos/builtin/packages/libnetfilter-cthelper/package.py index 4cbcb0042d..9fe324f54f 100644 --- a/var/spack/repos/builtin/packages/libnetfilter-cthelper/package.py +++ b/var/spack/repos/builtin/packages/libnetfilter-cthelper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibnetfilterCthelper(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnetfilter-cttimeout/package.py b/var/spack/repos/builtin/packages/libnetfilter-cttimeout/package.py index 90dc5e52a3..f3879e2653 100644 --- a/var/spack/repos/builtin/packages/libnetfilter-cttimeout/package.py +++ b/var/spack/repos/builtin/packages/libnetfilter-cttimeout/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibnetfilterCttimeout(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnetfilter-queue/package.py b/var/spack/repos/builtin/packages/libnetfilter-queue/package.py index 617b51b446..5a7fb70675 100644 --- a/var/spack/repos/builtin/packages/libnetfilter-queue/package.py +++ b/var/spack/repos/builtin/packages/libnetfilter-queue/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibnetfilterQueue(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnetworkit/package.py b/var/spack/repos/builtin/packages/libnetworkit/package.py index dccf44f3ab..84614b7890 100644 --- a/var/spack/repos/builtin/packages/libnetworkit/package.py +++ b/var/spack/repos/builtin/packages/libnetworkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnetworkit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libnfnetlink/package.py b/var/spack/repos/builtin/packages/libnfnetlink/package.py index 6b7dc18d24..82d34af7be 100644 --- a/var/spack/repos/builtin/packages/libnfnetlink/package.py +++ b/var/spack/repos/builtin/packages/libnfnetlink/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnfnetlink(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnfs/package.py b/var/spack/repos/builtin/packages/libnfs/package.py index e0a144c082..c79b2cc43a 100644 --- a/var/spack/repos/builtin/packages/libnfs/package.py +++ b/var/spack/repos/builtin/packages/libnfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnfs(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libnfsidmap/package.py b/var/spack/repos/builtin/packages/libnfsidmap/package.py index b48106ad79..e6520a0222 100644 --- a/var/spack/repos/builtin/packages/libnfsidmap/package.py +++ b/var/spack/repos/builtin/packages/libnfsidmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnfsidmap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnftnl/package.py b/var/spack/repos/builtin/packages/libnftnl/package.py index f03258e357..f9b32c9b89 100644 --- a/var/spack/repos/builtin/packages/libnftnl/package.py +++ b/var/spack/repos/builtin/packages/libnftnl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnftnl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnids/package.py b/var/spack/repos/builtin/packages/libnids/package.py index 3eabe1a75b..4128d56f0a 100644 --- a/var/spack/repos/builtin/packages/libnids/package.py +++ b/var/spack/repos/builtin/packages/libnids/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnids(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnl/package.py b/var/spack/repos/builtin/packages/libnl/package.py index ea788e71bf..1de244047a 100644 --- a/var/spack/repos/builtin/packages/libnl/package.py +++ b/var/spack/repos/builtin/packages/libnl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnotify/package.py b/var/spack/repos/builtin/packages/libnotify/package.py index 14eb014bba..1c2e0224ed 100644 --- a/var/spack/repos/builtin/packages/libnotify/package.py +++ b/var/spack/repos/builtin/packages/libnotify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnotify(MesonPackage): diff --git a/var/spack/repos/builtin/packages/libnova/package.py b/var/spack/repos/builtin/packages/libnova/package.py index 99ad749265..c4cd6ec382 100644 --- a/var/spack/repos/builtin/packages/libnova/package.py +++ b/var/spack/repos/builtin/packages/libnova/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnova(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnrm/package.py b/var/spack/repos/builtin/packages/libnrm/package.py index 23de185543..68ddd359ba 100644 --- a/var/spack/repos/builtin/packages/libnrm/package.py +++ b/var/spack/repos/builtin/packages/libnrm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnrm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libnsl/package.py b/var/spack/repos/builtin/packages/libnsl/package.py index 7e59a26c76..b7d0dad0e1 100644 --- a/var/spack/repos/builtin/packages/libnsl/package.py +++ b/var/spack/repos/builtin/packages/libnsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libnsl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libogg/package.py b/var/spack/repos/builtin/packages/libogg/package.py index 3401919e11..936bdb30d0 100644 --- a/var/spack/repos/builtin/packages/libogg/package.py +++ b/var/spack/repos/builtin/packages/libogg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libogg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/liboldx/package.py b/var/spack/repos/builtin/packages/liboldx/package.py index 8d84eb01ff..7ffdbd7ee4 100644 --- a/var/spack/repos/builtin/packages/liboldx/package.py +++ b/var/spack/repos/builtin/packages/liboldx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Liboldx(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libopts/package.py b/var/spack/repos/builtin/packages/libopts/package.py index 156120e58b..72eabfe7fc 100644 --- a/var/spack/repos/builtin/packages/libopts/package.py +++ b/var/spack/repos/builtin/packages/libopts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libopts(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libp11/package.py b/var/spack/repos/builtin/packages/libp11/package.py index 48b5f7e6f3..6575b70672 100644 --- a/var/spack/repos/builtin/packages/libp11/package.py +++ b/var/spack/repos/builtin/packages/libp11/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libp11(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpam/package.py b/var/spack/repos/builtin/packages/libpam/package.py index 1059c77550..601a6f9907 100644 --- a/var/spack/repos/builtin/packages/libpam/package.py +++ b/var/spack/repos/builtin/packages/libpam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpam(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpaper/package.py b/var/spack/repos/builtin/packages/libpaper/package.py index c064ac70b5..35c68346e4 100644 --- a/var/spack/repos/builtin/packages/libpaper/package.py +++ b/var/spack/repos/builtin/packages/libpaper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpaper(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpcap/package.py b/var/spack/repos/builtin/packages/libpcap/package.py index e7e37604ea..3d0b740db2 100644 --- a/var/spack/repos/builtin/packages/libpcap/package.py +++ b/var/spack/repos/builtin/packages/libpcap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpcap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpciaccess/package.py b/var/spack/repos/builtin/packages/libpciaccess/package.py index f011dff1a0..1af2e96c8d 100644 --- a/var/spack/repos/builtin/packages/libpciaccess/package.py +++ b/var/spack/repos/builtin/packages/libpciaccess/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpciaccess(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libpeas/package.py b/var/spack/repos/builtin/packages/libpeas/package.py index dc8fc57711..460ad7d1b6 100644 --- a/var/spack/repos/builtin/packages/libpeas/package.py +++ b/var/spack/repos/builtin/packages/libpeas/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class Libpeas(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpfm4/package.py b/var/spack/repos/builtin/packages/libpfm4/package.py index 7322cfb8ac..7a070b5fcf 100644 --- a/var/spack/repos/builtin/packages/libpfm4/package.py +++ b/var/spack/repos/builtin/packages/libpfm4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpfm4(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libpipeline/package.py b/var/spack/repos/builtin/packages/libpipeline/package.py index 8ee4d93dc6..16b5c976e4 100644 --- a/var/spack/repos/builtin/packages/libpipeline/package.py +++ b/var/spack/repos/builtin/packages/libpipeline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpipeline(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libplist/package.py b/var/spack/repos/builtin/packages/libplist/package.py index 50a9d68495..233d143136 100644 --- a/var/spack/repos/builtin/packages/libplist/package.py +++ b/var/spack/repos/builtin/packages/libplist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libplist(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py b/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py index bf2620124f..4b51ea931d 100644 --- a/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py +++ b/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibpmemobjCpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index d765ceeaab..5fec86c4e9 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpng(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libproxy/package.py b/var/spack/repos/builtin/packages/libproxy/package.py index e7edbf3ab5..bd8f2feca0 100644 --- a/var/spack/repos/builtin/packages/libproxy/package.py +++ b/var/spack/repos/builtin/packages/libproxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libproxy(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libpsl/package.py b/var/spack/repos/builtin/packages/libpsl/package.py index c9b9c6318a..fdb1b19d20 100644 --- a/var/spack/repos/builtin/packages/libpsl/package.py +++ b/var/spack/repos/builtin/packages/libpsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpsl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpsml/package.py b/var/spack/repos/builtin/packages/libpsml/package.py index 7413ca8e30..2e3d004fd9 100644 --- a/var/spack/repos/builtin/packages/libpsml/package.py +++ b/var/spack/repos/builtin/packages/libpsml/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libpsml(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpthread-stubs/package.py b/var/spack/repos/builtin/packages/libpthread-stubs/package.py index 80cffe9bf0..7938ab33cd 100644 --- a/var/spack/repos/builtin/packages/libpthread-stubs/package.py +++ b/var/spack/repos/builtin/packages/libpthread-stubs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibpthreadStubs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libpulsar/package.py b/var/spack/repos/builtin/packages/libpulsar/package.py index 1cf72125de..838321df49 100644 --- a/var/spack/repos/builtin/packages/libpulsar/package.py +++ b/var/spack/repos/builtin/packages/libpulsar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/libqglviewer/package.py b/var/spack/repos/builtin/packages/libqglviewer/package.py index faf2a25e23..67eb655f8d 100644 --- a/var/spack/repos/builtin/packages/libqglviewer/package.py +++ b/var/spack/repos/builtin/packages/libqglviewer/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libqglviewer(QMakePackage): """libQGLViewer is a C++ library based on Qt that eases the creation of OpenGL 3D viewers.""" diff --git a/var/spack/repos/builtin/packages/libqrencode/package.py b/var/spack/repos/builtin/packages/libqrencode/package.py index 6d44c8f7be..d94af243a7 100644 --- a/var/spack/repos/builtin/packages/libqrencode/package.py +++ b/var/spack/repos/builtin/packages/libqrencode/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libqrencode(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libquo/package.py b/var/spack/repos/builtin/packages/libquo/package.py index 7a7be15a08..3e7de9c19e 100644 --- a/var/spack/repos/builtin/packages/libquo/package.py +++ b/var/spack/repos/builtin/packages/libquo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libquo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libraw1394/package.py b/var/spack/repos/builtin/packages/libraw1394/package.py index 209ebbf52d..f8b1b28673 100644 --- a/var/spack/repos/builtin/packages/libraw1394/package.py +++ b/var/spack/repos/builtin/packages/libraw1394/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libraw1394(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/librdkafka/package.py b/var/spack/repos/builtin/packages/librdkafka/package.py index 0fe3cd4fcd..50cd8aec47 100644 --- a/var/spack/repos/builtin/packages/librdkafka/package.py +++ b/var/spack/repos/builtin/packages/librdkafka/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Librdkafka(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/librelp/package.py b/var/spack/repos/builtin/packages/librelp/package.py index 8dd8e45840..9d9f170447 100644 --- a/var/spack/repos/builtin/packages/librelp/package.py +++ b/var/spack/repos/builtin/packages/librelp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Librelp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libristra/package.py b/var/spack/repos/builtin/packages/libristra/package.py index e31ee3af8f..109d18c4e1 100644 --- a/var/spack/repos/builtin/packages/libristra/package.py +++ b/var/spack/repos/builtin/packages/libristra/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libristra(CMakePackage): diff --git a/var/spack/repos/builtin/packages/librmm/package.py b/var/spack/repos/builtin/packages/librmm/package.py index 8f00457adb..3cee830798 100644 --- a/var/spack/repos/builtin/packages/librmm/package.py +++ b/var/spack/repos/builtin/packages/librmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Librmm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/librom/package.py b/var/spack/repos/builtin/packages/librom/package.py index d144e0bb6f..8793edb069 100644 --- a/var/spack/repos/builtin/packages/librom/package.py +++ b/var/spack/repos/builtin/packages/librom/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/librsb/package.py b/var/spack/repos/builtin/packages/librsb/package.py index 15028dfe5b..8e7d9eea7a 100644 --- a/var/spack/repos/builtin/packages/librsb/package.py +++ b/var/spack/repos/builtin/packages/librsb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Librsb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/librsvg/package.py b/var/spack/repos/builtin/packages/librsvg/package.py index 01d8e21755..8a23d07a83 100644 --- a/var/spack/repos/builtin/packages/librsvg/package.py +++ b/var/spack/repos/builtin/packages/librsvg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Librsvg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/librtlsdr/package.py b/var/spack/repos/builtin/packages/librtlsdr/package.py index 6dfa83f8f5..fcdc10af1b 100644 --- a/var/spack/repos/builtin/packages/librtlsdr/package.py +++ b/var/spack/repos/builtin/packages/librtlsdr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Librtlsdr(CMakePackage): diff --git a/var/spack/repos/builtin/packages/librttopo/package.py b/var/spack/repos/builtin/packages/librttopo/package.py index cc17e0583e..86711b1410 100644 --- a/var/spack/repos/builtin/packages/librttopo/package.py +++ b/var/spack/repos/builtin/packages/librttopo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Librttopo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libsakura/package.py b/var/spack/repos/builtin/packages/libsakura/package.py index d423805b39..a64da8a8f4 100644 --- a/var/spack/repos/builtin/packages/libsakura/package.py +++ b/var/spack/repos/builtin/packages/libsakura/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsakura(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libsamplerate/package.py b/var/spack/repos/builtin/packages/libsamplerate/package.py index 7344fedffe..412202ae11 100644 --- a/var/spack/repos/builtin/packages/libsamplerate/package.py +++ b/var/spack/repos/builtin/packages/libsamplerate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsamplerate(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libseccomp/package.py b/var/spack/repos/builtin/packages/libseccomp/package.py index d76c1df6af..77dd955be2 100644 --- a/var/spack/repos/builtin/packages/libseccomp/package.py +++ b/var/spack/repos/builtin/packages/libseccomp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libseccomp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libsecret/package.py b/var/spack/repos/builtin/packages/libsecret/package.py index 3424d34cd5..b3415c23ee 100644 --- a/var/spack/repos/builtin/packages/libsecret/package.py +++ b/var/spack/repos/builtin/packages/libsecret/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsecret(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libsharp/package.py b/var/spack/repos/builtin/packages/libsharp/package.py index 72aa0770cc..04bfeb9c36 100644 --- a/var/spack/repos/builtin/packages/libsharp/package.py +++ b/var/spack/repos/builtin/packages/libsharp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsharp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libshm/package.py b/var/spack/repos/builtin/packages/libshm/package.py index db1bef90fb..1366976051 100644 --- a/var/spack/repos/builtin/packages/libshm/package.py +++ b/var/spack/repos/builtin/packages/libshm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libshm(Package): diff --git a/var/spack/repos/builtin/packages/libsigcpp/package.py b/var/spack/repos/builtin/packages/libsigcpp/package.py index 82f9f6c360..5e4acbe05a 100644 --- a/var/spack/repos/builtin/packages/libsigcpp/package.py +++ b/var/spack/repos/builtin/packages/libsigcpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsigcpp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libsignal-protocol-c/package.py b/var/spack/repos/builtin/packages/libsignal-protocol-c/package.py index 3999f16713..9fc4dc247d 100644 --- a/var/spack/repos/builtin/packages/libsignal-protocol-c/package.py +++ b/var/spack/repos/builtin/packages/libsignal-protocol-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LibsignalProtocolC(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libsigsegv/package.py b/var/spack/repos/builtin/packages/libsigsegv/package.py index b0709d8a1e..a831c9922c 100644 --- a/var/spack/repos/builtin/packages/libsigsegv/package.py +++ b/var/spack/repos/builtin/packages/libsigsegv/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libsigsegv(AutotoolsPackage, GNUMirrorPackage): """GNU libsigsegv is a library for handling page faults in user mode.""" diff --git a/var/spack/repos/builtin/packages/libslirp/package.py b/var/spack/repos/builtin/packages/libslirp/package.py index 24402598e7..0e3eb4088f 100644 --- a/var/spack/repos/builtin/packages/libslirp/package.py +++ b/var/spack/repos/builtin/packages/libslirp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libslirp(MesonPackage): diff --git a/var/spack/repos/builtin/packages/libsm/package.py b/var/spack/repos/builtin/packages/libsm/package.py index 3c4ff7274a..08a4d55c48 100644 --- a/var/spack/repos/builtin/packages/libsm/package.py +++ b/var/spack/repos/builtin/packages/libsm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsm(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libsndfile/package.py b/var/spack/repos/builtin/packages/libsndfile/package.py index a83b275470..056ebf7b2e 100644 --- a/var/spack/repos/builtin/packages/libsndfile/package.py +++ b/var/spack/repos/builtin/packages/libsndfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsndfile(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libsodium/package.py b/var/spack/repos/builtin/packages/libsodium/package.py index 0dd973078b..11031fabce 100644 --- a/var/spack/repos/builtin/packages/libsodium/package.py +++ b/var/spack/repos/builtin/packages/libsodium/package.py @@ -7,7 +7,7 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * class Libsodium(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libspatialindex/package.py b/var/spack/repos/builtin/packages/libspatialindex/package.py index bf27c612e6..fcf123d05f 100644 --- a/var/spack/repos/builtin/packages/libspatialindex/package.py +++ b/var/spack/repos/builtin/packages/libspatialindex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libspatialindex(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libspatialite/package.py b/var/spack/repos/builtin/packages/libspatialite/package.py index 0ef6666669..f7ff124206 100644 --- a/var/spack/repos/builtin/packages/libspatialite/package.py +++ b/var/spack/repos/builtin/packages/libspatialite/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Libspatialite(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libspiro/package.py b/var/spack/repos/builtin/packages/libspiro/package.py index ba63e408eb..19b5c4bcf3 100644 --- a/var/spack/repos/builtin/packages/libspiro/package.py +++ b/var/spack/repos/builtin/packages/libspiro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libspiro(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index 8d8ef2be49..4b3d5abf42 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsplash(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libssh/package.py b/var/spack/repos/builtin/packages/libssh/package.py index a61d06cc2d..23231fe473 100644 --- a/var/spack/repos/builtin/packages/libssh/package.py +++ b/var/spack/repos/builtin/packages/libssh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libssh(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libssh2/package.py b/var/spack/repos/builtin/packages/libssh2/package.py index 00067b5ce1..94c4cec53b 100644 --- a/var/spack/repos/builtin/packages/libssh2/package.py +++ b/var/spack/repos/builtin/packages/libssh2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libssh2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libsvm/package.py b/var/spack/repos/builtin/packages/libsvm/package.py index 0fd01d7614..f5fa43a3b2 100644 --- a/var/spack/repos/builtin/packages/libsvm/package.py +++ b/var/spack/repos/builtin/packages/libsvm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libsvm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libszip/package.py b/var/spack/repos/builtin/packages/libszip/package.py index 88dc19adb0..a83a0853a4 100644 --- a/var/spack/repos/builtin/packages/libszip/package.py +++ b/var/spack/repos/builtin/packages/libszip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libszip(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libtar/package.py b/var/spack/repos/builtin/packages/libtar/package.py index ef8add77a8..97f918b6f5 100644 --- a/var/spack/repos/builtin/packages/libtar/package.py +++ b/var/spack/repos/builtin/packages/libtar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtar(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libtasn1/package.py b/var/spack/repos/builtin/packages/libtasn1/package.py index 7b01adbbc8..fc6beba28c 100644 --- a/var/spack/repos/builtin/packages/libtasn1/package.py +++ b/var/spack/repos/builtin/packages/libtasn1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtasn1(Package): diff --git a/var/spack/repos/builtin/packages/libtermkey/package.py b/var/spack/repos/builtin/packages/libtermkey/package.py index c1c45a9b34..68a418ead2 100644 --- a/var/spack/repos/builtin/packages/libtermkey/package.py +++ b/var/spack/repos/builtin/packages/libtermkey/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtermkey(Package): diff --git a/var/spack/repos/builtin/packages/libthai/package.py b/var/spack/repos/builtin/packages/libthai/package.py index 68ffc663d0..e8bece98b8 100644 --- a/var/spack/repos/builtin/packages/libthai/package.py +++ b/var/spack/repos/builtin/packages/libthai/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libthai(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libtheora/package.py b/var/spack/repos/builtin/packages/libtheora/package.py index c506828fd7..77f4540b50 100644 --- a/var/spack/repos/builtin/packages/libtheora/package.py +++ b/var/spack/repos/builtin/packages/libtheora/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtheora(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index f0324b108e..0be12345df 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtiff(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libtirpc/package.py b/var/spack/repos/builtin/packages/libtirpc/package.py index b2d7215e2c..04bfb83582 100644 --- a/var/spack/repos/builtin/packages/libtirpc/package.py +++ b/var/spack/repos/builtin/packages/libtirpc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtirpc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libtlx/package.py b/var/spack/repos/builtin/packages/libtlx/package.py index a861835953..913eab2447 100644 --- a/var/spack/repos/builtin/packages/libtlx/package.py +++ b/var/spack/repos/builtin/packages/libtlx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtlx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libtomlc99/package.py b/var/spack/repos/builtin/packages/libtomlc99/package.py index cebc94367f..6762281a63 100644 --- a/var/spack/repos/builtin/packages/libtomlc99/package.py +++ b/var/spack/repos/builtin/packages/libtomlc99/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtomlc99(Package): diff --git a/var/spack/repos/builtin/packages/libtommath/package.py b/var/spack/repos/builtin/packages/libtommath/package.py index 04f8e2f505..8f392979fd 100644 --- a/var/spack/repos/builtin/packages/libtommath/package.py +++ b/var/spack/repos/builtin/packages/libtommath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtommath(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index 704464bcd3..8354cd5bb2 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -5,6 +5,8 @@ import re +from spack.package import * + class Libtool(AutotoolsPackage, GNUMirrorPackage): """libtool -- library building part of autotools.""" diff --git a/var/spack/repos/builtin/packages/libtorrent/package.py b/var/spack/repos/builtin/packages/libtorrent/package.py index dc80aed29a..38156999db 100644 --- a/var/spack/repos/builtin/packages/libtorrent/package.py +++ b/var/spack/repos/builtin/packages/libtorrent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libtorrent(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libtree/package.py b/var/spack/repos/builtin/packages/libtree/package.py index 5c518961a9..676aa39b79 100644 --- a/var/spack/repos/builtin/packages/libtree/package.py +++ b/var/spack/repos/builtin/packages/libtree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.build_systems.cmake import CMakePackage +from spack.package import * class Libtree(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libuecc/package.py b/var/spack/repos/builtin/packages/libuecc/package.py index 33a453348e..a1a309bcc5 100644 --- a/var/spack/repos/builtin/packages/libuecc/package.py +++ b/var/spack/repos/builtin/packages/libuecc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libuecc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libunistring/package.py b/var/spack/repos/builtin/packages/libunistring/package.py index a2d0f43d8f..e8f5df0141 100644 --- a/var/spack/repos/builtin/packages/libunistring/package.py +++ b/var/spack/repos/builtin/packages/libunistring/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libunistring(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index 0070b29b79..ef41ce1677 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libunwind(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libusb/package.py b/var/spack/repos/builtin/packages/libusb/package.py index e9f03af07f..374c40a5a1 100644 --- a/var/spack/repos/builtin/packages/libusb/package.py +++ b/var/spack/repos/builtin/packages/libusb/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libusb(AutotoolsPackage): """Library for USB device access.""" diff --git a/var/spack/repos/builtin/packages/libusbmuxd/package.py b/var/spack/repos/builtin/packages/libusbmuxd/package.py index 7b15afdf54..c659d7b06c 100644 --- a/var/spack/repos/builtin/packages/libusbmuxd/package.py +++ b/var/spack/repos/builtin/packages/libusbmuxd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libusbmuxd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libuser/package.py b/var/spack/repos/builtin/packages/libuser/package.py index fe7c83d66f..f0b30b99cd 100644 --- a/var/spack/repos/builtin/packages/libuser/package.py +++ b/var/spack/repos/builtin/packages/libuser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libuser(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libuuid/package.py b/var/spack/repos/builtin/packages/libuuid/package.py index 8ce682cc42..c955b3e8cc 100644 --- a/var/spack/repos/builtin/packages/libuuid/package.py +++ b/var/spack/repos/builtin/packages/libuuid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libuuid(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/libuv/package.py b/var/spack/repos/builtin/packages/libuv/package.py index 494fa78a48..2ae02a0574 100644 --- a/var/spack/repos/builtin/packages/libuv/package.py +++ b/var/spack/repos/builtin/packages/libuv/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Libuv(AutotoolsPackage): """Multi-platform library with a focus on asynchronous IO""" homepage = "https://libuv.org" diff --git a/var/spack/repos/builtin/packages/libvdwxc/package.py b/var/spack/repos/builtin/packages/libvdwxc/package.py index 6cba29740d..6cc1108e6f 100644 --- a/var/spack/repos/builtin/packages/libvdwxc/package.py +++ b/var/spack/repos/builtin/packages/libvdwxc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libvdwxc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libverto/package.py b/var/spack/repos/builtin/packages/libverto/package.py index 4ca5c2137a..e3f9659d56 100644 --- a/var/spack/repos/builtin/packages/libverto/package.py +++ b/var/spack/repos/builtin/packages/libverto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libverto(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libvips/package.py b/var/spack/repos/builtin/packages/libvips/package.py index 2719d93ac4..b5cff4a6e3 100644 --- a/var/spack/repos/builtin/packages/libvips/package.py +++ b/var/spack/repos/builtin/packages/libvips/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libvips(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libvorbis/package.py b/var/spack/repos/builtin/packages/libvorbis/package.py index e7364873ec..14e26d9472 100644 --- a/var/spack/repos/builtin/packages/libvorbis/package.py +++ b/var/spack/repos/builtin/packages/libvorbis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libvorbis(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libvori/package.py b/var/spack/repos/builtin/packages/libvori/package.py index 0d6180cdd5..fbdb8d2653 100644 --- a/var/spack/repos/builtin/packages/libvori/package.py +++ b/var/spack/repos/builtin/packages/libvori/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libvori(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libvpx/package.py b/var/spack/repos/builtin/packages/libvpx/package.py index d4168e93c9..9c12a315fc 100644 --- a/var/spack/repos/builtin/packages/libvpx/package.py +++ b/var/spack/repos/builtin/packages/libvpx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libvpx(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libvterm/package.py b/var/spack/repos/builtin/packages/libvterm/package.py index e0946d069d..e4ebc448c6 100644 --- a/var/spack/repos/builtin/packages/libvterm/package.py +++ b/var/spack/repos/builtin/packages/libvterm/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libvterm(Package): diff --git a/var/spack/repos/builtin/packages/libwebp/package.py b/var/spack/repos/builtin/packages/libwebp/package.py index a0e95dceb5..2d15379295 100644 --- a/var/spack/repos/builtin/packages/libwebp/package.py +++ b/var/spack/repos/builtin/packages/libwebp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libwebp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libwebsockets/package.py b/var/spack/repos/builtin/packages/libwebsockets/package.py index 9c6c537c3f..97e468983e 100644 --- a/var/spack/repos/builtin/packages/libwebsockets/package.py +++ b/var/spack/repos/builtin/packages/libwebsockets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libwebsockets(CMakePackage): diff --git a/var/spack/repos/builtin/packages/libwhich/package.py b/var/spack/repos/builtin/packages/libwhich/package.py index 7a1f1a87da..e6d3ad2f26 100644 --- a/var/spack/repos/builtin/packages/libwhich/package.py +++ b/var/spack/repos/builtin/packages/libwhich/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libwhich(Package): diff --git a/var/spack/repos/builtin/packages/libwindowswm/package.py b/var/spack/repos/builtin/packages/libwindowswm/package.py index a63082cd91..55a373957f 100644 --- a/var/spack/repos/builtin/packages/libwindowswm/package.py +++ b/var/spack/repos/builtin/packages/libwindowswm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libwindowswm(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py index 8053e40430..9ef0f1f014 100644 --- a/var/spack/repos/builtin/packages/libx11/package.py +++ b/var/spack/repos/builtin/packages/libx11/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libx11(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxau/package.py b/var/spack/repos/builtin/packages/libxau/package.py index 4faa25afdc..a31cfa66d0 100644 --- a/var/spack/repos/builtin/packages/libxau/package.py +++ b/var/spack/repos/builtin/packages/libxau/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxau(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxaw/package.py b/var/spack/repos/builtin/packages/libxaw/package.py index 1bdfa1bfaf..72e5886e6c 100644 --- a/var/spack/repos/builtin/packages/libxaw/package.py +++ b/var/spack/repos/builtin/packages/libxaw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxaw(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxaw3d/package.py b/var/spack/repos/builtin/packages/libxaw3d/package.py index b0a10e9e23..7abecea392 100644 --- a/var/spack/repos/builtin/packages/libxaw3d/package.py +++ b/var/spack/repos/builtin/packages/libxaw3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxaw3d(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py index 971a9ff953..7ba9c82dfc 100644 --- a/var/spack/repos/builtin/packages/libxc/package.py +++ b/var/spack/repos/builtin/packages/libxc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxc(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py index 29ca7ce06a..f36102ad74 100644 --- a/var/spack/repos/builtin/packages/libxcb/package.py +++ b/var/spack/repos/builtin/packages/libxcb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxcb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libxcomposite/package.py b/var/spack/repos/builtin/packages/libxcomposite/package.py index b4b3c78628..c816e93572 100644 --- a/var/spack/repos/builtin/packages/libxcomposite/package.py +++ b/var/spack/repos/builtin/packages/libxcomposite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxcomposite(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxcrypt/package.py b/var/spack/repos/builtin/packages/libxcrypt/package.py index d665741b79..8894c97f93 100644 --- a/var/spack/repos/builtin/packages/libxcrypt/package.py +++ b/var/spack/repos/builtin/packages/libxcrypt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxcrypt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libxcursor/package.py b/var/spack/repos/builtin/packages/libxcursor/package.py index d5f92c1be2..3a87c02893 100644 --- a/var/spack/repos/builtin/packages/libxcursor/package.py +++ b/var/spack/repos/builtin/packages/libxcursor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxcursor(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxdamage/package.py b/var/spack/repos/builtin/packages/libxdamage/package.py index e4baa9f82a..8e46370608 100644 --- a/var/spack/repos/builtin/packages/libxdamage/package.py +++ b/var/spack/repos/builtin/packages/libxdamage/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxdamage(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxdmcp/package.py b/var/spack/repos/builtin/packages/libxdmcp/package.py index 5623a14e93..99291f2936 100644 --- a/var/spack/repos/builtin/packages/libxdmcp/package.py +++ b/var/spack/repos/builtin/packages/libxdmcp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxdmcp(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxevie/package.py b/var/spack/repos/builtin/packages/libxevie/package.py index fda3351028..edfecba6a9 100644 --- a/var/spack/repos/builtin/packages/libxevie/package.py +++ b/var/spack/repos/builtin/packages/libxevie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxevie(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxext/package.py b/var/spack/repos/builtin/packages/libxext/package.py index 3cdfee7e62..9b41f5ef84 100644 --- a/var/spack/repos/builtin/packages/libxext/package.py +++ b/var/spack/repos/builtin/packages/libxext/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxext(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxfixes/package.py b/var/spack/repos/builtin/packages/libxfixes/package.py index f30156b96c..462c759c17 100644 --- a/var/spack/repos/builtin/packages/libxfixes/package.py +++ b/var/spack/repos/builtin/packages/libxfixes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxfixes(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxfont/package.py b/var/spack/repos/builtin/packages/libxfont/package.py index 4806502b71..c271077e8f 100644 --- a/var/spack/repos/builtin/packages/libxfont/package.py +++ b/var/spack/repos/builtin/packages/libxfont/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxfont(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxfont2/package.py b/var/spack/repos/builtin/packages/libxfont2/package.py index 1c3998313b..155b0621e7 100644 --- a/var/spack/repos/builtin/packages/libxfont2/package.py +++ b/var/spack/repos/builtin/packages/libxfont2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxfont2(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxfontcache/package.py b/var/spack/repos/builtin/packages/libxfontcache/package.py index 98e6170dfc..4ddf0fcfde 100644 --- a/var/spack/repos/builtin/packages/libxfontcache/package.py +++ b/var/spack/repos/builtin/packages/libxfontcache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxfontcache(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxft/package.py b/var/spack/repos/builtin/packages/libxft/package.py index 48bdf4db58..ee401e1cad 100644 --- a/var/spack/repos/builtin/packages/libxft/package.py +++ b/var/spack/repos/builtin/packages/libxft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxft(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxi/package.py b/var/spack/repos/builtin/packages/libxi/package.py index 462cb5793b..4b99d6d1a8 100644 --- a/var/spack/repos/builtin/packages/libxi/package.py +++ b/var/spack/repos/builtin/packages/libxi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxi(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxinerama/package.py b/var/spack/repos/builtin/packages/libxinerama/package.py index aaa701b91c..9c8546e32b 100644 --- a/var/spack/repos/builtin/packages/libxinerama/package.py +++ b/var/spack/repos/builtin/packages/libxinerama/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxinerama(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxkbcommon/package.py b/var/spack/repos/builtin/packages/libxkbcommon/package.py index 26b483cba1..1c7d080dcd 100644 --- a/var/spack/repos/builtin/packages/libxkbcommon/package.py +++ b/var/spack/repos/builtin/packages/libxkbcommon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxkbcommon(MesonPackage): diff --git a/var/spack/repos/builtin/packages/libxkbfile/package.py b/var/spack/repos/builtin/packages/libxkbfile/package.py index be93fe8d7d..5d6e814fc5 100644 --- a/var/spack/repos/builtin/packages/libxkbfile/package.py +++ b/var/spack/repos/builtin/packages/libxkbfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxkbfile(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxkbui/package.py b/var/spack/repos/builtin/packages/libxkbui/package.py index 50950c2bee..bdfa5fca96 100644 --- a/var/spack/repos/builtin/packages/libxkbui/package.py +++ b/var/spack/repos/builtin/packages/libxkbui/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxkbui(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index fd81efe961..6b95822c0f 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -5,7 +5,7 @@ import llnl.util.filesystem as fs import llnl.util.tty as tty -from spack import * +from spack.package import * class Libxml2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libxmu/package.py b/var/spack/repos/builtin/packages/libxmu/package.py index 12df3024a1..f2d6b36f06 100644 --- a/var/spack/repos/builtin/packages/libxmu/package.py +++ b/var/spack/repos/builtin/packages/libxmu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxmu(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxp/package.py b/var/spack/repos/builtin/packages/libxp/package.py index 959c864c0b..d5014d1dec 100644 --- a/var/spack/repos/builtin/packages/libxp/package.py +++ b/var/spack/repos/builtin/packages/libxp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxp(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py index 8295a137d0..cb87778ec7 100644 --- a/var/spack/repos/builtin/packages/libxpm/package.py +++ b/var/spack/repos/builtin/packages/libxpm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxpm(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxpresent/package.py b/var/spack/repos/builtin/packages/libxpresent/package.py index c52562ba5c..0e45ef6341 100644 --- a/var/spack/repos/builtin/packages/libxpresent/package.py +++ b/var/spack/repos/builtin/packages/libxpresent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxpresent(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxprintapputil/package.py b/var/spack/repos/builtin/packages/libxprintapputil/package.py index 21a38725b3..f60b951636 100644 --- a/var/spack/repos/builtin/packages/libxprintapputil/package.py +++ b/var/spack/repos/builtin/packages/libxprintapputil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxprintapputil(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxprintutil/package.py b/var/spack/repos/builtin/packages/libxprintutil/package.py index a43a7aa040..a8ce1163c3 100644 --- a/var/spack/repos/builtin/packages/libxprintutil/package.py +++ b/var/spack/repos/builtin/packages/libxprintutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxprintutil(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxrandr/package.py b/var/spack/repos/builtin/packages/libxrandr/package.py index 405daa12d7..0b75e68a46 100644 --- a/var/spack/repos/builtin/packages/libxrandr/package.py +++ b/var/spack/repos/builtin/packages/libxrandr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxrandr(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxrender/package.py b/var/spack/repos/builtin/packages/libxrender/package.py index 00e02331e2..87dd19b441 100644 --- a/var/spack/repos/builtin/packages/libxrender/package.py +++ b/var/spack/repos/builtin/packages/libxrender/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxrender(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxres/package.py b/var/spack/repos/builtin/packages/libxres/package.py index 4509cdf7ee..4779f5a6c5 100644 --- a/var/spack/repos/builtin/packages/libxres/package.py +++ b/var/spack/repos/builtin/packages/libxres/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxres(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxscrnsaver/package.py b/var/spack/repos/builtin/packages/libxscrnsaver/package.py index ee478a5dbf..f859326c25 100644 --- a/var/spack/repos/builtin/packages/libxscrnsaver/package.py +++ b/var/spack/repos/builtin/packages/libxscrnsaver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxscrnsaver(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxshmfence/package.py b/var/spack/repos/builtin/packages/libxshmfence/package.py index 4d5e2497e5..bb7251967f 100644 --- a/var/spack/repos/builtin/packages/libxshmfence/package.py +++ b/var/spack/repos/builtin/packages/libxshmfence/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxshmfence(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxslt/package.py b/var/spack/repos/builtin/packages/libxslt/package.py index 8f81eac4cf..a21f148905 100644 --- a/var/spack/repos/builtin/packages/libxslt/package.py +++ b/var/spack/repos/builtin/packages/libxslt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxslt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index b760406a64..a9e8a29ebf 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -6,7 +6,7 @@ import os from glob import glob -from spack import * +from spack.package import * class Libxsmm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/libxstream/package.py b/var/spack/repos/builtin/packages/libxstream/package.py index 5435479b43..9821f61058 100644 --- a/var/spack/repos/builtin/packages/libxstream/package.py +++ b/var/spack/repos/builtin/packages/libxstream/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxstream(Package): diff --git a/var/spack/repos/builtin/packages/libxt/package.py b/var/spack/repos/builtin/packages/libxt/package.py index e7db3fe0f2..aeecf6c2cb 100644 --- a/var/spack/repos/builtin/packages/libxt/package.py +++ b/var/spack/repos/builtin/packages/libxt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxt(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxtrap/package.py b/var/spack/repos/builtin/packages/libxtrap/package.py index 222db08960..acca4cca64 100644 --- a/var/spack/repos/builtin/packages/libxtrap/package.py +++ b/var/spack/repos/builtin/packages/libxtrap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxtrap(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxtst/package.py b/var/spack/repos/builtin/packages/libxtst/package.py index c7995f3f1f..a20a8fc389 100644 --- a/var/spack/repos/builtin/packages/libxtst/package.py +++ b/var/spack/repos/builtin/packages/libxtst/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxtst(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxv/package.py b/var/spack/repos/builtin/packages/libxv/package.py index ebbd167536..955b622ede 100644 --- a/var/spack/repos/builtin/packages/libxv/package.py +++ b/var/spack/repos/builtin/packages/libxv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxv(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxvmc/package.py b/var/spack/repos/builtin/packages/libxvmc/package.py index 3780523abf..84012c6b65 100644 --- a/var/spack/repos/builtin/packages/libxvmc/package.py +++ b/var/spack/repos/builtin/packages/libxvmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxvmc(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxxf86dga/package.py b/var/spack/repos/builtin/packages/libxxf86dga/package.py index 9ed12679ad..4b00ba8524 100644 --- a/var/spack/repos/builtin/packages/libxxf86dga/package.py +++ b/var/spack/repos/builtin/packages/libxxf86dga/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxxf86dga(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxxf86misc/package.py b/var/spack/repos/builtin/packages/libxxf86misc/package.py index f491ac1493..6089a0859e 100644 --- a/var/spack/repos/builtin/packages/libxxf86misc/package.py +++ b/var/spack/repos/builtin/packages/libxxf86misc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxxf86misc(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libxxf86vm/package.py b/var/spack/repos/builtin/packages/libxxf86vm/package.py index 9d91bc2f60..fea57a41e9 100644 --- a/var/spack/repos/builtin/packages/libxxf86vm/package.py +++ b/var/spack/repos/builtin/packages/libxxf86vm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libxxf86vm(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/libyaml/package.py b/var/spack/repos/builtin/packages/libyaml/package.py index 3b08782406..cfa1d5eb77 100644 --- a/var/spack/repos/builtin/packages/libyaml/package.py +++ b/var/spack/repos/builtin/packages/libyaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libyaml(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libyogrt/package.py b/var/spack/repos/builtin/packages/libyogrt/package.py index b9d2d6583e..d9bec09974 100644 --- a/var/spack/repos/builtin/packages/libyogrt/package.py +++ b/var/spack/repos/builtin/packages/libyogrt/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Libyogrt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libzip/package.py b/var/spack/repos/builtin/packages/libzip/package.py index 9a6f7278b9..4e24417026 100644 --- a/var/spack/repos/builtin/packages/libzip/package.py +++ b/var/spack/repos/builtin/packages/libzip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Libzip(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/libzmq/package.py b/var/spack/repos/builtin/packages/libzmq/package.py index e65cefbe28..506a0fb44a 100644 --- a/var/spack/repos/builtin/packages/libzmq/package.py +++ b/var/spack/repos/builtin/packages/libzmq/package.py @@ -5,6 +5,8 @@ import sys +from spack.package import * + class Libzmq(AutotoolsPackage): """The ZMQ networking/concurrency library and core API""" diff --git a/var/spack/repos/builtin/packages/liggghts/package.py b/var/spack/repos/builtin/packages/liggghts/package.py index 9e72fbfde8..9cf1c1f85d 100644 --- a/var/spack/repos/builtin/packages/liggghts/package.py +++ b/var/spack/repos/builtin/packages/liggghts/package.py @@ -6,7 +6,7 @@ import os from glob import glob -from spack import * +from spack.package import * class Liggghts(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lighttpd/package.py b/var/spack/repos/builtin/packages/lighttpd/package.py index 9ff4bdf50c..cbe0847627 100644 --- a/var/spack/repos/builtin/packages/lighttpd/package.py +++ b/var/spack/repos/builtin/packages/lighttpd/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lighttpd(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ligra/package.py b/var/spack/repos/builtin/packages/ligra/package.py index 7d318e4d1a..5d711cccd2 100644 --- a/var/spack/repos/builtin/packages/ligra/package.py +++ b/var/spack/repos/builtin/packages/ligra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ligra(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index 8386089e8a..15135d91be 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Likwid(Package): diff --git a/var/spack/repos/builtin/packages/linkphase3/package.py b/var/spack/repos/builtin/packages/linkphase3/package.py index d7354f1c94..7700afee16 100644 --- a/var/spack/repos/builtin/packages/linkphase3/package.py +++ b/var/spack/repos/builtin/packages/linkphase3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Linkphase3(Package): diff --git a/var/spack/repos/builtin/packages/linktest/package.py b/var/spack/repos/builtin/packages/linktest/package.py index ec9f129fee..86c31a2d0d 100644 --- a/var/spack/repos/builtin/packages/linktest/package.py +++ b/var/spack/repos/builtin/packages/linktest/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Linktest(MakefilePackage): """Performance tool to generate communication matrix using parallel ping-pong benchmark""" diff --git a/var/spack/repos/builtin/packages/linsys-v/package.py b/var/spack/repos/builtin/packages/linsys-v/package.py index 263e5c081b..21dbf99b36 100644 --- a/var/spack/repos/builtin/packages/linsys-v/package.py +++ b/var/spack/repos/builtin/packages/linsys-v/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LinsysV(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/linux-headers/package.py b/var/spack/repos/builtin/packages/linux-headers/package.py index 9265e191fd..9b08938a0f 100644 --- a/var/spack/repos/builtin/packages/linux-headers/package.py +++ b/var/spack/repos/builtin/packages/linux-headers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LinuxHeaders(Package): diff --git a/var/spack/repos/builtin/packages/linux-pam/package.py b/var/spack/repos/builtin/packages/linux-pam/package.py index 81e3e76cb5..0c010714be 100644 --- a/var/spack/repos/builtin/packages/linux-pam/package.py +++ b/var/spack/repos/builtin/packages/linux-pam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LinuxPam(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lis/package.py b/var/spack/repos/builtin/packages/lis/package.py index 012aff445e..d9213e066a 100644 --- a/var/spack/repos/builtin/packages/lis/package.py +++ b/var/spack/repos/builtin/packages/lis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lis(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/listres/package.py b/var/spack/repos/builtin/packages/listres/package.py index e0ffd2a6c7..937105c58c 100644 --- a/var/spack/repos/builtin/packages/listres/package.py +++ b/var/spack/repos/builtin/packages/listres/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Listres(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/lizard/package.py b/var/spack/repos/builtin/packages/lizard/package.py index 6fd4125369..88f1fa8e33 100644 --- a/var/spack/repos/builtin/packages/lizard/package.py +++ b/var/spack/repos/builtin/packages/lizard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lizard(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lksctp-tools/package.py b/var/spack/repos/builtin/packages/lksctp-tools/package.py index 4362b6edf5..d838c94ca0 100644 --- a/var/spack/repos/builtin/packages/lksctp-tools/package.py +++ b/var/spack/repos/builtin/packages/lksctp-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LksctpTools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 8ec75ba720..40bbc1a9f0 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class LlvmAmdgpu(CMakePackage): diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py index 8877fc4575..58b9e9dd8b 100644 --- a/var/spack/repos/builtin/packages/llvm-doe/package.py +++ b/var/spack/repos/builtin/packages/llvm-doe/package.py @@ -11,6 +11,7 @@ import llnl.util.tty as tty import spack.build_environment import spack.util.executable +from spack.package import * class LlvmDoe(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py index 8597084142..7a0ac20fc9 100644 --- a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LlvmOpenmpOmpt(CMakePackage): diff --git a/var/spack/repos/builtin/packages/llvm-openmp/package.py b/var/spack/repos/builtin/packages/llvm-openmp/package.py index 01cf3b115f..492cc5eef2 100644 --- a/var/spack/repos/builtin/packages/llvm-openmp/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LlvmOpenmp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index db6bd41a32..f8d4f29282 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -11,6 +11,7 @@ import llnl.util.tty as tty import spack.build_environment import spack.util.executable +from spack.package import * class Llvm(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/lm-sensors/package.py b/var/spack/repos/builtin/packages/lm-sensors/package.py index c44413a451..3f1e0274f6 100644 --- a/var/spack/repos/builtin/packages/lm-sensors/package.py +++ b/var/spack/repos/builtin/packages/lm-sensors/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LmSensors(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lmbench/package.py b/var/spack/repos/builtin/packages/lmbench/package.py index be163ad990..07fc68b025 100644 --- a/var/spack/repos/builtin/packages/lmbench/package.py +++ b/var/spack/repos/builtin/packages/lmbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lmbench(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lmdb/package.py b/var/spack/repos/builtin/packages/lmdb/package.py index a9ab1dca6b..04eb80072e 100644 --- a/var/spack/repos/builtin/packages/lmdb/package.py +++ b/var/spack/repos/builtin/packages/lmdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lmdb(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index 7de30bbeba..f9e6a874d2 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from glob import glob +from spack.package import * + class Lmod(AutotoolsPackage): """Lmod is a Lua based module system that easily handles the MODULEPATH diff --git a/var/spack/repos/builtin/packages/lndir/package.py b/var/spack/repos/builtin/packages/lndir/package.py index 645be978fb..8c61ee2b89 100644 --- a/var/spack/repos/builtin/packages/lndir/package.py +++ b/var/spack/repos/builtin/packages/lndir/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lndir(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/log4c/package.py b/var/spack/repos/builtin/packages/log4c/package.py index 2fec4a41d3..ec8feb568e 100644 --- a/var/spack/repos/builtin/packages/log4c/package.py +++ b/var/spack/repos/builtin/packages/log4c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Log4c(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/log4cplus/package.py b/var/spack/repos/builtin/packages/log4cplus/package.py index 7efae11d4e..8d33e935bb 100644 --- a/var/spack/repos/builtin/packages/log4cplus/package.py +++ b/var/spack/repos/builtin/packages/log4cplus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Log4cplus(CMakePackage): diff --git a/var/spack/repos/builtin/packages/log4cpp/package.py b/var/spack/repos/builtin/packages/log4cpp/package.py index 60011fefad..aa60e9ecdb 100644 --- a/var/spack/repos/builtin/packages/log4cpp/package.py +++ b/var/spack/repos/builtin/packages/log4cpp/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Log4cpp(AutotoolsPackage): """Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after diff --git a/var/spack/repos/builtin/packages/log4cxx/package.py b/var/spack/repos/builtin/packages/log4cxx/package.py index d4eb5ab7a1..3f4c351223 100644 --- a/var/spack/repos/builtin/packages/log4cxx/package.py +++ b/var/spack/repos/builtin/packages/log4cxx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Log4cxx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/logrotate/package.py b/var/spack/repos/builtin/packages/logrotate/package.py index e0d34a8265..a5d694d07d 100644 --- a/var/spack/repos/builtin/packages/logrotate/package.py +++ b/var/spack/repos/builtin/packages/logrotate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Logrotate(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/logstash/package.py b/var/spack/repos/builtin/packages/logstash/package.py index 586cc3d4d4..6501902d6d 100644 --- a/var/spack/repos/builtin/packages/logstash/package.py +++ b/var/spack/repos/builtin/packages/logstash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Logstash(Package): diff --git a/var/spack/repos/builtin/packages/loki/package.py b/var/spack/repos/builtin/packages/loki/package.py index c14238f3db..8f716fab6a 100644 --- a/var/spack/repos/builtin/packages/loki/package.py +++ b/var/spack/repos/builtin/packages/loki/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Loki(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/looptools/package.py b/var/spack/repos/builtin/packages/looptools/package.py index 2653cf024d..1026c68325 100644 --- a/var/spack/repos/builtin/packages/looptools/package.py +++ b/var/spack/repos/builtin/packages/looptools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Looptools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lordec/package.py b/var/spack/repos/builtin/packages/lordec/package.py index 571a59d239..569bedb97a 100644 --- a/var/spack/repos/builtin/packages/lordec/package.py +++ b/var/spack/repos/builtin/packages/lordec/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/lorene/package.py b/var/spack/repos/builtin/packages/lorene/package.py index 81b6281109..2a643156b7 100644 --- a/var/spack/repos/builtin/packages/lorene/package.py +++ b/var/spack/repos/builtin/packages/lorene/package.py @@ -6,7 +6,7 @@ import inspect import os -from spack import * +from spack.package import * class Lorene(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lp-solve/package.py b/var/spack/repos/builtin/packages/lp-solve/package.py index bc20eef778..4d7576781e 100644 --- a/var/spack/repos/builtin/packages/lp-solve/package.py +++ b/var/spack/repos/builtin/packages/lp-solve/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LpSolve(Package): diff --git a/var/spack/repos/builtin/packages/lrslib/package.py b/var/spack/repos/builtin/packages/lrslib/package.py index cc9acf4e53..5db209fec3 100644 --- a/var/spack/repos/builtin/packages/lrslib/package.py +++ b/var/spack/repos/builtin/packages/lrslib/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lrslib(Package): diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py index 81f6ac3831..cfac1bf533 100644 --- a/var/spack/repos/builtin/packages/lrzip/package.py +++ b/var/spack/repos/builtin/packages/lrzip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lrzip(Package): diff --git a/var/spack/repos/builtin/packages/lsf/package.py b/var/spack/repos/builtin/packages/lsf/package.py index ef4de363dd..3206d94811 100644 --- a/var/spack/repos/builtin/packages/lsf/package.py +++ b/var/spack/repos/builtin/packages/lsf/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lsf(Package): diff --git a/var/spack/repos/builtin/packages/lshw/package.py b/var/spack/repos/builtin/packages/lshw/package.py index 11ebf0bf1d..b85eeab529 100644 --- a/var/spack/repos/builtin/packages/lshw/package.py +++ b/var/spack/repos/builtin/packages/lshw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lshw(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lsof/package.py b/var/spack/repos/builtin/packages/lsof/package.py index 4837849aa3..e6762697c1 100644 --- a/var/spack/repos/builtin/packages/lsof/package.py +++ b/var/spack/repos/builtin/packages/lsof/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lsof(Package): diff --git a/var/spack/repos/builtin/packages/lsscsi/package.py b/var/spack/repos/builtin/packages/lsscsi/package.py index b587eda8b9..d69898160b 100644 --- a/var/spack/repos/builtin/packages/lsscsi/package.py +++ b/var/spack/repos/builtin/packages/lsscsi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lsscsi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ltp/package.py b/var/spack/repos/builtin/packages/ltp/package.py index 8e87bf1bfe..8e591c61ec 100644 --- a/var/spack/repos/builtin/packages/ltp/package.py +++ b/var/spack/repos/builtin/packages/ltp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ltp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ltr-retriever/package.py b/var/spack/repos/builtin/packages/ltr-retriever/package.py index a619192220..847bb6cdf8 100644 --- a/var/spack/repos/builtin/packages/ltr-retriever/package.py +++ b/var/spack/repos/builtin/packages/ltr-retriever/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class LtrRetriever(Package): diff --git a/var/spack/repos/builtin/packages/ltrace/package.py b/var/spack/repos/builtin/packages/ltrace/package.py index 8e48bcc1de..b1e72ac5ee 100644 --- a/var/spack/repos/builtin/packages/ltrace/package.py +++ b/var/spack/repos/builtin/packages/ltrace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ltrace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lua-bit32/package.py b/var/spack/repos/builtin/packages/lua-bit32/package.py index 4dca82dd64..3080c8b753 100644 --- a/var/spack/repos/builtin/packages/lua-bit32/package.py +++ b/var/spack/repos/builtin/packages/lua-bit32/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.pkgkit import * +from spack.package import * class LuaBit32(LuaPackage): diff --git a/var/spack/repos/builtin/packages/lua-bitlib/package.py b/var/spack/repos/builtin/packages/lua-bitlib/package.py index e07effd7ae..29825bc5c6 100644 --- a/var/spack/repos/builtin/packages/lua-bitlib/package.py +++ b/var/spack/repos/builtin/packages/lua-bitlib/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LuaBitlib(LuaPackage): diff --git a/var/spack/repos/builtin/packages/lua-ffi/package.py b/var/spack/repos/builtin/packages/lua-ffi/package.py index 7ba6e72be1..df08027484 100644 --- a/var/spack/repos/builtin/packages/lua-ffi/package.py +++ b/var/spack/repos/builtin/packages/lua-ffi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LuaFfi(LuaPackage): diff --git a/var/spack/repos/builtin/packages/lua-lpeg/package.py b/var/spack/repos/builtin/packages/lua-lpeg/package.py index 6c0d8f495c..b5654ccbfa 100644 --- a/var/spack/repos/builtin/packages/lua-lpeg/package.py +++ b/var/spack/repos/builtin/packages/lua-lpeg/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LuaLpeg(LuaPackage): diff --git a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py index 0e3e3f5fd2..c9aa489f77 100644 --- a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py +++ b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.pkgkit import * +from spack.package import * class LuaLuafilesystem(LuaPackage): diff --git a/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py b/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py index c081e34989..c0ac67953d 100644 --- a/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py +++ b/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py @@ -5,8 +5,8 @@ import os +from spack.package import * from spack.pkg.builtin.lua import LuaImplPackage -from spack.pkgkit import * class LuaLuajitOpenresty(LuaImplPackage): diff --git a/var/spack/repos/builtin/packages/lua-luajit/package.py b/var/spack/repos/builtin/packages/lua-luajit/package.py index 5c87e25c03..6054115b5d 100644 --- a/var/spack/repos/builtin/packages/lua-luajit/package.py +++ b/var/spack/repos/builtin/packages/lua-luajit/package.py @@ -5,8 +5,8 @@ import os +from spack.package import * from spack.pkg.builtin.lua import LuaImplPackage -from spack.pkgkit import * class LuaLuajit(LuaImplPackage): diff --git a/var/spack/repos/builtin/packages/lua-luaposix/package.py b/var/spack/repos/builtin/packages/lua-luaposix/package.py index e22be239c4..80c4b51f36 100644 --- a/var/spack/repos/builtin/packages/lua-luaposix/package.py +++ b/var/spack/repos/builtin/packages/lua-luaposix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LuaLuaposix(LuaPackage): diff --git a/var/spack/repos/builtin/packages/lua-mpack/package.py b/var/spack/repos/builtin/packages/lua-mpack/package.py index 8030a0b5a7..68af894167 100644 --- a/var/spack/repos/builtin/packages/lua-mpack/package.py +++ b/var/spack/repos/builtin/packages/lua-mpack/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LuaMpack(LuaPackage): diff --git a/var/spack/repos/builtin/packages/lua-sol2/package.py b/var/spack/repos/builtin/packages/lua-sol2/package.py index 2f2c276ce7..5d04635fa8 100644 --- a/var/spack/repos/builtin/packages/lua-sol2/package.py +++ b/var/spack/repos/builtin/packages/lua-sol2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LuaSol2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index 32322c7d36..de1a0a5c95 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -7,7 +7,7 @@ import glob import os import spack.build_environment -from spack.pkgkit import * +from spack.package import * from spack.util.executable import Executable diff --git a/var/spack/repos/builtin/packages/lucene/package.py b/var/spack/repos/builtin/packages/lucene/package.py index 70a084480e..9c6188ccd9 100644 --- a/var/spack/repos/builtin/packages/lucene/package.py +++ b/var/spack/repos/builtin/packages/lucene/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lucene(Package): diff --git a/var/spack/repos/builtin/packages/luit/package.py b/var/spack/repos/builtin/packages/luit/package.py index 394434b0be..b4ee8b7999 100644 --- a/var/spack/repos/builtin/packages/luit/package.py +++ b/var/spack/repos/builtin/packages/luit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Luit(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/lulesh/package.py b/var/spack/repos/builtin/packages/lulesh/package.py index 8ec98c5f73..a88fc763a2 100644 --- a/var/spack/repos/builtin/packages/lulesh/package.py +++ b/var/spack/repos/builtin/packages/lulesh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lulesh(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lumpy-sv/package.py b/var/spack/repos/builtin/packages/lumpy-sv/package.py index dee555f3ed..451e018568 100644 --- a/var/spack/repos/builtin/packages/lumpy-sv/package.py +++ b/var/spack/repos/builtin/packages/lumpy-sv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class LumpySv(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lustre/package.py b/var/spack/repos/builtin/packages/lustre/package.py index 67409695fa..cfd4a6fffa 100644 --- a/var/spack/repos/builtin/packages/lustre/package.py +++ b/var/spack/repos/builtin/packages/lustre/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Lustre(Package): diff --git a/var/spack/repos/builtin/packages/lvarray/package.py b/var/spack/repos/builtin/packages/lvarray/package.py index fe1455c1c6..84a88f10e5 100644 --- a/var/spack/repos/builtin/packages/lvarray/package.py +++ b/var/spack/repos/builtin/packages/lvarray/package.py @@ -9,7 +9,7 @@ import warnings from os import environ as env from os.path import join as pjoin -from spack import * +from spack.package import * def cmake_cache_entry(name, value, comment=""): diff --git a/var/spack/repos/builtin/packages/lvm2/package.py b/var/spack/repos/builtin/packages/lvm2/package.py index 8420c62f66..4a34efce6a 100644 --- a/var/spack/repos/builtin/packages/lvm2/package.py +++ b/var/spack/repos/builtin/packages/lvm2/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Lvm2(AutotoolsPackage, SourcewarePackage): """LVM2 is the userspace toolset that provides logical volume management facilities on linux. diff --git a/var/spack/repos/builtin/packages/lwgrp/package.py b/var/spack/repos/builtin/packages/lwgrp/package.py index 608dd258df..35fe437220 100644 --- a/var/spack/repos/builtin/packages/lwgrp/package.py +++ b/var/spack/repos/builtin/packages/lwgrp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lwgrp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lwm2/package.py b/var/spack/repos/builtin/packages/lwm2/package.py index b98da17f11..d4084c2f31 100644 --- a/var/spack/repos/builtin/packages/lwm2/package.py +++ b/var/spack/repos/builtin/packages/lwm2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lwm2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lwtnn/package.py b/var/spack/repos/builtin/packages/lwtnn/package.py index ddad550ca0..e15a906030 100644 --- a/var/spack/repos/builtin/packages/lwtnn/package.py +++ b/var/spack/repos/builtin/packages/lwtnn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lwtnn(CMakePackage): diff --git a/var/spack/repos/builtin/packages/lxc/package.py b/var/spack/repos/builtin/packages/lxc/package.py index 00cd2dbcde..53349a21a6 100644 --- a/var/spack/repos/builtin/packages/lxc/package.py +++ b/var/spack/repos/builtin/packages/lxc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lxc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lynx/package.py b/var/spack/repos/builtin/packages/lynx/package.py index 8b9bf5605a..9b540b06a7 100644 --- a/var/spack/repos/builtin/packages/lynx/package.py +++ b/var/spack/repos/builtin/packages/lynx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lynx(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index 9d3b0df6e8..5f172cd72a 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Lz4(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/lzma/package.py b/var/spack/repos/builtin/packages/lzma/package.py index 86ef5a3343..7ea814d8ff 100644 --- a/var/spack/repos/builtin/packages/lzma/package.py +++ b/var/spack/repos/builtin/packages/lzma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lzma(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lzo/package.py b/var/spack/repos/builtin/packages/lzo/package.py index 235afe3750..1d2eab90f2 100644 --- a/var/spack/repos/builtin/packages/lzo/package.py +++ b/var/spack/repos/builtin/packages/lzo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lzo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/lzop/package.py b/var/spack/repos/builtin/packages/lzop/package.py index a3e1972c4e..5512348213 100644 --- a/var/spack/repos/builtin/packages/lzop/package.py +++ b/var/spack/repos/builtin/packages/lzop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Lzop(CMakePackage): diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index f6a6cc4f36..cb0091e6e1 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -6,6 +6,8 @@ import os import re +from spack.package import * + class M4(AutotoolsPackage, GNUMirrorPackage): """GNU M4 is an implementation of the traditional Unix macro processor.""" diff --git a/var/spack/repos/builtin/packages/macfuse/package.py b/var/spack/repos/builtin/packages/macfuse/package.py index edbb45e836..ad94d4261c 100644 --- a/var/spack/repos/builtin/packages/macfuse/package.py +++ b/var/spack/repos/builtin/packages/macfuse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Macfuse(Package): diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index 8e823e4eac..67457a2b51 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Macsio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mad-numdiff/package.py b/var/spack/repos/builtin/packages/mad-numdiff/package.py index 4a3ba74344..26505532c3 100644 --- a/var/spack/repos/builtin/packages/mad-numdiff/package.py +++ b/var/spack/repos/builtin/packages/mad-numdiff/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MadNumdiff(CMakePackage): diff --git a/var/spack/repos/builtin/packages/madgraph5amc/package.py b/var/spack/repos/builtin/packages/madgraph5amc/package.py index 641461204c..53184db73a 100644 --- a/var/spack/repos/builtin/packages/madgraph5amc/package.py +++ b/var/spack/repos/builtin/packages/madgraph5amc/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Madgraph5amc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/madx/package.py b/var/spack/repos/builtin/packages/madx/package.py index 5cb8dd76f1..a42bbf470c 100644 --- a/var/spack/repos/builtin/packages/madx/package.py +++ b/var/spack/repos/builtin/packages/madx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Madx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mafft/package.py b/var/spack/repos/builtin/packages/mafft/package.py index b583cb98c2..92d92d9570 100644 --- a/var/spack/repos/builtin/packages/mafft/package.py +++ b/var/spack/repos/builtin/packages/mafft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mafft(Package): diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 17adf42c17..5cc3595c2d 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Magics(CMakePackage): diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index b66a9e30dc..e8f901fd89 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Magma(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/mahout/package.py b/var/spack/repos/builtin/packages/mahout/package.py index 882c81f1b7..8ea2bd933d 100644 --- a/var/spack/repos/builtin/packages/mahout/package.py +++ b/var/spack/repos/builtin/packages/mahout/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Mahout(MavenPackage): """The Apache Mahout project's goal is to build an environment for quickly creating scalable performant machine learning applications.""" diff --git a/var/spack/repos/builtin/packages/makedepend/package.py b/var/spack/repos/builtin/packages/makedepend/package.py index 9b17f776a5..051b62dc3b 100644 --- a/var/spack/repos/builtin/packages/makedepend/package.py +++ b/var/spack/repos/builtin/packages/makedepend/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Makedepend(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/maker/package.py b/var/spack/repos/builtin/packages/maker/package.py index 1bbbcf939a..db36d34f93 100644 --- a/var/spack/repos/builtin/packages/maker/package.py +++ b/var/spack/repos/builtin/packages/maker/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Maker(Package): diff --git a/var/spack/repos/builtin/packages/mallocmc/package.py b/var/spack/repos/builtin/packages/mallocmc/package.py index f0dea06ec5..a6b87bdff0 100644 --- a/var/spack/repos/builtin/packages/mallocmc/package.py +++ b/var/spack/repos/builtin/packages/mallocmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/maloc/package.py b/var/spack/repos/builtin/packages/maloc/package.py index c4d3c8a596..7dae9463ad 100644 --- a/var/spack/repos/builtin/packages/maloc/package.py +++ b/var/spack/repos/builtin/packages/maloc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Maloc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/man-db/package.py b/var/spack/repos/builtin/packages/man-db/package.py index c7249051d6..994049d248 100644 --- a/var/spack/repos/builtin/packages/man-db/package.py +++ b/var/spack/repos/builtin/packages/man-db/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ManDb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/manta/package.py b/var/spack/repos/builtin/packages/manta/package.py index a2eefc13e6..a1471211ec 100644 --- a/var/spack/repos/builtin/packages/manta/package.py +++ b/var/spack/repos/builtin/packages/manta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Manta(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mapnik/package.py b/var/spack/repos/builtin/packages/mapnik/package.py index d51618917c..25d69f4e56 100644 --- a/var/spack/repos/builtin/packages/mapnik/package.py +++ b/var/spack/repos/builtin/packages/mapnik/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/mapserver/package.py b/var/spack/repos/builtin/packages/mapserver/package.py index 5ac033dc63..2427ad86c1 100644 --- a/var/spack/repos/builtin/packages/mapserver/package.py +++ b/var/spack/repos/builtin/packages/mapserver/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Mapserver(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mapsplice2/package.py b/var/spack/repos/builtin/packages/mapsplice2/package.py index 054f49bac6..f5e250c5f8 100644 --- a/var/spack/repos/builtin/packages/mapsplice2/package.py +++ b/var/spack/repos/builtin/packages/mapsplice2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mapsplice2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/maq/package.py b/var/spack/repos/builtin/packages/maq/package.py index eb55937bd7..770b224998 100644 --- a/var/spack/repos/builtin/packages/maq/package.py +++ b/var/spack/repos/builtin/packages/maq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Maq(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/margo/package.py b/var/spack/repos/builtin/packages/margo/package.py index 4de63b4da0..52d7ee3ca1 100644 --- a/var/spack/repos/builtin/packages/margo/package.py +++ b/var/spack/repos/builtin/packages/margo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Margo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mariadb-c-client/package.py b/var/spack/repos/builtin/packages/mariadb-c-client/package.py index 12f1aa210f..ad6cf8243f 100644 --- a/var/spack/repos/builtin/packages/mariadb-c-client/package.py +++ b/var/spack/repos/builtin/packages/mariadb-c-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MariadbCClient(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mariadb/package.py b/var/spack/repos/builtin/packages/mariadb/package.py index 0e4a10e463..9b9845854e 100644 --- a/var/spack/repos/builtin/packages/mariadb/package.py +++ b/var/spack/repos/builtin/packages/mariadb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/mark/package.py b/var/spack/repos/builtin/packages/mark/package.py index 564e9d8985..56ed312f34 100644 --- a/var/spack/repos/builtin/packages/mark/package.py +++ b/var/spack/repos/builtin/packages/mark/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Mark(Package): diff --git a/var/spack/repos/builtin/packages/masa/package.py b/var/spack/repos/builtin/packages/masa/package.py index c267721ae3..e77d372e1d 100644 --- a/var/spack/repos/builtin/packages/masa/package.py +++ b/var/spack/repos/builtin/packages/masa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Masa(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mash/package.py b/var/spack/repos/builtin/packages/mash/package.py index 7bbd42b841..694b314188 100644 --- a/var/spack/repos/builtin/packages/mash/package.py +++ b/var/spack/repos/builtin/packages/mash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mash(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py index b0073b9ee1..4840643cd7 100644 --- a/var/spack/repos/builtin/packages/masurca/package.py +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/mathematica/package.py b/var/spack/repos/builtin/packages/mathematica/package.py index bc4d3541fa..43b2885595 100644 --- a/var/spack/repos/builtin/packages/mathematica/package.py +++ b/var/spack/repos/builtin/packages/mathematica/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Mathematica(Package): diff --git a/var/spack/repos/builtin/packages/matio/package.py b/var/spack/repos/builtin/packages/matio/package.py index f7a22cc1d5..0467833d13 100644 --- a/var/spack/repos/builtin/packages/matio/package.py +++ b/var/spack/repos/builtin/packages/matio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Matio(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/matlab/package.py b/var/spack/repos/builtin/packages/matlab/package.py index 71b6f0659c..440c9041f7 100644 --- a/var/spack/repos/builtin/packages/matlab/package.py +++ b/var/spack/repos/builtin/packages/matlab/package.py @@ -6,7 +6,7 @@ import os import subprocess -from spack import * +from spack.package import * class Matlab(Package): diff --git a/var/spack/repos/builtin/packages/maven/package.py b/var/spack/repos/builtin/packages/maven/package.py index 663ef4dea4..f683ee554b 100644 --- a/var/spack/repos/builtin/packages/maven/package.py +++ b/var/spack/repos/builtin/packages/maven/package.py @@ -5,6 +5,8 @@ import re +from spack.package import * + class Maven(Package): """Apache Maven is a software project management and comprehension tool.""" diff --git a/var/spack/repos/builtin/packages/maverick/package.py b/var/spack/repos/builtin/packages/maverick/package.py index 2a8f5f9d49..ea47b445ad 100644 --- a/var/spack/repos/builtin/packages/maverick/package.py +++ b/var/spack/repos/builtin/packages/maverick/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Maverick(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mawk/package.py b/var/spack/repos/builtin/packages/mawk/package.py index a9a3074a40..80350aa828 100644 --- a/var/spack/repos/builtin/packages/mawk/package.py +++ b/var/spack/repos/builtin/packages/mawk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mawk(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mbdyn/package.py b/var/spack/repos/builtin/packages/mbdyn/package.py index 598dafb027..e613bdefa7 100644 --- a/var/spack/repos/builtin/packages/mbdyn/package.py +++ b/var/spack/repos/builtin/packages/mbdyn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mbdyn(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mbedtls/package.py b/var/spack/repos/builtin/packages/mbedtls/package.py index 9fcded1cd3..fff1e38e5c 100644 --- a/var/spack/repos/builtin/packages/mbedtls/package.py +++ b/var/spack/repos/builtin/packages/mbedtls/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mbedtls(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mc/package.py b/var/spack/repos/builtin/packages/mc/package.py index 059a309b12..75466d9f48 100644 --- a/var/spack/repos/builtin/packages/mc/package.py +++ b/var/spack/repos/builtin/packages/mc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mcl/package.py b/var/spack/repos/builtin/packages/mcl/package.py index 1630a6a5d5..539ed47133 100644 --- a/var/spack/repos/builtin/packages/mcl/package.py +++ b/var/spack/repos/builtin/packages/mcl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mcl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mcpp/package.py b/var/spack/repos/builtin/packages/mcpp/package.py index 2e608c5893..5e71240ac1 100644 --- a/var/spack/repos/builtin/packages/mcpp/package.py +++ b/var/spack/repos/builtin/packages/mcpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mcpp(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/mcutils/package.py b/var/spack/repos/builtin/packages/mcutils/package.py index e0f19f6978..cedbc7c896 100644 --- a/var/spack/repos/builtin/packages/mcutils/package.py +++ b/var/spack/repos/builtin/packages/mcutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mcutils(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mdsplus/package.py b/var/spack/repos/builtin/packages/mdsplus/package.py index bd58d880a1..277424040b 100644 --- a/var/spack/repos/builtin/packages/mdsplus/package.py +++ b/var/spack/repos/builtin/packages/mdsplus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mdsplus(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mdtest/package.py b/var/spack/repos/builtin/packages/mdtest/package.py index 66527ae9b0..269039b44f 100644 --- a/var/spack/repos/builtin/packages/mdtest/package.py +++ b/var/spack/repos/builtin/packages/mdtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mdtest(Package): diff --git a/var/spack/repos/builtin/packages/med/package.py b/var/spack/repos/builtin/packages/med/package.py index 5418864c99..b1df37e56f 100644 --- a/var/spack/repos/builtin/packages/med/package.py +++ b/var/spack/repos/builtin/packages/med/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Med(CMakePackage): diff --git a/var/spack/repos/builtin/packages/meep/package.py b/var/spack/repos/builtin/packages/meep/package.py index 62c1d625da..9340a2d83f 100644 --- a/var/spack/repos/builtin/packages/meep/package.py +++ b/var/spack/repos/builtin/packages/meep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Meep(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mefit/package.py b/var/spack/repos/builtin/packages/mefit/package.py index 8de4cb08fb..e4f76c6977 100644 --- a/var/spack/repos/builtin/packages/mefit/package.py +++ b/var/spack/repos/builtin/packages/mefit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mefit(Package): diff --git a/var/spack/repos/builtin/packages/megadock/package.py b/var/spack/repos/builtin/packages/megadock/package.py index 11ec2ad8e5..46039bdd8e 100644 --- a/var/spack/repos/builtin/packages/megadock/package.py +++ b/var/spack/repos/builtin/packages/megadock/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Megadock(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/megahit/package.py b/var/spack/repos/builtin/packages/megahit/package.py index fd182d1949..50cf031c06 100644 --- a/var/spack/repos/builtin/packages/megahit/package.py +++ b/var/spack/repos/builtin/packages/megahit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Megahit(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/melissa/package.py b/var/spack/repos/builtin/packages/melissa/package.py index 33e5b85eae..2872dcb497 100644 --- a/var/spack/repos/builtin/packages/melissa/package.py +++ b/var/spack/repos/builtin/packages/melissa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Melissa(CMakePackage): diff --git a/var/spack/repos/builtin/packages/memaxes/package.py b/var/spack/repos/builtin/packages/memaxes/package.py index ee569d296c..d366e551a6 100644 --- a/var/spack/repos/builtin/packages/memaxes/package.py +++ b/var/spack/repos/builtin/packages/memaxes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Memaxes(Package): diff --git a/var/spack/repos/builtin/packages/memcached/package.py b/var/spack/repos/builtin/packages/memcached/package.py index 94da7ab09b..45624a85de 100644 --- a/var/spack/repos/builtin/packages/memcached/package.py +++ b/var/spack/repos/builtin/packages/memcached/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Memcached(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/meme/package.py b/var/spack/repos/builtin/packages/meme/package.py index a249334f42..32756fa655 100644 --- a/var/spack/repos/builtin/packages/meme/package.py +++ b/var/spack/repos/builtin/packages/meme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.version import Version diff --git a/var/spack/repos/builtin/packages/memkind/package.py b/var/spack/repos/builtin/packages/memkind/package.py index c2dcf33e28..9475c64a77 100644 --- a/var/spack/repos/builtin/packages/memkind/package.py +++ b/var/spack/repos/builtin/packages/memkind/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Memkind(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/memsurfer/package.py b/var/spack/repos/builtin/packages/memsurfer/package.py index 75f40a859e..058e122d41 100644 --- a/var/spack/repos/builtin/packages/memsurfer/package.py +++ b/var/spack/repos/builtin/packages/memsurfer/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Memsurfer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/memtester/package.py b/var/spack/repos/builtin/packages/memtester/package.py index b40e65ee39..ddfabf9833 100644 --- a/var/spack/repos/builtin/packages/memtester/package.py +++ b/var/spack/repos/builtin/packages/memtester/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Memtester(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/meraculous/package.py b/var/spack/repos/builtin/packages/meraculous/package.py index e20a4f6c3d..14220c4482 100644 --- a/var/spack/repos/builtin/packages/meraculous/package.py +++ b/var/spack/repos/builtin/packages/meraculous/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index b3b87dfda1..5a34ce25c3 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -5,7 +5,7 @@ from llnl.util import tty -from spack import * +from spack.package import * class Mercurial(PythonPackage): diff --git a/var/spack/repos/builtin/packages/mercury/package.py b/var/spack/repos/builtin/packages/mercury/package.py index 4a39ea90f4..aa697d6a66 100644 --- a/var/spack/repos/builtin/packages/mercury/package.py +++ b/var/spack/repos/builtin/packages/mercury/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/mesa-demos/package.py b/var/spack/repos/builtin/packages/mesa-demos/package.py index 419b8b3940..6e6f2cbfc6 100644 --- a/var/spack/repos/builtin/packages/mesa-demos/package.py +++ b/var/spack/repos/builtin/packages/mesa-demos/package.py @@ -2,10 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - import sys -from spack import * +from spack.package import * class MesaDemos(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mesa-glu/package.py b/var/spack/repos/builtin/packages/mesa-glu/package.py index 3baa4300bf..cf51236e73 100644 --- a/var/spack/repos/builtin/packages/mesa-glu/package.py +++ b/var/spack/repos/builtin/packages/mesa-glu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MesaGlu(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 2d10baab56..4d90b55a04 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Mesa(MesonPackage): diff --git a/var/spack/repos/builtin/packages/mesa18/package.py b/var/spack/repos/builtin/packages/mesa18/package.py index b74ba20e35..9848f9659b 100644 --- a/var/spack/repos/builtin/packages/mesa18/package.py +++ b/var/spack/repos/builtin/packages/mesa18/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Mesa18(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/meshkit/package.py b/var/spack/repos/builtin/packages/meshkit/package.py index 5f04d130ef..f6ccfc9123 100644 --- a/var/spack/repos/builtin/packages/meshkit/package.py +++ b/var/spack/repos/builtin/packages/meshkit/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class Meshkit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/meshtool/package.py b/var/spack/repos/builtin/packages/meshtool/package.py index 8d189600e8..79546139a5 100644 --- a/var/spack/repos/builtin/packages/meshtool/package.py +++ b/var/spack/repos/builtin/packages/meshtool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Meshtool(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index 929ec9dad6..0ca37e14e0 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Meson(PythonPackage): diff --git a/var/spack/repos/builtin/packages/mesquite/package.py b/var/spack/repos/builtin/packages/mesquite/package.py index 835104f707..79be319a71 100644 --- a/var/spack/repos/builtin/packages/mesquite/package.py +++ b/var/spack/repos/builtin/packages/mesquite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mesquite(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/metabat/package.py b/var/spack/repos/builtin/packages/metabat/package.py index 1d7082b646..88484431f6 100644 --- a/var/spack/repos/builtin/packages/metabat/package.py +++ b/var/spack/repos/builtin/packages/metabat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/metall/package.py b/var/spack/repos/builtin/packages/metall/package.py index c6423f619d..da71220a76 100644 --- a/var/spack/repos/builtin/packages/metall/package.py +++ b/var/spack/repos/builtin/packages/metall/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/metaphysicl/package.py b/var/spack/repos/builtin/packages/metaphysicl/package.py index 183beab04b..2553877aa1 100644 --- a/var/spack/repos/builtin/packages/metaphysicl/package.py +++ b/var/spack/repos/builtin/packages/metaphysicl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Metaphysicl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index 19cfa379bd..20c972f8df 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -7,7 +7,7 @@ import os import sys -from spack import * +from spack.package import * class Metis(Package): diff --git a/var/spack/repos/builtin/packages/metkit/package.py b/var/spack/repos/builtin/packages/metkit/package.py index 023d304f78..a05abf87e6 100644 --- a/var/spack/repos/builtin/packages/metkit/package.py +++ b/var/spack/repos/builtin/packages/metkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Metkit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index b0c52b72a3..5c2846144a 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -7,7 +7,7 @@ import os import shutil import sys -from spack import * +from spack.package import * class Mfem(Package, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/mg/package.py b/var/spack/repos/builtin/packages/mg/package.py index ef03fc3605..b3abe826e8 100644 --- a/var/spack/repos/builtin/packages/mg/package.py +++ b/var/spack/repos/builtin/packages/mg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mg(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mgis/package.py b/var/spack/repos/builtin/packages/mgis/package.py index f540479b79..214d640df9 100644 --- a/var/spack/repos/builtin/packages/mgis/package.py +++ b/var/spack/repos/builtin/packages/mgis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mgis(CMakePackage): diff --git a/var/spack/repos/builtin/packages/microbiomeutil/package.py b/var/spack/repos/builtin/packages/microbiomeutil/package.py index e886ebdf4f..c7b2985a0f 100644 --- a/var/spack/repos/builtin/packages/microbiomeutil/package.py +++ b/var/spack/repos/builtin/packages/microbiomeutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Microbiomeutil(MakefilePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/microsocks/package.py b/var/spack/repos/builtin/packages/microsocks/package.py index 06ee72959d..f9566716de 100644 --- a/var/spack/repos/builtin/packages/microsocks/package.py +++ b/var/spack/repos/builtin/packages/microsocks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Microsocks(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/migraphx/package.py b/var/spack/repos/builtin/packages/migraphx/package.py index 7fafa98a17..c162472e0f 100644 --- a/var/spack/repos/builtin/packages/migraphx/package.py +++ b/var/spack/repos/builtin/packages/migraphx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Migraphx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/migrate/package.py b/var/spack/repos/builtin/packages/migrate/package.py index 43b0977fc8..3f30d5511e 100644 --- a/var/spack/repos/builtin/packages/migrate/package.py +++ b/var/spack/repos/builtin/packages/migrate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Migrate(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mii/package.py b/var/spack/repos/builtin/packages/mii/package.py index 2e0006de3a..cbb3c4ae95 100644 --- a/var/spack/repos/builtin/packages/mii/package.py +++ b/var/spack/repos/builtin/packages/mii/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mii(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/millepede/package.py b/var/spack/repos/builtin/packages/millepede/package.py index e90f6a0ef4..0b4a7c3a5b 100644 --- a/var/spack/repos/builtin/packages/millepede/package.py +++ b/var/spack/repos/builtin/packages/millepede/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Millepede(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mimalloc/package.py b/var/spack/repos/builtin/packages/mimalloc/package.py index ec30dc4609..cdf921b1f4 100644 --- a/var/spack/repos/builtin/packages/mimalloc/package.py +++ b/var/spack/repos/builtin/packages/mimalloc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mimalloc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/minc-toolkit/package.py b/var/spack/repos/builtin/packages/minc-toolkit/package.py index 5dfc62f193..688e9db1fb 100644 --- a/var/spack/repos/builtin/packages/minc-toolkit/package.py +++ b/var/spack/repos/builtin/packages/minc-toolkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MincToolkit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/minced/package.py b/var/spack/repos/builtin/packages/minced/package.py index 3b273fa46d..a79cb2ee9d 100644 --- a/var/spack/repos/builtin/packages/minced/package.py +++ b/var/spack/repos/builtin/packages/minced/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minced(Package): diff --git a/var/spack/repos/builtin/packages/mindthegap/package.py b/var/spack/repos/builtin/packages/mindthegap/package.py index e2432b2423..34a6fd690c 100644 --- a/var/spack/repos/builtin/packages/mindthegap/package.py +++ b/var/spack/repos/builtin/packages/mindthegap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mindthegap(CMakePackage): diff --git a/var/spack/repos/builtin/packages/miniaero/package.py b/var/spack/repos/builtin/packages/miniaero/package.py index 5db7e87a23..9aecd78279 100644 --- a/var/spack/repos/builtin/packages/miniaero/package.py +++ b/var/spack/repos/builtin/packages/miniaero/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Miniaero(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py index a1791db01f..16303c6cbb 100644 --- a/var/spack/repos/builtin/packages/miniamr/package.py +++ b/var/spack/repos/builtin/packages/miniamr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Miniamr(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/miniapp-ascent/package.py b/var/spack/repos/builtin/packages/miniapp-ascent/package.py index 5d14f9e624..02f9bb3efb 100644 --- a/var/spack/repos/builtin/packages/miniapp-ascent/package.py +++ b/var/spack/repos/builtin/packages/miniapp-ascent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MiniappAscent(Package): diff --git a/var/spack/repos/builtin/packages/miniasm/package.py b/var/spack/repos/builtin/packages/miniasm/package.py index e9f0058e66..c5c38b53b0 100644 --- a/var/spack/repos/builtin/packages/miniasm/package.py +++ b/var/spack/repos/builtin/packages/miniasm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Miniasm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index c0ae417229..4f17d84986 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -5,7 +5,7 @@ from os.path import split -from spack import * +from spack.package import * from spack.util.environment import EnvironmentModifications diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index 63900b4ee9..dee3581975 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -6,7 +6,7 @@ import platform from os.path import split -from spack import * +from spack.package import * from spack.util.environment import EnvironmentModifications _versions = { diff --git a/var/spack/repos/builtin/packages/minife/package.py b/var/spack/repos/builtin/packages/minife/package.py index 5537456378..22ec325320 100644 --- a/var/spack/repos/builtin/packages/minife/package.py +++ b/var/spack/repos/builtin/packages/minife/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minife(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/miniforge3/package.py b/var/spack/repos/builtin/packages/miniforge3/package.py index 2e4d8fd314..45d43e44eb 100644 --- a/var/spack/repos/builtin/packages/miniforge3/package.py +++ b/var/spack/repos/builtin/packages/miniforge3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Miniforge3(Package): diff --git a/var/spack/repos/builtin/packages/minigan/package.py b/var/spack/repos/builtin/packages/minigan/package.py index c41f7a75bf..35554849b0 100644 --- a/var/spack/repos/builtin/packages/minigan/package.py +++ b/var/spack/repos/builtin/packages/minigan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minigan(Package): diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 081a08c84b..c8e0ee52e3 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -6,7 +6,7 @@ import tarfile -from spack import * +from spack.package import * class Minighost(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/minigmg/package.py b/var/spack/repos/builtin/packages/minigmg/package.py index 8bf54c52aa..ebcb0857f0 100644 --- a/var/spack/repos/builtin/packages/minigmg/package.py +++ b/var/spack/repos/builtin/packages/minigmg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Minigmg(Package): """miniGMG is a compact benchmark for understanding the performance challenges associated with geometric multigrid solvers diff --git a/var/spack/repos/builtin/packages/minimap2/package.py b/var/spack/repos/builtin/packages/minimap2/package.py index 4d07b6f09a..1168c74611 100644 --- a/var/spack/repos/builtin/packages/minimap2/package.py +++ b/var/spack/repos/builtin/packages/minimap2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minimap2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/minimd/package.py b/var/spack/repos/builtin/packages/minimd/package.py index c6ebb46e73..d5cc6f9612 100644 --- a/var/spack/repos/builtin/packages/minimd/package.py +++ b/var/spack/repos/builtin/packages/minimd/package.py @@ -5,6 +5,8 @@ import tarfile +from spack.package import * + class Minimd(MakefilePackage): """Proxy Application. A simple proxy for the force computations diff --git a/var/spack/repos/builtin/packages/minio/package.py b/var/spack/repos/builtin/packages/minio/package.py index ddaf292478..5b139699ad 100644 --- a/var/spack/repos/builtin/packages/minio/package.py +++ b/var/spack/repos/builtin/packages/minio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minio(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/miniqmc/package.py b/var/spack/repos/builtin/packages/miniqmc/package.py index a0f242c7e7..6dd1d52a6c 100644 --- a/var/spack/repos/builtin/packages/miniqmc/package.py +++ b/var/spack/repos/builtin/packages/miniqmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Miniqmc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/minisign/package.py b/var/spack/repos/builtin/packages/minisign/package.py index 598f717a19..ee3a5cf987 100644 --- a/var/spack/repos/builtin/packages/minisign/package.py +++ b/var/spack/repos/builtin/packages/minisign/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minisign(CMakePackage): diff --git a/var/spack/repos/builtin/packages/minismac2d/package.py b/var/spack/repos/builtin/packages/minismac2d/package.py index e1b5c941ab..13d91ac3cd 100644 --- a/var/spack/repos/builtin/packages/minismac2d/package.py +++ b/var/spack/repos/builtin/packages/minismac2d/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minismac2d(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/minitri/package.py b/var/spack/repos/builtin/packages/minitri/package.py index 0c71133256..79b97d16ec 100644 --- a/var/spack/repos/builtin/packages/minitri/package.py +++ b/var/spack/repos/builtin/packages/minitri/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minitri(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/minivite/package.py b/var/spack/repos/builtin/packages/minivite/package.py index abde033124..343a5b50ee 100644 --- a/var/spack/repos/builtin/packages/minivite/package.py +++ b/var/spack/repos/builtin/packages/minivite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minivite(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/minixyce/package.py b/var/spack/repos/builtin/packages/minixyce/package.py index 1d7691624c..d4b8f1d63f 100644 --- a/var/spack/repos/builtin/packages/minixyce/package.py +++ b/var/spack/repos/builtin/packages/minixyce/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minixyce(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/minizip/package.py b/var/spack/repos/builtin/packages/minizip/package.py index 589431a989..8606b5b95b 100644 --- a/var/spack/repos/builtin/packages/minizip/package.py +++ b/var/spack/repos/builtin/packages/minizip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minizip(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/minuit/package.py b/var/spack/repos/builtin/packages/minuit/package.py index 2a68c69026..b4a2265821 100644 --- a/var/spack/repos/builtin/packages/minuit/package.py +++ b/var/spack/repos/builtin/packages/minuit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Minuit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index a4103add50..cdf9f8a6d6 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/miopen-opencl/package.py b/var/spack/repos/builtin/packages/miopen-opencl/package.py index b7453ead9b..274ff68554 100644 --- a/var/spack/repos/builtin/packages/miopen-opencl/package.py +++ b/var/spack/repos/builtin/packages/miopen-opencl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/miopen-tensile/package.py b/var/spack/repos/builtin/packages/miopen-tensile/package.py index 64a72061f9..3a374e2856 100644 --- a/var/spack/repos/builtin/packages/miopen-tensile/package.py +++ b/var/spack/repos/builtin/packages/miopen-tensile/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MiopenTensile(CMakePackage): diff --git a/var/spack/repos/builtin/packages/miopengemm/package.py b/var/spack/repos/builtin/packages/miopengemm/package.py index 7432dd4e41..9764fbc73f 100644 --- a/var/spack/repos/builtin/packages/miopengemm/package.py +++ b/var/spack/repos/builtin/packages/miopengemm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Miopengemm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mira/package.py b/var/spack/repos/builtin/packages/mira/package.py index ebc2ca45e7..486fe7ad97 100644 --- a/var/spack/repos/builtin/packages/mira/package.py +++ b/var/spack/repos/builtin/packages/mira/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/miranda/package.py b/var/spack/repos/builtin/packages/miranda/package.py index 2fccb9060c..2fa5add08a 100644 --- a/var/spack/repos/builtin/packages/miranda/package.py +++ b/var/spack/repos/builtin/packages/miranda/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Miranda(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mirdeep2/package.py b/var/spack/repos/builtin/packages/mirdeep2/package.py index 23506e375d..e080d7815b 100644 --- a/var/spack/repos/builtin/packages/mirdeep2/package.py +++ b/var/spack/repos/builtin/packages/mirdeep2/package.py @@ -6,7 +6,7 @@ import glob from os import chmod -from spack import * +from spack.package import * class Mirdeep2(Package): diff --git a/var/spack/repos/builtin/packages/mitofates/package.py b/var/spack/repos/builtin/packages/mitofates/package.py index 705be2d408..1b39ce62f7 100644 --- a/var/spack/repos/builtin/packages/mitofates/package.py +++ b/var/spack/repos/builtin/packages/mitofates/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * class Mitofates(Package): diff --git a/var/spack/repos/builtin/packages/mitos/package.py b/var/spack/repos/builtin/packages/mitos/package.py index bc59240fb9..57bbb0e6a8 100644 --- a/var/spack/repos/builtin/packages/mitos/package.py +++ b/var/spack/repos/builtin/packages/mitos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mitos(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py index 0207e39a64..3d34cba894 100644 --- a/var/spack/repos/builtin/packages/mivisionx/package.py +++ b/var/spack/repos/builtin/packages/mivisionx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mivisionx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mixcr/package.py b/var/spack/repos/builtin/packages/mixcr/package.py index 89e60e70e0..fe591db1d4 100644 --- a/var/spack/repos/builtin/packages/mixcr/package.py +++ b/var/spack/repos/builtin/packages/mixcr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mixcr(Package): diff --git a/var/spack/repos/builtin/packages/mkfontdir/package.py b/var/spack/repos/builtin/packages/mkfontdir/package.py index f98a962f0a..411f108fb0 100644 --- a/var/spack/repos/builtin/packages/mkfontdir/package.py +++ b/var/spack/repos/builtin/packages/mkfontdir/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mkfontdir(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/mkfontscale/package.py b/var/spack/repos/builtin/packages/mkfontscale/package.py index b2ab4c497f..da3f324ecd 100644 --- a/var/spack/repos/builtin/packages/mkfontscale/package.py +++ b/var/spack/repos/builtin/packages/mkfontscale/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mkfontscale(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/mlhka/package.py b/var/spack/repos/builtin/packages/mlhka/package.py index 22b28b9872..e31a71da48 100644 --- a/var/spack/repos/builtin/packages/mlhka/package.py +++ b/var/spack/repos/builtin/packages/mlhka/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mlhka(Package): diff --git a/var/spack/repos/builtin/packages/mlirmiopen/package.py b/var/spack/repos/builtin/packages/mlirmiopen/package.py index 78eec1ebd5..9121ff9c8f 100644 --- a/var/spack/repos/builtin/packages/mlirmiopen/package.py +++ b/var/spack/repos/builtin/packages/mlirmiopen/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mlirmiopen(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mlocate/package.py b/var/spack/repos/builtin/packages/mlocate/package.py index 5f1454c437..18751b2141 100644 --- a/var/spack/repos/builtin/packages/mlocate/package.py +++ b/var/spack/repos/builtin/packages/mlocate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mlocate(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mlperf-deepcam/package.py b/var/spack/repos/builtin/packages/mlperf-deepcam/package.py index 1d27399195..ca0dec9324 100644 --- a/var/spack/repos/builtin/packages/mlperf-deepcam/package.py +++ b/var/spack/repos/builtin/packages/mlperf-deepcam/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MlperfDeepcam(Package, CudaPackage): diff --git a/var/spack/repos/builtin/packages/mmg/package.py b/var/spack/repos/builtin/packages/mmg/package.py index 55744c3452..32df11c461 100644 --- a/var/spack/repos/builtin/packages/mmg/package.py +++ b/var/spack/repos/builtin/packages/mmg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mmg(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mmv/package.py b/var/spack/repos/builtin/packages/mmv/package.py index 97b3f6a8d1..30b628b26e 100644 --- a/var/spack/repos/builtin/packages/mmv/package.py +++ b/var/spack/repos/builtin/packages/mmv/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Mmv(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py index aeb890ce04..4e3b9ca2c0 100644 --- a/var/spack/repos/builtin/packages/moab/package.py +++ b/var/spack/repos/builtin/packages/moab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Moab(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mochi-margo/package.py b/var/spack/repos/builtin/packages/mochi-margo/package.py index 4539296911..98c874c8b5 100644 --- a/var/spack/repos/builtin/packages/mochi-margo/package.py +++ b/var/spack/repos/builtin/packages/mochi-margo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MochiMargo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mochi-thallium/package.py b/var/spack/repos/builtin/packages/mochi-thallium/package.py index 720573c37a..0db85ce456 100644 --- a/var/spack/repos/builtin/packages/mochi-thallium/package.py +++ b/var/spack/repos/builtin/packages/mochi-thallium/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MochiThallium(CMakePackage): diff --git a/var/spack/repos/builtin/packages/model-traits/package.py b/var/spack/repos/builtin/packages/model-traits/package.py index b642204e3c..2755be13d4 100644 --- a/var/spack/repos/builtin/packages/model-traits/package.py +++ b/var/spack/repos/builtin/packages/model-traits/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ModelTraits(CMakePackage): diff --git a/var/spack/repos/builtin/packages/modeltest-ng/package.py b/var/spack/repos/builtin/packages/modeltest-ng/package.py index c75d12d8a5..e7566dfd08 100644 --- a/var/spack/repos/builtin/packages/modeltest-ng/package.py +++ b/var/spack/repos/builtin/packages/modeltest-ng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ModeltestNg(CMakePackage): diff --git a/var/spack/repos/builtin/packages/modern-wheel/package.py b/var/spack/repos/builtin/packages/modern-wheel/package.py index 9699b63c19..625a2a8ccf 100644 --- a/var/spack/repos/builtin/packages/modern-wheel/package.py +++ b/var/spack/repos/builtin/packages/modern-wheel/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class ModernWheel(CMakePackage): diff --git a/var/spack/repos/builtin/packages/modylas/package.py b/var/spack/repos/builtin/packages/modylas/package.py index 4a794497a6..c83c4617ea 100644 --- a/var/spack/repos/builtin/packages/modylas/package.py +++ b/var/spack/repos/builtin/packages/modylas/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Modylas(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mofem-cephas/package.py b/var/spack/repos/builtin/packages/mofem-cephas/package.py index 53324b902e..adbc27f63c 100644 --- a/var/spack/repos/builtin/packages/mofem-cephas/package.py +++ b/var/spack/repos/builtin/packages/mofem-cephas/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py index 5d121d3fda..403d2f5283 100644 --- a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py +++ b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MofemFractureModule(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py index ec498e6287..93070cd81f 100644 --- a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py +++ b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MofemMinimalSurfaceEquation(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mofem-users-modules/package.py b/var/spack/repos/builtin/packages/mofem-users-modules/package.py index 0081d7c080..a0ef1eed0d 100644 --- a/var/spack/repos/builtin/packages/mofem-users-modules/package.py +++ b/var/spack/repos/builtin/packages/mofem-users-modules/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MofemUsersModules(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mokutil/package.py b/var/spack/repos/builtin/packages/mokutil/package.py index c61f9fe2d1..f160b3cba8 100644 --- a/var/spack/repos/builtin/packages/mokutil/package.py +++ b/var/spack/repos/builtin/packages/mokutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mokutil(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/molcas/package.py b/var/spack/repos/builtin/packages/molcas/package.py index 4c94a54d30..253225d281 100644 --- a/var/spack/repos/builtin/packages/molcas/package.py +++ b/var/spack/repos/builtin/packages/molcas/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Molcas(CMakePackage): diff --git a/var/spack/repos/builtin/packages/molden/package.py b/var/spack/repos/builtin/packages/molden/package.py index f472f7e8ff..4ba0dedcab 100644 --- a/var/spack/repos/builtin/packages/molden/package.py +++ b/var/spack/repos/builtin/packages/molden/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Molden(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mongo-c-driver/package.py b/var/spack/repos/builtin/packages/mongo-c-driver/package.py index 27a38fe6e6..a8f874fbe0 100644 --- a/var/spack/repos/builtin/packages/mongo-c-driver/package.py +++ b/var/spack/repos/builtin/packages/mongo-c-driver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MongoCDriver(Package): diff --git a/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py b/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py index 348630f1c3..b81fa3f862 100644 --- a/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py +++ b/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MongoCxxDriver(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mongodb-async-driver/package.py b/var/spack/repos/builtin/packages/mongodb-async-driver/package.py index 8d78831548..675da62fe8 100644 --- a/var/spack/repos/builtin/packages/mongodb-async-driver/package.py +++ b/var/spack/repos/builtin/packages/mongodb-async-driver/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class MongodbAsyncDriver(MavenPackage): """The MongoDB Asynchronous Java Driver.""" diff --git a/var/spack/repos/builtin/packages/mono/package.py b/var/spack/repos/builtin/packages/mono/package.py index a16f944d69..af2f7ebe3f 100644 --- a/var/spack/repos/builtin/packages/mono/package.py +++ b/var/spack/repos/builtin/packages/mono/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mono(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/montage/package.py b/var/spack/repos/builtin/packages/montage/package.py index 36f7050f76..9e33f20117 100644 --- a/var/spack/repos/builtin/packages/montage/package.py +++ b/var/spack/repos/builtin/packages/montage/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Montage(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/moosefs/package.py b/var/spack/repos/builtin/packages/moosefs/package.py index abcf43052f..df74c92469 100644 --- a/var/spack/repos/builtin/packages/moosefs/package.py +++ b/var/spack/repos/builtin/packages/moosefs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Moosefs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/moreutils/package.py b/var/spack/repos/builtin/packages/moreutils/package.py index 981312558b..c0f6478f91 100644 --- a/var/spack/repos/builtin/packages/moreutils/package.py +++ b/var/spack/repos/builtin/packages/moreutils/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Moreutils(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mosh/package.py b/var/spack/repos/builtin/packages/mosh/package.py index b4bfa93620..c673084ddb 100644 --- a/var/spack/repos/builtin/packages/mosh/package.py +++ b/var/spack/repos/builtin/packages/mosh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mosh(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mosquitto/package.py b/var/spack/repos/builtin/packages/mosquitto/package.py index da5aeca51b..949b895d1a 100644 --- a/var/spack/repos/builtin/packages/mosquitto/package.py +++ b/var/spack/repos/builtin/packages/mosquitto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mosquitto(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mothur/package.py b/var/spack/repos/builtin/packages/mothur/package.py index 0db8e5f5c3..f9b928a6f2 100644 --- a/var/spack/repos/builtin/packages/mothur/package.py +++ b/var/spack/repos/builtin/packages/mothur/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/motif/package.py b/var/spack/repos/builtin/packages/motif/package.py index 05ed50cffe..861781243f 100644 --- a/var/spack/repos/builtin/packages/motif/package.py +++ b/var/spack/repos/builtin/packages/motif/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Motif(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py index e619734d69..5fad3a1b2a 100644 --- a/var/spack/repos/builtin/packages/motioncor2/package.py +++ b/var/spack/repos/builtin/packages/motioncor2/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Motioncor2(Package): diff --git a/var/spack/repos/builtin/packages/mount-point-attributes/package.py b/var/spack/repos/builtin/packages/mount-point-attributes/package.py index 7d8f28b41d..8069280a5d 100644 --- a/var/spack/repos/builtin/packages/mount-point-attributes/package.py +++ b/var/spack/repos/builtin/packages/mount-point-attributes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MountPointAttributes(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mozjs/package.py b/var/spack/repos/builtin/packages/mozjs/package.py index e8767ac245..d27e49538a 100644 --- a/var/spack/repos/builtin/packages/mozjs/package.py +++ b/var/spack/repos/builtin/packages/mozjs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mozjs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mpark-variant/package.py b/var/spack/repos/builtin/packages/mpark-variant/package.py index de7694adeb..0369bae698 100644 --- a/var/spack/repos/builtin/packages/mpark-variant/package.py +++ b/var/spack/repos/builtin/packages/mpark-variant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MparkVariant(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mpas-model/package.py b/var/spack/repos/builtin/packages/mpas-model/package.py index 7dd9388622..b2da27c678 100644 --- a/var/spack/repos/builtin/packages/mpas-model/package.py +++ b/var/spack/repos/builtin/packages/mpas-model/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MpasModel(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mpc/package.py b/var/spack/repos/builtin/packages/mpc/package.py index 277b1653f6..2b818d666d 100644 --- a/var/spack/repos/builtin/packages/mpc/package.py +++ b/var/spack/repos/builtin/packages/mpc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpc(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/mpdecimal/package.py b/var/spack/repos/builtin/packages/mpdecimal/package.py index bdfbca2d6d..8efb60826f 100644 --- a/var/spack/repos/builtin/packages/mpdecimal/package.py +++ b/var/spack/repos/builtin/packages/mpdecimal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpdecimal(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mpe2/package.py b/var/spack/repos/builtin/packages/mpe2/package.py index 2166a524be..f763a59fde 100644 --- a/var/spack/repos/builtin/packages/mpe2/package.py +++ b/var/spack/repos/builtin/packages/mpe2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpe2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mpest/package.py b/var/spack/repos/builtin/packages/mpest/package.py index 466fada744..5d59ccfe4d 100644 --- a/var/spack/repos/builtin/packages/mpest/package.py +++ b/var/spack/repos/builtin/packages/mpest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpest(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mpfi/package.py b/var/spack/repos/builtin/packages/mpfi/package.py index 7b0c7c1f31..d3fd0c70fd 100644 --- a/var/spack/repos/builtin/packages/mpfi/package.py +++ b/var/spack/repos/builtin/packages/mpfi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpfi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py index 7b1b4259f8..84fd0e5690 100644 --- a/var/spack/repos/builtin/packages/mpfr/package.py +++ b/var/spack/repos/builtin/packages/mpfr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpfr(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/mpi-bash/package.py b/var/spack/repos/builtin/packages/mpi-bash/package.py index 7bf3fab783..fabcb24bf8 100644 --- a/var/spack/repos/builtin/packages/mpi-bash/package.py +++ b/var/spack/repos/builtin/packages/mpi-bash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MpiBash(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mpi/package.py b/var/spack/repos/builtin/packages/mpi/package.py index 078855457a..0183b5c16a 100644 --- a/var/spack/repos/builtin/packages/mpi/package.py +++ b/var/spack/repos/builtin/packages/mpi/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Mpi(Package): """Virtual package for the Message Passing Interface.""" diff --git a/var/spack/repos/builtin/packages/mpibind/package.py b/var/spack/repos/builtin/packages/mpibind/package.py index 1f96798aff..4bdc8b7592 100644 --- a/var/spack/repos/builtin/packages/mpibind/package.py +++ b/var/spack/repos/builtin/packages/mpibind/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Mpibind(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 25205b0cf6..0cedbd218b 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -7,7 +7,7 @@ import os import re import sys -from spack import * +from spack.package import * class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index fbe3385db1..3abff34432 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpifileutils(Package): diff --git a/var/spack/repos/builtin/packages/mpilander/package.py b/var/spack/repos/builtin/packages/mpilander/package.py index 8a0cf46c25..10d71ca72f 100644 --- a/var/spack/repos/builtin/packages/mpilander/package.py +++ b/var/spack/repos/builtin/packages/mpilander/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpilander(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mpileaks/package.py b/var/spack/repos/builtin/packages/mpileaks/package.py index 1aa45cfd8f..ce0081fc7f 100644 --- a/var/spack/repos/builtin/packages/mpileaks/package.py +++ b/var/spack/repos/builtin/packages/mpileaks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpileaks(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mpip/package.py b/var/spack/repos/builtin/packages/mpip/package.py index a50bbe6c5d..0ee8734cf3 100644 --- a/var/spack/repos/builtin/packages/mpip/package.py +++ b/var/spack/repos/builtin/packages/mpip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpip(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mpir/package.py b/var/spack/repos/builtin/packages/mpir/package.py index 0254879e26..a92929ee9e 100644 --- a/var/spack/repos/builtin/packages/mpir/package.py +++ b/var/spack/repos/builtin/packages/mpir/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpir(Package): diff --git a/var/spack/repos/builtin/packages/mpitrampoline/package.py b/var/spack/repos/builtin/packages/mpitrampoline/package.py index e2a74e6657..68cae46e81 100644 --- a/var/spack/repos/builtin/packages/mpitrampoline/package.py +++ b/var/spack/repos/builtin/packages/mpitrampoline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpitrampoline(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mpiwrapper/package.py b/var/spack/repos/builtin/packages/mpiwrapper/package.py index 2cfb9c2e81..f4c8c7a714 100644 --- a/var/spack/repos/builtin/packages/mpiwrapper/package.py +++ b/var/spack/repos/builtin/packages/mpiwrapper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpiwrapper(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py index ccc671093e..7b4e51b284 100644 --- a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py +++ b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MpixLaunchSwift(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mpl/package.py b/var/spack/repos/builtin/packages/mpl/package.py index 1bda089f7d..f502f7ff93 100644 --- a/var/spack/repos/builtin/packages/mpl/package.py +++ b/var/spack/repos/builtin/packages/mpl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mpt/package.py b/var/spack/repos/builtin/packages/mpt/package.py index ebae9635a4..4f83ec42ff 100644 --- a/var/spack/repos/builtin/packages/mpt/package.py +++ b/var/spack/repos/builtin/packages/mpt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mpt(BundlePackage): diff --git a/var/spack/repos/builtin/packages/mptensor/package.py b/var/spack/repos/builtin/packages/mptensor/package.py index 68cd899287..7ee6eed7df 100644 --- a/var/spack/repos/builtin/packages/mptensor/package.py +++ b/var/spack/repos/builtin/packages/mptensor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mptensor(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mrbayes/package.py b/var/spack/repos/builtin/packages/mrbayes/package.py index 1011fc0d6b..0c699c7300 100644 --- a/var/spack/repos/builtin/packages/mrbayes/package.py +++ b/var/spack/repos/builtin/packages/mrbayes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mrbayes(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mrbench/package.py b/var/spack/repos/builtin/packages/mrbench/package.py index b27293b6d4..baa7da5cac 100644 --- a/var/spack/repos/builtin/packages/mrbench/package.py +++ b/var/spack/repos/builtin/packages/mrbench/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Mrbench(MavenPackage): """A simple Java tool for SMTP server benchmarking.""" diff --git a/var/spack/repos/builtin/packages/mrchem/package.py b/var/spack/repos/builtin/packages/mrchem/package.py index ef1b465e05..64fcfbee34 100644 --- a/var/spack/repos/builtin/packages/mrchem/package.py +++ b/var/spack/repos/builtin/packages/mrchem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mrchem(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mrcpp/package.py b/var/spack/repos/builtin/packages/mrcpp/package.py index 5aab962062..aa36c9eb28 100644 --- a/var/spack/repos/builtin/packages/mrcpp/package.py +++ b/var/spack/repos/builtin/packages/mrcpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mrcpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py index d5a7461419..99da3f1a11 100644 --- a/var/spack/repos/builtin/packages/mrnet/package.py +++ b/var/spack/repos/builtin/packages/mrnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py index 3cd19513c7..194e9163d9 100644 --- a/var/spack/repos/builtin/packages/mrtrix3/package.py +++ b/var/spack/repos/builtin/packages/mrtrix3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mrtrix3(Package): diff --git a/var/spack/repos/builtin/packages/mscgen/package.py b/var/spack/repos/builtin/packages/mscgen/package.py index 37d00af271..63b1e4dd1a 100644 --- a/var/spack/repos/builtin/packages/mscgen/package.py +++ b/var/spack/repos/builtin/packages/mscgen/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mscgen(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index 7cb807b618..24ff12e201 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MsgpackC(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mshadow/package.py b/var/spack/repos/builtin/packages/mshadow/package.py index 3cdc59f491..d7e5f025cf 100644 --- a/var/spack/repos/builtin/packages/mshadow/package.py +++ b/var/spack/repos/builtin/packages/mshadow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mshadow(Package): diff --git a/var/spack/repos/builtin/packages/msmc/package.py b/var/spack/repos/builtin/packages/msmc/package.py index b0eabbe554..e9573835b3 100644 --- a/var/spack/repos/builtin/packages/msmc/package.py +++ b/var/spack/repos/builtin/packages/msmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Msmc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/msmc2/package.py b/var/spack/repos/builtin/packages/msmc2/package.py index cc926b7c82..3d387a4254 100644 --- a/var/spack/repos/builtin/packages/msmc2/package.py +++ b/var/spack/repos/builtin/packages/msmc2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Msmc2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/mstk/package.py b/var/spack/repos/builtin/packages/mstk/package.py index 0a9669c70a..a2a7e8a9e9 100644 --- a/var/spack/repos/builtin/packages/mstk/package.py +++ b/var/spack/repos/builtin/packages/mstk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mstk(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mt-metis/package.py b/var/spack/repos/builtin/packages/mt-metis/package.py index 273310992e..5b2fb04497 100644 --- a/var/spack/repos/builtin/packages/mt-metis/package.py +++ b/var/spack/repos/builtin/packages/mt-metis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class MtMetis(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mujoco/package.py b/var/spack/repos/builtin/packages/mujoco/package.py index 2dba8bf7f9..0608cedb10 100644 --- a/var/spack/repos/builtin/packages/mujoco/package.py +++ b/var/spack/repos/builtin/packages/mujoco/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * class Mujoco(Package): diff --git a/var/spack/repos/builtin/packages/multitail/package.py b/var/spack/repos/builtin/packages/multitail/package.py index 898d1c0ba4..262a36ed04 100644 --- a/var/spack/repos/builtin/packages/multitail/package.py +++ b/var/spack/repos/builtin/packages/multitail/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Multitail(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/multitime/package.py b/var/spack/repos/builtin/packages/multitime/package.py index 037fecf7f2..d78a3064ff 100644 --- a/var/spack/repos/builtin/packages/multitime/package.py +++ b/var/spack/repos/builtin/packages/multitime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Multitime(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/multiverso/package.py b/var/spack/repos/builtin/packages/multiverso/package.py index 4d76df77f5..50ab9926a6 100644 --- a/var/spack/repos/builtin/packages/multiverso/package.py +++ b/var/spack/repos/builtin/packages/multiverso/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Multiverso(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mumax/package.py b/var/spack/repos/builtin/packages/mumax/package.py index 3638a30cb3..b80d1ff25e 100644 --- a/var/spack/repos/builtin/packages/mumax/package.py +++ b/var/spack/repos/builtin/packages/mumax/package.py @@ -6,7 +6,7 @@ import os import shutil -from spack import * +from spack.package import * class Mumax(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/mummer/package.py b/var/spack/repos/builtin/packages/mummer/package.py index 0c7b3b9e9c..d7a744975b 100644 --- a/var/spack/repos/builtin/packages/mummer/package.py +++ b/var/spack/repos/builtin/packages/mummer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mummer(Package): diff --git a/var/spack/repos/builtin/packages/mummer4/package.py b/var/spack/repos/builtin/packages/mummer4/package.py index e3464374c6..b1c0a1490d 100644 --- a/var/spack/repos/builtin/packages/mummer4/package.py +++ b/var/spack/repos/builtin/packages/mummer4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mummer4(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index 5ca8e59c8c..90a18c8502 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -7,6 +7,8 @@ import glob import os import sys +from spack.package import * + class Mumps(Package): """MUMPS: a MUltifrontal Massively Parallel sparse direct Solver""" diff --git a/var/spack/repos/builtin/packages/munge/package.py b/var/spack/repos/builtin/packages/munge/package.py index 6777f76211..cc2f08fb57 100644 --- a/var/spack/repos/builtin/packages/munge/package.py +++ b/var/spack/repos/builtin/packages/munge/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Munge(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/muparser/package.py b/var/spack/repos/builtin/packages/muparser/package.py index 0e181859b3..f2a938cc61 100644 --- a/var/spack/repos/builtin/packages/muparser/package.py +++ b/var/spack/repos/builtin/packages/muparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Muparser(Package): diff --git a/var/spack/repos/builtin/packages/muparserx/package.py b/var/spack/repos/builtin/packages/muparserx/package.py index 41063d72a5..aa36dfb914 100644 --- a/var/spack/repos/builtin/packages/muparserx/package.py +++ b/var/spack/repos/builtin/packages/muparserx/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Muparserx(CMakePackage): """A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more. """ diff --git a/var/spack/repos/builtin/packages/muscle/package.py b/var/spack/repos/builtin/packages/muscle/package.py index 42e674f3ba..9959886c6e 100644 --- a/var/spack/repos/builtin/packages/muscle/package.py +++ b/var/spack/repos/builtin/packages/muscle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Muscle(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/muse/package.py b/var/spack/repos/builtin/packages/muse/package.py index 70f19bc6da..af9544899f 100644 --- a/var/spack/repos/builtin/packages/muse/package.py +++ b/var/spack/repos/builtin/packages/muse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Muse(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/music/package.py b/var/spack/repos/builtin/packages/music/package.py index e483d279b9..7f03830f87 100644 --- a/var/spack/repos/builtin/packages/music/package.py +++ b/var/spack/repos/builtin/packages/music/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Music(CMakePackage): diff --git a/var/spack/repos/builtin/packages/musl/package.py b/var/spack/repos/builtin/packages/musl/package.py index f5312dbb41..0fad147a1b 100644 --- a/var/spack/repos/builtin/packages/musl/package.py +++ b/var/spack/repos/builtin/packages/musl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Musl(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/muster/package.py b/var/spack/repos/builtin/packages/muster/package.py index 20d9c75fac..328ee41522 100644 --- a/var/spack/repos/builtin/packages/muster/package.py +++ b/var/spack/repos/builtin/packages/muster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Muster(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mutationpp/package.py b/var/spack/repos/builtin/packages/mutationpp/package.py index 9756fe059c..9db657892e 100644 --- a/var/spack/repos/builtin/packages/mutationpp/package.py +++ b/var/spack/repos/builtin/packages/mutationpp/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Mutationpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py index 17ab721a79..4e16fb5730 100644 --- a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py +++ b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py @@ -6,6 +6,8 @@ import os.path import sys +from spack.package import * + class Mvapich2Gdr(AutotoolsPackage): """MVAPICH2-GDR is an optimized version of the MVAPICH2 MPI library for diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index deead402c6..3da7094dc2 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -7,6 +7,8 @@ import os.path import re import sys +from spack.package import * + class Mvapich2(AutotoolsPackage): """Mvapich2 is a High-Performance MPI Library for clusters with diverse diff --git a/var/spack/repos/builtin/packages/mvapich2x/package.py b/var/spack/repos/builtin/packages/mvapich2x/package.py index 4e3b65fb01..6bc36c22b9 100644 --- a/var/spack/repos/builtin/packages/mvapich2x/package.py +++ b/var/spack/repos/builtin/packages/mvapich2x/package.py @@ -6,6 +6,8 @@ import os.path import sys +from spack.package import * + class Mvapich2x(AutotoolsPackage): """MVAPICH2-X is the advanced version of the MVAPICH2 MPI library with diff --git a/var/spack/repos/builtin/packages/mxm/package.py b/var/spack/repos/builtin/packages/mxm/package.py index 81ee861989..3d1f874cff 100644 --- a/var/spack/repos/builtin/packages/mxm/package.py +++ b/var/spack/repos/builtin/packages/mxm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mxm(Package): diff --git a/var/spack/repos/builtin/packages/mxml/package.py b/var/spack/repos/builtin/packages/mxml/package.py index 446bef7fd6..608528ee9c 100644 --- a/var/spack/repos/builtin/packages/mxml/package.py +++ b/var/spack/repos/builtin/packages/mxml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mxml(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index e82aba74e2..98e6b0dcec 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mxnet(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/mysql/package.py b/var/spack/repos/builtin/packages/mysql/package.py index d4bac8c467..f040ff7968 100644 --- a/var/spack/repos/builtin/packages/mysql/package.py +++ b/var/spack/repos/builtin/packages/mysql/package.py @@ -6,7 +6,7 @@ import os import tempfile -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/mysqlpp/package.py b/var/spack/repos/builtin/packages/mysqlpp/package.py index a033e82f03..f3004fd9fc 100644 --- a/var/spack/repos/builtin/packages/mysqlpp/package.py +++ b/var/spack/repos/builtin/packages/mysqlpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Mysqlpp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/n2p2/package.py b/var/spack/repos/builtin/packages/n2p2/package.py index 35ee83ac8f..ca4cad2255 100644 --- a/var/spack/repos/builtin/packages/n2p2/package.py +++ b/var/spack/repos/builtin/packages/n2p2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/nacos/package.py b/var/spack/repos/builtin/packages/nacos/package.py index 518bdde915..d86f178457 100644 --- a/var/spack/repos/builtin/packages/nacos/package.py +++ b/var/spack/repos/builtin/packages/nacos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nacos(MavenPackage): diff --git a/var/spack/repos/builtin/packages/nag/package.py b/var/spack/repos/builtin/packages/nag/package.py index f16c9485b1..a8a66bee79 100644 --- a/var/spack/repos/builtin/packages/nag/package.py +++ b/var/spack/repos/builtin/packages/nag/package.py @@ -8,6 +8,7 @@ import re import llnl.util.tty as tty import spack.compiler +from spack.package import * class Nag(Package): diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index 1f503df7c0..a7d2cdbca5 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * def _parse_float(val): diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index 29deb2c23c..bd4baa2c9d 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Nalu(CMakePackage): diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index fa90f049ce..54cc100af0 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -9,7 +9,7 @@ import sys import llnl.util.tty as tty -from spack import * +from spack.package import * class Namd(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/nano/package.py b/var/spack/repos/builtin/packages/nano/package.py index 42e2d8d4ba..db5170b93a 100644 --- a/var/spack/repos/builtin/packages/nano/package.py +++ b/var/spack/repos/builtin/packages/nano/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nano(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nanoflann/package.py b/var/spack/repos/builtin/packages/nanoflann/package.py index 39d61494ea..7e9ef8d0a1 100644 --- a/var/spack/repos/builtin/packages/nanoflann/package.py +++ b/var/spack/repos/builtin/packages/nanoflann/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nanoflann(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nanomsg/package.py b/var/spack/repos/builtin/packages/nanomsg/package.py index 7edede2a5a..97e8b51be2 100644 --- a/var/spack/repos/builtin/packages/nanomsg/package.py +++ b/var/spack/repos/builtin/packages/nanomsg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nanomsg(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nanopb/package.py b/var/spack/repos/builtin/packages/nanopb/package.py index f68a86805a..3ebacc7314 100644 --- a/var/spack/repos/builtin/packages/nanopb/package.py +++ b/var/spack/repos/builtin/packages/nanopb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nanopb(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nasm/package.py b/var/spack/repos/builtin/packages/nasm/package.py index e56fc2661b..e34403ce64 100644 --- a/var/spack/repos/builtin/packages/nasm/package.py +++ b/var/spack/repos/builtin/packages/nasm/package.py @@ -5,7 +5,7 @@ import glob import os -from spack import * +from spack.package import * class Nasm(Package): diff --git a/var/spack/repos/builtin/packages/nauty/package.py b/var/spack/repos/builtin/packages/nauty/package.py index 9c65f08f50..a5ee493443 100644 --- a/var/spack/repos/builtin/packages/nauty/package.py +++ b/var/spack/repos/builtin/packages/nauty/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class Nauty(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nbdkit/package.py b/var/spack/repos/builtin/packages/nbdkit/package.py index 5d4b7740fe..6d0a152b3c 100644 --- a/var/spack/repos/builtin/packages/nbdkit/package.py +++ b/var/spack/repos/builtin/packages/nbdkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nbdkit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ncbi-magicblast/package.py b/var/spack/repos/builtin/packages/ncbi-magicblast/package.py index 5530b8e5b7..798e6d28ad 100644 --- a/var/spack/repos/builtin/packages/ncbi-magicblast/package.py +++ b/var/spack/repos/builtin/packages/ncbi-magicblast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NcbiMagicblast(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py b/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py index 567bfb3c5b..78bc70bad6 100644 --- a/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py +++ b/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NcbiRmblastn(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py index 99322b683b..ab53332331 100644 --- a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py +++ b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py @@ -5,7 +5,7 @@ from glob import glob -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/nccl-tests/package.py b/var/spack/repos/builtin/packages/nccl-tests/package.py index a73284c897..bdd54a5cad 100644 --- a/var/spack/repos/builtin/packages/nccl-tests/package.py +++ b/var/spack/repos/builtin/packages/nccl-tests/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class NcclTests(MakefilePackage, CudaPackage): """These tests check both the performance and the correctness of NCCL operations.""" diff --git a/var/spack/repos/builtin/packages/nccl/package.py b/var/spack/repos/builtin/packages/nccl/package.py index e159755385..3c37311fa1 100644 --- a/var/spack/repos/builtin/packages/nccl/package.py +++ b/var/spack/repos/builtin/packages/nccl/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Nccl(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/nccmp/package.py b/var/spack/repos/builtin/packages/nccmp/package.py index 5f736647e9..b8902ba38f 100644 --- a/var/spack/repos/builtin/packages/nccmp/package.py +++ b/var/spack/repos/builtin/packages/nccmp/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nccmp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ncdu/package.py b/var/spack/repos/builtin/packages/ncdu/package.py index 859b2da3c6..491f814a24 100644 --- a/var/spack/repos/builtin/packages/ncdu/package.py +++ b/var/spack/repos/builtin/packages/ncdu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ncdu(Package): diff --git a/var/spack/repos/builtin/packages/ncftp/package.py b/var/spack/repos/builtin/packages/ncftp/package.py index 9be8ea9359..a8da52b86c 100644 --- a/var/spack/repos/builtin/packages/ncftp/package.py +++ b/var/spack/repos/builtin/packages/ncftp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ncftp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ncio/package.py b/var/spack/repos/builtin/packages/ncio/package.py index 3214323cd9..4c58b41c31 100644 --- a/var/spack/repos/builtin/packages/ncio/package.py +++ b/var/spack/repos/builtin/packages/ncio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ncio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 19a0631e17..78d5a4a9a9 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -7,7 +7,7 @@ import glob import os import tempfile -from spack import * +from spack.package import * class Ncl(Package): diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py index 0af1aa5b36..0d2489853b 100644 --- a/var/spack/repos/builtin/packages/nco/package.py +++ b/var/spack/repos/builtin/packages/nco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nco(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ncompress/package.py b/var/spack/repos/builtin/packages/ncompress/package.py index a59c4a2c87..634f01c46b 100644 --- a/var/spack/repos/builtin/packages/ncompress/package.py +++ b/var/spack/repos/builtin/packages/ncompress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ncompress(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index b160effabc..3133ea1fb2 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Ncurses(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/ncview/package.py b/var/spack/repos/builtin/packages/ncview/package.py index fcb81cddff..dcaa915e66 100644 --- a/var/spack/repos/builtin/packages/ncview/package.py +++ b/var/spack/repos/builtin/packages/ncview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ncview(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ndiff/package.py b/var/spack/repos/builtin/packages/ndiff/package.py index 07c9074f51..4ac2711a61 100644 --- a/var/spack/repos/builtin/packages/ndiff/package.py +++ b/var/spack/repos/builtin/packages/ndiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ndiff(Package): diff --git a/var/spack/repos/builtin/packages/neartree/package.py b/var/spack/repos/builtin/packages/neartree/package.py index aaffdad10b..96a0fc7adc 100644 --- a/var/spack/repos/builtin/packages/neartree/package.py +++ b/var/spack/repos/builtin/packages/neartree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Neartree(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index bd0c3fb7d4..47576f6c30 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -6,7 +6,7 @@ import os from shutil import copyfile -from spack import * +from spack.package import * class Nek5000(Package): diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index 8732a28a63..f87dfa76e8 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nekbone(Package): diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py index aa83cffc1f..d349d7958c 100644 --- a/var/spack/repos/builtin/packages/nekcem/package.py +++ b/var/spack/repos/builtin/packages/nekcem/package.py @@ -6,7 +6,7 @@ import json import os -from spack import * +from spack.package import * class Nekcem(Package): diff --git a/var/spack/repos/builtin/packages/neko/package.py b/var/spack/repos/builtin/packages/neko/package.py index 6dd17805e9..fdbc103278 100644 --- a/var/spack/repos/builtin/packages/neko/package.py +++ b/var/spack/repos/builtin/packages/neko/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Neko(AutotoolsPackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/nekrs/package.py b/var/spack/repos/builtin/packages/nekrs/package.py index 0db6378d99..e390945813 100644 --- a/var/spack/repos/builtin/packages/nekrs/package.py +++ b/var/spack/repos/builtin/packages/nekrs/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Nekrs(Package, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/nektar/package.py b/var/spack/repos/builtin/packages/nektar/package.py index 9e6bdfc0d9..c9941378ad 100644 --- a/var/spack/repos/builtin/packages/nektar/package.py +++ b/var/spack/repos/builtin/packages/nektar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nektar(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nektools/package.py b/var/spack/repos/builtin/packages/nektools/package.py index fb5857f280..84dc8d1c4c 100644 --- a/var/spack/repos/builtin/packages/nektools/package.py +++ b/var/spack/repos/builtin/packages/nektools/package.py @@ -6,7 +6,7 @@ import numbers import os -from spack import * +from spack.package import * def is_integral(x): diff --git a/var/spack/repos/builtin/packages/nemsio/package.py b/var/spack/repos/builtin/packages/nemsio/package.py index 2a0642cb07..30f0f9bd92 100644 --- a/var/spack/repos/builtin/packages/nemsio/package.py +++ b/var/spack/repos/builtin/packages/nemsio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nemsio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nemsiogfs/package.py b/var/spack/repos/builtin/packages/nemsiogfs/package.py index 2aab6e18e2..9f956df267 100644 --- a/var/spack/repos/builtin/packages/nemsiogfs/package.py +++ b/var/spack/repos/builtin/packages/nemsiogfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nemsiogfs(CMakePackage): diff --git a/var/spack/repos/builtin/packages/neo4j/package.py b/var/spack/repos/builtin/packages/neo4j/package.py index d3fdd7fb84..e8c8200fba 100644 --- a/var/spack/repos/builtin/packages/neo4j/package.py +++ b/var/spack/repos/builtin/packages/neo4j/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Neo4j(MavenPackage): """Neo4j is the world's leading Graph Database. It is a high performance graph store with all the features expected of a mature and robust diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 2e87dc98e9..1b80f1a550 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.pkgkit import * +from spack.package import * class Neovim(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nest/package.py b/var/spack/repos/builtin/packages/nest/package.py index f9101ad993..33f5cb4c4e 100644 --- a/var/spack/repos/builtin/packages/nest/package.py +++ b/var/spack/repos/builtin/packages/nest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nest(CMakePackage): diff --git a/var/spack/repos/builtin/packages/net-snmp/package.py b/var/spack/repos/builtin/packages/net-snmp/package.py index 865df47aae..8c69312c94 100644 --- a/var/spack/repos/builtin/packages/net-snmp/package.py +++ b/var/spack/repos/builtin/packages/net-snmp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NetSnmp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index bd3508ac0b..61f53f40f7 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class NetcdfC(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netcdf-cxx/package.py b/var/spack/repos/builtin/packages/netcdf-cxx/package.py index c683c2829e..a6044c2d81 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NetcdfCxx(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index 012ab9ace2..cdfe7c4547 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class NetcdfCxx4(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py index 9c72bc4acd..2554805875 100644 --- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py +++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py @@ -7,7 +7,7 @@ import glob import os from shutil import Error, copyfile -from spack import * +from spack.package import * class NetcdfFortran(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netdata/package.py b/var/spack/repos/builtin/packages/netdata/package.py index a934714d9c..a8a5b4d9b5 100644 --- a/var/spack/repos/builtin/packages/netdata/package.py +++ b/var/spack/repos/builtin/packages/netdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Netdata(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netgauge/package.py b/var/spack/repos/builtin/packages/netgauge/package.py index f77173d1a3..81aab66479 100644 --- a/var/spack/repos/builtin/packages/netgauge/package.py +++ b/var/spack/repos/builtin/packages/netgauge/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Netgauge(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netgen/package.py b/var/spack/repos/builtin/packages/netgen/package.py index 2fa0d2d53a..8e6ce45ba7 100644 --- a/var/spack/repos/builtin/packages/netgen/package.py +++ b/var/spack/repos/builtin/packages/netgen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Netgen(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netkit-ftp/package.py b/var/spack/repos/builtin/packages/netkit-ftp/package.py index f846c5b86e..012fe14297 100644 --- a/var/spack/repos/builtin/packages/netkit-ftp/package.py +++ b/var/spack/repos/builtin/packages/netkit-ftp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NetkitFtp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 85bf7f3327..c4c7c9d7ad 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NetlibLapack(CMakePackage): diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index 763b75bf99..461108a480 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class ScalapackBase(CMakePackage): diff --git a/var/spack/repos/builtin/packages/netlib-xblas/package.py b/var/spack/repos/builtin/packages/netlib-xblas/package.py index e7ba844aba..8845071ffe 100644 --- a/var/spack/repos/builtin/packages/netlib-xblas/package.py +++ b/var/spack/repos/builtin/packages/netlib-xblas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NetlibXblas(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/netpbm/package.py b/var/spack/repos/builtin/packages/netpbm/package.py index 9381128129..62da24b29a 100644 --- a/var/spack/repos/builtin/packages/netpbm/package.py +++ b/var/spack/repos/builtin/packages/netpbm/package.py @@ -6,7 +6,7 @@ import os from shutil import copyfile -from spack import * +from spack.package import * class Netpbm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/netperf/package.py b/var/spack/repos/builtin/packages/netperf/package.py index 932b327513..d054c1d654 100644 --- a/var/spack/repos/builtin/packages/netperf/package.py +++ b/var/spack/repos/builtin/packages/netperf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Netperf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py index 9ef0924952..797cd6fb78 100644 --- a/var/spack/repos/builtin/packages/nettle/package.py +++ b/var/spack/repos/builtin/packages/nettle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nettle(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index 91d6179fdd..5eb80b593b 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Neuron(CMakePackage): diff --git a/var/spack/repos/builtin/packages/newt/package.py b/var/spack/repos/builtin/packages/newt/package.py index 301b8e3cb4..67eeedf78a 100644 --- a/var/spack/repos/builtin/packages/newt/package.py +++ b/var/spack/repos/builtin/packages/newt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Newt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nextflow/package.py b/var/spack/repos/builtin/packages/nextflow/package.py index 2bc87e346c..f1c52543ca 100644 --- a/var/spack/repos/builtin/packages/nextflow/package.py +++ b/var/spack/repos/builtin/packages/nextflow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nextflow(Package): diff --git a/var/spack/repos/builtin/packages/nfft/package.py b/var/spack/repos/builtin/packages/nfft/package.py index b9a5400849..549b4a5f25 100644 --- a/var/spack/repos/builtin/packages/nfft/package.py +++ b/var/spack/repos/builtin/packages/nfft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nfft(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nfs-ganesha/package.py b/var/spack/repos/builtin/packages/nfs-ganesha/package.py index b919a31c20..9aa3737de4 100644 --- a/var/spack/repos/builtin/packages/nfs-ganesha/package.py +++ b/var/spack/repos/builtin/packages/nfs-ganesha/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NfsGanesha(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nfs-utils/package.py b/var/spack/repos/builtin/packages/nfs-utils/package.py index 4f97e3e0ed..de5bdf6c48 100644 --- a/var/spack/repos/builtin/packages/nfs-utils/package.py +++ b/var/spack/repos/builtin/packages/nfs-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NfsUtils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nghttp2/package.py b/var/spack/repos/builtin/packages/nghttp2/package.py index 02799a95ab..9c3d021ba1 100644 --- a/var/spack/repos/builtin/packages/nghttp2/package.py +++ b/var/spack/repos/builtin/packages/nghttp2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nghttp2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nginx/package.py b/var/spack/repos/builtin/packages/nginx/package.py index e561c5421f..96d8b1330e 100644 --- a/var/spack/repos/builtin/packages/nginx/package.py +++ b/var/spack/repos/builtin/packages/nginx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nginx(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ngmerge/package.py b/var/spack/repos/builtin/packages/ngmerge/package.py index 129a3313e1..9e46599431 100644 --- a/var/spack/repos/builtin/packages/ngmerge/package.py +++ b/var/spack/repos/builtin/packages/ngmerge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ngmerge(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ngmlr/package.py b/var/spack/repos/builtin/packages/ngmlr/package.py index cc2bbeb5bc..1003e1d9ac 100644 --- a/var/spack/repos/builtin/packages/ngmlr/package.py +++ b/var/spack/repos/builtin/packages/ngmlr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ngmlr(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ngspice/package.py b/var/spack/repos/builtin/packages/ngspice/package.py index 6806d212f0..f80a408389 100644 --- a/var/spack/repos/builtin/packages/ngspice/package.py +++ b/var/spack/repos/builtin/packages/ngspice/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ngspice(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nicstat/package.py b/var/spack/repos/builtin/packages/nicstat/package.py index 01b773cd6b..483ac0c34b 100644 --- a/var/spack/repos/builtin/packages/nicstat/package.py +++ b/var/spack/repos/builtin/packages/nicstat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nicstat(MakefilePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/nim/package.py b/var/spack/repos/builtin/packages/nim/package.py index 3d3256375d..003cbf1a45 100644 --- a/var/spack/repos/builtin/packages/nim/package.py +++ b/var/spack/repos/builtin/packages/nim/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os.path +from spack.package import * + class Nim(Package): """Nim is a statically typed compiled systems programming language. diff --git a/var/spack/repos/builtin/packages/ninja-fortran/package.py b/var/spack/repos/builtin/packages/ninja-fortran/package.py index fbb81b3b0c..d01d5c7a6b 100644 --- a/var/spack/repos/builtin/packages/ninja-fortran/package.py +++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NinjaFortran(Package): diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index b242d2eeea..f7f9d0cf57 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import sys +from spack.package import * + class Ninja(Package): """Ninja is a small build system with a focus on speed. It differs from diff --git a/var/spack/repos/builtin/packages/nix/package.py b/var/spack/repos/builtin/packages/nix/package.py index 6b8fbabc0f..4ab6582334 100644 --- a/var/spack/repos/builtin/packages/nix/package.py +++ b/var/spack/repos/builtin/packages/nix/package.py @@ -7,7 +7,7 @@ import os import stat import tempfile -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/njet/package.py b/var/spack/repos/builtin/packages/njet/package.py index b297e5e3d1..cefa09a62d 100644 --- a/var/spack/repos/builtin/packages/njet/package.py +++ b/var/spack/repos/builtin/packages/njet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Njet(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nlcglib/package.py b/var/spack/repos/builtin/packages/nlcglib/package.py index 4aaffccdf4..f74eded0e7 100644 --- a/var/spack/repos/builtin/packages/nlcglib/package.py +++ b/var/spack/repos/builtin/packages/nlcglib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nlcglib(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/nlohmann-json-schema-validator/package.py b/var/spack/repos/builtin/packages/nlohmann-json-schema-validator/package.py index 6aa9ff3abf..de86c693af 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json-schema-validator/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json-schema-validator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NlohmannJsonSchemaValidator(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nlohmann-json/package.py b/var/spack/repos/builtin/packages/nlohmann-json/package.py index a6ab1d0b12..96d1b5e1af 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NlohmannJson(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py index 629f82fe82..97dc7acd9a 100644 --- a/var/spack/repos/builtin/packages/nlopt/package.py +++ b/var/spack/repos/builtin/packages/nlopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nlopt(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nmap/package.py b/var/spack/repos/builtin/packages/nmap/package.py index 11286efbbf..34dbff0575 100644 --- a/var/spack/repos/builtin/packages/nmap/package.py +++ b/var/spack/repos/builtin/packages/nmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nmap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nn-c/package.py b/var/spack/repos/builtin/packages/nn-c/package.py index 87471c714a..0fefff9957 100644 --- a/var/spack/repos/builtin/packages/nn-c/package.py +++ b/var/spack/repos/builtin/packages/nn-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NnC(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nnpack/package.py b/var/spack/repos/builtin/packages/nnpack/package.py index 9a0d1c7b88..1475c580d4 100644 --- a/var/spack/repos/builtin/packages/nnpack/package.py +++ b/var/spack/repos/builtin/packages/nnpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nnpack(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nnvm/package.py b/var/spack/repos/builtin/packages/nnvm/package.py index 02c2ff61f9..f42a2a3e26 100644 --- a/var/spack/repos/builtin/packages/nnvm/package.py +++ b/var/spack/repos/builtin/packages/nnvm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nnvm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index b0e8d61d99..cebb18a621 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -6,7 +6,7 @@ import subprocess import sys -from spack import * +from spack.package import * class NodeJs(Package): diff --git a/var/spack/repos/builtin/packages/notmuch/package.py b/var/spack/repos/builtin/packages/notmuch/package.py index d7032a26e7..74f0400150 100644 --- a/var/spack/repos/builtin/packages/notmuch/package.py +++ b/var/spack/repos/builtin/packages/notmuch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Notmuch(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/npb/package.py b/var/spack/repos/builtin/packages/npb/package.py index 473d59dcb2..6ac90b2f3a 100644 --- a/var/spack/repos/builtin/packages/npb/package.py +++ b/var/spack/repos/builtin/packages/npb/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import numbers -from spack import * +from spack.package import * def is_integral(x): diff --git a/var/spack/repos/builtin/packages/npm/package.py b/var/spack/repos/builtin/packages/npm/package.py index 5de8067164..e5532fd1d3 100644 --- a/var/spack/repos/builtin/packages/npm/package.py +++ b/var/spack/repos/builtin/packages/npm/package.py @@ -6,7 +6,7 @@ import os import shutil -from spack import * +from spack.package import * # NOTE: not actually an Autotools package diff --git a/var/spack/repos/builtin/packages/npth/package.py b/var/spack/repos/builtin/packages/npth/package.py index 37b5ce723c..b71bf00110 100644 --- a/var/spack/repos/builtin/packages/npth/package.py +++ b/var/spack/repos/builtin/packages/npth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Npth(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nrm/package.py b/var/spack/repos/builtin/packages/nrm/package.py index 1c684f7bd8..b2d8923e5f 100644 --- a/var/spack/repos/builtin/packages/nrm/package.py +++ b/var/spack/repos/builtin/packages/nrm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nrm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/ns-3-dev/package.py b/var/spack/repos/builtin/packages/ns-3-dev/package.py index 6e75c8d441..0ba08a747f 100644 --- a/var/spack/repos/builtin/packages/ns-3-dev/package.py +++ b/var/spack/repos/builtin/packages/ns-3-dev/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/nseg/package.py b/var/spack/repos/builtin/packages/nseg/package.py index b9622c932a..8bd391222b 100644 --- a/var/spack/repos/builtin/packages/nseg/package.py +++ b/var/spack/repos/builtin/packages/nseg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nseg(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/nsimd/package.py b/var/spack/repos/builtin/packages/nsimd/package.py index 4199eca101..e53cdce3c8 100644 --- a/var/spack/repos/builtin/packages/nsimd/package.py +++ b/var/spack/repos/builtin/packages/nsimd/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Nsimd(CMakePackage): """NSIMD is a vectorization library that abstracts SIMD programming. It was designed to exploit the maximum power of processors diff --git a/var/spack/repos/builtin/packages/nspr/package.py b/var/spack/repos/builtin/packages/nspr/package.py index 23de115551..2f0bfeca04 100644 --- a/var/spack/repos/builtin/packages/nspr/package.py +++ b/var/spack/repos/builtin/packages/nspr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nspr(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nss/package.py b/var/spack/repos/builtin/packages/nss/package.py index 673733621e..8dde198eb8 100644 --- a/var/spack/repos/builtin/packages/nss/package.py +++ b/var/spack/repos/builtin/packages/nss/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nss(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ntirpc/package.py b/var/spack/repos/builtin/packages/ntirpc/package.py index 16f89b404f..ccebcd70d6 100644 --- a/var/spack/repos/builtin/packages/ntirpc/package.py +++ b/var/spack/repos/builtin/packages/ntirpc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ntirpc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ntl/package.py b/var/spack/repos/builtin/packages/ntl/package.py index 260e92802a..56c7baef92 100644 --- a/var/spack/repos/builtin/packages/ntl/package.py +++ b/var/spack/repos/builtin/packages/ntl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ntl(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ntpoly/package.py b/var/spack/repos/builtin/packages/ntpoly/package.py index c9864e8b0e..b4ddb9e017 100644 --- a/var/spack/repos/builtin/packages/ntpoly/package.py +++ b/var/spack/repos/builtin/packages/ntpoly/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ntpoly(CMakePackage): diff --git a/var/spack/repos/builtin/packages/numactl/package.py b/var/spack/repos/builtin/packages/numactl/package.py index 36621eec59..b57c9756d5 100644 --- a/var/spack/repos/builtin/packages/numactl/package.py +++ b/var/spack/repos/builtin/packages/numactl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Numactl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/numamma/package.py b/var/spack/repos/builtin/packages/numamma/package.py index b5ce6abd3e..66e2cd0d2b 100644 --- a/var/spack/repos/builtin/packages/numamma/package.py +++ b/var/spack/repos/builtin/packages/numamma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Numamma(CMakePackage): diff --git a/var/spack/repos/builtin/packages/numap/package.py b/var/spack/repos/builtin/packages/numap/package.py index 8075fe75f8..0480015146 100644 --- a/var/spack/repos/builtin/packages/numap/package.py +++ b/var/spack/repos/builtin/packages/numap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Numap(CMakePackage): diff --git a/var/spack/repos/builtin/packages/numdiff/package.py b/var/spack/repos/builtin/packages/numdiff/package.py index ce8b8eb1ad..5b693791b0 100644 --- a/var/spack/repos/builtin/packages/numdiff/package.py +++ b/var/spack/repos/builtin/packages/numdiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Numdiff(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nut/package.py b/var/spack/repos/builtin/packages/nut/package.py index 3b2c61cd21..cb937eaaf1 100644 --- a/var/spack/repos/builtin/packages/nut/package.py +++ b/var/spack/repos/builtin/packages/nut/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nut(CMakePackage): diff --git a/var/spack/repos/builtin/packages/nvdimmsim/package.py b/var/spack/repos/builtin/packages/nvdimmsim/package.py index 15703e7bb9..df39954a58 100644 --- a/var/spack/repos/builtin/packages/nvdimmsim/package.py +++ b/var/spack/repos/builtin/packages/nvdimmsim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nvdimmsim(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/nvhpc/package.py b/var/spack/repos/builtin/packages/nvhpc/package.py index 44c429817a..f3d50980ec 100644 --- a/var/spack/repos/builtin/packages/nvhpc/package.py +++ b/var/spack/repos/builtin/packages/nvhpc/package.py @@ -7,7 +7,7 @@ import platform -from spack import * +from spack.package import * from spack.util.prefix import Prefix # FIXME Remove hack for polymorphic versions diff --git a/var/spack/repos/builtin/packages/nvptx-tools/package.py b/var/spack/repos/builtin/packages/nvptx-tools/package.py index 2a14067b6e..9519ff3ed3 100644 --- a/var/spack/repos/builtin/packages/nvptx-tools/package.py +++ b/var/spack/repos/builtin/packages/nvptx-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NvptxTools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/nvshmem/package.py b/var/spack/repos/builtin/packages/nvshmem/package.py index 6cf3d730f0..b2be2d2775 100644 --- a/var/spack/repos/builtin/packages/nvshmem/package.py +++ b/var/spack/repos/builtin/packages/nvshmem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nvshmem(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/nvtop/package.py b/var/spack/repos/builtin/packages/nvtop/package.py index 46901a300e..540b00a4e3 100644 --- a/var/spack/repos/builtin/packages/nvtop/package.py +++ b/var/spack/repos/builtin/packages/nvtop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nvtop(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index 759e86f90c..f0e8f1443a 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Nwchem(Package): diff --git a/var/spack/repos/builtin/packages/nyancat/package.py b/var/spack/repos/builtin/packages/nyancat/package.py index ac1fc4aa9a..d62ab428cf 100644 --- a/var/spack/repos/builtin/packages/nyancat/package.py +++ b/var/spack/repos/builtin/packages/nyancat/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Nyancat(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ocaml/package.py b/var/spack/repos/builtin/packages/ocaml/package.py index 675b74d603..920529e54f 100644 --- a/var/spack/repos/builtin/packages/ocaml/package.py +++ b/var/spack/repos/builtin/packages/ocaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ocaml(Package): diff --git a/var/spack/repos/builtin/packages/ocamlbuild/package.py b/var/spack/repos/builtin/packages/ocamlbuild/package.py index 6b5d6dc60a..fb0e5fe4af 100644 --- a/var/spack/repos/builtin/packages/ocamlbuild/package.py +++ b/var/spack/repos/builtin/packages/ocamlbuild/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ocamlbuild(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/occa/package.py b/var/spack/repos/builtin/packages/occa/package.py index 3957ff7807..fa62c4f66e 100644 --- a/var/spack/repos/builtin/packages/occa/package.py +++ b/var/spack/repos/builtin/packages/occa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Occa(Package): diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index bb0a8c7a08..aff0afb9ed 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -5,8 +5,8 @@ import platform -from spack import * from spack.operating_systems.mac_os import macos_version +from spack.package import * class Oce(Package): diff --git a/var/spack/repos/builtin/packages/oci-systemd-hook/package.py b/var/spack/repos/builtin/packages/oci-systemd-hook/package.py index b6bba9e5d8..7747de8812 100644 --- a/var/spack/repos/builtin/packages/oci-systemd-hook/package.py +++ b/var/spack/repos/builtin/packages/oci-systemd-hook/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OciSystemdHook(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ocl-icd/package.py b/var/spack/repos/builtin/packages/ocl-icd/package.py index 09794d2d80..2a0a0655b3 100644 --- a/var/spack/repos/builtin/packages/ocl-icd/package.py +++ b/var/spack/repos/builtin/packages/ocl-icd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OclIcd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/oclgrind/package.py b/var/spack/repos/builtin/packages/oclgrind/package.py index c67c2e4d4f..3785e254de 100644 --- a/var/spack/repos/builtin/packages/oclgrind/package.py +++ b/var/spack/repos/builtin/packages/oclgrind/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Oclgrind(CMakePackage): diff --git a/var/spack/repos/builtin/packages/oclint/package.py b/var/spack/repos/builtin/packages/oclint/package.py index ada6197ef8..56aca38a12 100644 --- a/var/spack/repos/builtin/packages/oclint/package.py +++ b/var/spack/repos/builtin/packages/oclint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Oclint(Package): diff --git a/var/spack/repos/builtin/packages/oclock/package.py b/var/spack/repos/builtin/packages/oclock/package.py index 177a409416..072e7c5a82 100644 --- a/var/spack/repos/builtin/packages/oclock/package.py +++ b/var/spack/repos/builtin/packages/oclock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Oclock(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/octa/package.py b/var/spack/repos/builtin/packages/octa/package.py index e172e2f72b..a358d630a2 100644 --- a/var/spack/repos/builtin/packages/octa/package.py +++ b/var/spack/repos/builtin/packages/octa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Octa(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/octave-arduino/package.py b/var/spack/repos/builtin/packages/octave-arduino/package.py index 3fdee138f2..57947b123b 100644 --- a/var/spack/repos/builtin/packages/octave-arduino/package.py +++ b/var/spack/repos/builtin/packages/octave-arduino/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveArduino(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-control/package.py b/var/spack/repos/builtin/packages/octave-control/package.py index c0f492fcc5..5ec0a7a4c6 100644 --- a/var/spack/repos/builtin/packages/octave-control/package.py +++ b/var/spack/repos/builtin/packages/octave-control/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveControl(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-gsl/package.py b/var/spack/repos/builtin/packages/octave-gsl/package.py index a3e67db969..924513b71a 100644 --- a/var/spack/repos/builtin/packages/octave-gsl/package.py +++ b/var/spack/repos/builtin/packages/octave-gsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveGsl(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-instrctl/package.py b/var/spack/repos/builtin/packages/octave-instrctl/package.py index 7fc1ea0a6c..e6a1a564dc 100644 --- a/var/spack/repos/builtin/packages/octave-instrctl/package.py +++ b/var/spack/repos/builtin/packages/octave-instrctl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveInstrctl(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-io/package.py b/var/spack/repos/builtin/packages/octave-io/package.py index 18207a5fba..e7a3125b73 100644 --- a/var/spack/repos/builtin/packages/octave-io/package.py +++ b/var/spack/repos/builtin/packages/octave-io/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveIo(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-optim/package.py b/var/spack/repos/builtin/packages/octave-optim/package.py index b2fa7ea850..7b6fc798ee 100644 --- a/var/spack/repos/builtin/packages/octave-optim/package.py +++ b/var/spack/repos/builtin/packages/octave-optim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveOptim(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-quaternion/package.py b/var/spack/repos/builtin/packages/octave-quaternion/package.py index b905dd4c82..535556139c 100644 --- a/var/spack/repos/builtin/packages/octave-quaternion/package.py +++ b/var/spack/repos/builtin/packages/octave-quaternion/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveQuaternion(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-signal/package.py b/var/spack/repos/builtin/packages/octave-signal/package.py index 441040ee59..abf4a26552 100644 --- a/var/spack/repos/builtin/packages/octave-signal/package.py +++ b/var/spack/repos/builtin/packages/octave-signal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveSignal(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-splines/package.py b/var/spack/repos/builtin/packages/octave-splines/package.py index ae20086e5e..73761f9ee3 100644 --- a/var/spack/repos/builtin/packages/octave-splines/package.py +++ b/var/spack/repos/builtin/packages/octave-splines/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveSplines(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-statistics/package.py b/var/spack/repos/builtin/packages/octave-statistics/package.py index 3e8ba5e50b..81de360b2b 100644 --- a/var/spack/repos/builtin/packages/octave-statistics/package.py +++ b/var/spack/repos/builtin/packages/octave-statistics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveStatistics(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-struct/package.py b/var/spack/repos/builtin/packages/octave-struct/package.py index 16532ad051..c541a71d34 100644 --- a/var/spack/repos/builtin/packages/octave-struct/package.py +++ b/var/spack/repos/builtin/packages/octave-struct/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveStruct(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave-symbolic/package.py b/var/spack/repos/builtin/packages/octave-symbolic/package.py index f6f0b2f626..a8d6b5fd53 100644 --- a/var/spack/repos/builtin/packages/octave-symbolic/package.py +++ b/var/spack/repos/builtin/packages/octave-symbolic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OctaveSymbolic(OctavePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 703b581eb5..03b48732a7 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -9,6 +9,7 @@ import sys import tempfile import spack.util.environment +from spack.package import * class Octave(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index a95c8c89cd..4cf8906b77 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -7,7 +7,7 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * class Octopus(Package, CudaPackage): diff --git a/var/spack/repos/builtin/packages/odc/package.py b/var/spack/repos/builtin/packages/odc/package.py index cd47266642..12c984c9f6 100644 --- a/var/spack/repos/builtin/packages/odc/package.py +++ b/var/spack/repos/builtin/packages/odc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Odc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/of-catalyst/package.py b/var/spack/repos/builtin/packages/of-catalyst/package.py index d2fa33d784..1bee428865 100644 --- a/var/spack/repos/builtin/packages/of-catalyst/package.py +++ b/var/spack/repos/builtin/packages/of-catalyst/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OfCatalyst(CMakePackage): diff --git a/var/spack/repos/builtin/packages/of-precice/package.py b/var/spack/repos/builtin/packages/of-precice/package.py index 273f464027..3013af0c94 100644 --- a/var/spack/repos/builtin/packages/of-precice/package.py +++ b/var/spack/repos/builtin/packages/of-precice/package.py @@ -7,7 +7,7 @@ import os import llnl.util.tty as tty -from spack import * +from spack.package import * from spack.pkg.builtin.openfoam import add_extra_files @@ -26,7 +26,7 @@ class OfPrecice(Package): # General patches common = ['change-userdir.sh', 'spack-derived-Allwmake'] - assets = [] + assets = [] # type: List[str] build_script = './spack-derived-Allwmake' build_userdir = 'spack-userdir' # Build user APPBIN, LIBBIN into here diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 783ac25e09..888c2fbe57 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -2,6 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * class OmegaH(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/ompss/package.py b/var/spack/repos/builtin/packages/ompss/package.py index 4f3fd6a4fe..fd782a05bf 100644 --- a/var/spack/repos/builtin/packages/ompss/package.py +++ b/var/spack/repos/builtin/packages/ompss/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Ompss(Package): diff --git a/var/spack/repos/builtin/packages/ompt-openmp/package.py b/var/spack/repos/builtin/packages/ompt-openmp/package.py index 0e29a4890a..a03989ba4d 100644 --- a/var/spack/repos/builtin/packages/ompt-openmp/package.py +++ b/var/spack/repos/builtin/packages/ompt-openmp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OmptOpenmp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/oneapi-level-zero/package.py b/var/spack/repos/builtin/packages/oneapi-level-zero/package.py index 5e2ebcda9c..86123198ad 100644 --- a/var/spack/repos/builtin/packages/oneapi-level-zero/package.py +++ b/var/spack/repos/builtin/packages/oneapi-level-zero/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OneapiLevelZero(CMakePackage): diff --git a/var/spack/repos/builtin/packages/onednn/package.py b/var/spack/repos/builtin/packages/onednn/package.py index fa2083d5ff..01ae09c632 100644 --- a/var/spack/repos/builtin/packages/onednn/package.py +++ b/var/spack/repos/builtin/packages/onednn/package.py @@ -5,6 +5,8 @@ import sys +from spack.package import * + class Onednn(CMakePackage): """oneAPI Deep Neural Network Library (oneDNN). diff --git a/var/spack/repos/builtin/packages/oniguruma/package.py b/var/spack/repos/builtin/packages/oniguruma/package.py index d7dd74d972..7a16e993e2 100644 --- a/var/spack/repos/builtin/packages/oniguruma/package.py +++ b/var/spack/repos/builtin/packages/oniguruma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Oniguruma(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/onnx/package.py b/var/spack/repos/builtin/packages/onnx/package.py index f7e63d891a..3deba15f24 100644 --- a/var/spack/repos/builtin/packages/onnx/package.py +++ b/var/spack/repos/builtin/packages/onnx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Onnx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ont-albacore/package.py b/var/spack/repos/builtin/packages/ont-albacore/package.py index 24b8f5d744..b532fe1066 100644 --- a/var/spack/repos/builtin/packages/ont-albacore/package.py +++ b/var/spack/repos/builtin/packages/ont-albacore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OntAlbacore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/oommf/package.py b/var/spack/repos/builtin/packages/oommf/package.py index 9e34a78cea..814b091933 100644 --- a/var/spack/repos/builtin/packages/oommf/package.py +++ b/var/spack/repos/builtin/packages/oommf/package.py @@ -5,8 +5,7 @@ import os.path -from spack import * -from spack.util.executable import Executable +from spack.package import * class Oommf(Package): diff --git a/var/spack/repos/builtin/packages/op2-dsl/package.py b/var/spack/repos/builtin/packages/op2-dsl/package.py index 9679404d5c..f16b6d1785 100644 --- a/var/spack/repos/builtin/packages/op2-dsl/package.py +++ b/var/spack/repos/builtin/packages/op2-dsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Op2Dsl(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/opa-psm2/package.py b/var/spack/repos/builtin/packages/opa-psm2/package.py index d752e24a44..aaa3e69f97 100644 --- a/var/spack/repos/builtin/packages/opa-psm2/package.py +++ b/var/spack/repos/builtin/packages/opa-psm2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OpaPsm2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/opam/package.py b/var/spack/repos/builtin/packages/opam/package.py index 727a4955e9..8139213bed 100644 --- a/var/spack/repos/builtin/packages/opam/package.py +++ b/var/spack/repos/builtin/packages/opam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opam(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py index c3906e1e32..80e4426c37 100644 --- a/var/spack/repos/builtin/packages/opari2/package.py +++ b/var/spack/repos/builtin/packages/opari2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opari2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/open-iscsi/package.py b/var/spack/repos/builtin/packages/open-iscsi/package.py index 17142fda0b..dd5db4bc90 100644 --- a/var/spack/repos/builtin/packages/open-iscsi/package.py +++ b/var/spack/repos/builtin/packages/open-iscsi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OpenIscsi(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/open-isns/package.py b/var/spack/repos/builtin/packages/open-isns/package.py index 120ec39845..5864dad3fd 100644 --- a/var/spack/repos/builtin/packages/open-isns/package.py +++ b/var/spack/repos/builtin/packages/open-isns/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OpenIsns(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/open3d/package.py b/var/spack/repos/builtin/packages/open3d/package.py index 7f92c0b5f7..4eba3c7abb 100644 --- a/var/spack/repos/builtin/packages/open3d/package.py +++ b/var/spack/repos/builtin/packages/open3d/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Open3d(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/openal-soft/package.py b/var/spack/repos/builtin/packages/openal-soft/package.py index 4bb5c5198a..74228830b1 100644 --- a/var/spack/repos/builtin/packages/openal-soft/package.py +++ b/var/spack/repos/builtin/packages/openal-soft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OpenalSoft(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openbabel/package.py b/var/spack/repos/builtin/packages/openbabel/package.py index 0818efaa86..571ee6acc0 100644 --- a/var/spack/repos/builtin/packages/openbabel/package.py +++ b/var/spack/repos/builtin/packages/openbabel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 7007915dda..ed18deae04 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -6,9 +6,7 @@ import os import re -from llnl.util.filesystem import library_extensions - -from spack import * +from spack.package import * from spack.package_test import compare_output_file, compile_c_and_execute diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py index 4d5a132e21..8e328d1b28 100644 --- a/var/spack/repos/builtin/packages/opencarp/package.py +++ b/var/spack/repos/builtin/packages/opencarp/package.py @@ -6,7 +6,7 @@ import os from datetime import datetime -from spack import * +from spack.package import * class Opencarp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/opencascade/package.py b/var/spack/repos/builtin/packages/opencascade/package.py index cdeb99673b..8c7cfc5700 100644 --- a/var/spack/repos/builtin/packages/opencascade/package.py +++ b/var/spack/repos/builtin/packages/opencascade/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opencascade(CMakePackage): diff --git a/var/spack/repos/builtin/packages/opencl-c-headers/package.py b/var/spack/repos/builtin/packages/opencl-c-headers/package.py index c2e38947b5..a556312ffb 100644 --- a/var/spack/repos/builtin/packages/opencl-c-headers/package.py +++ b/var/spack/repos/builtin/packages/opencl-c-headers/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * class OpenclCHeaders(Package): diff --git a/var/spack/repos/builtin/packages/opencl-clhpp/package.py b/var/spack/repos/builtin/packages/opencl-clhpp/package.py index 96423af9e5..d3758a901f 100644 --- a/var/spack/repos/builtin/packages/opencl-clhpp/package.py +++ b/var/spack/repos/builtin/packages/opencl-clhpp/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * class OpenclClhpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/opencl-headers/package.py b/var/spack/repos/builtin/packages/opencl-headers/package.py index eed6638da1..4349100b54 100644 --- a/var/spack/repos/builtin/packages/opencl-headers/package.py +++ b/var/spack/repos/builtin/packages/opencl-headers/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OpenclHeaders(BundlePackage): diff --git a/var/spack/repos/builtin/packages/opencoarrays/package.py b/var/spack/repos/builtin/packages/opencoarrays/package.py index 8d82a2510c..df3f7a05ad 100644 --- a/var/spack/repos/builtin/packages/opencoarrays/package.py +++ b/var/spack/repos/builtin/packages/opencoarrays/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opencoarrays(CMakePackage): diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index bf96ed08d4..cc5f1ed0b6 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -5,7 +5,7 @@ import re -from llnl.util.filesystem import library_extensions +from spack.package import * class Opencv(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/opendatadetector/package.py b/var/spack/repos/builtin/packages/opendatadetector/package.py index 5b77a1a1d3..914317d5a5 100644 --- a/var/spack/repos/builtin/packages/opendatadetector/package.py +++ b/var/spack/repos/builtin/packages/opendatadetector/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opendatadetector(CMakePackage): diff --git a/var/spack/repos/builtin/packages/opendx/package.py b/var/spack/repos/builtin/packages/opendx/package.py index 54b8ccf627..30909a2134 100644 --- a/var/spack/repos/builtin/packages/opendx/package.py +++ b/var/spack/repos/builtin/packages/opendx/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Opendx(AutotoolsPackage): """Open Visualization Data Explorer.""" diff --git a/var/spack/repos/builtin/packages/openexr/package.py b/var/spack/repos/builtin/packages/openexr/package.py index 6127589638..b69ec205a8 100644 --- a/var/spack/repos/builtin/packages/openexr/package.py +++ b/var/spack/repos/builtin/packages/openexr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openexr(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index ee0b621768..5ef7beec1d 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openfast(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openfdtd/package.py b/var/spack/repos/builtin/packages/openfdtd/package.py index 15e7d3e675..0858dce16a 100644 --- a/var/spack/repos/builtin/packages/openfdtd/package.py +++ b/var/spack/repos/builtin/packages/openfdtd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openfdtd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index b82ab0d0ae..9a81a0fefa 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -41,7 +41,7 @@ import re import llnl.util.tty as tty -from spack import * +from spack.package import * from spack.pkg.builtin.openfoam import ( OpenfoamArch, add_extra_files, @@ -123,10 +123,10 @@ class OpenfoamOrg(Package): _foam_arch = None # Content for etc/prefs.{csh,sh} - etc_prefs = {} + etc_prefs = {} # type: Dict[str, str] # Content for etc/config.{csh,sh}/ files - etc_config = {} + etc_config = {} # type: Dict[str, str] phases = ['configure', 'build', 'install'] build_script = './spack-Allwmake' # <- Added by patch() method. diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index 5535d604b9..80fb652b2f 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -46,7 +46,7 @@ import re import llnl.util.tty as tty -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost from spack.util.environment import EnvironmentModifications @@ -358,7 +358,7 @@ class Openfoam(Package): # General patches common = ['spack-Allwmake', 'README-spack'] - assets = [] + assets = [] # type: List[str] # Version-specific patches patch('1612-spack-patches.patch', when='@1612') @@ -380,10 +380,10 @@ class Openfoam(Package): _foam_arch = None # Content for etc/prefs.{csh,sh} - etc_prefs = {} + etc_prefs = {} # type: Dict[str,str] # Content for etc/config.{csh,sh}/ files - etc_config = {} + etc_config = {} # type: Dict[str,str] phases = ['configure', 'build', 'install'] build_script = './spack-Allwmake' # From patch() method. diff --git a/var/spack/repos/builtin/packages/openfst/package.py b/var/spack/repos/builtin/packages/openfst/package.py index 8849a7a1eb..c86679c7f6 100644 --- a/var/spack/repos/builtin/packages/openfst/package.py +++ b/var/spack/repos/builtin/packages/openfst/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openfst(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index 169329a408..9de2e6e2dd 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -6,6 +6,8 @@ import re import sys +from spack.package import * + class Opengl(BundlePackage): """Placeholder for external OpenGL libraries from hardware vendors""" @@ -90,6 +92,10 @@ class Opengl(BundlePackage): of OpenGL your Mac uses.""" raise InstallError(msg) + @fetcher.setter # Since fetcher is read-write, must override both + def fetcher(self): + _ = self.fetcher + @property def libs(self): if "platform=windows" in self.spec: diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index f6bce0fcaa..e380175708 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openglu(Package): @@ -59,6 +59,10 @@ class Openglu(Package): raise InstallError(msg) + @fetcher.setter # Since fetcher is read-write, must override both + def fetcher(self): + _ = self.fetcher + @property def libs(self): return find_libraries( diff --git a/var/spack/repos/builtin/packages/openimageio/package.py b/var/spack/repos/builtin/packages/openimageio/package.py index fd51429f68..8057232072 100644 --- a/var/spack/repos/builtin/packages/openimageio/package.py +++ b/var/spack/repos/builtin/packages/openimageio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/openipmi/package.py b/var/spack/repos/builtin/packages/openipmi/package.py index e8d9a8c862..2a10faa587 100644 --- a/var/spack/repos/builtin/packages/openipmi/package.py +++ b/var/spack/repos/builtin/packages/openipmi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openipmi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openjdk/package.py b/var/spack/repos/builtin/packages/openjdk/package.py index c5f82a4f65..fe1a00237e 100644 --- a/var/spack/repos/builtin/packages/openjdk/package.py +++ b/var/spack/repos/builtin/packages/openjdk/package.py @@ -7,6 +7,7 @@ import os import platform import re +from spack.package import * from spack.util.prefix import Prefix # If you need to add a new version, please be aware that: diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py index 2579354670..106ef1c7af 100644 --- a/var/spack/repos/builtin/packages/openjpeg/package.py +++ b/var/spack/repos/builtin/packages/openjpeg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openjpeg(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openkim-models/package.py b/var/spack/repos/builtin/packages/openkim-models/package.py index 40436c15b6..a28a488fe6 100644 --- a/var/spack/repos/builtin/packages/openkim-models/package.py +++ b/var/spack/repos/builtin/packages/openkim-models/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OpenkimModels(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openldap/package.py b/var/spack/repos/builtin/packages/openldap/package.py index 0fb8a65f1e..6e73a7ae89 100644 --- a/var/spack/repos/builtin/packages/openldap/package.py +++ b/var/spack/repos/builtin/packages/openldap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openldap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openlibm/package.py b/var/spack/repos/builtin/packages/openlibm/package.py index 89d86a9d76..9d2c423a51 100644 --- a/var/spack/repos/builtin/packages/openlibm/package.py +++ b/var/spack/repos/builtin/packages/openlibm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openlibm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/openloops/package.py b/var/spack/repos/builtin/packages/openloops/package.py index a363ee794a..e7800536f0 100644 --- a/var/spack/repos/builtin/packages/openloops/package.py +++ b/var/spack/repos/builtin/packages/openloops/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Openloops(Package): diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py index c1ccb31963..cd22b5df3f 100644 --- a/var/spack/repos/builtin/packages/openmc/package.py +++ b/var/spack/repos/builtin/packages/openmc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openmc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openmm/package.py b/var/spack/repos/builtin/packages/openmm/package.py index 840c5dd582..8759acaff1 100644 --- a/var/spack/repos/builtin/packages/openmm/package.py +++ b/var/spack/repos/builtin/packages/openmm/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Openmm(CMakePackage, CudaPackage): """A high performance toolkit for molecular simulation. Use it as diff --git a/var/spack/repos/builtin/packages/openmolcas/package.py b/var/spack/repos/builtin/packages/openmolcas/package.py index a2137b9e95..45ffdab36f 100644 --- a/var/spack/repos/builtin/packages/openmolcas/package.py +++ b/var/spack/repos/builtin/packages/openmolcas/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Openmolcas(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index c66581941c..fec58a55e7 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -11,6 +11,8 @@ import sys import llnl.util.tty as tty +from spack.package import * + class Openmpi(AutotoolsPackage, CudaPackage): """An open source Message Passing Interface implementation. diff --git a/var/spack/repos/builtin/packages/openmx/package.py b/var/spack/repos/builtin/packages/openmx/package.py index 687d85c954..26b6efef66 100644 --- a/var/spack/repos/builtin/packages/openmx/package.py +++ b/var/spack/repos/builtin/packages/openmx/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Openmx(MakefilePackage): """OpenMX (Open source package for Material eXplorer) is a software package for nano-scale material simulations based on density functional diff --git a/var/spack/repos/builtin/packages/opennurbs/package.py b/var/spack/repos/builtin/packages/opennurbs/package.py index 24df35c9f3..1e03b7fec7 100644 --- a/var/spack/repos/builtin/packages/opennurbs/package.py +++ b/var/spack/repos/builtin/packages/opennurbs/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Opennurbs(Package): """OpenNURBS is an open-source NURBS-based geometric modeling library and toolset, with meshing and display / output functions. diff --git a/var/spack/repos/builtin/packages/openpa/package.py b/var/spack/repos/builtin/packages/openpa/package.py index 3c2ce85223..4f94f2f3d4 100644 --- a/var/spack/repos/builtin/packages/openpa/package.py +++ b/var/spack/repos/builtin/packages/openpa/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openpa(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openpbs/package.py b/var/spack/repos/builtin/packages/openpbs/package.py index e70244392a..0b492a9f3a 100644 --- a/var/spack/repos/builtin/packages/openpbs/package.py +++ b/var/spack/repos/builtin/packages/openpbs/package.py @@ -5,7 +5,7 @@ import llnl.util.tty as tty -from spack import * +from spack.package import * class Openpbs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index 4e628f9869..f25715426f 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OpenpmdApi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openrasmol/package.py b/var/spack/repos/builtin/packages/openrasmol/package.py index 1b038c0baa..25bb196d01 100644 --- a/var/spack/repos/builtin/packages/openrasmol/package.py +++ b/var/spack/repos/builtin/packages/openrasmol/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openrasmol(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/openresty/package.py b/var/spack/repos/builtin/packages/openresty/package.py index 76400428e0..02dafc955d 100644 --- a/var/spack/repos/builtin/packages/openresty/package.py +++ b/var/spack/repos/builtin/packages/openresty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openresty(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openscenegraph/package.py b/var/spack/repos/builtin/packages/openscenegraph/package.py index 909a7bcce0..aef222a691 100644 --- a/var/spack/repos/builtin/packages/openscenegraph/package.py +++ b/var/spack/repos/builtin/packages/openscenegraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openscenegraph(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openslide/package.py b/var/spack/repos/builtin/packages/openslide/package.py index b77e5d7210..e4cb89c71d 100644 --- a/var/spack/repos/builtin/packages/openslide/package.py +++ b/var/spack/repos/builtin/packages/openslide/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openslide(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openslp/package.py b/var/spack/repos/builtin/packages/openslp/package.py index 98c325bce4..567958f4d4 100644 --- a/var/spack/repos/builtin/packages/openslp/package.py +++ b/var/spack/repos/builtin/packages/openslp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openslp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index e173a0ec50..09efe6e91a 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -5,9 +5,8 @@ import os -import spack import spack.store -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index f935ce6037..a924be4e2a 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -6,7 +6,7 @@ import os import spack.store -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/openssh/package.py b/var/spack/repos/builtin/packages/openssh/package.py index c7496d93e5..97ee7c03ae 100644 --- a/var/spack/repos/builtin/packages/openssh/package.py +++ b/var/spack/repos/builtin/packages/openssh/package.py @@ -6,7 +6,7 @@ import re import socket -from spack import * +from spack.package import * class Openssh(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 1917f1527d..330ed05bc6 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -8,7 +8,7 @@ import re import llnl.util.tty as tty -from spack import * +from spack.package import * class Openssl(Package): # Uses Fake Autotools, should subclass Package diff --git a/var/spack/repos/builtin/packages/openstf/package.py b/var/spack/repos/builtin/packages/openstf/package.py index 88d79a85ad..dd4fc41798 100644 --- a/var/spack/repos/builtin/packages/openstf/package.py +++ b/var/spack/repos/builtin/packages/openstf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openstf(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/opensubdiv/package.py b/var/spack/repos/builtin/packages/opensubdiv/package.py index b1ca1f4e1b..d940d3115b 100644 --- a/var/spack/repos/builtin/packages/opensubdiv/package.py +++ b/var/spack/repos/builtin/packages/opensubdiv/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opensubdiv(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/opentsdb/package.py b/var/spack/repos/builtin/packages/opentsdb/package.py index 3facc0e366..39923c240a 100644 --- a/var/spack/repos/builtin/packages/opentsdb/package.py +++ b/var/spack/repos/builtin/packages/opentsdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opentsdb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/openturns/package.py b/var/spack/repos/builtin/packages/openturns/package.py index b9479185c9..addf269fdf 100644 --- a/var/spack/repos/builtin/packages/openturns/package.py +++ b/var/spack/repos/builtin/packages/openturns/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openturns(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openvdb/package.py b/var/spack/repos/builtin/packages/openvdb/package.py index 64e407646e..efd8432cca 100644 --- a/var/spack/repos/builtin/packages/openvdb/package.py +++ b/var/spack/repos/builtin/packages/openvdb/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Openvdb(CMakePackage): diff --git a/var/spack/repos/builtin/packages/openwsman/package.py b/var/spack/repos/builtin/packages/openwsman/package.py index 4be86bbf6d..f8f63e600b 100644 --- a/var/spack/repos/builtin/packages/openwsman/package.py +++ b/var/spack/repos/builtin/packages/openwsman/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Openwsman(CMakePackage): diff --git a/var/spack/repos/builtin/packages/opium/package.py b/var/spack/repos/builtin/packages/opium/package.py index 8ed8c116c3..abb7172654 100644 --- a/var/spack/repos/builtin/packages/opium/package.py +++ b/var/spack/repos/builtin/packages/opium/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opium(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/optional-lite/package.py b/var/spack/repos/builtin/packages/optional-lite/package.py index 6060dc7efa..0072baf408 100644 --- a/var/spack/repos/builtin/packages/optional-lite/package.py +++ b/var/spack/repos/builtin/packages/optional-lite/package.py @@ -5,7 +5,7 @@ from shutil import copytree -from spack import * +from spack.package import * class OptionalLite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/optipng/package.py b/var/spack/repos/builtin/packages/optipng/package.py index a3b7f6b9c5..e588756698 100644 --- a/var/spack/repos/builtin/packages/optipng/package.py +++ b/var/spack/repos/builtin/packages/optipng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Optipng(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/opus/package.py b/var/spack/repos/builtin/packages/opus/package.py index 97ecf55ff0..5b58ef35e5 100644 --- a/var/spack/repos/builtin/packages/opus/package.py +++ b/var/spack/repos/builtin/packages/opus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Opus(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/or-tools/package.py b/var/spack/repos/builtin/packages/or-tools/package.py index b86747469e..0882c7eb7e 100644 --- a/var/spack/repos/builtin/packages/or-tools/package.py +++ b/var/spack/repos/builtin/packages/or-tools/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class OrTools(CMakePackage): """This project hosts operations research tools developed at Google and made available as open source under the Apache 2.0 diff --git a/var/spack/repos/builtin/packages/oracle-instant-client/package.py b/var/spack/repos/builtin/packages/oracle-instant-client/package.py index 76a1d03f42..358e16586a 100644 --- a/var/spack/repos/builtin/packages/oracle-instant-client/package.py +++ b/var/spack/repos/builtin/packages/oracle-instant-client/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * def oracleclient_releases(): diff --git a/var/spack/repos/builtin/packages/oras/package.py b/var/spack/repos/builtin/packages/oras/package.py index 40b2bf24e7..5b84b60734 100644 --- a/var/spack/repos/builtin/packages/oras/package.py +++ b/var/spack/repos/builtin/packages/oras/package.py @@ -4,9 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import llnl.util.tty as tty -from llnl.util.filesystem import find -from spack import * +from spack.package import * class Oras(Package): diff --git a/var/spack/repos/builtin/packages/orbit2/package.py b/var/spack/repos/builtin/packages/orbit2/package.py index 6f9c03427c..3531697d4e 100644 --- a/var/spack/repos/builtin/packages/orbit2/package.py +++ b/var/spack/repos/builtin/packages/orbit2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Orbit2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/orc/package.py b/var/spack/repos/builtin/packages/orc/package.py index b930ef35a0..9e4fe5d992 100644 --- a/var/spack/repos/builtin/packages/orc/package.py +++ b/var/spack/repos/builtin/packages/orc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Orc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/orca/package.py b/var/spack/repos/builtin/packages/orca/package.py index 75aa975415..2bfe51b402 100644 --- a/var/spack/repos/builtin/packages/orca/package.py +++ b/var/spack/repos/builtin/packages/orca/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Orca(Package): diff --git a/var/spack/repos/builtin/packages/orfm/package.py b/var/spack/repos/builtin/packages/orfm/package.py index f4afa43ecd..cb419b1d6d 100644 --- a/var/spack/repos/builtin/packages/orfm/package.py +++ b/var/spack/repos/builtin/packages/orfm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Orfm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/orientdb/package.py b/var/spack/repos/builtin/packages/orientdb/package.py index 67f4f1a2f0..8f249564b8 100644 --- a/var/spack/repos/builtin/packages/orientdb/package.py +++ b/var/spack/repos/builtin/packages/orientdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Orientdb(MavenPackage): diff --git a/var/spack/repos/builtin/packages/orthofiller/package.py b/var/spack/repos/builtin/packages/orthofiller/package.py index 3fcba5aad9..3d9c5ff9c4 100644 --- a/var/spack/repos/builtin/packages/orthofiller/package.py +++ b/var/spack/repos/builtin/packages/orthofiller/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Orthofiller(Package): diff --git a/var/spack/repos/builtin/packages/orthofinder/package.py b/var/spack/repos/builtin/packages/orthofinder/package.py index 9607360f02..6a8a7e2100 100644 --- a/var/spack/repos/builtin/packages/orthofinder/package.py +++ b/var/spack/repos/builtin/packages/orthofinder/package.py @@ -6,7 +6,7 @@ import os import shutil -from spack import * +from spack.package import * class Orthofinder(Package): diff --git a/var/spack/repos/builtin/packages/orthomcl/package.py b/var/spack/repos/builtin/packages/orthomcl/package.py index 97bdd768b1..4a4ef68557 100644 --- a/var/spack/repos/builtin/packages/orthomcl/package.py +++ b/var/spack/repos/builtin/packages/orthomcl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Orthomcl(Package): diff --git a/var/spack/repos/builtin/packages/osi/package.py b/var/spack/repos/builtin/packages/osi/package.py index 7ece92829a..b177476fec 100644 --- a/var/spack/repos/builtin/packages/osi/package.py +++ b/var/spack/repos/builtin/packages/osi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Osi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/osmctools/package.py b/var/spack/repos/builtin/packages/osmctools/package.py index 70469bf3af..8fd4d37042 100644 --- a/var/spack/repos/builtin/packages/osmctools/package.py +++ b/var/spack/repos/builtin/packages/osmctools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Osmctools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/osqp/package.py b/var/spack/repos/builtin/packages/osqp/package.py index f90f680609..68d386ee5a 100644 --- a/var/spack/repos/builtin/packages/osqp/package.py +++ b/var/spack/repos/builtin/packages/osqp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Osqp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ossp-uuid/package.py b/var/spack/repos/builtin/packages/ossp-uuid/package.py index 93e7fe2925..a5796bac7d 100644 --- a/var/spack/repos/builtin/packages/ossp-uuid/package.py +++ b/var/spack/repos/builtin/packages/ossp-uuid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class OsspUuid(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py index bf18832bcd..4a99450b0b 100644 --- a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class OsuMicroBenchmarks(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/otf/package.py b/var/spack/repos/builtin/packages/otf/package.py index 22275cadf5..8c1b652a6a 100644 --- a/var/spack/repos/builtin/packages/otf/package.py +++ b/var/spack/repos/builtin/packages/otf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Otf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py index 6d03b06655..fc1b6d5dc3 100644 --- a/var/spack/repos/builtin/packages/otf2/package.py +++ b/var/spack/repos/builtin/packages/otf2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Otf2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ovito/package.py b/var/spack/repos/builtin/packages/ovito/package.py index 10c76d4062..b40c151d18 100755 --- a/var/spack/repos/builtin/packages/ovito/package.py +++ b/var/spack/repos/builtin/packages/ovito/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ovito(Package): diff --git a/var/spack/repos/builtin/packages/p11-kit/package.py b/var/spack/repos/builtin/packages/p11-kit/package.py index 620b7e90ee..be3c103640 100644 --- a/var/spack/repos/builtin/packages/p11-kit/package.py +++ b/var/spack/repos/builtin/packages/p11-kit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class P11Kit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/p3dfft3/package.py b/var/spack/repos/builtin/packages/p3dfft3/package.py index fe297c9d15..3c7dc472a7 100644 --- a/var/spack/repos/builtin/packages/p3dfft3/package.py +++ b/var/spack/repos/builtin/packages/p3dfft3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class P3dfft3(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/p4est/package.py b/var/spack/repos/builtin/packages/p4est/package.py index 87427e3fa0..405753e80e 100644 --- a/var/spack/repos/builtin/packages/p4est/package.py +++ b/var/spack/repos/builtin/packages/p4est/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class P4est(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/p7zip/package.py b/var/spack/repos/builtin/packages/p7zip/package.py index fdf5b4a08b..2d9781dfd1 100644 --- a/var/spack/repos/builtin/packages/p7zip/package.py +++ b/var/spack/repos/builtin/packages/p7zip/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class P7zip(MakefilePackage): """A Unix port of the 7z file archiver""" diff --git a/var/spack/repos/builtin/packages/pacbio-daligner/package.py b/var/spack/repos/builtin/packages/pacbio-daligner/package.py index 4b7122ef46..ba0f24f964 100644 --- a/var/spack/repos/builtin/packages/pacbio-daligner/package.py +++ b/var/spack/repos/builtin/packages/pacbio-daligner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PacbioDaligner(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pacbio-damasker/package.py b/var/spack/repos/builtin/packages/pacbio-damasker/package.py index f7c15a181f..f94041989a 100644 --- a/var/spack/repos/builtin/packages/pacbio-damasker/package.py +++ b/var/spack/repos/builtin/packages/pacbio-damasker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PacbioDamasker(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py index 254fd5e965..d09697de3f 100644 --- a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PacbioDazzDb(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py index 29a402765a..ef92799b24 100644 --- a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PacbioDextractor(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pacifica-cli/package.py b/var/spack/repos/builtin/packages/pacifica-cli/package.py index b0ad1bd119..ba1c57e613 100644 --- a/var/spack/repos/builtin/packages/pacifica-cli/package.py +++ b/var/spack/repos/builtin/packages/pacifica-cli/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PacificaCli(PythonPackage): diff --git a/var/spack/repos/builtin/packages/packmol/package.py b/var/spack/repos/builtin/packages/packmol/package.py index 1c63a71ba6..21a6b6ea98 100644 --- a/var/spack/repos/builtin/packages/packmol/package.py +++ b/var/spack/repos/builtin/packages/packmol/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Packmol(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pacparser/package.py b/var/spack/repos/builtin/packages/pacparser/package.py index f986edbc16..3be37ed5c6 100644 --- a/var/spack/repos/builtin/packages/pacparser/package.py +++ b/var/spack/repos/builtin/packages/pacparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pacparser(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pacvim/package.py b/var/spack/repos/builtin/packages/pacvim/package.py index a9d660a06f..493379a912 100644 --- a/var/spack/repos/builtin/packages/pacvim/package.py +++ b/var/spack/repos/builtin/packages/pacvim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pacvim(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pagit/package.py b/var/spack/repos/builtin/packages/pagit/package.py index 3d743b641a..dbfd8f32f1 100644 --- a/var/spack/repos/builtin/packages/pagit/package.py +++ b/var/spack/repos/builtin/packages/pagit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pagit(Package): diff --git a/var/spack/repos/builtin/packages/pagmo/package.py b/var/spack/repos/builtin/packages/pagmo/package.py index f34a65b88b..eea6b06ec6 100644 --- a/var/spack/repos/builtin/packages/pagmo/package.py +++ b/var/spack/repos/builtin/packages/pagmo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/pagmo2/package.py b/var/spack/repos/builtin/packages/pagmo2/package.py index 03b2105a59..71b54a23f9 100644 --- a/var/spack/repos/builtin/packages/pagmo2/package.py +++ b/var/spack/repos/builtin/packages/pagmo2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pagmo2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pajeng/package.py b/var/spack/repos/builtin/packages/pajeng/package.py index d3ce66c7ba..3ce76e7f2c 100644 --- a/var/spack/repos/builtin/packages/pajeng/package.py +++ b/var/spack/repos/builtin/packages/pajeng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pajeng(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pal/package.py b/var/spack/repos/builtin/packages/pal/package.py index 3f959d0642..6fcc3537bc 100644 --- a/var/spack/repos/builtin/packages/pal/package.py +++ b/var/spack/repos/builtin/packages/pal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pal(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/palisade-development/package.py b/var/spack/repos/builtin/packages/palisade-development/package.py index a600babf86..eb5dd35c42 100644 --- a/var/spack/repos/builtin/packages/palisade-development/package.py +++ b/var/spack/repos/builtin/packages/palisade-development/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PalisadeDevelopment(CMakePackage): diff --git a/var/spack/repos/builtin/packages/paml/package.py b/var/spack/repos/builtin/packages/paml/package.py index 71f25f24ed..b688a43764 100644 --- a/var/spack/repos/builtin/packages/paml/package.py +++ b/var/spack/repos/builtin/packages/paml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Paml(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/panda/package.py b/var/spack/repos/builtin/packages/panda/package.py index 2d7472f832..f624c84c71 100644 --- a/var/spack/repos/builtin/packages/panda/package.py +++ b/var/spack/repos/builtin/packages/panda/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Panda(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py index 2661f9f919..f0951ad2e8 100644 --- a/var/spack/repos/builtin/packages/pandaseq/package.py +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pandaseq(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pandoc/package.py b/var/spack/repos/builtin/packages/pandoc/package.py index 4f10f819b4..7591f264ad 100644 --- a/var/spack/repos/builtin/packages/pandoc/package.py +++ b/var/spack/repos/builtin/packages/pandoc/package.py @@ -5,7 +5,7 @@ import platform -from spack import * +from spack.package import * class Pandoc(Package): diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index 43b537b3b4..4928f2a565 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pango(MesonPackage): diff --git a/var/spack/repos/builtin/packages/pangolin/package.py b/var/spack/repos/builtin/packages/pangolin/package.py index 54188d1558..87ec01f4f4 100644 --- a/var/spack/repos/builtin/packages/pangolin/package.py +++ b/var/spack/repos/builtin/packages/pangolin/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Pangolin(CMakePackage): """Pangolin is a lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input.""" diff --git a/var/spack/repos/builtin/packages/pangomm/package.py b/var/spack/repos/builtin/packages/pangomm/package.py index 2d5915b53b..b77cea0364 100644 --- a/var/spack/repos/builtin/packages/pangomm/package.py +++ b/var/spack/repos/builtin/packages/pangomm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pangomm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py index 179ffca5da..c8d763a706 100644 --- a/var/spack/repos/builtin/packages/papi/package.py +++ b/var/spack/repos/builtin/packages/papi/package.py @@ -9,6 +9,8 @@ import sys import llnl.util.filesystem as fs +from spack.package import * + class Papi(AutotoolsPackage, ROCmPackage): """PAPI provides the tool designer and application engineer with a diff --git a/var/spack/repos/builtin/packages/papyrus/package.py b/var/spack/repos/builtin/packages/papyrus/package.py index 79ce2592ba..f43d7bf943 100644 --- a/var/spack/repos/builtin/packages/papyrus/package.py +++ b/var/spack/repos/builtin/packages/papyrus/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Papyrus(CMakePackage): diff --git a/var/spack/repos/builtin/packages/paradiseo/package.py b/var/spack/repos/builtin/packages/paradiseo/package.py index 701be57bca..e04450ce32 100644 --- a/var/spack/repos/builtin/packages/paradiseo/package.py +++ b/var/spack/repos/builtin/packages/paradiseo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index 9fba85a599..517f994f6b 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class ParallelNetcdf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/parallel/package.py b/var/spack/repos/builtin/packages/parallel/package.py index e77fc3c083..197b238421 100644 --- a/var/spack/repos/builtin/packages/parallel/package.py +++ b/var/spack/repos/builtin/packages/parallel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Parallel(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/parallelio/package.py b/var/spack/repos/builtin/packages/parallelio/package.py index 88109098bc..8b6a4c0c19 100644 --- a/var/spack/repos/builtin/packages/parallelio/package.py +++ b/var/spack/repos/builtin/packages/parallelio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Parallelio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/parallelmergetree/package.py b/var/spack/repos/builtin/packages/parallelmergetree/package.py index 88a73408f2..31ec17b060 100644 --- a/var/spack/repos/builtin/packages/parallelmergetree/package.py +++ b/var/spack/repos/builtin/packages/parallelmergetree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Parallelmergetree(CMakePackage): diff --git a/var/spack/repos/builtin/packages/paraver/package.py b/var/spack/repos/builtin/packages/paraver/package.py index 5429bff303..59ecfdd8e3 100644 --- a/var/spack/repos/builtin/packages/paraver/package.py +++ b/var/spack/repos/builtin/packages/paraver/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Paraver(Package): diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 234fbc8c83..289a09ac49 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -6,7 +6,7 @@ import itertools import os -from spack import * +from spack.package import * class Paraview(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/parflow/package.py b/var/spack/repos/builtin/packages/parflow/package.py index f038da64d4..04a04c5e94 100644 --- a/var/spack/repos/builtin/packages/parflow/package.py +++ b/var/spack/repos/builtin/packages/parflow/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Parflow(CMakePackage): diff --git a/var/spack/repos/builtin/packages/parmetis/package.py b/var/spack/repos/builtin/packages/parmetis/package.py index f9f59badc5..7f6b2e0aea 100644 --- a/var/spack/repos/builtin/packages/parmetis/package.py +++ b/var/spack/repos/builtin/packages/parmetis/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * class Parmetis(CMakePackage): diff --git a/var/spack/repos/builtin/packages/parmgridgen/package.py b/var/spack/repos/builtin/packages/parmgridgen/package.py index ad6479b008..3c70b9f37a 100644 --- a/var/spack/repos/builtin/packages/parmgridgen/package.py +++ b/var/spack/repos/builtin/packages/parmgridgen/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * # Note: should probably be named 'mgridgen+mpi' (as per scotch, metis etc) diff --git a/var/spack/repos/builtin/packages/parmmg/package.py b/var/spack/repos/builtin/packages/parmmg/package.py index a5f5a0a3fd..f03d98f0bc 100644 --- a/var/spack/repos/builtin/packages/parmmg/package.py +++ b/var/spack/repos/builtin/packages/parmmg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Parmmg(CMakePackage): diff --git a/var/spack/repos/builtin/packages/parquet-cpp/package.py b/var/spack/repos/builtin/packages/parquet-cpp/package.py index 470c2308c4..fd2219b04a 100644 --- a/var/spack/repos/builtin/packages/parquet-cpp/package.py +++ b/var/spack/repos/builtin/packages/parquet-cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/parquet-format/package.py b/var/spack/repos/builtin/packages/parquet-format/package.py index 813727a543..2ca3925e2c 100644 --- a/var/spack/repos/builtin/packages/parquet-format/package.py +++ b/var/spack/repos/builtin/packages/parquet-format/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ParquetFormat(MavenPackage): diff --git a/var/spack/repos/builtin/packages/parsec/package.py b/var/spack/repos/builtin/packages/parsec/package.py index 670d04bf18..2621afb332 100644 --- a/var/spack/repos/builtin/packages/parsec/package.py +++ b/var/spack/repos/builtin/packages/parsec/package.py @@ -5,7 +5,7 @@ # import llnl.util.tty as tty -from spack import * +from spack.package import * class Parsec(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/parsimonator/package.py b/var/spack/repos/builtin/packages/parsimonator/package.py index 5232fc0b38..92a27e355a 100644 --- a/var/spack/repos/builtin/packages/parsimonator/package.py +++ b/var/spack/repos/builtin/packages/parsimonator/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Parsimonator(MakefilePackage): """Parsimonator is a no-frills light-weight implementation for building starting trees under parsimony for RAxML. diff --git a/var/spack/repos/builtin/packages/parsplice/package.py b/var/spack/repos/builtin/packages/parsplice/package.py index b6364e9e2c..ea3ec5a8ef 100644 --- a/var/spack/repos/builtin/packages/parsplice/package.py +++ b/var/spack/repos/builtin/packages/parsplice/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/partitionfinder/package.py b/var/spack/repos/builtin/packages/partitionfinder/package.py index e0c3a63b9b..71706b6b08 100644 --- a/var/spack/repos/builtin/packages/partitionfinder/package.py +++ b/var/spack/repos/builtin/packages/partitionfinder/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Partitionfinder(Package): diff --git a/var/spack/repos/builtin/packages/pasta/package.py b/var/spack/repos/builtin/packages/pasta/package.py index a0b30e08d6..acd2110542 100644 --- a/var/spack/repos/builtin/packages/pasta/package.py +++ b/var/spack/repos/builtin/packages/pasta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pasta(Package): diff --git a/var/spack/repos/builtin/packages/pastix/package.py b/var/spack/repos/builtin/packages/pastix/package.py index 63ad654b93..41f190985e 100644 --- a/var/spack/repos/builtin/packages/pastix/package.py +++ b/var/spack/repos/builtin/packages/pastix/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Pastix(CMakePackage, CudaPackage): """a high performance parallel solver for very large sparse linear systems based on direct methods""" diff --git a/var/spack/repos/builtin/packages/patch/package.py b/var/spack/repos/builtin/packages/patch/package.py index 88acdbf9f5..598a6c0cc6 100644 --- a/var/spack/repos/builtin/packages/patch/package.py +++ b/var/spack/repos/builtin/packages/patch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Patch(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/patchelf/package.py b/var/spack/repos/builtin/packages/patchelf/package.py index 449b5aace3..83f2b8d24b 100644 --- a/var/spack/repos/builtin/packages/patchelf/package.py +++ b/var/spack/repos/builtin/packages/patchelf/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class Patchelf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/patchutils/package.py b/var/spack/repos/builtin/packages/patchutils/package.py index 3d04b9ad66..7063f6bfb5 100644 --- a/var/spack/repos/builtin/packages/patchutils/package.py +++ b/var/spack/repos/builtin/packages/patchutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Patchutils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pathfinder/package.py b/var/spack/repos/builtin/packages/pathfinder/package.py index cf8f85501d..a8c32452c4 100644 --- a/var/spack/repos/builtin/packages/pathfinder/package.py +++ b/var/spack/repos/builtin/packages/pathfinder/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pathfinder(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pax-utils/package.py b/var/spack/repos/builtin/packages/pax-utils/package.py index 7a9fdc48fe..b71e7c9e04 100644 --- a/var/spack/repos/builtin/packages/pax-utils/package.py +++ b/var/spack/repos/builtin/packages/pax-utils/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PaxUtils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pbbam/package.py b/var/spack/repos/builtin/packages/pbbam/package.py index 04da6e6351..a6c9803776 100644 --- a/var/spack/repos/builtin/packages/pbbam/package.py +++ b/var/spack/repos/builtin/packages/pbbam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/pbmpi/package.py b/var/spack/repos/builtin/packages/pbmpi/package.py index 5eee955e34..ab63fa40ef 100644 --- a/var/spack/repos/builtin/packages/pbmpi/package.py +++ b/var/spack/repos/builtin/packages/pbmpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pbmpi(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pbsuite/package.py b/var/spack/repos/builtin/packages/pbsuite/package.py index 6d36a943dd..353e5bb38f 100644 --- a/var/spack/repos/builtin/packages/pbsuite/package.py +++ b/var/spack/repos/builtin/packages/pbsuite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pbsuite(Package, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/pciutils/package.py b/var/spack/repos/builtin/packages/pciutils/package.py index 84ca3db586..10bc0ebbc2 100644 --- a/var/spack/repos/builtin/packages/pciutils/package.py +++ b/var/spack/repos/builtin/packages/pciutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pciutils(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pcl/package.py b/var/spack/repos/builtin/packages/pcl/package.py index fdecb69e99..0ed83a2af5 100644 --- a/var/spack/repos/builtin/packages/pcl/package.py +++ b/var/spack/repos/builtin/packages/pcl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/pcma/package.py b/var/spack/repos/builtin/packages/pcma/package.py index 9d446160c4..6ca9b6ed36 100644 --- a/var/spack/repos/builtin/packages/pcma/package.py +++ b/var/spack/repos/builtin/packages/pcma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pcma(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py index ceb376184b..4930c92a1e 100644 --- a/var/spack/repos/builtin/packages/pcre/package.py +++ b/var/spack/repos/builtin/packages/pcre/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pcre(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pcre2/package.py b/var/spack/repos/builtin/packages/pcre2/package.py index 66b1970754..c2396555a6 100644 --- a/var/spack/repos/builtin/packages/pcre2/package.py +++ b/var/spack/repos/builtin/packages/pcre2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pcre2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pdc/package.py b/var/spack/repos/builtin/packages/pdc/package.py index 82e44a6f8d..fd5b043650 100644 --- a/var/spack/repos/builtin/packages/pdc/package.py +++ b/var/spack/repos/builtin/packages/pdc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pdc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pdf2svg/package.py b/var/spack/repos/builtin/packages/pdf2svg/package.py index db4efc4cd9..346d3ed563 100644 --- a/var/spack/repos/builtin/packages/pdf2svg/package.py +++ b/var/spack/repos/builtin/packages/pdf2svg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pdf2svg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pdftk/package.py b/var/spack/repos/builtin/packages/pdftk/package.py index ad718434a4..b010bb46c7 100644 --- a/var/spack/repos/builtin/packages/pdftk/package.py +++ b/var/spack/repos/builtin/packages/pdftk/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Pdftk(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pdsh/package.py b/var/spack/repos/builtin/packages/pdsh/package.py index 12735c3aba..9ce8b15c79 100644 --- a/var/spack/repos/builtin/packages/pdsh/package.py +++ b/var/spack/repos/builtin/packages/pdsh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pdsh(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py index 56643a6319..90302e6137 100644 --- a/var/spack/repos/builtin/packages/pdt/package.py +++ b/var/spack/repos/builtin/packages/pdt/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Pdt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py index 193553d03a..cc408afc5b 100644 --- a/var/spack/repos/builtin/packages/pegtl/package.py +++ b/var/spack/repos/builtin/packages/pegtl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * # package has a Makefile, but only to build examples diff --git a/var/spack/repos/builtin/packages/pennant/package.py b/var/spack/repos/builtin/packages/pennant/package.py index d5666a098d..4ca6d77fec 100644 --- a/var/spack/repos/builtin/packages/pennant/package.py +++ b/var/spack/repos/builtin/packages/pennant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pennant(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py index 673f361897..116ec1841e 100644 --- a/var/spack/repos/builtin/packages/percept/package.py +++ b/var/spack/repos/builtin/packages/percept/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/percona-server/package.py b/var/spack/repos/builtin/packages/percona-server/package.py index ea95c4be20..8d3bd7b55c 100644 --- a/var/spack/repos/builtin/packages/percona-server/package.py +++ b/var/spack/repos/builtin/packages/percona-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/perfstubs/package.py b/var/spack/repos/builtin/packages/perfstubs/package.py index 9634c9c01d..d5b4ff9310 100644 --- a/var/spack/repos/builtin/packages/perfstubs/package.py +++ b/var/spack/repos/builtin/packages/perfstubs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Perfstubs(CMakePackage): diff --git a/var/spack/repos/builtin/packages/perl-acme-damn/package.py b/var/spack/repos/builtin/packages/perl-acme-damn/package.py index 3a401f5847..8316cdb831 100644 --- a/var/spack/repos/builtin/packages/perl-acme-damn/package.py +++ b/var/spack/repos/builtin/packages/perl-acme-damn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlAcmeDamn(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py b/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py index 8cb04ad092..9a9e17fb6a 100644 --- a/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py +++ b/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlAlgorithmDiff(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-alien-build/package.py b/var/spack/repos/builtin/packages/perl-alien-build/package.py index 7f86229609..42fc8f45d1 100644 --- a/var/spack/repos/builtin/packages/perl-alien-build/package.py +++ b/var/spack/repos/builtin/packages/perl-alien-build/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlAlienBuild(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-alien-libxml2/package.py b/var/spack/repos/builtin/packages/perl-alien-libxml2/package.py index 6d777e6496..2252705cf3 100644 --- a/var/spack/repos/builtin/packages/perl-alien-libxml2/package.py +++ b/var/spack/repos/builtin/packages/perl-alien-libxml2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlAlienLibxml2(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-alien-svn/package.py b/var/spack/repos/builtin/packages/perl-alien-svn/package.py index 2e95e341d9..27f71fd314 100644 --- a/var/spack/repos/builtin/packages/perl-alien-svn/package.py +++ b/var/spack/repos/builtin/packages/perl-alien-svn/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class PerlAlienSvn(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-app-cmd/package.py b/var/spack/repos/builtin/packages/perl-app-cmd/package.py index 26f5206d46..b7651ce2db 100644 --- a/var/spack/repos/builtin/packages/perl-app-cmd/package.py +++ b/var/spack/repos/builtin/packages/perl-app-cmd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlAppCmd(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-array-utils/package.py b/var/spack/repos/builtin/packages/perl-array-utils/package.py index 8478937e92..bde16b514a 100644 --- a/var/spack/repos/builtin/packages/perl-array-utils/package.py +++ b/var/spack/repos/builtin/packages/perl-array-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlArrayUtils(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py b/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py index 9a0cb6c537..45a1204454 100644 --- a/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py +++ b/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlBHooksEndofscope(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-bio-searchio-hmmer/package.py b/var/spack/repos/builtin/packages/perl-bio-searchio-hmmer/package.py index fcd834459b..0b9e1afa09 100644 --- a/var/spack/repos/builtin/packages/perl-bio-searchio-hmmer/package.py +++ b/var/spack/repos/builtin/packages/perl-bio-searchio-hmmer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlBioSearchioHmmer(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-bioperl/package.py b/var/spack/repos/builtin/packages/perl-bioperl/package.py index 1a92e29600..40704f2fa8 100644 --- a/var/spack/repos/builtin/packages/perl-bioperl/package.py +++ b/var/spack/repos/builtin/packages/perl-bioperl/package.py @@ -5,7 +5,7 @@ import inspect -from spack import * +from spack.package import * class PerlBioperl(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-bit-vector/package.py b/var/spack/repos/builtin/packages/perl-bit-vector/package.py index dbc8537fac..eb71aaa35a 100644 --- a/var/spack/repos/builtin/packages/perl-bit-vector/package.py +++ b/var/spack/repos/builtin/packages/perl-bit-vector/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlBitVector(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-cairo/package.py b/var/spack/repos/builtin/packages/perl-cairo/package.py index f55c79b48a..257f703b25 100644 --- a/var/spack/repos/builtin/packages/perl-cairo/package.py +++ b/var/spack/repos/builtin/packages/perl-cairo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlCairo(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-capture-tiny/package.py b/var/spack/repos/builtin/packages/perl-capture-tiny/package.py index cd706ff82f..8b3af9b604 100644 --- a/var/spack/repos/builtin/packages/perl-capture-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-capture-tiny/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlCaptureTiny(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-carp-clan/package.py b/var/spack/repos/builtin/packages/perl-carp-clan/package.py index 6d35906a9b..85da352779 100644 --- a/var/spack/repos/builtin/packages/perl-carp-clan/package.py +++ b/var/spack/repos/builtin/packages/perl-carp-clan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlCarpClan(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-cgi/package.py b/var/spack/repos/builtin/packages/perl-cgi/package.py index 92cecc81c5..fe500598ac 100644 --- a/var/spack/repos/builtin/packages/perl-cgi/package.py +++ b/var/spack/repos/builtin/packages/perl-cgi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlCgi(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py b/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py index 119271d725..c39100edd3 100644 --- a/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py +++ b/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlClassDataInheritable(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-class-inspector/package.py b/var/spack/repos/builtin/packages/perl-class-inspector/package.py index 151c4860bb..337ee035f8 100644 --- a/var/spack/repos/builtin/packages/perl-class-inspector/package.py +++ b/var/spack/repos/builtin/packages/perl-class-inspector/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlClassInspector(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-class-load-xs/package.py b/var/spack/repos/builtin/packages/perl-class-load-xs/package.py index 09c018c5ba..fcdf94910f 100644 --- a/var/spack/repos/builtin/packages/perl-class-load-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-class-load-xs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlClassLoadXs(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-class-load/package.py b/var/spack/repos/builtin/packages/perl-class-load/package.py index d2c0e962b2..5fd11d8c15 100644 --- a/var/spack/repos/builtin/packages/perl-class-load/package.py +++ b/var/spack/repos/builtin/packages/perl-class-load/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlClassLoad(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-clone-choose/package.py b/var/spack/repos/builtin/packages/perl-clone-choose/package.py index 9adbe04889..53381b3456 100644 --- a/var/spack/repos/builtin/packages/perl-clone-choose/package.py +++ b/var/spack/repos/builtin/packages/perl-clone-choose/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlCloneChoose(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-clone/package.py b/var/spack/repos/builtin/packages/perl-clone/package.py index c61d720a23..df5d4c4a31 100644 --- a/var/spack/repos/builtin/packages/perl-clone/package.py +++ b/var/spack/repos/builtin/packages/perl-clone/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlClone(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py index 48ff0e28d3..710930f327 100644 --- a/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py +++ b/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlCompressRawBzip2(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py index 643cb45c45..d16bba25c9 100644 --- a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py +++ b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlCompressRawZlib(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-config-general/package.py b/var/spack/repos/builtin/packages/perl-config-general/package.py index bec018480a..2808842d78 100644 --- a/var/spack/repos/builtin/packages/perl-config-general/package.py +++ b/var/spack/repos/builtin/packages/perl-config-general/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlConfigGeneral(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-contextual-return/package.py b/var/spack/repos/builtin/packages/perl-contextual-return/package.py index 1dc668fc61..d81dfe0efd 100644 --- a/var/spack/repos/builtin/packages/perl-contextual-return/package.py +++ b/var/spack/repos/builtin/packages/perl-contextual-return/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlContextualReturn(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py b/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py index 34dfb0ce1d..d66c8d9b50 100644 --- a/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py +++ b/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlCpanMetaCheck(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-data-dumper/package.py b/var/spack/repos/builtin/packages/perl-data-dumper/package.py index 963342b3b7..d23a684b8a 100644 --- a/var/spack/repos/builtin/packages/perl-data-dumper/package.py +++ b/var/spack/repos/builtin/packages/perl-data-dumper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDataDumper(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-data-optlist/package.py b/var/spack/repos/builtin/packages/perl-data-optlist/package.py index 8ff010be43..64f005692a 100644 --- a/var/spack/repos/builtin/packages/perl-data-optlist/package.py +++ b/var/spack/repos/builtin/packages/perl-data-optlist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDataOptlist(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-data-stag/package.py b/var/spack/repos/builtin/packages/perl-data-stag/package.py index 29b0d2e7d0..fabae36121 100644 --- a/var/spack/repos/builtin/packages/perl-data-stag/package.py +++ b/var/spack/repos/builtin/packages/perl-data-stag/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDataStag(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-date-manip/package.py b/var/spack/repos/builtin/packages/perl-date-manip/package.py index 254e89c771..419bb425e2 100644 --- a/var/spack/repos/builtin/packages/perl-date-manip/package.py +++ b/var/spack/repos/builtin/packages/perl-date-manip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDateManip(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-db-file/package.py b/var/spack/repos/builtin/packages/perl-db-file/package.py index 7a843dfcb1..9c3fea210e 100644 --- a/var/spack/repos/builtin/packages/perl-db-file/package.py +++ b/var/spack/repos/builtin/packages/perl-db-file/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDbFile(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py index d2d1c72f3e..6f789a4aaa 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDbdMysql(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-dbd-pg/package.py b/var/spack/repos/builtin/packages/perl-dbd-pg/package.py index 7898ddac25..60b8695e01 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-pg/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-pg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDbdPg(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py index d8d311f38b..dfecb838fb 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDbdSqlite(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-dbi/package.py b/var/spack/repos/builtin/packages/perl-dbi/package.py index 39959f01e2..a871e10686 100644 --- a/var/spack/repos/builtin/packages/perl-dbi/package.py +++ b/var/spack/repos/builtin/packages/perl-dbi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDbi(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-devel-cycle/package.py b/var/spack/repos/builtin/packages/perl-devel-cycle/package.py index 82b79a2466..0f5cfdc62f 100644 --- a/var/spack/repos/builtin/packages/perl-devel-cycle/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-cycle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDevelCycle(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py b/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py index 71ba9ce90b..baef9fe786 100644 --- a/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDevelGlobaldestruction(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py index 3b850fb71a..bb583a7f05 100644 --- a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDevelOverloadinfo(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py index 880f665724..1dea61cb41 100644 --- a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDevelStacktrace(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-devel-symdump/package.py b/var/spack/repos/builtin/packages/perl-devel-symdump/package.py index 6572169864..65d2400d33 100644 --- a/var/spack/repos/builtin/packages/perl-devel-symdump/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-symdump/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDevelSymdump(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-digest-md5/package.py b/var/spack/repos/builtin/packages/perl-digest-md5/package.py index 325d67a6ec..ecdb84305d 100644 --- a/var/spack/repos/builtin/packages/perl-digest-md5/package.py +++ b/var/spack/repos/builtin/packages/perl-digest-md5/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDigestMd5(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py b/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py index 9332f8353f..3659fb1eb8 100644 --- a/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py +++ b/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlDistCheckconflicts(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-encode-locale/package.py b/var/spack/repos/builtin/packages/perl-encode-locale/package.py index b8c7c27007..154aba5023 100644 --- a/var/spack/repos/builtin/packages/perl-encode-locale/package.py +++ b/var/spack/repos/builtin/packages/perl-encode-locale/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlEncodeLocale(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-error/package.py b/var/spack/repos/builtin/packages/perl-error/package.py index acef0da4f2..dd1e5f6965 100644 --- a/var/spack/repos/builtin/packages/perl-error/package.py +++ b/var/spack/repos/builtin/packages/perl-error/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlError(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-eval-closure/package.py b/var/spack/repos/builtin/packages/perl-eval-closure/package.py index e8f88e8a51..209ed15c0c 100644 --- a/var/spack/repos/builtin/packages/perl-eval-closure/package.py +++ b/var/spack/repos/builtin/packages/perl-eval-closure/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlEvalClosure(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-exception-class/package.py b/var/spack/repos/builtin/packages/perl-exception-class/package.py index aa2b04fb6b..ca4027b5d7 100644 --- a/var/spack/repos/builtin/packages/perl-exception-class/package.py +++ b/var/spack/repos/builtin/packages/perl-exception-class/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExceptionClass(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-exporter-lite/package.py b/var/spack/repos/builtin/packages/perl-exporter-lite/package.py index f49ce4f39c..a697ed534c 100644 --- a/var/spack/repos/builtin/packages/perl-exporter-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-exporter-lite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExporterLite(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py index 263cc9b4f5..1d4e904869 100644 --- a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExporterTiny(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-extutils-config/package.py b/var/spack/repos/builtin/packages/perl-extutils-config/package.py index 72044e90b2..ed80d9aa1b 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-config/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-config/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExtutilsConfig(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py index f8811306d6..53bfd289b0 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExtutilsDepends(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-extutils-helpers/package.py b/var/spack/repos/builtin/packages/perl-extutils-helpers/package.py index 90c6f00c81..d08fd299a1 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-helpers/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-helpers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExtutilsHelpers(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py b/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py index 4c63ecaf83..d846a1b9a5 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExtutilsInstallpaths(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py b/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py index 1324570807..346d76ece2 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExtutilsMakemaker(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py index 03c2dd710f..343f9da424 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlExtutilsPkgconfig(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-ffi-checklib/package.py b/var/spack/repos/builtin/packages/perl-ffi-checklib/package.py index 5dceb04d07..142c328bd1 100644 --- a/var/spack/repos/builtin/packages/perl-ffi-checklib/package.py +++ b/var/spack/repos/builtin/packages/perl-ffi-checklib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFfiChecklib(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-chdir/package.py b/var/spack/repos/builtin/packages/perl-file-chdir/package.py index f813e01673..ae0d578b8c 100644 --- a/var/spack/repos/builtin/packages/perl-file-chdir/package.py +++ b/var/spack/repos/builtin/packages/perl-file-chdir/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileChdir(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py index f9ffe8e290..749f7bab22 100644 --- a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py +++ b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileCopyRecursive(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-homedir/package.py b/var/spack/repos/builtin/packages/perl-file-homedir/package.py index c7aaa2cdf0..e398f2e998 100644 --- a/var/spack/repos/builtin/packages/perl-file-homedir/package.py +++ b/var/spack/repos/builtin/packages/perl-file-homedir/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileHomedir(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-listing/package.py b/var/spack/repos/builtin/packages/perl-file-listing/package.py index 603597b127..facc265d95 100644 --- a/var/spack/repos/builtin/packages/perl-file-listing/package.py +++ b/var/spack/repos/builtin/packages/perl-file-listing/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileListing(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-pushd/package.py b/var/spack/repos/builtin/packages/perl-file-pushd/package.py index 7e87626f09..598499b153 100644 --- a/var/spack/repos/builtin/packages/perl-file-pushd/package.py +++ b/var/spack/repos/builtin/packages/perl-file-pushd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFilePushd(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py index e62f281a51..e7c85924d7 100644 --- a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py +++ b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileSharedirInstall(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py index 15b64218e1..bd4488f44e 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileSlurpTiny(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-slurp/package.py b/var/spack/repos/builtin/packages/perl-file-slurp/package.py index fb8200d1d8..c11b7abf95 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurp/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileSlurp(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-slurper/package.py b/var/spack/repos/builtin/packages/perl-file-slurper/package.py index 3ac6f0de3c..4bb081fe57 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurper/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileSlurper(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-file-which/package.py b/var/spack/repos/builtin/packages/perl-file-which/package.py index c893b3b3a0..fa05891b97 100644 --- a/var/spack/repos/builtin/packages/perl-file-which/package.py +++ b/var/spack/repos/builtin/packages/perl-file-which/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFileWhich(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-font-ttf/package.py b/var/spack/repos/builtin/packages/perl-font-ttf/package.py index 6c3192b28f..6a27574afa 100644 --- a/var/spack/repos/builtin/packages/perl-font-ttf/package.py +++ b/var/spack/repos/builtin/packages/perl-font-ttf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlFontTtf(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-forks/package.py b/var/spack/repos/builtin/packages/perl-forks/package.py index 31b8f33df1..d1a42fd91c 100644 --- a/var/spack/repos/builtin/packages/perl-forks/package.py +++ b/var/spack/repos/builtin/packages/perl-forks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlForks(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-fth/package.py b/var/spack/repos/builtin/packages/perl-fth/package.py index 7c64501e75..1363a98b3b 100644 --- a/var/spack/repos/builtin/packages/perl-fth/package.py +++ b/var/spack/repos/builtin/packages/perl-fth/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class PerlFth(Package): diff --git a/var/spack/repos/builtin/packages/perl-gd/package.py b/var/spack/repos/builtin/packages/perl-gd/package.py index a8cca42048..14adb839f4 100644 --- a/var/spack/repos/builtin/packages/perl-gd/package.py +++ b/var/spack/repos/builtin/packages/perl-gd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlGd(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py b/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py index 62caf6fa6e..ad0ab6bf2b 100644 --- a/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py +++ b/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlGdgraphHistogram(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-gdgraph/package.py b/var/spack/repos/builtin/packages/perl-gdgraph/package.py index 3378622f7b..0d57b5774f 100644 --- a/var/spack/repos/builtin/packages/perl-gdgraph/package.py +++ b/var/spack/repos/builtin/packages/perl-gdgraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlGdgraph(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-gdtextutil/package.py b/var/spack/repos/builtin/packages/perl-gdtextutil/package.py index a0c81d1963..041a67192c 100644 --- a/var/spack/repos/builtin/packages/perl-gdtextutil/package.py +++ b/var/spack/repos/builtin/packages/perl-gdtextutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlGdtextutil(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-getopt-tabular/package.py b/var/spack/repos/builtin/packages/perl-getopt-tabular/package.py index 2019b9e2d0..b60a164030 100644 --- a/var/spack/repos/builtin/packages/perl-getopt-tabular/package.py +++ b/var/spack/repos/builtin/packages/perl-getopt-tabular/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlGetoptTabular(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py index fca0e31ba5..bb29e7589b 100644 --- a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py +++ b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlGraphReadwrite(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-graph/package.py b/var/spack/repos/builtin/packages/perl-graph/package.py index 927df516b5..c224572bb4 100644 --- a/var/spack/repos/builtin/packages/perl-graph/package.py +++ b/var/spack/repos/builtin/packages/perl-graph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlGraph(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-hash-merge/package.py b/var/spack/repos/builtin/packages/perl-hash-merge/package.py index f2b74b9d6a..a7ece4a204 100644 --- a/var/spack/repos/builtin/packages/perl-hash-merge/package.py +++ b/var/spack/repos/builtin/packages/perl-hash-merge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlHashMerge(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-html-parser/package.py b/var/spack/repos/builtin/packages/perl-html-parser/package.py index db26d637f4..ce1149ac86 100644 --- a/var/spack/repos/builtin/packages/perl-html-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-html-parser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlHtmlParser(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-html-tagset/package.py b/var/spack/repos/builtin/packages/perl-html-tagset/package.py index 34eaf1a28f..9b8389d323 100644 --- a/var/spack/repos/builtin/packages/perl-html-tagset/package.py +++ b/var/spack/repos/builtin/packages/perl-html-tagset/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlHtmlTagset(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-http-cookies/package.py b/var/spack/repos/builtin/packages/perl-http-cookies/package.py index a9e12bd06f..a3273a562b 100644 --- a/var/spack/repos/builtin/packages/perl-http-cookies/package.py +++ b/var/spack/repos/builtin/packages/perl-http-cookies/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlHttpCookies(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-http-daemon/package.py b/var/spack/repos/builtin/packages/perl-http-daemon/package.py index 8d5e4589d9..bdf0a7e7d9 100644 --- a/var/spack/repos/builtin/packages/perl-http-daemon/package.py +++ b/var/spack/repos/builtin/packages/perl-http-daemon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlHttpDaemon(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-http-date/package.py b/var/spack/repos/builtin/packages/perl-http-date/package.py index 58292e1f2a..d9846da387 100644 --- a/var/spack/repos/builtin/packages/perl-http-date/package.py +++ b/var/spack/repos/builtin/packages/perl-http-date/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlHttpDate(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-http-message/package.py b/var/spack/repos/builtin/packages/perl-http-message/package.py index 7b5e4f4acd..a46096777f 100644 --- a/var/spack/repos/builtin/packages/perl-http-message/package.py +++ b/var/spack/repos/builtin/packages/perl-http-message/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlHttpMessage(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py index f5c18ef19f..0582bd2bff 100644 --- a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py +++ b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlHttpNegotiate(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-inline-c/package.py b/var/spack/repos/builtin/packages/perl-inline-c/package.py index 8367ffbe4b..7e026f8fb7 100644 --- a/var/spack/repos/builtin/packages/perl-inline-c/package.py +++ b/var/spack/repos/builtin/packages/perl-inline-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlInlineC(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-inline/package.py b/var/spack/repos/builtin/packages/perl-inline/package.py index cd79f2418c..81983fdd2c 100644 --- a/var/spack/repos/builtin/packages/perl-inline/package.py +++ b/var/spack/repos/builtin/packages/perl-inline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlInline(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-all/package.py b/var/spack/repos/builtin/packages/perl-io-all/package.py index 1bdfb0014d..a889db138f 100644 --- a/var/spack/repos/builtin/packages/perl-io-all/package.py +++ b/var/spack/repos/builtin/packages/perl-io-all/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIoAll(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-compress/package.py b/var/spack/repos/builtin/packages/perl-io-compress/package.py index a781bcbdc2..15aa4c4ab2 100644 --- a/var/spack/repos/builtin/packages/perl-io-compress/package.py +++ b/var/spack/repos/builtin/packages/perl-io-compress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIoCompress(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-html/package.py b/var/spack/repos/builtin/packages/perl-io-html/package.py index c36a4f8625..04fc1cf1a2 100644 --- a/var/spack/repos/builtin/packages/perl-io-html/package.py +++ b/var/spack/repos/builtin/packages/perl-io-html/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIoHtml(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-prompt/package.py b/var/spack/repos/builtin/packages/perl-io-prompt/package.py index 7664665026..afde26564c 100644 --- a/var/spack/repos/builtin/packages/perl-io-prompt/package.py +++ b/var/spack/repos/builtin/packages/perl-io-prompt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIoPrompt(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py index c2fee63e95..15390dde76 100644 --- a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py +++ b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIoSessiondata(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py index e8469e280a..7740075261 100644 --- a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py +++ b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py @@ -5,7 +5,7 @@ import inspect -from spack import * +from spack.package import * class PerlIoSocketSsl(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-string/package.py b/var/spack/repos/builtin/packages/perl-io-string/package.py index 9486356c1a..eefca50f76 100644 --- a/var/spack/repos/builtin/packages/perl-io-string/package.py +++ b/var/spack/repos/builtin/packages/perl-io-string/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIoString(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-stringy/package.py b/var/spack/repos/builtin/packages/perl-io-stringy/package.py index d1a6c3b4e3..c7470a1856 100644 --- a/var/spack/repos/builtin/packages/perl-io-stringy/package.py +++ b/var/spack/repos/builtin/packages/perl-io-stringy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIoStringy(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-io-tty/package.py b/var/spack/repos/builtin/packages/perl-io-tty/package.py index d55bc318ac..2155e39b2a 100644 --- a/var/spack/repos/builtin/packages/perl-io-tty/package.py +++ b/var/spack/repos/builtin/packages/perl-io-tty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIoTty(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-ipc-run/package.py b/var/spack/repos/builtin/packages/perl-ipc-run/package.py index 3535e38d1b..3a1bded9c9 100644 --- a/var/spack/repos/builtin/packages/perl-ipc-run/package.py +++ b/var/spack/repos/builtin/packages/perl-ipc-run/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlIpcRun(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-json/package.py b/var/spack/repos/builtin/packages/perl-json/package.py index 879a59a6fd..3f5b6b34af 100644 --- a/var/spack/repos/builtin/packages/perl-json/package.py +++ b/var/spack/repos/builtin/packages/perl-json/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlJson(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-libwww-perl/package.py b/var/spack/repos/builtin/packages/perl-libwww-perl/package.py index e95a441d84..bfba4ce104 100644 --- a/var/spack/repos/builtin/packages/perl-libwww-perl/package.py +++ b/var/spack/repos/builtin/packages/perl-libwww-perl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlLibwwwPerl(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-libxml-perl/package.py b/var/spack/repos/builtin/packages/perl-libxml-perl/package.py index 66829c6355..e89ab9bc9e 100644 --- a/var/spack/repos/builtin/packages/perl-libxml-perl/package.py +++ b/var/spack/repos/builtin/packages/perl-libxml-perl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlLibxmlPerl(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-list-moreutils-xs/package.py b/var/spack/repos/builtin/packages/perl-list-moreutils-xs/package.py index be69864f0b..2f9dc953a2 100644 --- a/var/spack/repos/builtin/packages/perl-list-moreutils-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-list-moreutils-xs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlListMoreutilsXs(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py index 5d9435c4b6..dd64edb742 100644 --- a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py +++ b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlListMoreutils(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py index 9eafb45d47..8bfc4f95ae 100644 --- a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py +++ b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlLogLog4perl(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-logger-simple/package.py b/var/spack/repos/builtin/packages/perl-logger-simple/package.py index 7ad4b28772..e973520792 100644 --- a/var/spack/repos/builtin/packages/perl-logger-simple/package.py +++ b/var/spack/repos/builtin/packages/perl-logger-simple/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlLoggerSimple(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py index a8f8c54942..56012ddcdd 100644 --- a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlLwpMediatypes(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py index 0402aa4ab7..46c144866d 100644 --- a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlLwpProtocolHttps(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-mailtools/package.py b/var/spack/repos/builtin/packages/perl-mailtools/package.py index fa7fb87290..faeb7e7fe1 100644 --- a/var/spack/repos/builtin/packages/perl-mailtools/package.py +++ b/var/spack/repos/builtin/packages/perl-mailtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMailtools(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-math-bezier/package.py b/var/spack/repos/builtin/packages/perl-math-bezier/package.py index 8e3bb6b74c..2e73427858 100644 --- a/var/spack/repos/builtin/packages/perl-math-bezier/package.py +++ b/var/spack/repos/builtin/packages/perl-math-bezier/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMathBezier(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-math-cdf/package.py b/var/spack/repos/builtin/packages/perl-math-cdf/package.py index 85c8ff5708..f7365b4272 100644 --- a/var/spack/repos/builtin/packages/perl-math-cdf/package.py +++ b/var/spack/repos/builtin/packages/perl-math-cdf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMathCdf(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-math-cephes/package.py b/var/spack/repos/builtin/packages/perl-math-cephes/package.py index f6e1d78386..2171aed6e6 100644 --- a/var/spack/repos/builtin/packages/perl-math-cephes/package.py +++ b/var/spack/repos/builtin/packages/perl-math-cephes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMathCephes(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py b/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py index 99905bc52a..1eaa3e74c1 100644 --- a/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py +++ b/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMathMatrixreal(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-math-round/package.py b/var/spack/repos/builtin/packages/perl-math-round/package.py index 3b3669ed6e..6d3f35cb6b 100644 --- a/var/spack/repos/builtin/packages/perl-math-round/package.py +++ b/var/spack/repos/builtin/packages/perl-math-round/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMathRound(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-math-vecstat/package.py b/var/spack/repos/builtin/packages/perl-math-vecstat/package.py index 4940d1d341..91d397b266 100644 --- a/var/spack/repos/builtin/packages/perl-math-vecstat/package.py +++ b/var/spack/repos/builtin/packages/perl-math-vecstat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMathVecstat(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-mce/package.py b/var/spack/repos/builtin/packages/perl-mce/package.py index a0cf5afeef..c5dfabb760 100644 --- a/var/spack/repos/builtin/packages/perl-mce/package.py +++ b/var/spack/repos/builtin/packages/perl-mce/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMce(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-mni-perllib/package.py b/var/spack/repos/builtin/packages/perl-mni-perllib/package.py index 5c372c52b8..084a8b7002 100644 --- a/var/spack/repos/builtin/packages/perl-mni-perllib/package.py +++ b/var/spack/repos/builtin/packages/perl-mni-perllib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMniPerllib(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py b/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py index b0fc4e3d28..e9fe4ea5bd 100644 --- a/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlModuleBuildTiny(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-module-build/package.py b/var/spack/repos/builtin/packages/perl-module-build/package.py index 52dfcd4565..84d063866b 100644 --- a/var/spack/repos/builtin/packages/perl-module-build/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PerlModuleBuild(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-module-implementation/package.py b/var/spack/repos/builtin/packages/perl-module-implementation/package.py index e5d30c3246..aaf6fb0400 100644 --- a/var/spack/repos/builtin/packages/perl-module-implementation/package.py +++ b/var/spack/repos/builtin/packages/perl-module-implementation/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlModuleImplementation(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py b/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py index 18a8de7a76..c330173fbf 100644 --- a/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py +++ b/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlModuleRuntimeConflicts(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-module-runtime/package.py b/var/spack/repos/builtin/packages/perl-module-runtime/package.py index a85fcd4d82..b64ae64a5f 100644 --- a/var/spack/repos/builtin/packages/perl-module-runtime/package.py +++ b/var/spack/repos/builtin/packages/perl-module-runtime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlModuleRuntime(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-moose/package.py b/var/spack/repos/builtin/packages/perl-moose/package.py index 73fac2f954..f70e2f2647 100644 --- a/var/spack/repos/builtin/packages/perl-moose/package.py +++ b/var/spack/repos/builtin/packages/perl-moose/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMoose(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py index ab861181a8..6d12b44c4f 100644 --- a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py +++ b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMozillaCa(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-mro-compat/package.py b/var/spack/repos/builtin/packages/perl-mro-compat/package.py index 237823dfb5..ccc03a6db3 100644 --- a/var/spack/repos/builtin/packages/perl-mro-compat/package.py +++ b/var/spack/repos/builtin/packages/perl-mro-compat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlMroCompat(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-namespace-clean/package.py b/var/spack/repos/builtin/packages/perl-namespace-clean/package.py index afc50598a1..e76f3407c9 100644 --- a/var/spack/repos/builtin/packages/perl-namespace-clean/package.py +++ b/var/spack/repos/builtin/packages/perl-namespace-clean/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlNamespaceClean(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-net-http/package.py b/var/spack/repos/builtin/packages/perl-net-http/package.py index b44858971e..ce548101bb 100644 --- a/var/spack/repos/builtin/packages/perl-net-http/package.py +++ b/var/spack/repos/builtin/packages/perl-net-http/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlNetHttp(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py index 1274f68fa8..401206e472 100644 --- a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py +++ b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlNetScpExpect(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py index 3138df748f..215e5b60e5 100644 --- a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py +++ b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py @@ -5,7 +5,7 @@ import inspect -from spack import * +from spack.package import * class PerlNetSsleay(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-number-format/package.py b/var/spack/repos/builtin/packages/perl-number-format/package.py index 3bb3b0b6d1..0bc5644ca7 100644 --- a/var/spack/repos/builtin/packages/perl-number-format/package.py +++ b/var/spack/repos/builtin/packages/perl-number-format/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlNumberFormat(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-object-insideout/package.py b/var/spack/repos/builtin/packages/perl-object-insideout/package.py index e206d5a296..95d98a4055 100644 --- a/var/spack/repos/builtin/packages/perl-object-insideout/package.py +++ b/var/spack/repos/builtin/packages/perl-object-insideout/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlObjectInsideout(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py b/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py index c97164aae5..20275279c8 100644 --- a/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py +++ b/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPackageDeprecationmanager(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py b/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py index 656de85fef..977e514575 100644 --- a/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPackageStashXs(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-package-stash/package.py b/var/spack/repos/builtin/packages/perl-package-stash/package.py index 90a5794cbb..5cc0c131e8 100644 --- a/var/spack/repos/builtin/packages/perl-package-stash/package.py +++ b/var/spack/repos/builtin/packages/perl-package-stash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPackageStash(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-padwalker/package.py b/var/spack/repos/builtin/packages/perl-padwalker/package.py index 5eca132ac3..0e202cfb96 100644 --- a/var/spack/repos/builtin/packages/perl-padwalker/package.py +++ b/var/spack/repos/builtin/packages/perl-padwalker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPadwalker(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py index 9de3fac928..9261a0de7f 100644 --- a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py +++ b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlParallelForkmanager(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-params-util/package.py b/var/spack/repos/builtin/packages/perl-params-util/package.py index 3e75364a03..6a66f4d516 100644 --- a/var/spack/repos/builtin/packages/perl-params-util/package.py +++ b/var/spack/repos/builtin/packages/perl-params-util/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlParamsUtil(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-params-validate/package.py b/var/spack/repos/builtin/packages/perl-params-validate/package.py index 216eb7d6d1..bdcc0af1eb 100644 --- a/var/spack/repos/builtin/packages/perl-params-validate/package.py +++ b/var/spack/repos/builtin/packages/perl-params-validate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlParamsValidate(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py index 736dd9fa05..c2715a52f9 100644 --- a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py +++ b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlParseRecdescent(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-path-tiny/package.py b/var/spack/repos/builtin/packages/perl-path-tiny/package.py index cfe91a00ca..c6d77c0793 100644 --- a/var/spack/repos/builtin/packages/perl-path-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-path-tiny/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPathTiny(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-pdf-api2/package.py b/var/spack/repos/builtin/packages/perl-pdf-api2/package.py index c4dd172e77..519d1dc2d5 100644 --- a/var/spack/repos/builtin/packages/perl-pdf-api2/package.py +++ b/var/spack/repos/builtin/packages/perl-pdf-api2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPdfApi2(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-pegex/package.py b/var/spack/repos/builtin/packages/perl-pegex/package.py index 7718f5b1f4..b2892e36c3 100644 --- a/var/spack/repos/builtin/packages/perl-pegex/package.py +++ b/var/spack/repos/builtin/packages/perl-pegex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPegex(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-perl-unsafe-signals/package.py b/var/spack/repos/builtin/packages/perl-perl-unsafe-signals/package.py index f4c7ee4c51..88aa750054 100644 --- a/var/spack/repos/builtin/packages/perl-perl-unsafe-signals/package.py +++ b/var/spack/repos/builtin/packages/perl-perl-unsafe-signals/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPerlUnsafeSignals(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-perl-version/package.py b/var/spack/repos/builtin/packages/perl-perl-version/package.py index e2a8890dce..321b2a9e4f 100644 --- a/var/spack/repos/builtin/packages/perl-perl-version/package.py +++ b/var/spack/repos/builtin/packages/perl-perl-version/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPerlVersion(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py b/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py index c6a4b4f24c..32f3250482 100644 --- a/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py +++ b/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPerl4Corelibs(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py index 7b2069c30c..28db92b164 100644 --- a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py +++ b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPerl6Slurp(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py index 8c5b1dc594..99a5a987be 100644 --- a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py +++ b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPerlioGzip(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py b/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py index 019fb2d918..99cb11ff74 100644 --- a/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py +++ b/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlPerlioUtf8Strict(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-readonly/package.py b/var/spack/repos/builtin/packages/perl-readonly/package.py index f95acf3779..b9a0de6861 100644 --- a/var/spack/repos/builtin/packages/perl-readonly/package.py +++ b/var/spack/repos/builtin/packages/perl-readonly/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlReadonly(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-regexp-common/package.py b/var/spack/repos/builtin/packages/perl-regexp-common/package.py index 21d7da5202..70dc9cf6a6 100644 --- a/var/spack/repos/builtin/packages/perl-regexp-common/package.py +++ b/var/spack/repos/builtin/packages/perl-regexp-common/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlRegexpCommon(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-scalar-list-utils/package.py b/var/spack/repos/builtin/packages/perl-scalar-list-utils/package.py index 828ebe282d..3327398ea4 100644 --- a/var/spack/repos/builtin/packages/perl-scalar-list-utils/package.py +++ b/var/spack/repos/builtin/packages/perl-scalar-list-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlScalarListUtils(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py b/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py index e58ec010ef..601e2b1e3d 100644 --- a/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py +++ b/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlScalarUtilNumeric(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-set-intervaltree/package.py b/var/spack/repos/builtin/packages/perl-set-intervaltree/package.py index 3b18d7b6fb..26ccea4814 100644 --- a/var/spack/repos/builtin/packages/perl-set-intervaltree/package.py +++ b/var/spack/repos/builtin/packages/perl-set-intervaltree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSetIntervaltree(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-set-intspan/package.py b/var/spack/repos/builtin/packages/perl-set-intspan/package.py index fb79f85c02..3467181452 100644 --- a/var/spack/repos/builtin/packages/perl-set-intspan/package.py +++ b/var/spack/repos/builtin/packages/perl-set-intspan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSetIntspan(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-set-scalar/package.py b/var/spack/repos/builtin/packages/perl-set-scalar/package.py index bdff12369f..8deb551860 100644 --- a/var/spack/repos/builtin/packages/perl-set-scalar/package.py +++ b/var/spack/repos/builtin/packages/perl-set-scalar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSetScalar(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-soap-lite/package.py b/var/spack/repos/builtin/packages/perl-soap-lite/package.py index 91b4c6b99b..833bb64aea 100644 --- a/var/spack/repos/builtin/packages/perl-soap-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-soap-lite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSoapLite(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-star-fusion/package.py b/var/spack/repos/builtin/packages/perl-star-fusion/package.py index 0bc2f63fb0..2f5b5a2862 100644 --- a/var/spack/repos/builtin/packages/perl-star-fusion/package.py +++ b/var/spack/repos/builtin/packages/perl-star-fusion/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PerlStarFusion(Package): """STAR-Fusion is a component of the Trinity Cancer Transcriptome Analysis Toolkit (CTAT). STAR-Fusion uses the STAR aligner to identify candidate diff --git a/var/spack/repos/builtin/packages/perl-statistics-basic/package.py b/var/spack/repos/builtin/packages/perl-statistics-basic/package.py index 1af20ca118..e85800a87b 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-basic/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-basic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlStatisticsBasic(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py index f8f68cbaec..5b9141cf89 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlStatisticsDescriptive(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-statistics-pca/package.py b/var/spack/repos/builtin/packages/perl-statistics-pca/package.py index 592ba1fa5e..cd15ea3b15 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-pca/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-pca/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlStatisticsPca(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py b/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py index fd9ed01c56..0e28886ae4 100644 --- a/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSubExporterProgressive(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-sub-exporter/package.py b/var/spack/repos/builtin/packages/perl-sub-exporter/package.py index cd0260a482..c71d47b074 100644 --- a/var/spack/repos/builtin/packages/perl-sub-exporter/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-exporter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSubExporter(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-sub-identify/package.py b/var/spack/repos/builtin/packages/perl-sub-identify/package.py index 0cced554a0..b75df47965 100644 --- a/var/spack/repos/builtin/packages/perl-sub-identify/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-identify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSubIdentify(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-sub-install/package.py b/var/spack/repos/builtin/packages/perl-sub-install/package.py index 864d42dd66..efb136ccb1 100644 --- a/var/spack/repos/builtin/packages/perl-sub-install/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-install/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSubInstall(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-sub-name/package.py b/var/spack/repos/builtin/packages/perl-sub-name/package.py index 5702e85342..f443ab27c3 100644 --- a/var/spack/repos/builtin/packages/perl-sub-name/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-name/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSubName(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py b/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py index 636ce61f66..2289fcf86c 100644 --- a/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSubUplevel(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-svg/package.py b/var/spack/repos/builtin/packages/perl-svg/package.py index b1e0a7e3a9..7e7e16b063 100644 --- a/var/spack/repos/builtin/packages/perl-svg/package.py +++ b/var/spack/repos/builtin/packages/perl-svg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSvg(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-swissknife/package.py b/var/spack/repos/builtin/packages/perl-swissknife/package.py index a2b649c6ce..c1e0d3d7f6 100644 --- a/var/spack/repos/builtin/packages/perl-swissknife/package.py +++ b/var/spack/repos/builtin/packages/perl-swissknife/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSwissknife(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-sys-sigaction/package.py b/var/spack/repos/builtin/packages/perl-sys-sigaction/package.py index 4b3e4348c8..6fe575fc6b 100644 --- a/var/spack/repos/builtin/packages/perl-sys-sigaction/package.py +++ b/var/spack/repos/builtin/packages/perl-sys-sigaction/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlSysSigaction(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-task-weaken/package.py b/var/spack/repos/builtin/packages/perl-task-weaken/package.py index bc655cb210..878ccf217d 100644 --- a/var/spack/repos/builtin/packages/perl-task-weaken/package.py +++ b/var/spack/repos/builtin/packages/perl-task-weaken/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTaskWeaken(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py b/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py index b3d386e333..58c7e74c86 100644 --- a/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py +++ b/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTermReadlineGnu(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-termreadkey/package.py b/var/spack/repos/builtin/packages/perl-termreadkey/package.py index 93a5dce214..3b41f026d5 100644 --- a/var/spack/repos/builtin/packages/perl-termreadkey/package.py +++ b/var/spack/repos/builtin/packages/perl-termreadkey/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTermreadkey(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py b/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py index e418e2b6be..dfcfaf1177 100644 --- a/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py +++ b/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestCleannamespaces(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-deep/package.py b/var/spack/repos/builtin/packages/perl-test-deep/package.py index 47b64a5d83..30348a4642 100644 --- a/var/spack/repos/builtin/packages/perl-test-deep/package.py +++ b/var/spack/repos/builtin/packages/perl-test-deep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestDeep(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-differences/package.py b/var/spack/repos/builtin/packages/perl-test-differences/package.py index 98c5e3f8c6..657caf4659 100644 --- a/var/spack/repos/builtin/packages/perl-test-differences/package.py +++ b/var/spack/repos/builtin/packages/perl-test-differences/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestDifferences(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-exception/package.py b/var/spack/repos/builtin/packages/perl-test-exception/package.py index 9d2d9a1207..643fc83c4b 100644 --- a/var/spack/repos/builtin/packages/perl-test-exception/package.py +++ b/var/spack/repos/builtin/packages/perl-test-exception/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestException(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-fatal/package.py b/var/spack/repos/builtin/packages/perl-test-fatal/package.py index 568f60cc4a..d336e560ed 100644 --- a/var/spack/repos/builtin/packages/perl-test-fatal/package.py +++ b/var/spack/repos/builtin/packages/perl-test-fatal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestFatal(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py b/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py index dfec63a6bd..f66e9f7f22 100644 --- a/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py +++ b/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestMemoryCycle(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-more/package.py b/var/spack/repos/builtin/packages/perl-test-more/package.py index 9cb1183ee1..d3b293ce98 100644 --- a/var/spack/repos/builtin/packages/perl-test-more/package.py +++ b/var/spack/repos/builtin/packages/perl-test-more/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestMore(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-most/package.py b/var/spack/repos/builtin/packages/perl-test-most/package.py index bef50ea161..83081448fe 100644 --- a/var/spack/repos/builtin/packages/perl-test-most/package.py +++ b/var/spack/repos/builtin/packages/perl-test-most/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestMost(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-needs/package.py b/var/spack/repos/builtin/packages/perl-test-needs/package.py index 44c9638067..b2f655d324 100644 --- a/var/spack/repos/builtin/packages/perl-test-needs/package.py +++ b/var/spack/repos/builtin/packages/perl-test-needs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestNeeds(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-output/package.py b/var/spack/repos/builtin/packages/perl-test-output/package.py index e35d4ae907..9550481a33 100644 --- a/var/spack/repos/builtin/packages/perl-test-output/package.py +++ b/var/spack/repos/builtin/packages/perl-test-output/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestOutput(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-requires/package.py b/var/spack/repos/builtin/packages/perl-test-requires/package.py index 26eae8c1d0..da5614d09f 100644 --- a/var/spack/repos/builtin/packages/perl-test-requires/package.py +++ b/var/spack/repos/builtin/packages/perl-test-requires/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestRequires(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py index 5fe424518c..9666c7fc6b 100644 --- a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py +++ b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestRequiresinternet(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-warn/package.py b/var/spack/repos/builtin/packages/perl-test-warn/package.py index e406b495b1..c9ddccefc0 100644 --- a/var/spack/repos/builtin/packages/perl-test-warn/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestWarn(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-test-warnings/package.py b/var/spack/repos/builtin/packages/perl-test-warnings/package.py index 08c9b2de20..2986281c09 100644 --- a/var/spack/repos/builtin/packages/perl-test-warnings/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warnings/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTestWarnings(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-text-csv/package.py b/var/spack/repos/builtin/packages/perl-text-csv/package.py index f90aaff7c6..e0eec412f1 100644 --- a/var/spack/repos/builtin/packages/perl-text-csv/package.py +++ b/var/spack/repos/builtin/packages/perl-text-csv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTextCsv(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-text-diff/package.py b/var/spack/repos/builtin/packages/perl-text-diff/package.py index 00fc4e6e1c..1af5e008a8 100644 --- a/var/spack/repos/builtin/packages/perl-text-diff/package.py +++ b/var/spack/repos/builtin/packages/perl-text-diff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTextDiff(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-text-format/package.py b/var/spack/repos/builtin/packages/perl-text-format/package.py index 5fb9d117c8..cc0dffb5c1 100644 --- a/var/spack/repos/builtin/packages/perl-text-format/package.py +++ b/var/spack/repos/builtin/packages/perl-text-format/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTextFormat(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-text-simpletable/package.py b/var/spack/repos/builtin/packages/perl-text-simpletable/package.py index 10b8f1c56f..990d2d0b6a 100644 --- a/var/spack/repos/builtin/packages/perl-text-simpletable/package.py +++ b/var/spack/repos/builtin/packages/perl-text-simpletable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTextSimpletable(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-text-soundex/package.py b/var/spack/repos/builtin/packages/perl-text-soundex/package.py index 1262382d95..65f3e0b83c 100644 --- a/var/spack/repos/builtin/packages/perl-text-soundex/package.py +++ b/var/spack/repos/builtin/packages/perl-text-soundex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTextSoundex(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py index 7cc4e30557..53fda5f534 100644 --- a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py +++ b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTextUnidecode(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-thread-queue/package.py b/var/spack/repos/builtin/packages/perl-thread-queue/package.py index b6fcde9986..f41d27c172 100644 --- a/var/spack/repos/builtin/packages/perl-thread-queue/package.py +++ b/var/spack/repos/builtin/packages/perl-thread-queue/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlThreadQueue(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-threads/package.py b/var/spack/repos/builtin/packages/perl-threads/package.py index 5052f74974..23add26727 100644 --- a/var/spack/repos/builtin/packages/perl-threads/package.py +++ b/var/spack/repos/builtin/packages/perl-threads/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlThreads(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-time-hires/package.py b/var/spack/repos/builtin/packages/perl-time-hires/package.py index 450f43016d..b816217509 100644 --- a/var/spack/repos/builtin/packages/perl-time-hires/package.py +++ b/var/spack/repos/builtin/packages/perl-time-hires/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTimeHires(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-time-piece/package.py b/var/spack/repos/builtin/packages/perl-time-piece/package.py index dd0baacf15..c3a6c3ba96 100644 --- a/var/spack/repos/builtin/packages/perl-time-piece/package.py +++ b/var/spack/repos/builtin/packages/perl-time-piece/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTimePiece(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-timedate/package.py b/var/spack/repos/builtin/packages/perl-timedate/package.py index d37904c443..ec94ce45a9 100644 --- a/var/spack/repos/builtin/packages/perl-timedate/package.py +++ b/var/spack/repos/builtin/packages/perl-timedate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTimedate(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-tk/package.py b/var/spack/repos/builtin/packages/perl-tk/package.py index 0c5f009cae..d674185e0d 100644 --- a/var/spack/repos/builtin/packages/perl-tk/package.py +++ b/var/spack/repos/builtin/packages/perl-tk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTk(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-try-tiny/package.py b/var/spack/repos/builtin/packages/perl-try-tiny/package.py index ef903d7cb5..0b4b4534a7 100644 --- a/var/spack/repos/builtin/packages/perl-try-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-try-tiny/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlTryTiny(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-uri-encode/package.py b/var/spack/repos/builtin/packages/perl-uri-encode/package.py index 33468766c3..82262dd006 100644 --- a/var/spack/repos/builtin/packages/perl-uri-encode/package.py +++ b/var/spack/repos/builtin/packages/perl-uri-encode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlUriEncode(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-uri/package.py b/var/spack/repos/builtin/packages/perl-uri/package.py index a1b8616d57..461ab0de2b 100644 --- a/var/spack/repos/builtin/packages/perl-uri/package.py +++ b/var/spack/repos/builtin/packages/perl-uri/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlUri(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-want/package.py b/var/spack/repos/builtin/packages/perl-want/package.py index 24e8b19d4d..06563e7083 100644 --- a/var/spack/repos/builtin/packages/perl-want/package.py +++ b/var/spack/repos/builtin/packages/perl-want/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlWant(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py index d2d8a9d050..0c6c4cdc68 100644 --- a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py +++ b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlWwwRobotrules(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-dom-xpath/package.py b/var/spack/repos/builtin/packages/perl-xml-dom-xpath/package.py index 0402899d83..bdfedcd58e 100644 --- a/var/spack/repos/builtin/packages/perl-xml-dom-xpath/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-dom-xpath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlDomXpath(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-dom/package.py b/var/spack/repos/builtin/packages/perl-xml-dom/package.py index 9ab9b1729f..33ef7345ba 100644 --- a/var/spack/repos/builtin/packages/perl-xml-dom/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-dom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlDom(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-filter-buffertext/package.py b/var/spack/repos/builtin/packages/perl-xml-filter-buffertext/package.py index 77f1549de3..a700b50701 100644 --- a/var/spack/repos/builtin/packages/perl-xml-filter-buffertext/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-filter-buffertext/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlFilterBuffertext(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py index 99ffd6fa91..86a215f1b3 100644 --- a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlLibxml(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py b/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py index 4808c07a0e..94624ebeb0 100644 --- a/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlLibxslt(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-namespacesupport/package.py b/var/spack/repos/builtin/packages/perl-xml-namespacesupport/package.py index f32b2bf9cd..867768f29e 100644 --- a/var/spack/repos/builtin/packages/perl-xml-namespacesupport/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-namespacesupport/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlNamespacesupport(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py index 4b122b8140..4c9cba2cb8 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlParserLite(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-parser/package.py b/var/spack/repos/builtin/packages/perl-xml-parser/package.py index 544c4c5e88..89c6381bae 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PerlXmlParser(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-quote/package.py b/var/spack/repos/builtin/packages/perl-xml-quote/package.py index 46e6685f67..5de2af509c 100644 --- a/var/spack/repos/builtin/packages/perl-xml-quote/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-quote/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlQuote(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-regexp/package.py b/var/spack/repos/builtin/packages/perl-xml-regexp/package.py index 04a315d987..dfcb9ece5c 100644 --- a/var/spack/repos/builtin/packages/perl-xml-regexp/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-regexp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlRegexp(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-sax-base/package.py b/var/spack/repos/builtin/packages/perl-xml-sax-base/package.py index 5b2d8137cc..87ab106317 100644 --- a/var/spack/repos/builtin/packages/perl-xml-sax-base/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-sax-base/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlSaxBase(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-sax-writer/package.py b/var/spack/repos/builtin/packages/perl-xml-sax-writer/package.py index d996bda696..fb421f3226 100644 --- a/var/spack/repos/builtin/packages/perl-xml-sax-writer/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-sax-writer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlSaxWriter(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-sax/package.py b/var/spack/repos/builtin/packages/perl-xml-sax/package.py index 13c2b6264d..481801b4bc 100644 --- a/var/spack/repos/builtin/packages/perl-xml-sax/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-sax/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlSax(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-simple/package.py b/var/spack/repos/builtin/packages/perl-xml-simple/package.py index 5844e12183..be0a699245 100644 --- a/var/spack/repos/builtin/packages/perl-xml-simple/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-simple/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlSimple(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-twig/package.py b/var/spack/repos/builtin/packages/perl-xml-twig/package.py index 0bafa3dda9..af1f0a0b3b 100644 --- a/var/spack/repos/builtin/packages/perl-xml-twig/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-twig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlTwig(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-writer/package.py b/var/spack/repos/builtin/packages/perl-xml-writer/package.py index d790fcf430..88572d7d59 100644 --- a/var/spack/repos/builtin/packages/perl-xml-writer/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-writer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlWriter(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-xml-xpathengine/package.py b/var/spack/repos/builtin/packages/perl-xml-xpathengine/package.py index c8efd62e18..70f06dd34c 100644 --- a/var/spack/repos/builtin/packages/perl-xml-xpathengine/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-xpathengine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlXmlXpathengine(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py index d3bd35062b..e8a9e344e2 100644 --- a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py +++ b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlYamlLibyaml(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl-yaml/package.py b/var/spack/repos/builtin/packages/perl-yaml/package.py index 85090d77de..ba0b26b231 100644 --- a/var/spack/repos/builtin/packages/perl-yaml/package.py +++ b/var/spack/repos/builtin/packages/perl-yaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PerlYaml(PerlPackage): diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 07f2396a27..711ad20fa3 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -11,7 +11,6 @@ # Author: Justin Too <justin@doubleotoo.com> # Date: September 6, 2015 # - import os import platform import re @@ -21,8 +20,8 @@ from contextlib import contextmanager from llnl.util.lang import match_predicate from llnl.util.symlink import symlink -from spack import * from spack.operating_systems.mac_os import macos_version +from spack.package import * is_windows = sys.platform == 'win32' diff --git a/var/spack/repos/builtin/packages/pestpp/package.py b/var/spack/repos/builtin/packages/pestpp/package.py index 3cecb47aec..fbdeadad4d 100644 --- a/var/spack/repos/builtin/packages/pestpp/package.py +++ b/var/spack/repos/builtin/packages/pestpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pestpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/petaca/package.py b/var/spack/repos/builtin/packages/petaca/package.py index 8a2ec10292..7df8386438 100644 --- a/var/spack/repos/builtin/packages/petaca/package.py +++ b/var/spack/repos/builtin/packages/petaca/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Petaca(CMakePackage): diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index a8951f1220..2a1530a4e3 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +from spack.package import * + class Petsc(Package, CudaPackage, ROCmPackage): """PETSc is a suite of data structures and routines for the scalable diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py index 99e626ddaa..7270561485 100644 --- a/var/spack/repos/builtin/packages/pexsi/package.py +++ b/var/spack/repos/builtin/packages/pexsi/package.py @@ -7,7 +7,7 @@ import inspect import os.path -from spack import * +from spack.package import * class Pexsi(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pfapack/package.py b/var/spack/repos/builtin/packages/pfapack/package.py index 211665dba0..e800c2d6f2 100644 --- a/var/spack/repos/builtin/packages/pfapack/package.py +++ b/var/spack/repos/builtin/packages/pfapack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pfapack(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pfft/package.py b/var/spack/repos/builtin/packages/pfft/package.py index 942cd2791e..ba5a08e925 100644 --- a/var/spack/repos/builtin/packages/pfft/package.py +++ b/var/spack/repos/builtin/packages/pfft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pfft(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pflask/package.py b/var/spack/repos/builtin/packages/pflask/package.py index d4092e2d66..0247a008ae 100644 --- a/var/spack/repos/builtin/packages/pflask/package.py +++ b/var/spack/repos/builtin/packages/pflask/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pflask(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index 5fd56be4d8..e5b0dd7c95 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pflotran(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pfunit/package.py b/var/spack/repos/builtin/packages/pfunit/package.py index 53c524bf09..e2e765c021 100644 --- a/var/spack/repos/builtin/packages/pfunit/package.py +++ b/var/spack/repos/builtin/packages/pfunit/package.py @@ -5,8 +5,7 @@ import glob -# -from spack import * +from spack.package import * class Pfunit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pgdspider/package.py b/var/spack/repos/builtin/packages/pgdspider/package.py index 32cc1c609c..98655d9a52 100644 --- a/var/spack/repos/builtin/packages/pgdspider/package.py +++ b/var/spack/repos/builtin/packages/pgdspider/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Pgdspider(Package): diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py index 01f72831e4..fff715fbdd 100644 --- a/var/spack/repos/builtin/packages/pgi/package.py +++ b/var/spack/repos/builtin/packages/pgi/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.util.prefix import Prefix diff --git a/var/spack/repos/builtin/packages/pgplot/package.py b/var/spack/repos/builtin/packages/pgplot/package.py index 6b867dc9ff..cf7aa82b39 100644 --- a/var/spack/repos/builtin/packages/pgplot/package.py +++ b/var/spack/repos/builtin/packages/pgplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pgplot(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py index 6d58111019..c7caec1abe 100644 --- a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py +++ b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Phantompeakqualtools(RPackage): diff --git a/var/spack/repos/builtin/packages/phast/package.py b/var/spack/repos/builtin/packages/phast/package.py index 0399e000a2..a4838b6801 100644 --- a/var/spack/repos/builtin/packages/phast/package.py +++ b/var/spack/repos/builtin/packages/phast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Phast(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/phasta/package.py b/var/spack/repos/builtin/packages/phasta/package.py index 0f959bc268..a360c20a7b 100644 --- a/var/spack/repos/builtin/packages/phasta/package.py +++ b/var/spack/repos/builtin/packages/phasta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Phasta(CMakePackage): diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 194c9a1e26..34c4ed0d33 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -6,7 +6,7 @@ import llnl.util.tty as tty import spack.hooks.sbang as sbang -from spack import * +from spack.package import * class Phist(CMakePackage): diff --git a/var/spack/repos/builtin/packages/phoenix/package.py b/var/spack/repos/builtin/packages/phoenix/package.py index 35a9b43222..cfdb247843 100644 --- a/var/spack/repos/builtin/packages/phoenix/package.py +++ b/var/spack/repos/builtin/packages/phoenix/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Phoenix(MavenPackage): """Apache Phoenix is a SQL skin over HBase delivered as a client-embedded JDBC driver targeting low latency queries over HBase data.""" diff --git a/var/spack/repos/builtin/packages/photos-f/package.py b/var/spack/repos/builtin/packages/photos-f/package.py index 0ea43592c1..e8db4d0b2e 100644 --- a/var/spack/repos/builtin/packages/photos-f/package.py +++ b/var/spack/repos/builtin/packages/photos-f/package.py @@ -7,7 +7,7 @@ import os import shutil from glob import glob -from spack import * +from spack.package import * class PhotosF(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/photos/package.py b/var/spack/repos/builtin/packages/photos/package.py index 6080793f68..4557c3539f 100644 --- a/var/spack/repos/builtin/packages/photos/package.py +++ b/var/spack/repos/builtin/packages/photos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Photos(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/php/package.py b/var/spack/repos/builtin/packages/php/package.py index a7d85b38a9..efe31bda74 100644 --- a/var/spack/repos/builtin/packages/php/package.py +++ b/var/spack/repos/builtin/packages/php/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import spack.hooks.sbang as sbang -from spack import * +from spack.package import * class Php(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/phrap-crossmatch-swat/package.py b/var/spack/repos/builtin/packages/phrap-crossmatch-swat/package.py index 6e201e2f5a..025203809b 100644 --- a/var/spack/repos/builtin/packages/phrap-crossmatch-swat/package.py +++ b/var/spack/repos/builtin/packages/phrap-crossmatch-swat/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PhrapCrossmatchSwat(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/phred/package.py b/var/spack/repos/builtin/packages/phred/package.py index 8e299f148d..9c01aaff89 100644 --- a/var/spack/repos/builtin/packages/phred/package.py +++ b/var/spack/repos/builtin/packages/phred/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Phred(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/phylip/package.py b/var/spack/repos/builtin/packages/phylip/package.py index 95a183779e..4d05b842be 100644 --- a/var/spack/repos/builtin/packages/phylip/package.py +++ b/var/spack/repos/builtin/packages/phylip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Phylip(Package): diff --git a/var/spack/repos/builtin/packages/phylobayesmpi/package.py b/var/spack/repos/builtin/packages/phylobayesmpi/package.py index 58ea812669..dc9715c045 100644 --- a/var/spack/repos/builtin/packages/phylobayesmpi/package.py +++ b/var/spack/repos/builtin/packages/phylobayesmpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Phylobayesmpi(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/phyluce/package.py b/var/spack/repos/builtin/packages/phyluce/package.py index b4cd6f8d49..92ba4fecd6 100644 --- a/var/spack/repos/builtin/packages/phyluce/package.py +++ b/var/spack/repos/builtin/packages/phyluce/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Phyluce(PythonPackage): diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index e7a63b9f7b..095968f5da 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -7,7 +7,7 @@ import glob import os.path import re -from spack import * +from spack.package import * class Picard(Package): diff --git a/var/spack/repos/builtin/packages/picsar/package.py b/var/spack/repos/builtin/packages/picsar/package.py index c461e32136..c42bee98d9 100644 --- a/var/spack/repos/builtin/packages/picsar/package.py +++ b/var/spack/repos/builtin/packages/picsar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Picsar(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/picsarlite/package.py b/var/spack/repos/builtin/packages/picsarlite/package.py index bed46ab9d3..46291c9c2b 100644 --- a/var/spack/repos/builtin/packages/picsarlite/package.py +++ b/var/spack/repos/builtin/packages/picsarlite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Picsarlite(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pidx/package.py b/var/spack/repos/builtin/packages/pidx/package.py index 4e19921eec..d49326c555 100644 --- a/var/spack/repos/builtin/packages/pidx/package.py +++ b/var/spack/repos/builtin/packages/pidx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pidx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pig/package.py b/var/spack/repos/builtin/packages/pig/package.py index 70bc1fa9d5..d9371316ff 100644 --- a/var/spack/repos/builtin/packages/pig/package.py +++ b/var/spack/repos/builtin/packages/pig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pig(Package): diff --git a/var/spack/repos/builtin/packages/pigz/package.py b/var/spack/repos/builtin/packages/pigz/package.py index 4d27a3a90d..2252a90fbc 100644 --- a/var/spack/repos/builtin/packages/pigz/package.py +++ b/var/spack/repos/builtin/packages/pigz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pigz(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pika/package.py b/var/spack/repos/builtin/packages/pika/package.py index 522736f1c1..c001013e5a 100644 --- a/var/spack/repos/builtin/packages/pika/package.py +++ b/var/spack/repos/builtin/packages/pika/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * class Pika(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/pilon/package.py b/var/spack/repos/builtin/packages/pilon/package.py index e783ba4776..b0ba5c5e52 100644 --- a/var/spack/repos/builtin/packages/pilon/package.py +++ b/var/spack/repos/builtin/packages/pilon/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Pilon(Package): diff --git a/var/spack/repos/builtin/packages/pindel/package.py b/var/spack/repos/builtin/packages/pindel/package.py index 38d8cfa193..a34998aa09 100644 --- a/var/spack/repos/builtin/packages/pindel/package.py +++ b/var/spack/repos/builtin/packages/pindel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pindel(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pinentry/package.py b/var/spack/repos/builtin/packages/pinentry/package.py index 44fd90008b..1f0aa24218 100644 --- a/var/spack/repos/builtin/packages/pinentry/package.py +++ b/var/spack/repos/builtin/packages/pinentry/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Pinentry(AutotoolsPackage): """pinentry is a small collection of dialog programs that allow GnuPG to read passphrases and PIN numbers in a secure manner. diff --git a/var/spack/repos/builtin/packages/pinfo/package.py b/var/spack/repos/builtin/packages/pinfo/package.py index f45fc6c7d2..7273c0614a 100644 --- a/var/spack/repos/builtin/packages/pinfo/package.py +++ b/var/spack/repos/builtin/packages/pinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pinfo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pipework/package.py b/var/spack/repos/builtin/packages/pipework/package.py index 680dbfd288..ec90ed301d 100644 --- a/var/spack/repos/builtin/packages/pipework/package.py +++ b/var/spack/repos/builtin/packages/pipework/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pipework(Package): diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py index ed1ed252a9..4b0cafc89a 100644 --- a/var/spack/repos/builtin/packages/piranha/package.py +++ b/var/spack/repos/builtin/packages/piranha/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/pism/package.py b/var/spack/repos/builtin/packages/pism/package.py index 6c1e16e8ba..84ef68a0ff 100644 --- a/var/spack/repos/builtin/packages/pism/package.py +++ b/var/spack/repos/builtin/packages/pism/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pism(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index 4f564dec62..09ef8d6133 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Pixman(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pixz/package.py b/var/spack/repos/builtin/packages/pixz/package.py index 5b04db3a0c..061a08fd26 100644 --- a/var/spack/repos/builtin/packages/pixz/package.py +++ b/var/spack/repos/builtin/packages/pixz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pixz(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index f7acc80a02..762a5f19b1 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PkgConfig(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index fbd88fe7f5..1745c943bc 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pkgconf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pktools/package.py b/var/spack/repos/builtin/packages/pktools/package.py index ec4c9af8d0..ea8d471e90 100644 --- a/var/spack/repos/builtin/packages/pktools/package.py +++ b/var/spack/repos/builtin/packages/pktools/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/planck-likelihood/package.py b/var/spack/repos/builtin/packages/planck-likelihood/package.py index 166da48757..42ac4e0061 100644 --- a/var/spack/repos/builtin/packages/planck-likelihood/package.py +++ b/var/spack/repos/builtin/packages/planck-likelihood/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PlanckLikelihood(Package): diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index 40682b61d8..711803eb92 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Plasma(CMakePackage): diff --git a/var/spack/repos/builtin/packages/platypus/package.py b/var/spack/repos/builtin/packages/platypus/package.py index 476f96ea4d..fc315dced7 100644 --- a/var/spack/repos/builtin/packages/platypus/package.py +++ b/var/spack/repos/builtin/packages/platypus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Platypus(Package): diff --git a/var/spack/repos/builtin/packages/plink-ng/package.py b/var/spack/repos/builtin/packages/plink-ng/package.py index 55a98ea178..412253a588 100644 --- a/var/spack/repos/builtin/packages/plink-ng/package.py +++ b/var/spack/repos/builtin/packages/plink-ng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PlinkNg(Package): diff --git a/var/spack/repos/builtin/packages/plink/package.py b/var/spack/repos/builtin/packages/plink/package.py index 82294e2a2d..5f12006994 100644 --- a/var/spack/repos/builtin/packages/plink/package.py +++ b/var/spack/repos/builtin/packages/plink/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Plink(Package): diff --git a/var/spack/repos/builtin/packages/plplot/package.py b/var/spack/repos/builtin/packages/plplot/package.py index f5f9a9d2ef..017bf57b3f 100644 --- a/var/spack/repos/builtin/packages/plplot/package.py +++ b/var/spack/repos/builtin/packages/plplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Plplot(CMakePackage): diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index 668069ea53..6620a2ee23 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -6,6 +6,8 @@ import collections import os.path +from spack.package import * + class Plumed(AutotoolsPackage): """PLUMED is an open source library for free energy calculations in diff --git a/var/spack/repos/builtin/packages/ply/package.py b/var/spack/repos/builtin/packages/ply/package.py index daadd39969..3e0d2aaaea 100644 --- a/var/spack/repos/builtin/packages/ply/package.py +++ b/var/spack/repos/builtin/packages/ply/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ply(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pmdk/package.py b/var/spack/repos/builtin/packages/pmdk/package.py index 57a55acbc9..9a3caa0467 100644 --- a/var/spack/repos/builtin/packages/pmdk/package.py +++ b/var/spack/repos/builtin/packages/pmdk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pmdk(Package): diff --git a/var/spack/repos/builtin/packages/pmemkv/package.py b/var/spack/repos/builtin/packages/pmemkv/package.py index 2d140f31af..0c9b0a7780 100644 --- a/var/spack/repos/builtin/packages/pmemkv/package.py +++ b/var/spack/repos/builtin/packages/pmemkv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pmemkv(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pmerge/package.py b/var/spack/repos/builtin/packages/pmerge/package.py index ff337076b4..2369d0895f 100644 --- a/var/spack/repos/builtin/packages/pmerge/package.py +++ b/var/spack/repos/builtin/packages/pmerge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pmerge(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pmgr-collective/package.py b/var/spack/repos/builtin/packages/pmgr-collective/package.py index d6edcb33ec..867b6459d1 100644 --- a/var/spack/repos/builtin/packages/pmgr-collective/package.py +++ b/var/spack/repos/builtin/packages/pmgr-collective/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PmgrCollective(Package): diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index d0d7592a36..9c47d38649 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class Pmix(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pmlib/package.py b/var/spack/repos/builtin/packages/pmlib/package.py index 5f827b5fa8..e52f64ae25 100644 --- a/var/spack/repos/builtin/packages/pmlib/package.py +++ b/var/spack/repos/builtin/packages/pmlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pmlib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pnfft/package.py b/var/spack/repos/builtin/packages/pnfft/package.py index ccabe54d90..cb1d14c9ef 100644 --- a/var/spack/repos/builtin/packages/pnfft/package.py +++ b/var/spack/repos/builtin/packages/pnfft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pnfft(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pngquant/package.py b/var/spack/repos/builtin/packages/pngquant/package.py index 4b2e98b028..31efe7d5e2 100644 --- a/var/spack/repos/builtin/packages/pngquant/package.py +++ b/var/spack/repos/builtin/packages/pngquant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pngquant(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py index 51b5eeb112..3f3449b916 100644 --- a/var/spack/repos/builtin/packages/pngwriter/package.py +++ b/var/spack/repos/builtin/packages/pngwriter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pngwriter(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pnmpi/package.py b/var/spack/repos/builtin/packages/pnmpi/package.py index e345a377fd..7ec0718cee 100644 --- a/var/spack/repos/builtin/packages/pnmpi/package.py +++ b/var/spack/repos/builtin/packages/pnmpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pnmpi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/poamsa/package.py b/var/spack/repos/builtin/packages/poamsa/package.py index 89e47d12ff..e85a70797b 100644 --- a/var/spack/repos/builtin/packages/poamsa/package.py +++ b/var/spack/repos/builtin/packages/poamsa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Poamsa(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index 02fe512243..7c4dbae147 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.package_test import compare_output_file, compile_c_and_execute diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py index 5184cc674c..1673dc36bc 100644 --- a/var/spack/repos/builtin/packages/podio/package.py +++ b/var/spack/repos/builtin/packages/podio/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Podio(CMakePackage): """PODIO, or plain-old-data I/O, is a C++ library to support the creation and handling of data models in particle physics.""" diff --git a/var/spack/repos/builtin/packages/podman/package.py b/var/spack/repos/builtin/packages/podman/package.py index 2233cb7764..e1756080e3 100644 --- a/var/spack/repos/builtin/packages/podman/package.py +++ b/var/spack/repos/builtin/packages/podman/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Podman(Package): diff --git a/var/spack/repos/builtin/packages/poke/package.py b/var/spack/repos/builtin/packages/poke/package.py index 9249dad5f5..d21d0ff405 100644 --- a/var/spack/repos/builtin/packages/poke/package.py +++ b/var/spack/repos/builtin/packages/poke/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Poke(AutotoolsPackage, GNUMirrorPackage): """"The extensible editor for structured binary data""" homepage = "https://www.jemarch.net/poke.html" diff --git a/var/spack/repos/builtin/packages/polymake/package.py b/var/spack/repos/builtin/packages/polymake/package.py index 6213f5f8b6..28e950fb7c 100644 --- a/var/spack/repos/builtin/packages/polymake/package.py +++ b/var/spack/repos/builtin/packages/polymake/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/poplddecay/package.py b/var/spack/repos/builtin/packages/poplddecay/package.py index 49eef781a7..27b50c96cb 100644 --- a/var/spack/repos/builtin/packages/poplddecay/package.py +++ b/var/spack/repos/builtin/packages/poplddecay/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Poplddecay(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/poppler-data/package.py b/var/spack/repos/builtin/packages/poppler-data/package.py index 4203f41068..d0b50a11a8 100644 --- a/var/spack/repos/builtin/packages/poppler-data/package.py +++ b/var/spack/repos/builtin/packages/poppler-data/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PopplerData(CMakePackage): diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 9aedd07ab2..6dfc1bea82 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Poppler(CMakePackage): diff --git a/var/spack/repos/builtin/packages/popt/package.py b/var/spack/repos/builtin/packages/popt/package.py index 13ba765cf1..c1aaf573ca 100644 --- a/var/spack/repos/builtin/packages/popt/package.py +++ b/var/spack/repos/builtin/packages/popt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Popt(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/porta/package.py b/var/spack/repos/builtin/packages/porta/package.py index 8549546238..cb6693622a 100644 --- a/var/spack/repos/builtin/packages/porta/package.py +++ b/var/spack/repos/builtin/packages/porta/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Porta(Package): diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py index fb12d6ea0a..1d71d22ccb 100644 --- a/var/spack/repos/builtin/packages/portage/package.py +++ b/var/spack/repos/builtin/packages/portage/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Portage(CMakePackage): diff --git a/var/spack/repos/builtin/packages/portcullis/package.py b/var/spack/repos/builtin/packages/portcullis/package.py index c6aecaeedf..0aa3c0b1df 100644 --- a/var/spack/repos/builtin/packages/portcullis/package.py +++ b/var/spack/repos/builtin/packages/portcullis/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Portcullis(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ports-of-call/package.py b/var/spack/repos/builtin/packages/ports-of-call/package.py index 91731cdff3..d450259e0c 100644 --- a/var/spack/repos/builtin/packages/ports-of-call/package.py +++ b/var/spack/repos/builtin/packages/ports-of-call/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PortsOfCall(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/postgis/package.py b/var/spack/repos/builtin/packages/postgis/package.py index 90275be437..9101f5fa50 100644 --- a/var/spack/repos/builtin/packages/postgis/package.py +++ b/var/spack/repos/builtin/packages/postgis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Postgis(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py index fa1bde728e..096d04584b 100644 --- a/var/spack/repos/builtin/packages/postgresql/package.py +++ b/var/spack/repos/builtin/packages/postgresql/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Postgresql(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/povray/package.py b/var/spack/repos/builtin/packages/povray/package.py index 8b0c51d0f8..fb420b4692 100644 --- a/var/spack/repos/builtin/packages/povray/package.py +++ b/var/spack/repos/builtin/packages/povray/package.py @@ -9,7 +9,7 @@ import getpass # For getting fqdn for defaulting COMPILED_BY import socket -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/powerapi/package.py b/var/spack/repos/builtin/packages/powerapi/package.py index 2886fa20d1..6810a7b8fc 100644 --- a/var/spack/repos/builtin/packages/powerapi/package.py +++ b/var/spack/repos/builtin/packages/powerapi/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Powerapi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/powertop/package.py b/var/spack/repos/builtin/packages/powertop/package.py index 39ca530e4f..c05bfb7b5c 100644 --- a/var/spack/repos/builtin/packages/powertop/package.py +++ b/var/spack/repos/builtin/packages/powertop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Powertop(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ppl/package.py b/var/spack/repos/builtin/packages/ppl/package.py index cd204d9d36..acbb76bec1 100644 --- a/var/spack/repos/builtin/packages/ppl/package.py +++ b/var/spack/repos/builtin/packages/ppl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ppl(Package): diff --git a/var/spack/repos/builtin/packages/pplacer/package.py b/var/spack/repos/builtin/packages/pplacer/package.py index ebc4589b8c..74d3844bc2 100644 --- a/var/spack/repos/builtin/packages/pplacer/package.py +++ b/var/spack/repos/builtin/packages/pplacer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pplacer(Package): diff --git a/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py b/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py index dec55838b6..7b2ea36727 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenApplAmrFdm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-appl-bem-at/package.py b/var/spack/repos/builtin/packages/ppopen-appl-bem-at/package.py index 795f72929b..b9f7186e1c 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-bem-at/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-bem-at/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenApplBemAt(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-appl-bem/package.py b/var/spack/repos/builtin/packages/ppopen-appl-bem/package.py index 990549421f..b1f282cc47 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-bem/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-bem/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PpopenApplBem(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-appl-dem-util/package.py b/var/spack/repos/builtin/packages/ppopen-appl-dem-util/package.py index b309f1ef8f..7658ebad18 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-dem-util/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-dem-util/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenApplDemUtil(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-appl-fdm-at/package.py b/var/spack/repos/builtin/packages/ppopen-appl-fdm-at/package.py index 5cc638e25c..c67dbf5b74 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-fdm-at/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-fdm-at/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenApplFdmAt(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-appl-fdm/package.py b/var/spack/repos/builtin/packages/ppopen-appl-fdm/package.py index 1785a06d0a..efd95d265e 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-fdm/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-fdm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenApplFdm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-appl-fem/package.py b/var/spack/repos/builtin/packages/ppopen-appl-fem/package.py index b5d28f5aaf..16951260e9 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-fem/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-fem/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class PpopenApplFem(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-appl-fvm/package.py b/var/spack/repos/builtin/packages/ppopen-appl-fvm/package.py index c2003845cb..6557638a4f 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-fvm/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-fvm/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenApplFvm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-at/package.py b/var/spack/repos/builtin/packages/ppopen-at/package.py index ef35cbbfe6..2afcf7dcba 100644 --- a/var/spack/repos/builtin/packages/ppopen-at/package.py +++ b/var/spack/repos/builtin/packages/ppopen-at/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenAt(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-math-mp/package.py b/var/spack/repos/builtin/packages/ppopen-math-mp/package.py index 55ca6600cd..9b86273ccf 100644 --- a/var/spack/repos/builtin/packages/ppopen-math-mp/package.py +++ b/var/spack/repos/builtin/packages/ppopen-math-mp/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenMathMp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/ppopen-math-vis/package.py b/var/spack/repos/builtin/packages/ppopen-math-vis/package.py index ed57164125..c381928d81 100644 --- a/var/spack/repos/builtin/packages/ppopen-math-vis/package.py +++ b/var/spack/repos/builtin/packages/ppopen-math-vis/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PpopenMathVis(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/prank/package.py b/var/spack/repos/builtin/packages/prank/package.py index 2abfb69fd7..8b944fbd75 100644 --- a/var/spack/repos/builtin/packages/prank/package.py +++ b/var/spack/repos/builtin/packages/prank/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Prank(Package): diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py index 2780791619..9b1c293b3a 100644 --- a/var/spack/repos/builtin/packages/precice/package.py +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Precice(CMakePackage): diff --git a/var/spack/repos/builtin/packages/predixy/package.py b/var/spack/repos/builtin/packages/predixy/package.py index fb75863c21..4c7858fd1c 100644 --- a/var/spack/repos/builtin/packages/predixy/package.py +++ b/var/spack/repos/builtin/packages/predixy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Predixy(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/premake-core/package.py b/var/spack/repos/builtin/packages/premake-core/package.py index fa0a1cbde8..da7ebab99e 100644 --- a/var/spack/repos/builtin/packages/premake-core/package.py +++ b/var/spack/repos/builtin/packages/premake-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PremakeCore(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/presentproto/package.py b/var/spack/repos/builtin/packages/presentproto/package.py index 507d675120..d785b95df4 100644 --- a/var/spack/repos/builtin/packages/presentproto/package.py +++ b/var/spack/repos/builtin/packages/presentproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Presentproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/preseq/package.py b/var/spack/repos/builtin/packages/preseq/package.py index 1847992f4c..21daee5d94 100644 --- a/var/spack/repos/builtin/packages/preseq/package.py +++ b/var/spack/repos/builtin/packages/preseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Preseq(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/presto/package.py b/var/spack/repos/builtin/packages/presto/package.py index 0f5c67a92a..c2213e4405 100644 --- a/var/spack/repos/builtin/packages/presto/package.py +++ b/var/spack/repos/builtin/packages/presto/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Presto(MavenPackage): """Presto is a distributed SQL query engine for big data.""" diff --git a/var/spack/repos/builtin/packages/price/package.py b/var/spack/repos/builtin/packages/price/package.py index f607bdcb39..5b7e565708 100644 --- a/var/spack/repos/builtin/packages/price/package.py +++ b/var/spack/repos/builtin/packages/price/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Price(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/primer3/package.py b/var/spack/repos/builtin/packages/primer3/package.py index eb24b97d4b..7dfe6c64f1 100644 --- a/var/spack/repos/builtin/packages/primer3/package.py +++ b/var/spack/repos/builtin/packages/primer3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Primer3(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/prinseq-lite/package.py b/var/spack/repos/builtin/packages/prinseq-lite/package.py index f70399bc2b..8a61211e93 100644 --- a/var/spack/repos/builtin/packages/prinseq-lite/package.py +++ b/var/spack/repos/builtin/packages/prinseq-lite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PrinseqLite(Package): diff --git a/var/spack/repos/builtin/packages/printproto/package.py b/var/spack/repos/builtin/packages/printproto/package.py index 41c7ae159f..1cb454253c 100644 --- a/var/spack/repos/builtin/packages/printproto/package.py +++ b/var/spack/repos/builtin/packages/printproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Printproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/prism/package.py b/var/spack/repos/builtin/packages/prism/package.py index c136e902b3..71c73acd92 100644 --- a/var/spack/repos/builtin/packages/prism/package.py +++ b/var/spack/repos/builtin/packages/prism/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Prism(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/prmon/package.py b/var/spack/repos/builtin/packages/prmon/package.py index 52cc3f3c05..b32fa6b1eb 100644 --- a/var/spack/repos/builtin/packages/prmon/package.py +++ b/var/spack/repos/builtin/packages/prmon/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Prmon(CMakePackage): diff --git a/var/spack/repos/builtin/packages/prng/package.py b/var/spack/repos/builtin/packages/prng/package.py index b9a508e376..80959a0fd7 100644 --- a/var/spack/repos/builtin/packages/prng/package.py +++ b/var/spack/repos/builtin/packages/prng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Prng(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/probconsrna/package.py b/var/spack/repos/builtin/packages/probconsrna/package.py index 6c3288feab..ba52265109 100644 --- a/var/spack/repos/builtin/packages/probconsrna/package.py +++ b/var/spack/repos/builtin/packages/probconsrna/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Probconsrna(Package): diff --git a/var/spack/repos/builtin/packages/procenv/package.py b/var/spack/repos/builtin/packages/procenv/package.py index b008f536ed..cccf3f36c4 100644 --- a/var/spack/repos/builtin/packages/procenv/package.py +++ b/var/spack/repos/builtin/packages/procenv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Procenv(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/process-in-process/package.py b/var/spack/repos/builtin/packages/process-in-process/package.py index c9460f89cd..f173e7842e 100644 --- a/var/spack/repos/builtin/packages/process-in-process/package.py +++ b/var/spack/repos/builtin/packages/process-in-process/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ProcessInProcess(Package): diff --git a/var/spack/repos/builtin/packages/procps-ng/package.py b/var/spack/repos/builtin/packages/procps-ng/package.py index 2ff806adf9..39fadf6d43 100644 --- a/var/spack/repos/builtin/packages/procps-ng/package.py +++ b/var/spack/repos/builtin/packages/procps-ng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ProcpsNg(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/procps/package.py b/var/spack/repos/builtin/packages/procps/package.py index 7f4d5f45ab..e7e0e01b69 100644 --- a/var/spack/repos/builtin/packages/procps/package.py +++ b/var/spack/repos/builtin/packages/procps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Procps(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/prod-util/package.py b/var/spack/repos/builtin/packages/prod-util/package.py index 37587a5a5b..20f65d1073 100644 --- a/var/spack/repos/builtin/packages/prod-util/package.py +++ b/var/spack/repos/builtin/packages/prod-util/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ProdUtil(CMakePackage): diff --git a/var/spack/repos/builtin/packages/prodigal/package.py b/var/spack/repos/builtin/packages/prodigal/package.py index 17a39b537a..9910485874 100644 --- a/var/spack/repos/builtin/packages/prodigal/package.py +++ b/var/spack/repos/builtin/packages/prodigal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Prodigal(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/professor/package.py b/var/spack/repos/builtin/packages/professor/package.py index 4f3ef78154..eef891b0f9 100644 --- a/var/spack/repos/builtin/packages/professor/package.py +++ b/var/spack/repos/builtin/packages/professor/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class Professor(Package): diff --git a/var/spack/repos/builtin/packages/profugusmc/package.py b/var/spack/repos/builtin/packages/profugusmc/package.py index 8bd56ca5fe..0e04c43a07 100644 --- a/var/spack/repos/builtin/packages/profugusmc/package.py +++ b/var/spack/repos/builtin/packages/profugusmc/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Profugusmc(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index 408500a436..07c72a9ba1 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Proj(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/prokka/package.py b/var/spack/repos/builtin/packages/prokka/package.py index 63e98a174b..9791273d38 100644 --- a/var/spack/repos/builtin/packages/prokka/package.py +++ b/var/spack/repos/builtin/packages/prokka/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Prokka(Package): diff --git a/var/spack/repos/builtin/packages/prometheus/package.py b/var/spack/repos/builtin/packages/prometheus/package.py index 5375db3f28..ebbc8ff25c 100644 --- a/var/spack/repos/builtin/packages/prometheus/package.py +++ b/var/spack/repos/builtin/packages/prometheus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Prometheus(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/prophecy4f/package.py b/var/spack/repos/builtin/packages/prophecy4f/package.py index c026ec2054..16cec25222 100644 --- a/var/spack/repos/builtin/packages/prophecy4f/package.py +++ b/var/spack/repos/builtin/packages/prophecy4f/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Prophecy4f(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/protobuf-c/package.py b/var/spack/repos/builtin/packages/protobuf-c/package.py index 36e4b732be..498d776d02 100644 --- a/var/spack/repos/builtin/packages/protobuf-c/package.py +++ b/var/spack/repos/builtin/packages/protobuf-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ProtobufC(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 3097674e02..9534a45216 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -6,7 +6,7 @@ import sys import spack.util.web -from spack import * +from spack.package import * class Protobuf(Package): diff --git a/var/spack/repos/builtin/packages/proxymngr/package.py b/var/spack/repos/builtin/packages/proxymngr/package.py index 24623c4f6e..d61b4abed0 100644 --- a/var/spack/repos/builtin/packages/proxymngr/package.py +++ b/var/spack/repos/builtin/packages/proxymngr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Proxymngr(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/prrte/package.py b/var/spack/repos/builtin/packages/prrte/package.py index f9eb279918..00658c69e5 100644 --- a/var/spack/repos/builtin/packages/prrte/package.py +++ b/var/spack/repos/builtin/packages/prrte/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class Prrte(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pruners-ninja/package.py b/var/spack/repos/builtin/packages/pruners-ninja/package.py index 1f5bfdf6d5..789c59633f 100644 --- a/var/spack/repos/builtin/packages/pruners-ninja/package.py +++ b/var/spack/repos/builtin/packages/pruners-ninja/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PrunersNinja(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ps-lite/package.py b/var/spack/repos/builtin/packages/ps-lite/package.py index ef6e1c4bb6..55aaef3f5d 100644 --- a/var/spack/repos/builtin/packages/ps-lite/package.py +++ b/var/spack/repos/builtin/packages/ps-lite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PsLite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/psi4/package.py b/var/spack/repos/builtin/packages/psi4/package.py index 0f89e1590f..4f0ff5da50 100644 --- a/var/spack/repos/builtin/packages/psi4/package.py +++ b/var/spack/repos/builtin/packages/psi4/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Psi4(CMakePackage): diff --git a/var/spack/repos/builtin/packages/psimd/package.py b/var/spack/repos/builtin/packages/psimd/package.py index 077f180dfb..f1e6b06374 100644 --- a/var/spack/repos/builtin/packages/psimd/package.py +++ b/var/spack/repos/builtin/packages/psimd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Psimd(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pslib/package.py b/var/spack/repos/builtin/packages/pslib/package.py index c023dacbaf..0d47a563d7 100644 --- a/var/spack/repos/builtin/packages/pslib/package.py +++ b/var/spack/repos/builtin/packages/pslib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pslib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/psm/package.py b/var/spack/repos/builtin/packages/psm/package.py index b707c23549..90d1eba739 100644 --- a/var/spack/repos/builtin/packages/psm/package.py +++ b/var/spack/repos/builtin/packages/psm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Psm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/psmc/package.py b/var/spack/repos/builtin/packages/psmc/package.py index eb78240e0b..8faf26f7bc 100644 --- a/var/spack/repos/builtin/packages/psmc/package.py +++ b/var/spack/repos/builtin/packages/psmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Psmc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pstreams/package.py b/var/spack/repos/builtin/packages/pstreams/package.py index ffb7e3667e..a00d53900a 100644 --- a/var/spack/repos/builtin/packages/pstreams/package.py +++ b/var/spack/repos/builtin/packages/pstreams/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pstreams(Package): diff --git a/var/spack/repos/builtin/packages/pthreadpool/package.py b/var/spack/repos/builtin/packages/pthreadpool/package.py index 93ce659e25..89f0f9acd5 100644 --- a/var/spack/repos/builtin/packages/pthreadpool/package.py +++ b/var/spack/repos/builtin/packages/pthreadpool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pthreadpool(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pugixml/package.py b/var/spack/repos/builtin/packages/pugixml/package.py index 66105ba2e9..9890ab8c6a 100644 --- a/var/spack/repos/builtin/packages/pugixml/package.py +++ b/var/spack/repos/builtin/packages/pugixml/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pugixml(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pulseaudio/package.py b/var/spack/repos/builtin/packages/pulseaudio/package.py index 3b0b4c0e04..58e223098d 100644 --- a/var/spack/repos/builtin/packages/pulseaudio/package.py +++ b/var/spack/repos/builtin/packages/pulseaudio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pulseaudio(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index f1fe42c4c7..76ecca178f 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pumi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pv/package.py b/var/spack/repos/builtin/packages/pv/package.py index 22f349f78e..3498a65709 100644 --- a/var/spack/repos/builtin/packages/pv/package.py +++ b/var/spack/repos/builtin/packages/pv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pv(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/pvm/package.py b/var/spack/repos/builtin/packages/pvm/package.py index 887969e868..72bbc04d83 100644 --- a/var/spack/repos/builtin/packages/pvm/package.py +++ b/var/spack/repos/builtin/packages/pvm/package.py @@ -5,7 +5,7 @@ import subprocess -from spack import * +from spack.package import * class Pvm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/pxz/package.py b/var/spack/repos/builtin/packages/pxz/package.py index 57751d5f15..424631f8b0 100644 --- a/var/spack/repos/builtin/packages/pxz/package.py +++ b/var/spack/repos/builtin/packages/pxz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pxz(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/py-3to2/package.py b/var/spack/repos/builtin/packages/py-3to2/package.py index 9827a559c1..2736ff8c67 100644 --- a/var/spack/repos/builtin/packages/py-3to2/package.py +++ b/var/spack/repos/builtin/packages/py-3to2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Py3to2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-4suite-xml/package.py b/var/spack/repos/builtin/packages/py-4suite-xml/package.py index f809727c28..8b98fd1e32 100644 --- a/var/spack/repos/builtin/packages/py-4suite-xml/package.py +++ b/var/spack/repos/builtin/packages/py-4suite-xml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Py4suiteXml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-abcpy/package.py b/var/spack/repos/builtin/packages/py-abcpy/package.py index 7802d8a189..36f610c6b5 100644 --- a/var/spack/repos/builtin/packages/py-abcpy/package.py +++ b/var/spack/repos/builtin/packages/py-abcpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAbcpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-abipy/package.py b/var/spack/repos/builtin/packages/py-abipy/package.py index b0c03dc853..5af2e8c754 100644 --- a/var/spack/repos/builtin/packages/py-abipy/package.py +++ b/var/spack/repos/builtin/packages/py-abipy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAbipy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-absl-py/package.py b/var/spack/repos/builtin/packages/py-absl-py/package.py index cf555b164e..f88d325da0 100644 --- a/var/spack/repos/builtin/packages/py-absl-py/package.py +++ b/var/spack/repos/builtin/packages/py-absl-py/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAbslPy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-accimage/package.py b/var/spack/repos/builtin/packages/py-accimage/package.py index 36eab706b8..9a680d64fb 100644 --- a/var/spack/repos/builtin/packages/py-accimage/package.py +++ b/var/spack/repos/builtin/packages/py-accimage/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAccimage(PythonPackage): """An accelerated Image loader and preprocessor leveraging Intel IPP. diff --git a/var/spack/repos/builtin/packages/py-acme-tiny/package.py b/var/spack/repos/builtin/packages/py-acme-tiny/package.py index a029784834..5ff013e792 100644 --- a/var/spack/repos/builtin/packages/py-acme-tiny/package.py +++ b/var/spack/repos/builtin/packages/py-acme-tiny/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAcmeTiny(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-adal/package.py b/var/spack/repos/builtin/packages/py-adal/package.py index d789767341..484a3e37e2 100644 --- a/var/spack/repos/builtin/packages/py-adal/package.py +++ b/var/spack/repos/builtin/packages/py-adal/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAdal(PythonPackage): """The ADAL for Python library makes it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD diff --git a/var/spack/repos/builtin/packages/py-adb-enhanced/package.py b/var/spack/repos/builtin/packages/py-adb-enhanced/package.py index a7cc4b8e85..3e06052b9e 100644 --- a/var/spack/repos/builtin/packages/py-adb-enhanced/package.py +++ b/var/spack/repos/builtin/packages/py-adb-enhanced/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAdbEnhanced(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-addict/package.py b/var/spack/repos/builtin/packages/py-addict/package.py index 5e1400a11c..5b361dd407 100644 --- a/var/spack/repos/builtin/packages/py-addict/package.py +++ b/var/spack/repos/builtin/packages/py-addict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAddict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-adios/package.py b/var/spack/repos/builtin/packages/py-adios/package.py index 468ce3ba25..2cffc0c3f7 100644 --- a/var/spack/repos/builtin/packages/py-adios/package.py +++ b/var/spack/repos/builtin/packages/py-adios/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyAdios(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py b/var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py index dd0121f7f5..83e3d64e8b 100644 --- a/var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py +++ b/var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAdvancedhtmlparser(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aenum/package.py b/var/spack/repos/builtin/packages/py-aenum/package.py index 26517e676e..50cd7174b5 100644 --- a/var/spack/repos/builtin/packages/py-aenum/package.py +++ b/var/spack/repos/builtin/packages/py-aenum/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAenum(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-affine/package.py b/var/spack/repos/builtin/packages/py-affine/package.py index be48a141f6..2e379ad9f9 100644 --- a/var/spack/repos/builtin/packages/py-affine/package.py +++ b/var/spack/repos/builtin/packages/py-affine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAffine(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-agate-dbf/package.py b/var/spack/repos/builtin/packages/py-agate-dbf/package.py index 8225ba6aba..e81d42d970 100644 --- a/var/spack/repos/builtin/packages/py-agate-dbf/package.py +++ b/var/spack/repos/builtin/packages/py-agate-dbf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAgateDbf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-agate-excel/package.py b/var/spack/repos/builtin/packages/py-agate-excel/package.py index 41046042b8..0473c31198 100644 --- a/var/spack/repos/builtin/packages/py-agate-excel/package.py +++ b/var/spack/repos/builtin/packages/py-agate-excel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAgateExcel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-agate-sql/package.py b/var/spack/repos/builtin/packages/py-agate-sql/package.py index 85d91b2afa..6c81303070 100644 --- a/var/spack/repos/builtin/packages/py-agate-sql/package.py +++ b/var/spack/repos/builtin/packages/py-agate-sql/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAgateSql(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-agate/package.py b/var/spack/repos/builtin/packages/py-agate/package.py index c67dee4294..d3a2fa79be 100644 --- a/var/spack/repos/builtin/packages/py-agate/package.py +++ b/var/spack/repos/builtin/packages/py-agate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAgate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aiobotocore/package.py b/var/spack/repos/builtin/packages/py-aiobotocore/package.py index 6cfbb5f201..0cf93bbe8c 100644 --- a/var/spack/repos/builtin/packages/py-aiobotocore/package.py +++ b/var/spack/repos/builtin/packages/py-aiobotocore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAiobotocore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aiodns/package.py b/var/spack/repos/builtin/packages/py-aiodns/package.py index aa6348ef66..1c1db55e12 100644 --- a/var/spack/repos/builtin/packages/py-aiodns/package.py +++ b/var/spack/repos/builtin/packages/py-aiodns/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAiodns(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aiofiles/package.py b/var/spack/repos/builtin/packages/py-aiofiles/package.py index dc5eb28af8..075247df18 100644 --- a/var/spack/repos/builtin/packages/py-aiofiles/package.py +++ b/var/spack/repos/builtin/packages/py-aiofiles/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAiofiles(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py b/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py index 6810050081..5cb44098ec 100644 --- a/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py +++ b/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAiohttpCors(PythonPackage): """aiohttp_cors library implements Cross Origin Resource Sharing (CORS) support for aiohttp asyncio-powered asynchronous HTTP server.""" diff --git a/var/spack/repos/builtin/packages/py-aiohttp/package.py b/var/spack/repos/builtin/packages/py-aiohttp/package.py index 4ed679049c..dbc097b072 100644 --- a/var/spack/repos/builtin/packages/py-aiohttp/package.py +++ b/var/spack/repos/builtin/packages/py-aiohttp/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAiohttp(PythonPackage): """Supports both client and server side of HTTP protocol. Supports both client and server Web-Sockets out-of-the-box and diff --git a/var/spack/repos/builtin/packages/py-aioitertools/package.py b/var/spack/repos/builtin/packages/py-aioitertools/package.py index 09db7dd0ef..bd2ddf65a8 100644 --- a/var/spack/repos/builtin/packages/py-aioitertools/package.py +++ b/var/spack/repos/builtin/packages/py-aioitertools/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAioitertools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aioredis/package.py b/var/spack/repos/builtin/packages/py-aioredis/package.py index 0c7c0e4a30..4d9962b837 100644 --- a/var/spack/repos/builtin/packages/py-aioredis/package.py +++ b/var/spack/repos/builtin/packages/py-aioredis/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAioredis(PythonPackage): """asyncio (PEP 3156) Redis support.""" diff --git a/var/spack/repos/builtin/packages/py-aiosignal/package.py b/var/spack/repos/builtin/packages/py-aiosignal/package.py index 67a2f04e4d..ef41f48bad 100644 --- a/var/spack/repos/builtin/packages/py-aiosignal/package.py +++ b/var/spack/repos/builtin/packages/py-aiosignal/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAiosignal(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aiosqlite/package.py b/var/spack/repos/builtin/packages/py-aiosqlite/package.py index bf3dafe63f..ea113ce432 100644 --- a/var/spack/repos/builtin/packages/py-aiosqlite/package.py +++ b/var/spack/repos/builtin/packages/py-aiosqlite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAiosqlite(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-alabaster/package.py b/var/spack/repos/builtin/packages/py-alabaster/package.py index 75002a13f1..ba3c398fd3 100644 --- a/var/spack/repos/builtin/packages/py-alabaster/package.py +++ b/var/spack/repos/builtin/packages/py-alabaster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAlabaster(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-alembic/package.py b/var/spack/repos/builtin/packages/py-alembic/package.py index cd7a0d354c..1bb2fdff21 100644 --- a/var/spack/repos/builtin/packages/py-alembic/package.py +++ b/var/spack/repos/builtin/packages/py-alembic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAlembic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-altgraph/package.py b/var/spack/repos/builtin/packages/py-altgraph/package.py index b41c2daa45..8b97d66b5a 100644 --- a/var/spack/repos/builtin/packages/py-altgraph/package.py +++ b/var/spack/repos/builtin/packages/py-altgraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAltgraph(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-amqp/package.py b/var/spack/repos/builtin/packages/py-amqp/package.py index 42419be84b..ef8fc6f3d5 100644 --- a/var/spack/repos/builtin/packages/py-amqp/package.py +++ b/var/spack/repos/builtin/packages/py-amqp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAmqp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-angel/package.py b/var/spack/repos/builtin/packages/py-angel/package.py index 89971e7d07..b1b929e520 100644 --- a/var/spack/repos/builtin/packages/py-angel/package.py +++ b/var/spack/repos/builtin/packages/py-angel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAngel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aniso8601/package.py b/var/spack/repos/builtin/packages/py-aniso8601/package.py index 587bba1968..ee272fa22a 100644 --- a/var/spack/repos/builtin/packages/py-aniso8601/package.py +++ b/var/spack/repos/builtin/packages/py-aniso8601/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAniso8601(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-annexremote/package.py b/var/spack/repos/builtin/packages/py-annexremote/package.py index 7e57a3061b..48b7416055 100644 --- a/var/spack/repos/builtin/packages/py-annexremote/package.py +++ b/var/spack/repos/builtin/packages/py-annexremote/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAnnexremote(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ansi2html/package.py b/var/spack/repos/builtin/packages/py-ansi2html/package.py index 16203cb266..7cb4f6641d 100644 --- a/var/spack/repos/builtin/packages/py-ansi2html/package.py +++ b/var/spack/repos/builtin/packages/py-ansi2html/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAnsi2html(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ansible/package.py b/var/spack/repos/builtin/packages/py-ansible/package.py index c0e0df75a9..269ff8be3e 100644 --- a/var/spack/repos/builtin/packages/py-ansible/package.py +++ b/var/spack/repos/builtin/packages/py-ansible/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAnsible(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py b/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py index 51acdb2ef0..8909f48198 100644 --- a/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py +++ b/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAntlr4Python3Runtime(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-anuga/package.py b/var/spack/repos/builtin/packages/py-anuga/package.py index fd18e5426b..e969da3a17 100644 --- a/var/spack/repos/builtin/packages/py-anuga/package.py +++ b/var/spack/repos/builtin/packages/py-anuga/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAnuga(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-anyio/package.py b/var/spack/repos/builtin/packages/py-anyio/package.py index bd001dac7c..70b3152e65 100644 --- a/var/spack/repos/builtin/packages/py-anyio/package.py +++ b/var/spack/repos/builtin/packages/py-anyio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAnyio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-anytree/package.py b/var/spack/repos/builtin/packages/py-anytree/package.py index 17e10c3a4a..9b642ed9f6 100644 --- a/var/spack/repos/builtin/packages/py-anytree/package.py +++ b/var/spack/repos/builtin/packages/py-anytree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAnytree(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-apache-beam/package.py b/var/spack/repos/builtin/packages/py-apache-beam/package.py index 61cbc3840d..84387d87d1 100644 --- a/var/spack/repos/builtin/packages/py-apache-beam/package.py +++ b/var/spack/repos/builtin/packages/py-apache-beam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyApacheBeam(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-apache-libcloud/package.py b/var/spack/repos/builtin/packages/py-apache-libcloud/package.py index 93665ce2ea..c950b2f2f8 100644 --- a/var/spack/repos/builtin/packages/py-apache-libcloud/package.py +++ b/var/spack/repos/builtin/packages/py-apache-libcloud/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyApacheLibcloud(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-apex/package.py b/var/spack/repos/builtin/packages/py-apex/package.py index d8076692c7..7d46bdf832 100644 --- a/var/spack/repos/builtin/packages/py-apex/package.py +++ b/var/spack/repos/builtin/packages/py-apex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyApex(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-apipkg/package.py b/var/spack/repos/builtin/packages/py-apipkg/package.py index c6c6e4d73e..8a2aadff22 100644 --- a/var/spack/repos/builtin/packages/py-apipkg/package.py +++ b/var/spack/repos/builtin/packages/py-apipkg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyApipkg(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-appdirs/package.py b/var/spack/repos/builtin/packages/py-appdirs/package.py index a74410107f..8b72587b2d 100644 --- a/var/spack/repos/builtin/packages/py-appdirs/package.py +++ b/var/spack/repos/builtin/packages/py-appdirs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAppdirs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-applicationinsights/package.py b/var/spack/repos/builtin/packages/py-applicationinsights/package.py index 74f67825c1..495317c624 100644 --- a/var/spack/repos/builtin/packages/py-applicationinsights/package.py +++ b/var/spack/repos/builtin/packages/py-applicationinsights/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyApplicationinsights(PythonPackage): """This project extends the Application Insights API surface to support Python.""" diff --git a/var/spack/repos/builtin/packages/py-appnope/package.py b/var/spack/repos/builtin/packages/py-appnope/package.py index c94d559915..b35a4aacdb 100644 --- a/var/spack/repos/builtin/packages/py-appnope/package.py +++ b/var/spack/repos/builtin/packages/py-appnope/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAppnope(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-apptools/package.py b/var/spack/repos/builtin/packages/py-apptools/package.py index c093f43764..6556455dd8 100644 --- a/var/spack/repos/builtin/packages/py-apptools/package.py +++ b/var/spack/repos/builtin/packages/py-apptools/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyApptools(PythonPackage): """The apptools project includes a set of packages that Enthought has found useful in creating a number of applications. They implement functionality diff --git a/var/spack/repos/builtin/packages/py-apscheduler/package.py b/var/spack/repos/builtin/packages/py-apscheduler/package.py index 3f236f92e4..08cd71c97c 100644 --- a/var/spack/repos/builtin/packages/py-apscheduler/package.py +++ b/var/spack/repos/builtin/packages/py-apscheduler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyApscheduler(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-arcgis/package.py b/var/spack/repos/builtin/packages/py-arcgis/package.py index 8a9d898829..39ed34f05c 100644 --- a/var/spack/repos/builtin/packages/py-arcgis/package.py +++ b/var/spack/repos/builtin/packages/py-arcgis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyArcgis(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-archspec/package.py b/var/spack/repos/builtin/packages/py-archspec/package.py index 6a058e2486..5f20523857 100644 --- a/var/spack/repos/builtin/packages/py-archspec/package.py +++ b/var/spack/repos/builtin/packages/py-archspec/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyArchspec(PythonPackage): """A library for detecting, labeling and reasoning about microarchitectures. diff --git a/var/spack/repos/builtin/packages/py-argcomplete/package.py b/var/spack/repos/builtin/packages/py-argcomplete/package.py index 354164e640..05ead1840d 100644 --- a/var/spack/repos/builtin/packages/py-argcomplete/package.py +++ b/var/spack/repos/builtin/packages/py-argcomplete/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyArgcomplete(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-argh/package.py b/var/spack/repos/builtin/packages/py-argh/package.py index 6b3c003c44..b0beddd1b5 100644 --- a/var/spack/repos/builtin/packages/py-argh/package.py +++ b/var/spack/repos/builtin/packages/py-argh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyArgh(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-argon2-cffi-bindings/package.py b/var/spack/repos/builtin/packages/py-argon2-cffi-bindings/package.py index c6720f5eb3..4c676e58e3 100644 --- a/var/spack/repos/builtin/packages/py-argon2-cffi-bindings/package.py +++ b/var/spack/repos/builtin/packages/py-argon2-cffi-bindings/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyArgon2CffiBindings(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-argon2-cffi/package.py b/var/spack/repos/builtin/packages/py-argon2-cffi/package.py index df91685adf..b8bba0156f 100644 --- a/var/spack/repos/builtin/packages/py-argon2-cffi/package.py +++ b/var/spack/repos/builtin/packages/py-argon2-cffi/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyArgon2Cffi(PythonPackage): """The secure Argon2 password hashing algorithm..""" diff --git a/var/spack/repos/builtin/packages/py-argparse/package.py b/var/spack/repos/builtin/packages/py-argparse/package.py index 168c055292..b04f6cc643 100644 --- a/var/spack/repos/builtin/packages/py-argparse/package.py +++ b/var/spack/repos/builtin/packages/py-argparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyArgparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-args/package.py b/var/spack/repos/builtin/packages/py-args/package.py index 3228713e7a..ab3158d1f5 100644 --- a/var/spack/repos/builtin/packages/py-args/package.py +++ b/var/spack/repos/builtin/packages/py-args/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyArgs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-arrow/package.py b/var/spack/repos/builtin/packages/py-arrow/package.py index ecef12d0b6..f24ca2e250 100644 --- a/var/spack/repos/builtin/packages/py-arrow/package.py +++ b/var/spack/repos/builtin/packages/py-arrow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyArrow(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-arviz/package.py b/var/spack/repos/builtin/packages/py-arviz/package.py index 769d3d0604..19322f0112 100644 --- a/var/spack/repos/builtin/packages/py-arviz/package.py +++ b/var/spack/repos/builtin/packages/py-arviz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyArviz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-asciitree/package.py b/var/spack/repos/builtin/packages/py-asciitree/package.py index f1d398df83..383a42e859 100644 --- a/var/spack/repos/builtin/packages/py-asciitree/package.py +++ b/var/spack/repos/builtin/packages/py-asciitree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsciitree(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-asdf/package.py b/var/spack/repos/builtin/packages/py-asdf/package.py index 149e3a54ce..195bd5289d 100644 --- a/var/spack/repos/builtin/packages/py-asdf/package.py +++ b/var/spack/repos/builtin/packages/py-asdf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsdf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ase/package.py b/var/spack/repos/builtin/packages/py-ase/package.py index cc8643563b..bdbf35b631 100644 --- a/var/spack/repos/builtin/packages/py-ase/package.py +++ b/var/spack/repos/builtin/packages/py-ase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-asgiref/package.py b/var/spack/repos/builtin/packages/py-asgiref/package.py index f141c619d5..aa7c6d272b 100644 --- a/var/spack/repos/builtin/packages/py-asgiref/package.py +++ b/var/spack/repos/builtin/packages/py-asgiref/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsgiref(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-asn1crypto/package.py b/var/spack/repos/builtin/packages/py-asn1crypto/package.py index e8e959729b..c6a9776130 100644 --- a/var/spack/repos/builtin/packages/py-asn1crypto/package.py +++ b/var/spack/repos/builtin/packages/py-asn1crypto/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsn1crypto(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-aspy-yaml/package.py b/var/spack/repos/builtin/packages/py-aspy-yaml/package.py index 9007604e02..467d2fe4a6 100644 --- a/var/spack/repos/builtin/packages/py-aspy-yaml/package.py +++ b/var/spack/repos/builtin/packages/py-aspy-yaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAspyYaml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-asserts/package.py b/var/spack/repos/builtin/packages/py-asserts/package.py index 56c530956c..9cda421573 100644 --- a/var/spack/repos/builtin/packages/py-asserts/package.py +++ b/var/spack/repos/builtin/packages/py-asserts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsserts(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-asteval/package.py b/var/spack/repos/builtin/packages/py-asteval/package.py index 4675512e2d..f1761a1e36 100644 --- a/var/spack/repos/builtin/packages/py-asteval/package.py +++ b/var/spack/repos/builtin/packages/py-asteval/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsteval(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-astor/package.py b/var/spack/repos/builtin/packages/py-astor/package.py index 5c7a3ae00f..fc9d57aecb 100644 --- a/var/spack/repos/builtin/packages/py-astor/package.py +++ b/var/spack/repos/builtin/packages/py-astor/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAstor(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-astpretty/package.py b/var/spack/repos/builtin/packages/py-astpretty/package.py index 6651371441..cc0a264a92 100644 --- a/var/spack/repos/builtin/packages/py-astpretty/package.py +++ b/var/spack/repos/builtin/packages/py-astpretty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAstpretty(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py index e2b693b6ae..f31aa11469 100644 --- a/var/spack/repos/builtin/packages/py-astroid/package.py +++ b/var/spack/repos/builtin/packages/py-astroid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAstroid(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-astropy-healpix/package.py b/var/spack/repos/builtin/packages/py-astropy-healpix/package.py index 3a723daa59..369404e3b4 100644 --- a/var/spack/repos/builtin/packages/py-astropy-healpix/package.py +++ b/var/spack/repos/builtin/packages/py-astropy-healpix/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAstropyHealpix(PythonPackage): """HEALPix (Hierarchical Equal Area isoLatitude Pixelisation) is an algorithm for pixellizing a sphere that is sometimes used in diff --git a/var/spack/repos/builtin/packages/py-astropy-helpers/package.py b/var/spack/repos/builtin/packages/py-astropy-helpers/package.py index 3caed66d44..a20c460d11 100644 --- a/var/spack/repos/builtin/packages/py-astropy-helpers/package.py +++ b/var/spack/repos/builtin/packages/py-astropy-helpers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAstropyHelpers(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py index 0692ce57c3..621b655e69 100644 --- a/var/spack/repos/builtin/packages/py-astropy/package.py +++ b/var/spack/repos/builtin/packages/py-astropy/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyAstropy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-asttokens/package.py b/var/spack/repos/builtin/packages/py-asttokens/package.py index 18f04dd0ec..fa8e60a7a4 100644 --- a/var/spack/repos/builtin/packages/py-asttokens/package.py +++ b/var/spack/repos/builtin/packages/py-asttokens/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsttokens(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-astunparse/package.py b/var/spack/repos/builtin/packages/py-astunparse/package.py index aaff8cf2cb..9266cb793d 100644 --- a/var/spack/repos/builtin/packages/py-astunparse/package.py +++ b/var/spack/repos/builtin/packages/py-astunparse/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAstunparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-async-generator/package.py b/var/spack/repos/builtin/packages/py-async-generator/package.py index 40364b6849..d24d68733b 100644 --- a/var/spack/repos/builtin/packages/py-async-generator/package.py +++ b/var/spack/repos/builtin/packages/py-async-generator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsyncGenerator(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-async-lru/package.py b/var/spack/repos/builtin/packages/py-async-lru/package.py index 44b23c9079..22e47ac4c4 100644 --- a/var/spack/repos/builtin/packages/py-async-lru/package.py +++ b/var/spack/repos/builtin/packages/py-async-lru/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsyncLru(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-async-timeout/package.py b/var/spack/repos/builtin/packages/py-async-timeout/package.py index bb5dc8f269..e80fc26603 100644 --- a/var/spack/repos/builtin/packages/py-async-timeout/package.py +++ b/var/spack/repos/builtin/packages/py-async-timeout/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAsyncTimeout(PythonPackage): """asyncio-compatible timeout context manager.""" diff --git a/var/spack/repos/builtin/packages/py-asyncio/package.py b/var/spack/repos/builtin/packages/py-asyncio/package.py index da18286d66..5dd0a1c7db 100644 --- a/var/spack/repos/builtin/packages/py-asyncio/package.py +++ b/var/spack/repos/builtin/packages/py-asyncio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsyncio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-asynctest/package.py b/var/spack/repos/builtin/packages/py-asynctest/package.py index be5aeb2b14..9fd0d10e10 100644 --- a/var/spack/repos/builtin/packages/py-asynctest/package.py +++ b/var/spack/repos/builtin/packages/py-asynctest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAsynctest(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-atomicwrites/package.py b/var/spack/repos/builtin/packages/py-atomicwrites/package.py index c316233e12..7d766b564c 100644 --- a/var/spack/repos/builtin/packages/py-atomicwrites/package.py +++ b/var/spack/repos/builtin/packages/py-atomicwrites/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAtomicwrites(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-atpublic/package.py b/var/spack/repos/builtin/packages/py-atpublic/package.py index 81251c8de3..cb6f98e0ca 100644 --- a/var/spack/repos/builtin/packages/py-atpublic/package.py +++ b/var/spack/repos/builtin/packages/py-atpublic/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAtpublic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-atropos/package.py b/var/spack/repos/builtin/packages/py-atropos/package.py index 6c46919c39..08706e4b2c 100644 --- a/var/spack/repos/builtin/packages/py-atropos/package.py +++ b/var/spack/repos/builtin/packages/py-atropos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAtropos(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ats/package.py b/var/spack/repos/builtin/packages/py-ats/package.py index ed9dc8ebe5..0c0a119ad3 100644 --- a/var/spack/repos/builtin/packages/py-ats/package.py +++ b/var/spack/repos/builtin/packages/py-ats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAts(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-attrs/package.py b/var/spack/repos/builtin/packages/py-attrs/package.py index bb12a31cc5..75cc361e22 100644 --- a/var/spack/repos/builtin/packages/py-attrs/package.py +++ b/var/spack/repos/builtin/packages/py-attrs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAttrs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-audioread/package.py b/var/spack/repos/builtin/packages/py-audioread/package.py index 836fdb3467..9126603250 100644 --- a/var/spack/repos/builtin/packages/py-audioread/package.py +++ b/var/spack/repos/builtin/packages/py-audioread/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAudioread(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-autograd-gamma/package.py b/var/spack/repos/builtin/packages/py-autograd-gamma/package.py index 2e4c9c88de..ae5cc6103c 100644 --- a/var/spack/repos/builtin/packages/py-autograd-gamma/package.py +++ b/var/spack/repos/builtin/packages/py-autograd-gamma/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAutogradGamma(PythonPackage): """autograd compatible approximations to the derivatives of the Gamma-family of functions.""" diff --git a/var/spack/repos/builtin/packages/py-autograd/package.py b/var/spack/repos/builtin/packages/py-autograd/package.py index 0852750fd7..56ec226943 100644 --- a/var/spack/repos/builtin/packages/py-autograd/package.py +++ b/var/spack/repos/builtin/packages/py-autograd/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAutograd(PythonPackage): """Autograd can automatically differentiate native Python and Numpy code. It can handle a large subset of Python's features, diff --git a/var/spack/repos/builtin/packages/py-automat/package.py b/var/spack/repos/builtin/packages/py-automat/package.py index ab593551b2..fac4b7fe68 100644 --- a/var/spack/repos/builtin/packages/py-automat/package.py +++ b/var/spack/repos/builtin/packages/py-automat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAutomat(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-autopep8/package.py b/var/spack/repos/builtin/packages/py-autopep8/package.py index abc0796024..947d8ec03a 100644 --- a/var/spack/repos/builtin/packages/py-autopep8/package.py +++ b/var/spack/repos/builtin/packages/py-autopep8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAutopep8(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-auxlib/package.py b/var/spack/repos/builtin/packages/py-auxlib/package.py index 90adcedd7a..eb1930ae43 100644 --- a/var/spack/repos/builtin/packages/py-auxlib/package.py +++ b/var/spack/repos/builtin/packages/py-auxlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAuxlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py b/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py index 2f990bce7a..3182645f17 100644 --- a/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py +++ b/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAvroJsonSerializer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-avro-python3/package.py b/var/spack/repos/builtin/packages/py-avro-python3/package.py index 16bf1db4c5..d81cbdabc8 100644 --- a/var/spack/repos/builtin/packages/py-avro-python3/package.py +++ b/var/spack/repos/builtin/packages/py-avro-python3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAvroPython3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-avro/package.py b/var/spack/repos/builtin/packages/py-avro/package.py index de9a9566ed..dd46732a5d 100644 --- a/var/spack/repos/builtin/packages/py-avro/package.py +++ b/var/spack/repos/builtin/packages/py-avro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAvro(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-awesome-slugify/package.py b/var/spack/repos/builtin/packages/py-awesome-slugify/package.py index 25a3f799f4..f7dcdf7b0e 100644 --- a/var/spack/repos/builtin/packages/py-awesome-slugify/package.py +++ b/var/spack/repos/builtin/packages/py-awesome-slugify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAwesomeSlugify(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-awkward/package.py b/var/spack/repos/builtin/packages/py-awkward/package.py index 71b63ca2ec..5f9968e0d0 100644 --- a/var/spack/repos/builtin/packages/py-awkward/package.py +++ b/var/spack/repos/builtin/packages/py-awkward/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAwkward(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-awkward0/package.py b/var/spack/repos/builtin/packages/py-awkward0/package.py index eb3835514e..0571906071 100644 --- a/var/spack/repos/builtin/packages/py-awkward0/package.py +++ b/var/spack/repos/builtin/packages/py-awkward0/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAwkward0(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-awkward1/package.py b/var/spack/repos/builtin/packages/py-awkward1/package.py index 95d8e206bf..68392218b5 100644 --- a/var/spack/repos/builtin/packages/py-awkward1/package.py +++ b/var/spack/repos/builtin/packages/py-awkward1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAwkward1(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-azote/package.py b/var/spack/repos/builtin/packages/py-azote/package.py index 2a60217eb3..3a1cbdbf82 100644 --- a/var/spack/repos/builtin/packages/py-azote/package.py +++ b/var/spack/repos/builtin/packages/py-azote/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAzote(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-azure-batch/package.py b/var/spack/repos/builtin/packages/py-azure-batch/package.py index 6390f87eeb..d149e042ef 100644 --- a/var/spack/repos/builtin/packages/py-azure-batch/package.py +++ b/var/spack/repos/builtin/packages/py-azure-batch/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureBatch(PythonPackage): """Microsoft Azure Batch Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py index 8a2f3ca942..4d87cd955c 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureCliCommandModulesNspkg(PythonPackage): """Microsoft Azure CLI Command Modules Namespace Package.""" diff --git a/var/spack/repos/builtin/packages/py-azure-cli-core/package.py b/var/spack/repos/builtin/packages/py-azure-cli-core/package.py index 499976d6c5..cdec2e2472 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-core/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureCliCore(PythonPackage): """Microsoft Azure Command-Line Tools Core Module.""" diff --git a/var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py index b877de7d1d..c353b46fcb 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureCliNspkg(PythonPackage): """Microsoft Azure CLI Namespace Package.""" diff --git a/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py b/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py index 96bcd63c4e..eeed54fae3 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureCliTelemetry(PythonPackage): """Microsoft Azure CLI Telemetry Package.""" diff --git a/var/spack/repos/builtin/packages/py-azure-cli/package.py b/var/spack/repos/builtin/packages/py-azure-cli/package.py index b7039d736c..aaaea6c00c 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureCli(PythonPackage): """Microsoft Azure Command-Line Tools.""" diff --git a/var/spack/repos/builtin/packages/py-azure-common/package.py b/var/spack/repos/builtin/packages/py-azure-common/package.py index d1c49da179..236ea30624 100644 --- a/var/spack/repos/builtin/packages/py-azure-common/package.py +++ b/var/spack/repos/builtin/packages/py-azure-common/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureCommon(PythonPackage): """Microsoft Azure Client Library for Python (Common).""" diff --git a/var/spack/repos/builtin/packages/py-azure-core/package.py b/var/spack/repos/builtin/packages/py-azure-core/package.py index 8624fdd5b5..3e89a96316 100644 --- a/var/spack/repos/builtin/packages/py-azure-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-core/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureCore(PythonPackage): """Microsoft Azure Core Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-cosmos/package.py b/var/spack/repos/builtin/packages/py-azure-cosmos/package.py index 6657dfb6d2..099aa09550 100644 --- a/var/spack/repos/builtin/packages/py-azure-cosmos/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cosmos/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureCosmos(PythonPackage): """Microsoft Azure Cosmos Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py b/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py index 5e4e1b9de1..42d6e2c88a 100644 --- a/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py +++ b/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureDatalakeStore(PythonPackage): """Azure Data Lake Store Filesystem Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py b/var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py index 6d590608d4..e3fac9cc09 100644 --- a/var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py +++ b/var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureFunctionsDevopsBuild(PythonPackage): """Python package for integrating Azure Functions with Azure DevOps. Specifically made for the Azure CLI.""" diff --git a/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py b/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py index f4f309bc3d..f66d06d766 100644 --- a/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py +++ b/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureGraphrbac(PythonPackage): """Microsoft Azure Graph RBAC Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-identity/package.py b/var/spack/repos/builtin/packages/py-azure-identity/package.py index f606e24aea..cdddc202a6 100644 --- a/var/spack/repos/builtin/packages/py-azure-identity/package.py +++ b/var/spack/repos/builtin/packages/py-azure-identity/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureIdentity(PythonPackage): """Microsoft Azure Identity Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py index f7fa072807..0e74413846 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureKeyvaultCertificates(PythonPackage): """Microsoft Azure Key Vault Certificates Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py index 064845c821..dd2e26cf96 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureKeyvaultKeys(PythonPackage): """Microsoft Azure Key Vault Keys Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py index 251e3e4057..19f452a986 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureKeyvaultNspkg(PythonPackage): """Microsoft Azure Key Vault Namespace Package.""" diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py index 819df92ca0..dcf26e0f3c 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureKeyvaultSecrets(PythonPackage): """Microsoft Azure Key Vault Secrets Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault/package.py index 5415b192a5..d673c30b27 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureKeyvault(PythonPackage): """Microsoft Azure Key Vault Client Libraries for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py b/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py index e6f20f5d41..b40be2b948 100644 --- a/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureLoganalytics(PythonPackage): """Microsoft Azure Log Analytics Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py index bc51d98e91..dbb92c8097 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtAdvisor(PythonPackage): """Microsoft Azure Advisor Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py index 8e404caaa5..4847863ed8 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtApimanagement(PythonPackage): """Microsoft Azure API Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py index da815be7ff..7ed38ab945 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtAppconfiguration(PythonPackage): """Microsoft Azure App Configuration Management Client Library for Python. """ diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py index 5b220d4612..6be6200da3 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtApplicationinsights(PythonPackage): """Microsoft Azure Application Insights Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py index cdf3e3fe06..ecc143ee40 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtAuthorization(PythonPackage): """Microsoft Azure Authorization Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py index bc70fd230a..7e2254d8f8 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtBatch(PythonPackage): """Microsoft Azure Batch Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py index 9424bed5cb..b928f27f7b 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtBatchai(PythonPackage): """Microsoft Azure Batch AI Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py index 9ea65b3451..fd36a229a5 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtBilling(PythonPackage): """Microsoft Azure Billing Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py index 4c544d0151..4902a2164a 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtBotservice(PythonPackage): """Microsoft Azure Bot Service Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py index 083d9aa456..7d34c1727f 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtCdn(PythonPackage): """Microsoft Azure CDN Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py index 148403cb35..f3e3d5d89a 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtCognitiveservices(PythonPackage): """Microsoft Azure Cognitive Services Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py index 131886b450..ca792ce9cc 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtCompute(PythonPackage): """Microsoft Azure Compute Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py index e04453dee6..cfd875d1b3 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtConsumption(PythonPackage): """Microsoft Azure Consumption Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py index ad4b8df8d1..5c2a5b39a6 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtContainerinstance(PythonPackage): """Microsoft Azure Container Instance Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py index c057d7e9a1..535e72fb81 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtContainerregistry(PythonPackage): """Microsoft Azure Container Registry Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py index 5105d3e8fa..6c429598b8 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtContainerservice(PythonPackage): """Microsoft Azure Container Service Management Client Library for Python. """ diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py index 2bf8c3b973..1dd153eb95 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtCore(PythonPackage): """Microsoft Azure Management Core Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py index a86ef879ff..807c5ee6d0 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtCosmosdb(PythonPackage): """Microsoft Azure Cosmos DB Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py index 881051ff9b..d398efa37f 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtDatalakeAnalytics(PythonPackage): """Microsoft Azure Data Lake Analytics Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py index 8f135bb87f..b9b64f3353 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtDatalakeStore(PythonPackage): """Microsoft Azure Data Lake Store Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py index 5e032bc89f..cb52a43e59 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtDatamigration(PythonPackage): """Microsoft Azure Data Migration Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py index fab4c58c70..c5f9535578 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtDeploymentmanager(PythonPackage): """Microsoft Azure Deployment Manager Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py index e7dd3ce566..53c4fdc4da 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtDevtestlabs(PythonPackage): """Microsoft Azure DevTestLabs Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py index c1b0385915..c02f7cd71f 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtDns(PythonPackage): """Microsoft Azure DNS Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py index 9ed1006a54..da86459d40 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtEventgrid(PythonPackage): """Microsoft Azure EventGrid Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py index 92535605ea..8f1295738d 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtEventhub(PythonPackage): """Microsoft Azure EventHub Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py index daf9a853ca..0c63082651 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtHdinsight(PythonPackage): """Microsoft Azure HDInsight Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py index 9f12a0771b..b34f9ee5e9 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtImagebuilder(PythonPackage): """Microsoft Azure Image Builder Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py index 1168c600bf..ba94935f13 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtIotcentral(PythonPackage): """Microsoft Azure IoTCentral Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py index 260414db2a..be03bf9208 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtIothub(PythonPackage): """Microsoft Azure IoTHub Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py index 030a777279..b30c42882e 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtIothubprovisioningservices(PythonPackage): """Microsoft Azure IoTHub Provisioning Services Client Library for Python. """ diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py index 30d7866d08..1663a2dd73 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtKeyvault(PythonPackage): """Microsoft Azure Key Vault Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py index 70751bf3cf..ac5707b6e4 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtKusto(PythonPackage): """Microsoft Azure Kusto Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py index 878d89de68..7f0b4e3258 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtLoganalytics(PythonPackage): """Microsoft Azure Log Analytics Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py index b4d877c951..1ffa466d81 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtManagedservices(PythonPackage): """Microsoft Azure Managed Services Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py index 778e204155..cfb7661e64 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtManagementgroups(PythonPackage): """Microsoft Azure Management Groups Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py index 56e84a52fa..2670e72a69 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtMaps(PythonPackage): """Microsoft Azure Maps Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py index 814b3e056c..4ce5d62661 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtMarketplaceordering(PythonPackage): """Microsoft Azure Market Place Ordering Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py index 37d4d6d6cb..de7297ee49 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtMedia(PythonPackage): """Microsoft Azure Media Services Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py index 28bdf5f4d8..ac87d84e73 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtMonitor(PythonPackage): """Microsoft Azure Monitor Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py index da70559d07..3e1880b463 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtMsi(PythonPackage): """Microsoft Azure MSI Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py index 1ec5b360d9..263532169e 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtNetapp(PythonPackage): """Microsoft Azure NetApp Files Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py index 0d38edb28f..ee423ebbdc 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtNetwork(PythonPackage): """Microsoft Azure Network Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-nspkg/package.py index 9a1d3d20d9..546a6d69fa 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-nspkg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtNspkg(PythonPackage): """Microsoft Azure Resource Management Namespace Package [Internal].""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py index 99e7e12a47..97f0afc701 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtPolicyinsights(PythonPackage): """Microsoft Azure Policy Insights Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py index 4190925ecf..939a70dd85 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtPrivatedns(PythonPackage): """Microsoft Azure DNS Private Zones Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py index 6e68b134ef..e13bee484e 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtRdbms(PythonPackage): """Microsoft Azure RDBMS Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py index b7413fb3a5..e2104c03b1 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtRecoveryservices(PythonPackage): """Microsoft Azure Recovery Services Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py index 4824554786..4ec0fd0290 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtRecoveryservicesbackup(PythonPackage): """Microsoft Azure Recovery Services Backup Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py index 12b17d7d9c..401b991612 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtRedhatopenshift(PythonPackage): """Microsoft Azure Red Hat Openshift Management Client Library for Python. """ diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py index 84f6a7ed60..7ff5e22446 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtRedis(PythonPackage): """Microsoft Azure Redis Cache Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py index 50a759cede..34038350f4 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtRelay(PythonPackage): """Microsoft Azure Relay Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py index 32a67700f0..8e348946b5 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtReservations(PythonPackage): """Microsoft Azure Reservations Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py index e2ca0d000a..dbb44caed1 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtResource(PythonPackage): """Microsoft Azure Resource Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py index d95f87c8ad..1d7a38af98 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtSearch(PythonPackage): """Microsoft Azure Search Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py index 99dfcff1ba..b567fb6605 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtSecurity(PythonPackage): """Microsoft Azure Security Center Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py index 16ba3e63ca..b440093346 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtServicebus(PythonPackage): """Microsoft Azure Service Bus Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py index 34ae609d77..9fcd42e747 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtServicefabric(PythonPackage): """Microsoft Azure Service Fabric Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py index d3fa8a5dc9..0ea0b50c07 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtSignalr(PythonPackage): """Microsoft Azure SignalR Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py index 9a32291e99..429907f482 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtSql(PythonPackage): """Microsoft Azure SQL Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py index b1b1d84925..dcc8da8a01 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtSqlvirtualmachine(PythonPackage): """Microsoft Azure SQL Virtual Machine Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py index a04c627442..da08c663b1 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtStorage(PythonPackage): """Microsoft Azure Storage Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py index e7338ee055..47c35ea53d 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtTrafficmanager(PythonPackage): """Microsoft Azure Traffic Manager Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py index 5251822bf8..fee78efc7d 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMgmtWeb(PythonPackage): """Microsoft Azure Web Apps Management Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py b/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py index 74ec2bc730..611cda21fd 100644 --- a/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py +++ b/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureMultiapiStorage(PythonPackage): """Microsoft Azure Storage Client Library for Python with multi API version support.""" diff --git a/var/spack/repos/builtin/packages/py-azure-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-nspkg/package.py index fa19aeb8f9..cc129c716d 100644 --- a/var/spack/repos/builtin/packages/py-azure-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-nspkg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureNspkg(PythonPackage): """Microsoft Azure Namespace Package [Internal].""" diff --git a/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py b/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py index 4a0899af3d..0ad7d3372a 100644 --- a/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py +++ b/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyAzureStorageBlob(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-azure-storage-common/package.py b/var/spack/repos/builtin/packages/py-azure-storage-common/package.py index c7c6f4c774..d088d43b48 100644 --- a/var/spack/repos/builtin/packages/py-azure-storage-common/package.py +++ b/var/spack/repos/builtin/packages/py-azure-storage-common/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureStorageCommon(PythonPackage): """Microsoft Azure Storage Common Client Library for Python.""" diff --git a/var/spack/repos/builtin/packages/py-azure-storage-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-storage-nspkg/package.py index 49d2736da2..a0c0bedab0 100644 --- a/var/spack/repos/builtin/packages/py-azure-storage-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-storage-nspkg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzureStorageNspkg(PythonPackage): """Microsoft Azure Storage Namespace Package.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py b/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py index cbe4ce9553..a6dc336a1b 100644 --- a/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlAutomlCore(PythonPackage): """The azureml-automl-core package is a package containing functionality used by the azureml-train-automl package.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-core/package.py b/var/spack/repos/builtin/packages/py-azureml-core/package.py index 7ae907a32c..6efc300630 100644 --- a/var/spack/repos/builtin/packages/py-azureml-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-core/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlCore(PythonPackage): """The azureml-core contains functionality for creating and managing: * Azure Machine Learning workspaces, experiments and runs; diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py index 7d1eccc67b..26e97f2e43 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py @@ -5,6 +5,8 @@ import sys +from spack.package import * + class PyAzuremlDataprepNative(PythonPackage): """Python Package for AzureML DataPrep specific native extensions.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py index 80812faacf..2c4f7fb476 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py @@ -7,7 +7,7 @@ import sys import archspec -from spack import * +from spack.package import * class PyAzuremlDataprepRslex(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py index 4c9ddeb232..f2f61dee47 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlDataprep(PythonPackage): """Azure ML Data Preparation SDK.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py b/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py index c676995d8d..9aaeb6e1c5 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlDatasetRuntime(PythonPackage): """The purpose of this package is to coordinate dependencies within AzureML packages. It is not intended for public use.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py index a21481129c..2d8a752065 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlPipelineCore(PythonPackage): """Core functionality to enable azureml-pipeline feature.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py index 4c066756b9..694a0847e8 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlPipelineSteps(PythonPackage): """Represents a unit of computation in azureml-pipeline.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py index 6ecf4967a7..3e087cf54b 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlPipeline(PythonPackage): """The Azure Machine Learning SDK for Python can be used to create ML pipelines as well as to submit and track individual pipeline runs.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-sdk/package.py b/var/spack/repos/builtin/packages/py-azureml-sdk/package.py index 3912128d3b..1ef9e64273 100644 --- a/var/spack/repos/builtin/packages/py-azureml-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-sdk/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlSdk(PythonPackage): """Microsoft Azure Machine Learning Python SDK.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py b/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py index 1649055a47..0a1e48c437 100644 --- a/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlTelemetry(PythonPackage): """Machine learning (ML) telemetry package is used to collect telemetry data.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py b/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py index e99ba1faee..ce479701d8 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlTrainAutomlClient(PythonPackage): """The azureml-train-automl-client package contains functionality for automatically finding the best machine learning model and its parameters, diff --git a/var/spack/repos/builtin/packages/py-azureml-train-core/package.py b/var/spack/repos/builtin/packages/py-azureml-train-core/package.py index 2a9add3b21..b0f4fec837 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-core/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlTrainCore(PythonPackage): """The azureml-train-core contains functionality used by azureml-train metapackage.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py b/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py index 85b4820758..356f03bdba 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlTrainRestclientsHyperdrive(PythonPackage): """The azureml-train-restclients-hyperdrive contains functionality for azureml-train metapackage.""" diff --git a/var/spack/repos/builtin/packages/py-azureml-train/package.py b/var/spack/repos/builtin/packages/py-azureml-train/package.py index 82d7586f28..91f0828957 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyAzuremlTrain(PythonPackage): """The azureml-train package provides estimators for training models using different deep learning frameworks and functionality for hyperparameter diff --git a/var/spack/repos/builtin/packages/py-babel/package.py b/var/spack/repos/builtin/packages/py-babel/package.py index 60edefec7e..45033e55a4 100644 --- a/var/spack/repos/builtin/packages/py-babel/package.py +++ b/var/spack/repos/builtin/packages/py-babel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBabel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backcall/package.py b/var/spack/repos/builtin/packages/py-backcall/package.py index 2496262ae5..5eedae9088 100644 --- a/var/spack/repos/builtin/packages/py-backcall/package.py +++ b/var/spack/repos/builtin/packages/py-backcall/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackcall(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-abc/package.py b/var/spack/repos/builtin/packages/py-backports-abc/package.py index 358b520e92..dcca53ac22 100644 --- a/var/spack/repos/builtin/packages/py-backports-abc/package.py +++ b/var/spack/repos/builtin/packages/py-backports-abc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsAbc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py b/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py index 61ff55e513..d463d668e0 100644 --- a/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py +++ b/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsEntryPointsSelectable(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index 55247279b5..62fbe6422e 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsFunctoolsLruCache(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-lzma/package.py b/var/spack/repos/builtin/packages/py-backports-lzma/package.py index b0831e64bc..955f05c2a3 100644 --- a/var/spack/repos/builtin/packages/py-backports-lzma/package.py +++ b/var/spack/repos/builtin/packages/py-backports-lzma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsLzma(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-os/package.py b/var/spack/repos/builtin/packages/py-backports-os/package.py index 1eb7c03820..b6e0e0b76c 100644 --- a/var/spack/repos/builtin/packages/py-backports-os/package.py +++ b/var/spack/repos/builtin/packages/py-backports-os/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsOs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py index 0ce9218fd8..56fe38b17b 100644 --- a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py +++ b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsShutilGetTerminalSize(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py index 59c7058c4d..2644c57676 100644 --- a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py +++ b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsSslMatchHostname(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-tempfile/package.py b/var/spack/repos/builtin/packages/py-backports-tempfile/package.py index 986a383a39..ee4db2fdcc 100644 --- a/var/spack/repos/builtin/packages/py-backports-tempfile/package.py +++ b/var/spack/repos/builtin/packages/py-backports-tempfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsTempfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-backports-weakref/package.py b/var/spack/repos/builtin/packages/py-backports-weakref/package.py index 3645b43e40..28bbae2faf 100644 --- a/var/spack/repos/builtin/packages/py-backports-weakref/package.py +++ b/var/spack/repos/builtin/packages/py-backports-weakref/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBackportsWeakref(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bandit/package.py b/var/spack/repos/builtin/packages/py-bandit/package.py index b3f13c0824..ad11e67da7 100644 --- a/var/spack/repos/builtin/packages/py-bandit/package.py +++ b/var/spack/repos/builtin/packages/py-bandit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBandit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py index b98a07120f..bca8a88026 100644 --- a/var/spack/repos/builtin/packages/py-basemap/package.py +++ b/var/spack/repos/builtin/packages/py-basemap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBasemap(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bash-kernel/package.py b/var/spack/repos/builtin/packages/py-bash-kernel/package.py index 1a5bb31e1c..7c4b238f07 100644 --- a/var/spack/repos/builtin/packages/py-bash-kernel/package.py +++ b/var/spack/repos/builtin/packages/py-bash-kernel/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBashKernel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-basis-set-exchange/package.py b/var/spack/repos/builtin/packages/py-basis-set-exchange/package.py index dd584af40b..3c05d0b1e9 100644 --- a/var/spack/repos/builtin/packages/py-basis-set-exchange/package.py +++ b/var/spack/repos/builtin/packages/py-basis-set-exchange/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBasisSetExchange(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-batchspawner/package.py b/var/spack/repos/builtin/packages/py-batchspawner/package.py index 881251b024..db68cdc50f 100644 --- a/var/spack/repos/builtin/packages/py-batchspawner/package.py +++ b/var/spack/repos/builtin/packages/py-batchspawner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBatchspawner(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bayesian-optimization/package.py b/var/spack/repos/builtin/packages/py-bayesian-optimization/package.py index a14c4d1c8f..f4d797edbb 100644 --- a/var/spack/repos/builtin/packages/py-bayesian-optimization/package.py +++ b/var/spack/repos/builtin/packages/py-bayesian-optimization/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBayesianOptimization(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py index 1f8bc137f8..cdd213615f 100644 --- a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py +++ b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBcbioGff(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bcolz/package.py b/var/spack/repos/builtin/packages/py-bcolz/package.py index 7c72f0dca6..85efdb8482 100644 --- a/var/spack/repos/builtin/packages/py-bcolz/package.py +++ b/var/spack/repos/builtin/packages/py-bcolz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBcolz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bcrypt/package.py b/var/spack/repos/builtin/packages/py-bcrypt/package.py index a946663316..4efa1186a6 100644 --- a/var/spack/repos/builtin/packages/py-bcrypt/package.py +++ b/var/spack/repos/builtin/packages/py-bcrypt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBcrypt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-beancount/package.py b/var/spack/repos/builtin/packages/py-beancount/package.py index ec2a418041..f8d3f767eb 100644 --- a/var/spack/repos/builtin/packages/py-beancount/package.py +++ b/var/spack/repos/builtin/packages/py-beancount/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBeancount(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py index e9eb48ceec..bd8ed3d082 100644 --- a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py +++ b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBeautifulsoup4(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-beniget/package.py b/var/spack/repos/builtin/packages/py-beniget/package.py index 5672fec3da..94020bf13e 100644 --- a/var/spack/repos/builtin/packages/py-beniget/package.py +++ b/var/spack/repos/builtin/packages/py-beniget/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBeniget(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bids-validator/package.py b/var/spack/repos/builtin/packages/py-bids-validator/package.py index 7fdbaf02cc..5c7d7b5dcd 100644 --- a/var/spack/repos/builtin/packages/py-bids-validator/package.py +++ b/var/spack/repos/builtin/packages/py-bids-validator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBidsValidator(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bigdft/package.py b/var/spack/repos/builtin/packages/py-bigdft/package.py index 2566e4d34f..36ae2496c3 100644 --- a/var/spack/repos/builtin/packages/py-bigdft/package.py +++ b/var/spack/repos/builtin/packages/py-bigdft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBigdft(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bigfloat/package.py b/var/spack/repos/builtin/packages/py-bigfloat/package.py index 44414b69f3..d2635a711c 100644 --- a/var/spack/repos/builtin/packages/py-bigfloat/package.py +++ b/var/spack/repos/builtin/packages/py-bigfloat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBigfloat(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-billiard/package.py b/var/spack/repos/builtin/packages/py-billiard/package.py index d7b19bcf92..ce02a6ece5 100644 --- a/var/spack/repos/builtin/packages/py-billiard/package.py +++ b/var/spack/repos/builtin/packages/py-billiard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBilliard(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-binaryornot/package.py b/var/spack/repos/builtin/packages/py-binaryornot/package.py index 13040aac68..0ee41ba20e 100644 --- a/var/spack/repos/builtin/packages/py-binaryornot/package.py +++ b/var/spack/repos/builtin/packages/py-binaryornot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBinaryornot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bintrees/package.py b/var/spack/repos/builtin/packages/py-bintrees/package.py index 78203f645d..3e44f7ac6d 100644 --- a/var/spack/repos/builtin/packages/py-bintrees/package.py +++ b/var/spack/repos/builtin/packages/py-bintrees/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBintrees(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-binwalk/package.py b/var/spack/repos/builtin/packages/py-binwalk/package.py index e840b719c2..715ea3b293 100644 --- a/var/spack/repos/builtin/packages/py-binwalk/package.py +++ b/var/spack/repos/builtin/packages/py-binwalk/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBinwalk(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-biom-format/package.py b/var/spack/repos/builtin/packages/py-biom-format/package.py index c8f345dc22..4c048967a3 100644 --- a/var/spack/repos/builtin/packages/py-biom-format/package.py +++ b/var/spack/repos/builtin/packages/py-biom-format/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBiomFormat(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-biomine/package.py b/var/spack/repos/builtin/packages/py-biomine/package.py index c96f4a742b..a3f2a350af 100644 --- a/var/spack/repos/builtin/packages/py-biomine/package.py +++ b/var/spack/repos/builtin/packages/py-biomine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBiomine(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-biopandas/package.py b/var/spack/repos/builtin/packages/py-biopandas/package.py index 791c98810b..674f7cd0d4 100644 --- a/var/spack/repos/builtin/packages/py-biopandas/package.py +++ b/var/spack/repos/builtin/packages/py-biopandas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBiopandas(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-biopython/package.py b/var/spack/repos/builtin/packages/py-biopython/package.py index fdba00ce4e..fe6e8e0c69 100644 --- a/var/spack/repos/builtin/packages/py-biopython/package.py +++ b/var/spack/repos/builtin/packages/py-biopython/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBiopython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bitarray/package.py b/var/spack/repos/builtin/packages/py-bitarray/package.py index da2755b4c2..e1c3ca7241 100644 --- a/var/spack/repos/builtin/packages/py-bitarray/package.py +++ b/var/spack/repos/builtin/packages/py-bitarray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBitarray(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bitstring/package.py b/var/spack/repos/builtin/packages/py-bitstring/package.py index a855329f90..72c5c47ae9 100644 --- a/var/spack/repos/builtin/packages/py-bitstring/package.py +++ b/var/spack/repos/builtin/packages/py-bitstring/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBitstring(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-black/package.py b/var/spack/repos/builtin/packages/py-black/package.py index 406b58087e..accfb182df 100644 --- a/var/spack/repos/builtin/packages/py-black/package.py +++ b/var/spack/repos/builtin/packages/py-black/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBlack(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bleach/package.py b/var/spack/repos/builtin/packages/py-bleach/package.py index 0e1e660d05..edbad573e2 100644 --- a/var/spack/repos/builtin/packages/py-bleach/package.py +++ b/var/spack/repos/builtin/packages/py-bleach/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBleach(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-blessed/package.py b/var/spack/repos/builtin/packages/py-blessed/package.py index b1c2a06336..2867d56c24 100644 --- a/var/spack/repos/builtin/packages/py-blessed/package.py +++ b/var/spack/repos/builtin/packages/py-blessed/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBlessed(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-blessings/package.py b/var/spack/repos/builtin/packages/py-blessings/package.py index aa7f96ef00..d6f2b1cb93 100644 --- a/var/spack/repos/builtin/packages/py-blessings/package.py +++ b/var/spack/repos/builtin/packages/py-blessings/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBlessings(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-blinker/package.py b/var/spack/repos/builtin/packages/py-blinker/package.py index 9e2fca1b0d..d18e2679ce 100644 --- a/var/spack/repos/builtin/packages/py-blinker/package.py +++ b/var/spack/repos/builtin/packages/py-blinker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBlinker(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-blis/package.py b/var/spack/repos/builtin/packages/py-blis/package.py index 9638b062e3..e81853cc58 100644 --- a/var/spack/repos/builtin/packages/py-blis/package.py +++ b/var/spack/repos/builtin/packages/py-blis/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyBlis(PythonPackage): """Cython BLIS: Fast BLAS-like operations from Python and Cython, without the tears""" diff --git a/var/spack/repos/builtin/packages/py-blosc/package.py b/var/spack/repos/builtin/packages/py-blosc/package.py index 907567d9f8..870872d9b0 100644 --- a/var/spack/repos/builtin/packages/py-blosc/package.py +++ b/var/spack/repos/builtin/packages/py-blosc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBlosc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bmap-tools/package.py b/var/spack/repos/builtin/packages/py-bmap-tools/package.py index 7db73ac7e6..c7ad3b468d 100644 --- a/var/spack/repos/builtin/packages/py-bmap-tools/package.py +++ b/var/spack/repos/builtin/packages/py-bmap-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBmapTools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bokeh/package.py b/var/spack/repos/builtin/packages/py-bokeh/package.py index 16e30e1646..7dad434a06 100644 --- a/var/spack/repos/builtin/packages/py-bokeh/package.py +++ b/var/spack/repos/builtin/packages/py-bokeh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBokeh(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-boltons/package.py b/var/spack/repos/builtin/packages/py-boltons/package.py index 7f13461e78..27ba38413a 100644 --- a/var/spack/repos/builtin/packages/py-boltons/package.py +++ b/var/spack/repos/builtin/packages/py-boltons/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBoltons(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-boom-boot-manager/package.py b/var/spack/repos/builtin/packages/py-boom-boot-manager/package.py index b462d97ec7..620eab8d23 100644 --- a/var/spack/repos/builtin/packages/py-boom-boot-manager/package.py +++ b/var/spack/repos/builtin/packages/py-boom-boot-manager/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBoomBootManager(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-boost-histogram/package.py b/var/spack/repos/builtin/packages/py-boost-histogram/package.py index 552879056e..f23e27db40 100644 --- a/var/spack/repos/builtin/packages/py-boost-histogram/package.py +++ b/var/spack/repos/builtin/packages/py-boost-histogram/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBoostHistogram(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-boto/package.py b/var/spack/repos/builtin/packages/py-boto/package.py index c20f52f4b4..988bafc562 100644 --- a/var/spack/repos/builtin/packages/py-boto/package.py +++ b/var/spack/repos/builtin/packages/py-boto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBoto(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-boto3/package.py b/var/spack/repos/builtin/packages/py-boto3/package.py index cbc8efb59d..0585f9120e 100644 --- a/var/spack/repos/builtin/packages/py-boto3/package.py +++ b/var/spack/repos/builtin/packages/py-boto3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBoto3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-botocore/package.py b/var/spack/repos/builtin/packages/py-botocore/package.py index 1e1911c58c..c67b68cef6 100644 --- a/var/spack/repos/builtin/packages/py-botocore/package.py +++ b/var/spack/repos/builtin/packages/py-botocore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBotocore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bottle/package.py b/var/spack/repos/builtin/packages/py-bottle/package.py index 888a9f92d7..759669d0f1 100644 --- a/var/spack/repos/builtin/packages/py-bottle/package.py +++ b/var/spack/repos/builtin/packages/py-bottle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBottle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bottleneck/package.py b/var/spack/repos/builtin/packages/py-bottleneck/package.py index 8a38c4024c..2ce572556d 100644 --- a/var/spack/repos/builtin/packages/py-bottleneck/package.py +++ b/var/spack/repos/builtin/packages/py-bottleneck/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBottleneck(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-breakseq2/package.py b/var/spack/repos/builtin/packages/py-breakseq2/package.py index 02fb373537..d4d89ea21b 100644 --- a/var/spack/repos/builtin/packages/py-breakseq2/package.py +++ b/var/spack/repos/builtin/packages/py-breakseq2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBreakseq2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-breathe/package.py b/var/spack/repos/builtin/packages/py-breathe/package.py index 26e221f58f..b5db224e70 100644 --- a/var/spack/repos/builtin/packages/py-breathe/package.py +++ b/var/spack/repos/builtin/packages/py-breathe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBreathe(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-brian/package.py b/var/spack/repos/builtin/packages/py-brian/package.py index da17a8f082..0606c2d11c 100644 --- a/var/spack/repos/builtin/packages/py-brian/package.py +++ b/var/spack/repos/builtin/packages/py-brian/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBrian(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-brian2/package.py b/var/spack/repos/builtin/packages/py-brian2/package.py index 548dc88176..f13d284f11 100644 --- a/var/spack/repos/builtin/packages/py-brian2/package.py +++ b/var/spack/repos/builtin/packages/py-brian2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBrian2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-brotlipy/package.py b/var/spack/repos/builtin/packages/py-brotlipy/package.py index 40eccc30ba..3a0055f25a 100644 --- a/var/spack/repos/builtin/packages/py-brotlipy/package.py +++ b/var/spack/repos/builtin/packages/py-brotlipy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBrotlipy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bsddb3/package.py b/var/spack/repos/builtin/packages/py-bsddb3/package.py index 672e262740..e7423387a8 100644 --- a/var/spack/repos/builtin/packages/py-bsddb3/package.py +++ b/var/spack/repos/builtin/packages/py-bsddb3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBsddb3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-build/package.py b/var/spack/repos/builtin/packages/py-build/package.py index 98f9feb8a8..595998472c 100644 --- a/var/spack/repos/builtin/packages/py-build/package.py +++ b/var/spack/repos/builtin/packages/py-build/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBuild(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bx-python/package.py b/var/spack/repos/builtin/packages/py-bx-python/package.py index 2b5ab3bf3f..7cf4e16749 100644 --- a/var/spack/repos/builtin/packages/py-bx-python/package.py +++ b/var/spack/repos/builtin/packages/py-bx-python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBxPython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-bz2file/package.py b/var/spack/repos/builtin/packages/py-bz2file/package.py index bf18a24651..7d6a4c1141 100644 --- a/var/spack/repos/builtin/packages/py-bz2file/package.py +++ b/var/spack/repos/builtin/packages/py-bz2file/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyBz2file(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cachecontrol/package.py b/var/spack/repos/builtin/packages/py-cachecontrol/package.py index e8dac62b00..d7244cfb94 100644 --- a/var/spack/repos/builtin/packages/py-cachecontrol/package.py +++ b/var/spack/repos/builtin/packages/py-cachecontrol/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCachecontrol(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cached-property/package.py b/var/spack/repos/builtin/packages/py-cached-property/package.py index 6d29fba81a..f13695f1f5 100644 --- a/var/spack/repos/builtin/packages/py-cached-property/package.py +++ b/var/spack/repos/builtin/packages/py-cached-property/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCachedProperty(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cachetools/package.py b/var/spack/repos/builtin/packages/py-cachetools/package.py index c4df5ab59a..36ede91b5e 100644 --- a/var/spack/repos/builtin/packages/py-cachetools/package.py +++ b/var/spack/repos/builtin/packages/py-cachetools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCachetools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cachy/package.py b/var/spack/repos/builtin/packages/py-cachy/package.py index e312775816..5cae224e17 100644 --- a/var/spack/repos/builtin/packages/py-cachy/package.py +++ b/var/spack/repos/builtin/packages/py-cachy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCachy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cairocffi/package.py b/var/spack/repos/builtin/packages/py-cairocffi/package.py index ee5a830dc1..077b6d5635 100644 --- a/var/spack/repos/builtin/packages/py-cairocffi/package.py +++ b/var/spack/repos/builtin/packages/py-cairocffi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCairocffi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cantoolz/package.py b/var/spack/repos/builtin/packages/py-cantoolz/package.py index 2b02068e86..ea76f7710a 100644 --- a/var/spack/repos/builtin/packages/py-cantoolz/package.py +++ b/var/spack/repos/builtin/packages/py-cantoolz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCantoolz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-carputils/package.py b/var/spack/repos/builtin/packages/py-carputils/package.py index 5c0cc6ecca..01ca756577 100644 --- a/var/spack/repos/builtin/packages/py-carputils/package.py +++ b/var/spack/repos/builtin/packages/py-carputils/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyCarputils(PythonPackage): """The carputils framework for running simulations with the openCARP software.""" diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py index a8ce436f76..589df6239c 100644 --- a/var/spack/repos/builtin/packages/py-cartopy/package.py +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCartopy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-catalogue/package.py b/var/spack/repos/builtin/packages/py-catalogue/package.py index 13c803f445..6c25476c3c 100644 --- a/var/spack/repos/builtin/packages/py-catalogue/package.py +++ b/var/spack/repos/builtin/packages/py-catalogue/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyCatalogue(PythonPackage): """catalogue: Super lightweight function registries for your library.""" diff --git a/var/spack/repos/builtin/packages/py-catkin-pkg/package.py b/var/spack/repos/builtin/packages/py-catkin-pkg/package.py index d1ef724508..3a624940eb 100644 --- a/var/spack/repos/builtin/packages/py-catkin-pkg/package.py +++ b/var/spack/repos/builtin/packages/py-catkin-pkg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyCatkinPkg(PythonPackage): """Library for retrieving information about catkin packages.""" diff --git a/var/spack/repos/builtin/packages/py-cclib/package.py b/var/spack/repos/builtin/packages/py-cclib/package.py index 161ddd533f..1154108d1a 100644 --- a/var/spack/repos/builtin/packages/py-cclib/package.py +++ b/var/spack/repos/builtin/packages/py-cclib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCclib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cdat-lite/package.py b/var/spack/repos/builtin/packages/py-cdat-lite/package.py index 71d991d849..e94a774a9a 100644 --- a/var/spack/repos/builtin/packages/py-cdat-lite/package.py +++ b/var/spack/repos/builtin/packages/py-cdat-lite/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyCdatLite(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cdo/package.py b/var/spack/repos/builtin/packages/py-cdo/package.py index 7db1964dd1..6ddcb421bc 100644 --- a/var/spack/repos/builtin/packages/py-cdo/package.py +++ b/var/spack/repos/builtin/packages/py-cdo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCdo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cdsapi/package.py b/var/spack/repos/builtin/packages/py-cdsapi/package.py index fe774a36f6..549a4540fd 100644 --- a/var/spack/repos/builtin/packages/py-cdsapi/package.py +++ b/var/spack/repos/builtin/packages/py-cdsapi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCdsapi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cekit/package.py b/var/spack/repos/builtin/packages/py-cekit/package.py index 34093ef7cd..f9936dc37a 100644 --- a/var/spack/repos/builtin/packages/py-cekit/package.py +++ b/var/spack/repos/builtin/packages/py-cekit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCekit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-celery/package.py b/var/spack/repos/builtin/packages/py-celery/package.py index 2b44e16255..9b730dce2d 100644 --- a/var/spack/repos/builtin/packages/py-celery/package.py +++ b/var/spack/repos/builtin/packages/py-celery/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCelery(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cerberus/package.py b/var/spack/repos/builtin/packages/py-cerberus/package.py index 3ac18eb435..c630562de1 100644 --- a/var/spack/repos/builtin/packages/py-cerberus/package.py +++ b/var/spack/repos/builtin/packages/py-cerberus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCerberus(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-certifi/package.py b/var/spack/repos/builtin/packages/py-certifi/package.py index cad9ac8c84..efb19a6ee8 100644 --- a/var/spack/repos/builtin/packages/py-certifi/package.py +++ b/var/spack/repos/builtin/packages/py-certifi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCertifi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-certipy/package.py b/var/spack/repos/builtin/packages/py-certipy/package.py index 8e91adbe12..1e45f267f4 100644 --- a/var/spack/repos/builtin/packages/py-certipy/package.py +++ b/var/spack/repos/builtin/packages/py-certipy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCertipy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cf-units/package.py b/var/spack/repos/builtin/packages/py-cf-units/package.py index 8d2c468979..0956b760a1 100644 --- a/var/spack/repos/builtin/packages/py-cf-units/package.py +++ b/var/spack/repos/builtin/packages/py-cf-units/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCfUnits(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cffconvert/package.py b/var/spack/repos/builtin/packages/py-cffconvert/package.py index 1fc6ccb5d9..524ce7ee09 100644 --- a/var/spack/repos/builtin/packages/py-cffconvert/package.py +++ b/var/spack/repos/builtin/packages/py-cffconvert/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCffconvert(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cffi/package.py b/var/spack/repos/builtin/packages/py-cffi/package.py index 711e601635..67adb47d9f 100644 --- a/var/spack/repos/builtin/packages/py-cffi/package.py +++ b/var/spack/repos/builtin/packages/py-cffi/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class PyCffi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cfgrib/package.py b/var/spack/repos/builtin/packages/py-cfgrib/package.py index 0657e17612..d74064f538 100644 --- a/var/spack/repos/builtin/packages/py-cfgrib/package.py +++ b/var/spack/repos/builtin/packages/py-cfgrib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCfgrib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cfgv/package.py b/var/spack/repos/builtin/packages/py-cfgv/package.py index b9b444e902..367c9b6e59 100644 --- a/var/spack/repos/builtin/packages/py-cfgv/package.py +++ b/var/spack/repos/builtin/packages/py-cfgv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCfgv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cftime/package.py b/var/spack/repos/builtin/packages/py-cftime/package.py index cec4b6db54..efd03635f8 100644 --- a/var/spack/repos/builtin/packages/py-cftime/package.py +++ b/var/spack/repos/builtin/packages/py-cftime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCftime(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-chai/package.py b/var/spack/repos/builtin/packages/py-chai/package.py index 11e559ea89..54699864b0 100644 --- a/var/spack/repos/builtin/packages/py-chai/package.py +++ b/var/spack/repos/builtin/packages/py-chai/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyChai(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-chainer/package.py b/var/spack/repos/builtin/packages/py-chainer/package.py index 937bd84e4c..38cc32e100 100644 --- a/var/spack/repos/builtin/packages/py-chainer/package.py +++ b/var/spack/repos/builtin/packages/py-chainer/package.py @@ -5,7 +5,7 @@ import json -from spack import * +from spack.package import * class PyChainer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-chainmap/package.py b/var/spack/repos/builtin/packages/py-chainmap/package.py index 951d69d0d6..42878a7162 100644 --- a/var/spack/repos/builtin/packages/py-chainmap/package.py +++ b/var/spack/repos/builtin/packages/py-chainmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyChainmap(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-chalice/package.py b/var/spack/repos/builtin/packages/py-chalice/package.py index 10ae708117..18eaab0c2b 100644 --- a/var/spack/repos/builtin/packages/py-chalice/package.py +++ b/var/spack/repos/builtin/packages/py-chalice/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyChalice(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-chardet/package.py b/var/spack/repos/builtin/packages/py-chardet/package.py index b65556e613..79c6d8b2c6 100644 --- a/var/spack/repos/builtin/packages/py-chardet/package.py +++ b/var/spack/repos/builtin/packages/py-chardet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyChardet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-charm4py/package.py b/var/spack/repos/builtin/packages/py-charm4py/package.py index 409abf328c..cca34d9049 100644 --- a/var/spack/repos/builtin/packages/py-charm4py/package.py +++ b/var/spack/repos/builtin/packages/py-charm4py/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCharm4py(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-charset-normalizer/package.py b/var/spack/repos/builtin/packages/py-charset-normalizer/package.py index b8e6ea9632..ccbdd5ee12 100644 --- a/var/spack/repos/builtin/packages/py-charset-normalizer/package.py +++ b/var/spack/repos/builtin/packages/py-charset-normalizer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCharsetNormalizer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-checkm-genome/package.py b/var/spack/repos/builtin/packages/py-checkm-genome/package.py index e160ec0943..60c290aaa2 100644 --- a/var/spack/repos/builtin/packages/py-checkm-genome/package.py +++ b/var/spack/repos/builtin/packages/py-checkm-genome/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCheckmGenome(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cheetah/package.py b/var/spack/repos/builtin/packages/py-cheetah/package.py index f038f30c68..6d0572a834 100644 --- a/var/spack/repos/builtin/packages/py-cheetah/package.py +++ b/var/spack/repos/builtin/packages/py-cheetah/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCheetah(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cheetah3/package.py b/var/spack/repos/builtin/packages/py-cheetah3/package.py index 684acc02b1..bf647aa831 100644 --- a/var/spack/repos/builtin/packages/py-cheetah3/package.py +++ b/var/spack/repos/builtin/packages/py-cheetah3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCheetah3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cheroot/package.py b/var/spack/repos/builtin/packages/py-cheroot/package.py index 8737d88475..ffb090eb0f 100644 --- a/var/spack/repos/builtin/packages/py-cheroot/package.py +++ b/var/spack/repos/builtin/packages/py-cheroot/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCheroot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cherrypy/package.py b/var/spack/repos/builtin/packages/py-cherrypy/package.py index 2db6f70c3f..1dbd2e2368 100644 --- a/var/spack/repos/builtin/packages/py-cherrypy/package.py +++ b/var/spack/repos/builtin/packages/py-cherrypy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCherrypy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-chronyk/package.py b/var/spack/repos/builtin/packages/py-chronyk/package.py index 2f333a7733..2ec3d3ff78 100644 --- a/var/spack/repos/builtin/packages/py-chronyk/package.py +++ b/var/spack/repos/builtin/packages/py-chronyk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyChronyk(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ci-info/package.py b/var/spack/repos/builtin/packages/py-ci-info/package.py index 31b2f35e66..0a0e2ca8f5 100644 --- a/var/spack/repos/builtin/packages/py-ci-info/package.py +++ b/var/spack/repos/builtin/packages/py-ci-info/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCiInfo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ci-sdr/package.py b/var/spack/repos/builtin/packages/py-ci-sdr/package.py index d18228dfa8..91c236628a 100644 --- a/var/spack/repos/builtin/packages/py-ci-sdr/package.py +++ b/var/spack/repos/builtin/packages/py-ci-sdr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCiSdr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cinema-lib/package.py b/var/spack/repos/builtin/packages/py-cinema-lib/package.py index 1d0936830a..50bf0b6e54 100644 --- a/var/spack/repos/builtin/packages/py-cinema-lib/package.py +++ b/var/spack/repos/builtin/packages/py-cinema-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCinemaLib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cinemasci/package.py b/var/spack/repos/builtin/packages/py-cinemasci/package.py index e0cd6e4d03..d5cecc6018 100644 --- a/var/spack/repos/builtin/packages/py-cinemasci/package.py +++ b/var/spack/repos/builtin/packages/py-cinemasci/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCinemasci(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-citeproc-py/package.py b/var/spack/repos/builtin/packages/py-citeproc-py/package.py index 147d0f9d79..a3e9d774ba 100644 --- a/var/spack/repos/builtin/packages/py-citeproc-py/package.py +++ b/var/spack/repos/builtin/packages/py-citeproc-py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCiteprocPy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-clean-text/package.py b/var/spack/repos/builtin/packages/py-clean-text/package.py index fc0a9845f0..9d4b5513ed 100644 --- a/var/spack/repos/builtin/packages/py-clean-text/package.py +++ b/var/spack/repos/builtin/packages/py-clean-text/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCleanText(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cleo/package.py b/var/spack/repos/builtin/packages/py-cleo/package.py index 3b16ffeb08..e9777b2a74 100644 --- a/var/spack/repos/builtin/packages/py-cleo/package.py +++ b/var/spack/repos/builtin/packages/py-cleo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCleo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-click-didyoumean/package.py b/var/spack/repos/builtin/packages/py-click-didyoumean/package.py index bca8b37a86..a1d24ed77d 100644 --- a/var/spack/repos/builtin/packages/py-click-didyoumean/package.py +++ b/var/spack/repos/builtin/packages/py-click-didyoumean/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClickDidyoumean(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-click-plugins/package.py b/var/spack/repos/builtin/packages/py-click-plugins/package.py index 9d40a72958..1d01dcd77e 100644 --- a/var/spack/repos/builtin/packages/py-click-plugins/package.py +++ b/var/spack/repos/builtin/packages/py-click-plugins/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClickPlugins(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-click-repl/package.py b/var/spack/repos/builtin/packages/py-click-repl/package.py index 68686c7b3b..732f85578b 100644 --- a/var/spack/repos/builtin/packages/py-click-repl/package.py +++ b/var/spack/repos/builtin/packages/py-click-repl/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClickRepl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-click/package.py b/var/spack/repos/builtin/packages/py-click/package.py index 6295a6afe7..d5275694fb 100644 --- a/var/spack/repos/builtin/packages/py-click/package.py +++ b/var/spack/repos/builtin/packages/py-click/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClick(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cligj/package.py b/var/spack/repos/builtin/packages/py-cligj/package.py index 3be3512048..cc30ac85fd 100644 --- a/var/spack/repos/builtin/packages/py-cligj/package.py +++ b/var/spack/repos/builtin/packages/py-cligj/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCligj(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-clikit/package.py b/var/spack/repos/builtin/packages/py-clikit/package.py index bb8f5ba247..4b72db24ea 100644 --- a/var/spack/repos/builtin/packages/py-clikit/package.py +++ b/var/spack/repos/builtin/packages/py-clikit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClikit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-climate/package.py b/var/spack/repos/builtin/packages/py-climate/package.py index f841738b91..78d840e045 100644 --- a/var/spack/repos/builtin/packages/py-climate/package.py +++ b/var/spack/repos/builtin/packages/py-climate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClimate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-clint/package.py b/var/spack/repos/builtin/packages/py-clint/package.py index 1ac16f7df8..7bd210fbfc 100644 --- a/var/spack/repos/builtin/packages/py-clint/package.py +++ b/var/spack/repos/builtin/packages/py-clint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClint(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-clipboard/package.py b/var/spack/repos/builtin/packages/py-clipboard/package.py index 1c0d100467..8c1fe5675a 100644 --- a/var/spack/repos/builtin/packages/py-clipboard/package.py +++ b/var/spack/repos/builtin/packages/py-clipboard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClipboard(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cloudpickle/package.py b/var/spack/repos/builtin/packages/py-cloudpickle/package.py index 7cb9f01228..fb3744f1ff 100644 --- a/var/spack/repos/builtin/packages/py-cloudpickle/package.py +++ b/var/spack/repos/builtin/packages/py-cloudpickle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCloudpickle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-clustershell/package.py b/var/spack/repos/builtin/packages/py-clustershell/package.py index 41f6688729..42ff5df0c1 100644 --- a/var/spack/repos/builtin/packages/py-clustershell/package.py +++ b/var/spack/repos/builtin/packages/py-clustershell/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyClustershell(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cmake-format/package.py b/var/spack/repos/builtin/packages/py-cmake-format/package.py index e9a03e9ccc..3294138c07 100644 --- a/var/spack/repos/builtin/packages/py-cmake-format/package.py +++ b/var/spack/repos/builtin/packages/py-cmake-format/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCmakeFormat(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cmake/package.py b/var/spack/repos/builtin/packages/py-cmake/package.py index ad1f62504a..1c2b3491c1 100644 --- a/var/spack/repos/builtin/packages/py-cmake/package.py +++ b/var/spack/repos/builtin/packages/py-cmake/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCmake(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cmocean/package.py b/var/spack/repos/builtin/packages/py-cmocean/package.py index 77f230cc9d..bdcd91deb4 100644 --- a/var/spack/repos/builtin/packages/py-cmocean/package.py +++ b/var/spack/repos/builtin/packages/py-cmocean/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyCmocean(PythonPackage): """Colormaps for Oceanography.""" diff --git a/var/spack/repos/builtin/packages/py-cmsml/package.py b/var/spack/repos/builtin/packages/py-cmsml/package.py index 3860a48dda..7012171fdc 100644 --- a/var/spack/repos/builtin/packages/py-cmsml/package.py +++ b/var/spack/repos/builtin/packages/py-cmsml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCmsml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cnvkit/package.py b/var/spack/repos/builtin/packages/py-cnvkit/package.py index e8fdd0ccdc..1e172b20fb 100644 --- a/var/spack/repos/builtin/packages/py-cnvkit/package.py +++ b/var/spack/repos/builtin/packages/py-cnvkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCnvkit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-coapthon3/package.py b/var/spack/repos/builtin/packages/py-coapthon3/package.py index 9e4bd40223..fe4421c9b1 100644 --- a/var/spack/repos/builtin/packages/py-coapthon3/package.py +++ b/var/spack/repos/builtin/packages/py-coapthon3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCoapthon3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-codecov/package.py b/var/spack/repos/builtin/packages/py-codecov/package.py index 66a75c2fa0..0669daeaee 100644 --- a/var/spack/repos/builtin/packages/py-codecov/package.py +++ b/var/spack/repos/builtin/packages/py-codecov/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCodecov(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cogent/package.py b/var/spack/repos/builtin/packages/py-cogent/package.py index c746198318..b5dfc967e0 100644 --- a/var/spack/repos/builtin/packages/py-cogent/package.py +++ b/var/spack/repos/builtin/packages/py-cogent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCogent(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-coilmq/package.py b/var/spack/repos/builtin/packages/py-coilmq/package.py index e8276cd15e..1a0126388b 100644 --- a/var/spack/repos/builtin/packages/py-coilmq/package.py +++ b/var/spack/repos/builtin/packages/py-coilmq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCoilmq(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colorama/package.py b/var/spack/repos/builtin/packages/py-colorama/package.py index 38c98a71f7..b290461b45 100644 --- a/var/spack/repos/builtin/packages/py-colorama/package.py +++ b/var/spack/repos/builtin/packages/py-colorama/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColorama(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colorclass/package.py b/var/spack/repos/builtin/packages/py-colorclass/package.py index 05138031e7..637402e125 100644 --- a/var/spack/repos/builtin/packages/py-colorclass/package.py +++ b/var/spack/repos/builtin/packages/py-colorclass/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColorclass(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colored-traceback/package.py b/var/spack/repos/builtin/packages/py-colored-traceback/package.py index 95ed49753a..48b9048f64 100644 --- a/var/spack/repos/builtin/packages/py-colored-traceback/package.py +++ b/var/spack/repos/builtin/packages/py-colored-traceback/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColoredTraceback(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colored/package.py b/var/spack/repos/builtin/packages/py-colored/package.py index 41bac9604c..9aa87b95bd 100644 --- a/var/spack/repos/builtin/packages/py-colored/package.py +++ b/var/spack/repos/builtin/packages/py-colored/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColored(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-coloredlogs/package.py b/var/spack/repos/builtin/packages/py-coloredlogs/package.py index b9bc663313..dee9cdb9d5 100644 --- a/var/spack/repos/builtin/packages/py-coloredlogs/package.py +++ b/var/spack/repos/builtin/packages/py-coloredlogs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColoredlogs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colorful/package.py b/var/spack/repos/builtin/packages/py-colorful/package.py index 905bc782fc..356bc10b09 100644 --- a/var/spack/repos/builtin/packages/py-colorful/package.py +++ b/var/spack/repos/builtin/packages/py-colorful/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyColorful(PythonPackage): """Terminal string styling done right, in Python.""" diff --git a/var/spack/repos/builtin/packages/py-colorio/package.py b/var/spack/repos/builtin/packages/py-colorio/package.py index 3beaad690a..ddc438a17c 100644 --- a/var/spack/repos/builtin/packages/py-colorio/package.py +++ b/var/spack/repos/builtin/packages/py-colorio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColorio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colorlog/package.py b/var/spack/repos/builtin/packages/py-colorlog/package.py index d5c9875cf7..0cbb7b30b6 100644 --- a/var/spack/repos/builtin/packages/py-colorlog/package.py +++ b/var/spack/repos/builtin/packages/py-colorlog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColorlog(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colormath/package.py b/var/spack/repos/builtin/packages/py-colormath/package.py index 90aa5bbd8f..cd1baa6883 100644 --- a/var/spack/repos/builtin/packages/py-colormath/package.py +++ b/var/spack/repos/builtin/packages/py-colormath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColormath(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colorpy/package.py b/var/spack/repos/builtin/packages/py-colorpy/package.py index b8a202dd61..d94d8a5227 100644 --- a/var/spack/repos/builtin/packages/py-colorpy/package.py +++ b/var/spack/repos/builtin/packages/py-colorpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColorpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-colorspacious/package.py b/var/spack/repos/builtin/packages/py-colorspacious/package.py index 59787c0b00..61fa859915 100644 --- a/var/spack/repos/builtin/packages/py-colorspacious/package.py +++ b/var/spack/repos/builtin/packages/py-colorspacious/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyColorspacious(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-commonmark/package.py b/var/spack/repos/builtin/packages/py-commonmark/package.py index 6eae746b1c..037138d12e 100644 --- a/var/spack/repos/builtin/packages/py-commonmark/package.py +++ b/var/spack/repos/builtin/packages/py-commonmark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCommonmark(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-configargparse/package.py b/var/spack/repos/builtin/packages/py-configargparse/package.py index c75066ead5..dd33c6aef0 100644 --- a/var/spack/repos/builtin/packages/py-configargparse/package.py +++ b/var/spack/repos/builtin/packages/py-configargparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyConfigargparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-configobj/package.py b/var/spack/repos/builtin/packages/py-configobj/package.py index 8c1ba6fe24..c4005e4603 100644 --- a/var/spack/repos/builtin/packages/py-configobj/package.py +++ b/var/spack/repos/builtin/packages/py-configobj/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyConfigobj(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-configparser/package.py b/var/spack/repos/builtin/packages/py-configparser/package.py index b2c8e6c2c5..8021cacd05 100644 --- a/var/spack/repos/builtin/packages/py-configparser/package.py +++ b/var/spack/repos/builtin/packages/py-configparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyConfigparser(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-configspace/package.py b/var/spack/repos/builtin/packages/py-configspace/package.py index 7f3355ce07..9b2fa18d7e 100644 --- a/var/spack/repos/builtin/packages/py-configspace/package.py +++ b/var/spack/repos/builtin/packages/py-configspace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyConfigspace(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-connectionpool/package.py b/var/spack/repos/builtin/packages/py-connectionpool/package.py index 36b97b8550..5d5dd44b56 100644 --- a/var/spack/repos/builtin/packages/py-connectionpool/package.py +++ b/var/spack/repos/builtin/packages/py-connectionpool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyConnectionpool(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-constantly/package.py b/var/spack/repos/builtin/packages/py-constantly/package.py index 71cac55d5e..86acb47830 100644 --- a/var/spack/repos/builtin/packages/py-constantly/package.py +++ b/var/spack/repos/builtin/packages/py-constantly/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyConstantly(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-contextily/package.py b/var/spack/repos/builtin/packages/py-contextily/package.py index f1b70f7707..2482834885 100644 --- a/var/spack/repos/builtin/packages/py-contextily/package.py +++ b/var/spack/repos/builtin/packages/py-contextily/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyContextily(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-contextlib2/package.py b/var/spack/repos/builtin/packages/py-contextlib2/package.py index 4f5c1678a4..61bdceb960 100644 --- a/var/spack/repos/builtin/packages/py-contextlib2/package.py +++ b/var/spack/repos/builtin/packages/py-contextlib2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyContextlib2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-contextvars/package.py b/var/spack/repos/builtin/packages/py-contextvars/package.py index d7824e6afd..fe29b8e5e7 100644 --- a/var/spack/repos/builtin/packages/py-contextvars/package.py +++ b/var/spack/repos/builtin/packages/py-contextvars/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyContextvars(PythonPackage): """This package implements a backport of Python 3.7 contextvars module (see PEP 567) for Python 3.6.""" diff --git a/var/spack/repos/builtin/packages/py-control/package.py b/var/spack/repos/builtin/packages/py-control/package.py index 596c375585..30312ee0de 100644 --- a/var/spack/repos/builtin/packages/py-control/package.py +++ b/var/spack/repos/builtin/packages/py-control/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyControl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-convertdate/package.py b/var/spack/repos/builtin/packages/py-convertdate/package.py index 52a90948c2..d2b22a61f4 100644 --- a/var/spack/repos/builtin/packages/py-convertdate/package.py +++ b/var/spack/repos/builtin/packages/py-convertdate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyConvertdate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-convokit/package.py b/var/spack/repos/builtin/packages/py-convokit/package.py index 0472eae8db..719cc91b3f 100644 --- a/var/spack/repos/builtin/packages/py-convokit/package.py +++ b/var/spack/repos/builtin/packages/py-convokit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyConvokit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cookiecutter/package.py b/var/spack/repos/builtin/packages/py-cookiecutter/package.py index ecbc47b7b3..d47804c1c5 100644 --- a/var/spack/repos/builtin/packages/py-cookiecutter/package.py +++ b/var/spack/repos/builtin/packages/py-cookiecutter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCookiecutter(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cookies/package.py b/var/spack/repos/builtin/packages/py-cookies/package.py index 87950cab89..2f6cc47c60 100644 --- a/var/spack/repos/builtin/packages/py-cookies/package.py +++ b/var/spack/repos/builtin/packages/py-cookies/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCookies(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-copulas/package.py b/var/spack/repos/builtin/packages/py-copulas/package.py index ee2031efd1..389e458c35 100644 --- a/var/spack/repos/builtin/packages/py-copulas/package.py +++ b/var/spack/repos/builtin/packages/py-copulas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCopulas(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-correctionlib/package.py b/var/spack/repos/builtin/packages/py-correctionlib/package.py index e91f7a9315..d8f2232193 100644 --- a/var/spack/repos/builtin/packages/py-correctionlib/package.py +++ b/var/spack/repos/builtin/packages/py-correctionlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCorrectionlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-counter/package.py b/var/spack/repos/builtin/packages/py-counter/package.py index 2626779e3c..d3a54f6916 100644 --- a/var/spack/repos/builtin/packages/py-counter/package.py +++ b/var/spack/repos/builtin/packages/py-counter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCounter(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cov-core/package.py b/var/spack/repos/builtin/packages/py-cov-core/package.py index a69aa62145..cd46510049 100644 --- a/var/spack/repos/builtin/packages/py-cov-core/package.py +++ b/var/spack/repos/builtin/packages/py-cov-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCovCore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-coverage/package.py b/var/spack/repos/builtin/packages/py-coverage/package.py index b73b137628..674a895d50 100644 --- a/var/spack/repos/builtin/packages/py-coverage/package.py +++ b/var/spack/repos/builtin/packages/py-coverage/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCoverage(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-coveralls/package.py b/var/spack/repos/builtin/packages/py-coveralls/package.py index 348a8b0402..5ddbbca715 100644 --- a/var/spack/repos/builtin/packages/py-coveralls/package.py +++ b/var/spack/repos/builtin/packages/py-coveralls/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCoveralls(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cppheaderparser/package.py b/var/spack/repos/builtin/packages/py-cppheaderparser/package.py index 75f7e4f625..59edc2afe4 100644 --- a/var/spack/repos/builtin/packages/py-cppheaderparser/package.py +++ b/var/spack/repos/builtin/packages/py-cppheaderparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCppheaderparser(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cppy/package.py b/var/spack/repos/builtin/packages/py-cppy/package.py index 693a3de60a..5c28fd77eb 100644 --- a/var/spack/repos/builtin/packages/py-cppy/package.py +++ b/var/spack/repos/builtin/packages/py-cppy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCppy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-crashtest/package.py b/var/spack/repos/builtin/packages/py-crashtest/package.py index a7f0559fa4..fc66e77577 100644 --- a/var/spack/repos/builtin/packages/py-crashtest/package.py +++ b/var/spack/repos/builtin/packages/py-crashtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCrashtest(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-crcmod/package.py b/var/spack/repos/builtin/packages/py-crcmod/package.py index b2e8555a12..dff63ce4b8 100644 --- a/var/spack/repos/builtin/packages/py-crcmod/package.py +++ b/var/spack/repos/builtin/packages/py-crcmod/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCrcmod(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-crispresso/package.py b/var/spack/repos/builtin/packages/py-crispresso/package.py index 2185879423..ea72338561 100644 --- a/var/spack/repos/builtin/packages/py-crispresso/package.py +++ b/var/spack/repos/builtin/packages/py-crispresso/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCrispresso(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-crossmap/package.py b/var/spack/repos/builtin/packages/py-crossmap/package.py index 881df8687b..a78b0fdf85 100644 --- a/var/spack/repos/builtin/packages/py-crossmap/package.py +++ b/var/spack/repos/builtin/packages/py-crossmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCrossmap(PythonPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/py-cryolobm/package.py b/var/spack/repos/builtin/packages/py-cryolobm/package.py index d2b1bf7c0b..c9001a44cc 100644 --- a/var/spack/repos/builtin/packages/py-cryolobm/package.py +++ b/var/spack/repos/builtin/packages/py-cryolobm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCryolobm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cryptography/package.py b/var/spack/repos/builtin/packages/py-cryptography/package.py index e4521cf769..0a9642942a 100644 --- a/var/spack/repos/builtin/packages/py-cryptography/package.py +++ b/var/spack/repos/builtin/packages/py-cryptography/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyCryptography(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cssselect/package.py b/var/spack/repos/builtin/packages/py-cssselect/package.py index 5957f5b48f..022da4ecc7 100644 --- a/var/spack/repos/builtin/packages/py-cssselect/package.py +++ b/var/spack/repos/builtin/packages/py-cssselect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCssselect(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py index 15739c765b..903c38ba75 100644 --- a/var/spack/repos/builtin/packages/py-csvkit/package.py +++ b/var/spack/repos/builtin/packages/py-csvkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCsvkit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ctgan/package.py b/var/spack/repos/builtin/packages/py-ctgan/package.py index 1293279344..6c1e976d09 100644 --- a/var/spack/repos/builtin/packages/py-ctgan/package.py +++ b/var/spack/repos/builtin/packages/py-ctgan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCtgan(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cudf/package.py b/var/spack/repos/builtin/packages/py-cudf/package.py index 4272efce1b..893b7b8cc0 100644 --- a/var/spack/repos/builtin/packages/py-cudf/package.py +++ b/var/spack/repos/builtin/packages/py-cudf/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyCudf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cuml/package.py b/var/spack/repos/builtin/packages/py-cuml/package.py index 237c1dc441..a54e4b76fd 100644 --- a/var/spack/repos/builtin/packages/py-cuml/package.py +++ b/var/spack/repos/builtin/packages/py-cuml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCuml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cupy/package.py b/var/spack/repos/builtin/packages/py-cupy/package.py index 4a9a27b8be..820a285058 100644 --- a/var/spack/repos/builtin/packages/py-cupy/package.py +++ b/var/spack/repos/builtin/packages/py-cupy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCupy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-current/package.py b/var/spack/repos/builtin/packages/py-current/package.py index 4dbb194da8..7faa91c282 100644 --- a/var/spack/repos/builtin/packages/py-current/package.py +++ b/var/spack/repos/builtin/packages/py-current/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCurrent(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cutadapt/package.py b/var/spack/repos/builtin/packages/py-cutadapt/package.py index 5b19361c7d..e243672149 100644 --- a/var/spack/repos/builtin/packages/py-cutadapt/package.py +++ b/var/spack/repos/builtin/packages/py-cutadapt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCutadapt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cvxopt/package.py b/var/spack/repos/builtin/packages/py-cvxopt/package.py index fe25486e4d..e64a488456 100644 --- a/var/spack/repos/builtin/packages/py-cvxopt/package.py +++ b/var/spack/repos/builtin/packages/py-cvxopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCvxopt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cvxpy/package.py b/var/spack/repos/builtin/packages/py-cvxpy/package.py index bcceb51b31..ecce96399c 100644 --- a/var/spack/repos/builtin/packages/py-cvxpy/package.py +++ b/var/spack/repos/builtin/packages/py-cvxpy/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCvxpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cx-oracle/package.py b/var/spack/repos/builtin/packages/py-cx-oracle/package.py index 6d81d4f1ef..05c241c84f 100644 --- a/var/spack/repos/builtin/packages/py-cx-oracle/package.py +++ b/var/spack/repos/builtin/packages/py-cx-oracle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCxOracle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cycler/package.py b/var/spack/repos/builtin/packages/py-cycler/package.py index eca91cf2aa..250a43cf5a 100644 --- a/var/spack/repos/builtin/packages/py-cycler/package.py +++ b/var/spack/repos/builtin/packages/py-cycler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCycler(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cymem/package.py b/var/spack/repos/builtin/packages/py-cymem/package.py index 46d997e982..0ec94c9a3e 100644 --- a/var/spack/repos/builtin/packages/py-cymem/package.py +++ b/var/spack/repos/builtin/packages/py-cymem/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyCymem(PythonPackage): """Manage calls to calloc/free through Cython.""" diff --git a/var/spack/repos/builtin/packages/py-cyordereddict/package.py b/var/spack/repos/builtin/packages/py-cyordereddict/package.py index 5cc1074583..ebb44eb77a 100644 --- a/var/spack/repos/builtin/packages/py-cyordereddict/package.py +++ b/var/spack/repos/builtin/packages/py-cyordereddict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCyordereddict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cython-bbox/package.py b/var/spack/repos/builtin/packages/py-cython-bbox/package.py index 22b93b6725..2b3f6798cd 100644 --- a/var/spack/repos/builtin/packages/py-cython-bbox/package.py +++ b/var/spack/repos/builtin/packages/py-cython-bbox/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyCythonBbox(PythonPackage): """cython_bbox is widely used in object detection tasks. To my best knowledge, it was first implemented in Faster-RCNN. Since diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index e749896c34..4c70c14899 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-cyvcf2/package.py b/var/spack/repos/builtin/packages/py-cyvcf2/package.py index 3cd52ae068..719d88c236 100644 --- a/var/spack/repos/builtin/packages/py-cyvcf2/package.py +++ b/var/spack/repos/builtin/packages/py-cyvcf2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyCyvcf2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-d2to1/package.py b/var/spack/repos/builtin/packages/py-d2to1/package.py index 0451bf32f5..1e9f5e248b 100644 --- a/var/spack/repos/builtin/packages/py-d2to1/package.py +++ b/var/spack/repos/builtin/packages/py-d2to1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyD2to1(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dadi/package.py b/var/spack/repos/builtin/packages/py-dadi/package.py index 5edd15acd4..dcd43aebcb 100644 --- a/var/spack/repos/builtin/packages/py-dadi/package.py +++ b/var/spack/repos/builtin/packages/py-dadi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDadi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-damask/package.py b/var/spack/repos/builtin/packages/py-damask/package.py index 22d0bc3b44..e3c1b47b6c 100644 --- a/var/spack/repos/builtin/packages/py-damask/package.py +++ b/var/spack/repos/builtin/packages/py-damask/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyDamask(PythonPackage): """Pre- and post-processing tools for DAMASK""" diff --git a/var/spack/repos/builtin/packages/py-dask-glm/package.py b/var/spack/repos/builtin/packages/py-dask-glm/package.py index 7c4c67297b..23aec6cc15 100644 --- a/var/spack/repos/builtin/packages/py-dask-glm/package.py +++ b/var/spack/repos/builtin/packages/py-dask-glm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDaskGlm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dask-ml/package.py b/var/spack/repos/builtin/packages/py-dask-ml/package.py index 976b641afb..ac56cfd8af 100644 --- a/var/spack/repos/builtin/packages/py-dask-ml/package.py +++ b/var/spack/repos/builtin/packages/py-dask-ml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDaskMl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dask-sphinx-theme/package.py b/var/spack/repos/builtin/packages/py-dask-sphinx-theme/package.py index 9c8c3315d6..de217a4a51 100644 --- a/var/spack/repos/builtin/packages/py-dask-sphinx-theme/package.py +++ b/var/spack/repos/builtin/packages/py-dask-sphinx-theme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDaskSphinxTheme(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py index 98608b8171..ad330a4c32 100644 --- a/var/spack/repos/builtin/packages/py-dask/package.py +++ b/var/spack/repos/builtin/packages/py-dask/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDask(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dataclasses/package.py b/var/spack/repos/builtin/packages/py-dataclasses/package.py index 8a06135f3a..57f93ebf69 100644 --- a/var/spack/repos/builtin/packages/py-dataclasses/package.py +++ b/var/spack/repos/builtin/packages/py-dataclasses/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDataclasses(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datacube/package.py b/var/spack/repos/builtin/packages/py-datacube/package.py index 17892e7de3..ead34d9216 100644 --- a/var/spack/repos/builtin/packages/py-datacube/package.py +++ b/var/spack/repos/builtin/packages/py-datacube/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDatacube(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datalad-container/package.py b/var/spack/repos/builtin/packages/py-datalad-container/package.py index ced890deb6..763a136bdb 100644 --- a/var/spack/repos/builtin/packages/py-datalad-container/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-container/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDataladContainer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datalad-hirni/package.py b/var/spack/repos/builtin/packages/py-datalad-hirni/package.py index ab83694c01..dc43266daa 100644 --- a/var/spack/repos/builtin/packages/py-datalad-hirni/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-hirni/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDataladHirni(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datalad-metalad/package.py b/var/spack/repos/builtin/packages/py-datalad-metalad/package.py index 07870683c5..b090123596 100644 --- a/var/spack/repos/builtin/packages/py-datalad-metalad/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-metalad/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDataladMetalad(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datalad-neuroimaging/package.py b/var/spack/repos/builtin/packages/py-datalad-neuroimaging/package.py index 914c8f690a..d33ec253f9 100644 --- a/var/spack/repos/builtin/packages/py-datalad-neuroimaging/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-neuroimaging/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDataladNeuroimaging(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datalad-webapp/package.py b/var/spack/repos/builtin/packages/py-datalad-webapp/package.py index 7900411b61..2d891bbf7d 100644 --- a/var/spack/repos/builtin/packages/py-datalad-webapp/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-webapp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDataladWebapp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datalad/package.py b/var/spack/repos/builtin/packages/py-datalad/package.py index 64dc5e573a..65058bb6b0 100644 --- a/var/spack/repos/builtin/packages/py-datalad/package.py +++ b/var/spack/repos/builtin/packages/py-datalad/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDatalad(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datasets/package.py b/var/spack/repos/builtin/packages/py-datasets/package.py index 1fb6f93ced..fbc578bfef 100644 --- a/var/spack/repos/builtin/packages/py-datasets/package.py +++ b/var/spack/repos/builtin/packages/py-datasets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDatasets(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dateparser/package.py b/var/spack/repos/builtin/packages/py-dateparser/package.py index 7186cf4035..e5ead457c9 100644 --- a/var/spack/repos/builtin/packages/py-dateparser/package.py +++ b/var/spack/repos/builtin/packages/py-dateparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDateparser(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-datrie/package.py b/var/spack/repos/builtin/packages/py-datrie/package.py index 73cb25f808..290c6f70c0 100644 --- a/var/spack/repos/builtin/packages/py-datrie/package.py +++ b/var/spack/repos/builtin/packages/py-datrie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDatrie(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dbf/package.py b/var/spack/repos/builtin/packages/py-dbf/package.py index a86288b1dc..5fc64eb554 100644 --- a/var/spack/repos/builtin/packages/py-dbf/package.py +++ b/var/spack/repos/builtin/packages/py-dbf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDbf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dbfread/package.py b/var/spack/repos/builtin/packages/py-dbfread/package.py index 988b131cd3..1c3cfd1096 100644 --- a/var/spack/repos/builtin/packages/py-dbfread/package.py +++ b/var/spack/repos/builtin/packages/py-dbfread/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDbfread(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-deap/package.py b/var/spack/repos/builtin/packages/py-deap/package.py index 96c4daff24..7b8698c551 100644 --- a/var/spack/repos/builtin/packages/py-deap/package.py +++ b/var/spack/repos/builtin/packages/py-deap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDeap(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-debtcollector/package.py b/var/spack/repos/builtin/packages/py-debtcollector/package.py index ba893002cd..171a0584e9 100644 --- a/var/spack/repos/builtin/packages/py-debtcollector/package.py +++ b/var/spack/repos/builtin/packages/py-debtcollector/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDebtcollector(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-debugpy/package.py b/var/spack/repos/builtin/packages/py-debugpy/package.py index 18fdabedc1..da644bfb89 100644 --- a/var/spack/repos/builtin/packages/py-debugpy/package.py +++ b/var/spack/repos/builtin/packages/py-debugpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDebugpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-decorator/package.py b/var/spack/repos/builtin/packages/py-decorator/package.py index b6e0e4c85d..96e58e7f4c 100644 --- a/var/spack/repos/builtin/packages/py-decorator/package.py +++ b/var/spack/repos/builtin/packages/py-decorator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDecorator(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-deepdiff/package.py b/var/spack/repos/builtin/packages/py-deepdiff/package.py index d6136d3c57..b151829a16 100644 --- a/var/spack/repos/builtin/packages/py-deepdiff/package.py +++ b/var/spack/repos/builtin/packages/py-deepdiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDeepdiff(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-deepecho/package.py b/var/spack/repos/builtin/packages/py-deepecho/package.py index 2e67b4dcd4..ed3c445842 100644 --- a/var/spack/repos/builtin/packages/py-deepecho/package.py +++ b/var/spack/repos/builtin/packages/py-deepecho/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDeepecho(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-deepsig/package.py b/var/spack/repos/builtin/packages/py-deepsig/package.py index cbcbb6e53f..33397a8cff 100644 --- a/var/spack/repos/builtin/packages/py-deepsig/package.py +++ b/var/spack/repos/builtin/packages/py-deepsig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDeepsig(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-deeptools/package.py b/var/spack/repos/builtin/packages/py-deeptools/package.py index 692205ac84..e9634378ad 100644 --- a/var/spack/repos/builtin/packages/py-deeptools/package.py +++ b/var/spack/repos/builtin/packages/py-deeptools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDeeptools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-deeptoolsintervals/package.py b/var/spack/repos/builtin/packages/py-deeptoolsintervals/package.py index 9c5501ecb2..57353365bf 100644 --- a/var/spack/repos/builtin/packages/py-deeptoolsintervals/package.py +++ b/var/spack/repos/builtin/packages/py-deeptoolsintervals/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDeeptoolsintervals(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-defusedxml/package.py b/var/spack/repos/builtin/packages/py-defusedxml/package.py index 3a28657afb..caa5af2260 100644 --- a/var/spack/repos/builtin/packages/py-defusedxml/package.py +++ b/var/spack/repos/builtin/packages/py-defusedxml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDefusedxml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dendropy/package.py b/var/spack/repos/builtin/packages/py-dendropy/package.py index 1d6e53fa58..b5c3c78e89 100644 --- a/var/spack/repos/builtin/packages/py-dendropy/package.py +++ b/var/spack/repos/builtin/packages/py-dendropy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDendropy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-deprecated/package.py b/var/spack/repos/builtin/packages/py-deprecated/package.py index ff1ff92216..7172562b0e 100644 --- a/var/spack/repos/builtin/packages/py-deprecated/package.py +++ b/var/spack/repos/builtin/packages/py-deprecated/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDeprecated(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-deprecation/package.py b/var/spack/repos/builtin/packages/py-deprecation/package.py index 4ff0675dc7..6d345cc6d4 100644 --- a/var/spack/repos/builtin/packages/py-deprecation/package.py +++ b/var/spack/repos/builtin/packages/py-deprecation/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDeprecation(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-descartes/package.py b/var/spack/repos/builtin/packages/py-descartes/package.py index 30cc72116f..382f36d97a 100644 --- a/var/spack/repos/builtin/packages/py-descartes/package.py +++ b/var/spack/repos/builtin/packages/py-descartes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDescartes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-devlib/package.py b/var/spack/repos/builtin/packages/py-devlib/package.py index 505711291a..ad987a0c30 100644 --- a/var/spack/repos/builtin/packages/py-devlib/package.py +++ b/var/spack/repos/builtin/packages/py-devlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDevlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dgl/package.py b/var/spack/repos/builtin/packages/py-dgl/package.py index b94f0a6442..1602079ce1 100644 --- a/var/spack/repos/builtin/packages/py-dgl/package.py +++ b/var/spack/repos/builtin/packages/py-dgl/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyDgl(CMakePackage): """Deep Graph Library (DGL). diff --git a/var/spack/repos/builtin/packages/py-dh-scikit-optimize/package.py b/var/spack/repos/builtin/packages/py-dh-scikit-optimize/package.py index c51a3a647d..f285f85da8 100644 --- a/var/spack/repos/builtin/packages/py-dh-scikit-optimize/package.py +++ b/var/spack/repos/builtin/packages/py-dh-scikit-optimize/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDhScikitOptimize(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dictdiffer/package.py b/var/spack/repos/builtin/packages/py-dictdiffer/package.py index 2dcc07cca5..ddb25c846a 100644 --- a/var/spack/repos/builtin/packages/py-dictdiffer/package.py +++ b/var/spack/repos/builtin/packages/py-dictdiffer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDictdiffer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dill/package.py b/var/spack/repos/builtin/packages/py-dill/package.py index b2685946d8..772f65dc7f 100644 --- a/var/spack/repos/builtin/packages/py-dill/package.py +++ b/var/spack/repos/builtin/packages/py-dill/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDill(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dipy/package.py b/var/spack/repos/builtin/packages/py-dipy/package.py index 860fa9070c..5ba7a93f77 100644 --- a/var/spack/repos/builtin/packages/py-dipy/package.py +++ b/var/spack/repos/builtin/packages/py-dipy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDipy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-discover/package.py b/var/spack/repos/builtin/packages/py-discover/package.py index 8b0fb45c10..8e7ad226eb 100644 --- a/var/spack/repos/builtin/packages/py-discover/package.py +++ b/var/spack/repos/builtin/packages/py-discover/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDiscover(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-diskcache/package.py b/var/spack/repos/builtin/packages/py-diskcache/package.py index 71e2fcae91..61f6dc6086 100644 --- a/var/spack/repos/builtin/packages/py-diskcache/package.py +++ b/var/spack/repos/builtin/packages/py-diskcache/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyDiskcache(PythonPackage): """Disk Cache -- Disk and file backed persistent cache.""" diff --git a/var/spack/repos/builtin/packages/py-distance/package.py b/var/spack/repos/builtin/packages/py-distance/package.py index 10d44e6fda..cfd2bc5b97 100644 --- a/var/spack/repos/builtin/packages/py-distance/package.py +++ b/var/spack/repos/builtin/packages/py-distance/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDistance(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-distlib/package.py b/var/spack/repos/builtin/packages/py-distlib/package.py index 7c98938ed4..d2ac9e65dc 100644 --- a/var/spack/repos/builtin/packages/py-distlib/package.py +++ b/var/spack/repos/builtin/packages/py-distlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDistlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-distributed/package.py b/var/spack/repos/builtin/packages/py-distributed/package.py index 07561753cb..a723d81074 100644 --- a/var/spack/repos/builtin/packages/py-distributed/package.py +++ b/var/spack/repos/builtin/packages/py-distributed/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDistributed(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-distro/package.py b/var/spack/repos/builtin/packages/py-distro/package.py index 52461db879..98617d9483 100644 --- a/var/spack/repos/builtin/packages/py-distro/package.py +++ b/var/spack/repos/builtin/packages/py-distro/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyDistro(PythonPackage): """Distro - an OS platform information API.""" diff --git a/var/spack/repos/builtin/packages/py-django/package.py b/var/spack/repos/builtin/packages/py-django/package.py index d6de6d5d3d..6e19f7f635 100644 --- a/var/spack/repos/builtin/packages/py-django/package.py +++ b/var/spack/repos/builtin/packages/py-django/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDjango(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dlcpar/package.py b/var/spack/repos/builtin/packages/py-dlcpar/package.py index 3d374a0be0..be918f65a0 100644 --- a/var/spack/repos/builtin/packages/py-dlcpar/package.py +++ b/var/spack/repos/builtin/packages/py-dlcpar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDlcpar(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dm-tree/package.py b/var/spack/repos/builtin/packages/py-dm-tree/package.py index 18b16abd06..41bc30ded8 100644 --- a/var/spack/repos/builtin/packages/py-dm-tree/package.py +++ b/var/spack/repos/builtin/packages/py-dm-tree/package.py @@ -5,6 +5,8 @@ import tempfile +from spack.package import * + class PyDmTree(PythonPackage): """tree is a library for working with nested data structures. In a diff --git a/var/spack/repos/builtin/packages/py-dnaio/package.py b/var/spack/repos/builtin/packages/py-dnaio/package.py index b730a6ec8a..0725ab65d0 100644 --- a/var/spack/repos/builtin/packages/py-dnaio/package.py +++ b/var/spack/repos/builtin/packages/py-dnaio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDnaio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-docker/package.py b/var/spack/repos/builtin/packages/py-docker/package.py index 399d52f148..6ce490d734 100644 --- a/var/spack/repos/builtin/packages/py-docker/package.py +++ b/var/spack/repos/builtin/packages/py-docker/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyDocker(PythonPackage): """A Python library for the Docker Engine API.""" diff --git a/var/spack/repos/builtin/packages/py-dockerpy-creds/package.py b/var/spack/repos/builtin/packages/py-dockerpy-creds/package.py index 13f1043a5a..a5e9931015 100644 --- a/var/spack/repos/builtin/packages/py-dockerpy-creds/package.py +++ b/var/spack/repos/builtin/packages/py-dockerpy-creds/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDockerpyCreds(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-docopt/package.py b/var/spack/repos/builtin/packages/py-docopt/package.py index f0c9ae4a1d..d658671d39 100644 --- a/var/spack/repos/builtin/packages/py-docopt/package.py +++ b/var/spack/repos/builtin/packages/py-docopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDocopt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-docutils-stubs/package.py b/var/spack/repos/builtin/packages/py-docutils-stubs/package.py index 77949a3502..3153f033e0 100644 --- a/var/spack/repos/builtin/packages/py-docutils-stubs/package.py +++ b/var/spack/repos/builtin/packages/py-docutils-stubs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDocutilsStubs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-docutils/package.py b/var/spack/repos/builtin/packages/py-docutils/package.py index 5afeebc8d0..3bf79dd81b 100644 --- a/var/spack/repos/builtin/packages/py-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-docutils/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyDocutils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dominate/package.py b/var/spack/repos/builtin/packages/py-dominate/package.py index e80c177f55..328484ec19 100644 --- a/var/spack/repos/builtin/packages/py-dominate/package.py +++ b/var/spack/repos/builtin/packages/py-dominate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDominate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dotnetcore2/package.py b/var/spack/repos/builtin/packages/py-dotnetcore2/package.py index c93986a093..f9ea115be7 100644 --- a/var/spack/repos/builtin/packages/py-dotnetcore2/package.py +++ b/var/spack/repos/builtin/packages/py-dotnetcore2/package.py @@ -5,6 +5,8 @@ import sys +from spack.package import * + class PyDotnetcore2(PythonPackage): """.Net Core 2.1 runtime.""" diff --git a/var/spack/repos/builtin/packages/py-downhill/package.py b/var/spack/repos/builtin/packages/py-downhill/package.py index 273f33dbaf..1c05630388 100644 --- a/var/spack/repos/builtin/packages/py-downhill/package.py +++ b/var/spack/repos/builtin/packages/py-downhill/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDownhill(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-doxypy/package.py b/var/spack/repos/builtin/packages/py-doxypy/package.py index 3abc0cb5e0..aab87f2827 100644 --- a/var/spack/repos/builtin/packages/py-doxypy/package.py +++ b/var/spack/repos/builtin/packages/py-doxypy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDoxypy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-doxypypy/package.py b/var/spack/repos/builtin/packages/py-doxypypy/package.py index 2d167eb16c..52e614871b 100644 --- a/var/spack/repos/builtin/packages/py-doxypypy/package.py +++ b/var/spack/repos/builtin/packages/py-doxypypy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDoxypypy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dp-gp-cluster/package.py b/var/spack/repos/builtin/packages/py-dp-gp-cluster/package.py index b0b220bb02..87c49efac2 100644 --- a/var/spack/repos/builtin/packages/py-dp-gp-cluster/package.py +++ b/var/spack/repos/builtin/packages/py-dp-gp-cluster/package.py @@ -6,7 +6,7 @@ from glob import glob from os import unlink -from spack import * +from spack.package import * class PyDpGpCluster(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dpath/package.py b/var/spack/repos/builtin/packages/py-dpath/package.py index 124df81e73..cc619efa43 100644 --- a/var/spack/repos/builtin/packages/py-dpath/package.py +++ b/var/spack/repos/builtin/packages/py-dpath/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDpath(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-drmaa/package.py b/var/spack/repos/builtin/packages/py-drmaa/package.py index 63d5b2ec2a..306b74705f 100644 --- a/var/spack/repos/builtin/packages/py-drmaa/package.py +++ b/var/spack/repos/builtin/packages/py-drmaa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDrmaa(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dryscrape/package.py b/var/spack/repos/builtin/packages/py-dryscrape/package.py index 669c5dc328..c9897d508c 100644 --- a/var/spack/repos/builtin/packages/py-dryscrape/package.py +++ b/var/spack/repos/builtin/packages/py-dryscrape/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDryscrape(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-duecredit/package.py b/var/spack/repos/builtin/packages/py-duecredit/package.py index 61cdcec2d7..d3245f7cad 100644 --- a/var/spack/repos/builtin/packages/py-duecredit/package.py +++ b/var/spack/repos/builtin/packages/py-duecredit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDuecredit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dulwich/package.py b/var/spack/repos/builtin/packages/py-dulwich/package.py index d5a46823ec..2ebeaa0be2 100644 --- a/var/spack/repos/builtin/packages/py-dulwich/package.py +++ b/var/spack/repos/builtin/packages/py-dulwich/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDulwich(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dvc/package.py b/var/spack/repos/builtin/packages/py-dvc/package.py index a77a6eb1d7..940222295e 100644 --- a/var/spack/repos/builtin/packages/py-dvc/package.py +++ b/var/spack/repos/builtin/packages/py-dvc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDvc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dxchange/package.py b/var/spack/repos/builtin/packages/py-dxchange/package.py index 1fb44d9728..6e17097d8b 100644 --- a/var/spack/repos/builtin/packages/py-dxchange/package.py +++ b/var/spack/repos/builtin/packages/py-dxchange/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDxchange(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-dxfile/package.py b/var/spack/repos/builtin/packages/py-dxfile/package.py index ae6dea6f98..f30aa1453e 100644 --- a/var/spack/repos/builtin/packages/py-dxfile/package.py +++ b/var/spack/repos/builtin/packages/py-dxfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyDxfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-earthengine-api/package.py b/var/spack/repos/builtin/packages/py-earthengine-api/package.py index d17a5c2351..29917f07ef 100644 --- a/var/spack/repos/builtin/packages/py-earthengine-api/package.py +++ b/var/spack/repos/builtin/packages/py-earthengine-api/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEarthengineApi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py index 68d40a119e..d580568264 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEasybuildEasyblocks(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py index 2fc1250b8c..d7ae832565 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEasybuildEasyconfigs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py index 31bccf8a42..e5aae66a04 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEasybuildFramework(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-eccodes/package.py b/var/spack/repos/builtin/packages/py-eccodes/package.py index d87adb8b19..5950d8cf26 100644 --- a/var/spack/repos/builtin/packages/py-eccodes/package.py +++ b/var/spack/repos/builtin/packages/py-eccodes/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class PyEccodes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ecdsa/package.py b/var/spack/repos/builtin/packages/py-ecdsa/package.py index 3fd378e165..46364652d2 100644 --- a/var/spack/repos/builtin/packages/py-ecdsa/package.py +++ b/var/spack/repos/builtin/packages/py-ecdsa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEcdsa(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ecos/package.py b/var/spack/repos/builtin/packages/py-ecos/package.py index 3750c358bd..9e9301351f 100644 --- a/var/spack/repos/builtin/packages/py-ecos/package.py +++ b/var/spack/repos/builtin/packages/py-ecos/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEcos(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-edffile/package.py b/var/spack/repos/builtin/packages/py-edffile/package.py index 185acea995..e15fa8bc55 100644 --- a/var/spack/repos/builtin/packages/py-edffile/package.py +++ b/var/spack/repos/builtin/packages/py-edffile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEdffile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-editdistance/package.py b/var/spack/repos/builtin/packages/py-editdistance/package.py index a6ce9acc9d..f45a3b3b1c 100644 --- a/var/spack/repos/builtin/packages/py-editdistance/package.py +++ b/var/spack/repos/builtin/packages/py-editdistance/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEditdistance(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-efficientnet-pytorch/package.py b/var/spack/repos/builtin/packages/py-efficientnet-pytorch/package.py index 4c36f1ad56..d6a6c440eb 100644 --- a/var/spack/repos/builtin/packages/py-efficientnet-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-efficientnet-pytorch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEfficientnetPytorch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-eg/package.py b/var/spack/repos/builtin/packages/py-eg/package.py index 1e8a06ed01..498a4039ed 100644 --- a/var/spack/repos/builtin/packages/py-eg/package.py +++ b/var/spack/repos/builtin/packages/py-eg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEg(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-einops/package.py b/var/spack/repos/builtin/packages/py-einops/package.py index f7809dd0e0..51a61cf57f 100644 --- a/var/spack/repos/builtin/packages/py-einops/package.py +++ b/var/spack/repos/builtin/packages/py-einops/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEinops(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-elasticsearch/package.py b/var/spack/repos/builtin/packages/py-elasticsearch/package.py index d669a3fcca..93dad35333 100644 --- a/var/spack/repos/builtin/packages/py-elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/py-elasticsearch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyElasticsearch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-elephant/package.py b/var/spack/repos/builtin/packages/py-elephant/package.py index 8f74844a2f..4531b2e269 100644 --- a/var/spack/repos/builtin/packages/py-elephant/package.py +++ b/var/spack/repos/builtin/packages/py-elephant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyElephant(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-emcee/package.py b/var/spack/repos/builtin/packages/py-emcee/package.py index 0fbae19d2c..f8c1c6d3a4 100644 --- a/var/spack/repos/builtin/packages/py-emcee/package.py +++ b/var/spack/repos/builtin/packages/py-emcee/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEmcee(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-emoji/package.py b/var/spack/repos/builtin/packages/py-emoji/package.py index 7090871f0c..6b06855120 100644 --- a/var/spack/repos/builtin/packages/py-emoji/package.py +++ b/var/spack/repos/builtin/packages/py-emoji/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEmoji(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-empy/package.py b/var/spack/repos/builtin/packages/py-empy/package.py index 06650a4114..70f031c02d 100644 --- a/var/spack/repos/builtin/packages/py-empy/package.py +++ b/var/spack/repos/builtin/packages/py-empy/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEmpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py index 3252e43520..403f05dda0 100644 --- a/var/spack/repos/builtin/packages/py-entrypoints/package.py +++ b/var/spack/repos/builtin/packages/py-entrypoints/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEntrypoints(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py index d6cf28b0ac..a1e71b6298 100644 --- a/var/spack/repos/builtin/packages/py-enum34/package.py +++ b/var/spack/repos/builtin/packages/py-enum34/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEnum34(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-envisage/package.py b/var/spack/repos/builtin/packages/py-envisage/package.py index 0cda5a114d..5032d87039 100644 --- a/var/spack/repos/builtin/packages/py-envisage/package.py +++ b/var/spack/repos/builtin/packages/py-envisage/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyEnvisage(PythonPackage): """Envisage is a Python-based framework for building extensible applications, that is, applications whose functionality can be extended by diff --git a/var/spack/repos/builtin/packages/py-ephem/package.py b/var/spack/repos/builtin/packages/py-ephem/package.py index 42d327c7a9..15354f33a6 100644 --- a/var/spack/repos/builtin/packages/py-ephem/package.py +++ b/var/spack/repos/builtin/packages/py-ephem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEphem(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-epydoc/package.py b/var/spack/repos/builtin/packages/py-epydoc/package.py index 7711d93c7e..96c36ff067 100644 --- a/var/spack/repos/builtin/packages/py-epydoc/package.py +++ b/var/spack/repos/builtin/packages/py-epydoc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEpydoc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py index 71a5232982..e741cf2c76 100644 --- a/var/spack/repos/builtin/packages/py-espresso/package.py +++ b/var/spack/repos/builtin/packages/py-espresso/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index 9ea6b29a20..70d54c6a27 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEspressopp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py index 2fb6f602ad..4ee95f7816 100644 --- a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py +++ b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEtXmlfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-etelemetry/package.py b/var/spack/repos/builtin/packages/py-etelemetry/package.py index e513b78e4c..51839649cb 100644 --- a/var/spack/repos/builtin/packages/py-etelemetry/package.py +++ b/var/spack/repos/builtin/packages/py-etelemetry/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEtelemetry(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-eventlet/package.py b/var/spack/repos/builtin/packages/py-eventlet/package.py index 3ba7d4eac5..6b53dc9454 100644 --- a/var/spack/repos/builtin/packages/py-eventlet/package.py +++ b/var/spack/repos/builtin/packages/py-eventlet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEventlet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-execnet/package.py b/var/spack/repos/builtin/packages/py-execnet/package.py index f292317c6f..7e5ed0f1d6 100644 --- a/var/spack/repos/builtin/packages/py-execnet/package.py +++ b/var/spack/repos/builtin/packages/py-execnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyExecnet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-executing/package.py b/var/spack/repos/builtin/packages/py-executing/package.py index 068f4e1715..368f88dd0f 100644 --- a/var/spack/repos/builtin/packages/py-executing/package.py +++ b/var/spack/repos/builtin/packages/py-executing/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyExecuting(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-exifread/package.py b/var/spack/repos/builtin/packages/py-exifread/package.py index 6b0188b9ef..b7eed84d17 100644 --- a/var/spack/repos/builtin/packages/py-exifread/package.py +++ b/var/spack/repos/builtin/packages/py-exifread/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyExifread(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-exodus-bundler/package.py b/var/spack/repos/builtin/packages/py-exodus-bundler/package.py index a5a97df404..2e678d1869 100644 --- a/var/spack/repos/builtin/packages/py-exodus-bundler/package.py +++ b/var/spack/repos/builtin/packages/py-exodus-bundler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyExodusBundler(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-extension-helpers/package.py b/var/spack/repos/builtin/packages/py-extension-helpers/package.py index 2aa76cb922..baf4812cb4 100644 --- a/var/spack/repos/builtin/packages/py-extension-helpers/package.py +++ b/var/spack/repos/builtin/packages/py-extension-helpers/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyExtensionHelpers(PythonPackage): """The extension-helpers package includes convenience helpers to assist with building Python packages with compiled C/Cython diff --git a/var/spack/repos/builtin/packages/py-extras/package.py b/var/spack/repos/builtin/packages/py-extras/package.py index 6a24eb037c..d76607fa7b 100644 --- a/var/spack/repos/builtin/packages/py-extras/package.py +++ b/var/spack/repos/builtin/packages/py-extras/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyExtras(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ez-setup/package.py b/var/spack/repos/builtin/packages/py-ez-setup/package.py index 2d74a11d6f..f6f96302ab 100644 --- a/var/spack/repos/builtin/packages/py-ez-setup/package.py +++ b/var/spack/repos/builtin/packages/py-ez-setup/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyEzSetup(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-f90wrap/package.py b/var/spack/repos/builtin/packages/py-f90wrap/package.py index 24099cdf90..da8d28a411 100644 --- a/var/spack/repos/builtin/packages/py-f90wrap/package.py +++ b/var/spack/repos/builtin/packages/py-f90wrap/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyF90wrap(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fabric/package.py b/var/spack/repos/builtin/packages/py-fabric/package.py index a0654e46c1..daad12ae89 100644 --- a/var/spack/repos/builtin/packages/py-fabric/package.py +++ b/var/spack/repos/builtin/packages/py-fabric/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyFabric(PythonPackage): """High level SSH command execution.""" diff --git a/var/spack/repos/builtin/packages/py-faker/package.py b/var/spack/repos/builtin/packages/py-faker/package.py index 1d57a13fee..079dadd8cd 100644 --- a/var/spack/repos/builtin/packages/py-faker/package.py +++ b/var/spack/repos/builtin/packages/py-faker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFaker(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-falcon/package.py b/var/spack/repos/builtin/packages/py-falcon/package.py index 0f019dedd7..869abb0e49 100644 --- a/var/spack/repos/builtin/packages/py-falcon/package.py +++ b/var/spack/repos/builtin/packages/py-falcon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFalcon(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fallocate/package.py b/var/spack/repos/builtin/packages/py-fallocate/package.py index 03e762340a..6392ca718c 100644 --- a/var/spack/repos/builtin/packages/py-fallocate/package.py +++ b/var/spack/repos/builtin/packages/py-fallocate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFallocate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastai/package.py b/var/spack/repos/builtin/packages/py-fastai/package.py index 2b4a88151f..bb6833e2df 100644 --- a/var/spack/repos/builtin/packages/py-fastai/package.py +++ b/var/spack/repos/builtin/packages/py-fastai/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastai(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastaindex/package.py b/var/spack/repos/builtin/packages/py-fastaindex/package.py index 7d9e2fbb69..55eb005d0d 100644 --- a/var/spack/repos/builtin/packages/py-fastaindex/package.py +++ b/var/spack/repos/builtin/packages/py-fastaindex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastaindex(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastavro/package.py b/var/spack/repos/builtin/packages/py-fastavro/package.py index 1f07ff4f21..f1abd37475 100644 --- a/var/spack/repos/builtin/packages/py-fastavro/package.py +++ b/var/spack/repos/builtin/packages/py-fastavro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastavro(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastcache/package.py b/var/spack/repos/builtin/packages/py-fastcache/package.py index bf09af2d71..0c71d101de 100644 --- a/var/spack/repos/builtin/packages/py-fastcache/package.py +++ b/var/spack/repos/builtin/packages/py-fastcache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastcache(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastcluster/package.py b/var/spack/repos/builtin/packages/py-fastcluster/package.py index 314256ed72..53d05cb362 100644 --- a/var/spack/repos/builtin/packages/py-fastcluster/package.py +++ b/var/spack/repos/builtin/packages/py-fastcluster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastcluster(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastcore/package.py b/var/spack/repos/builtin/packages/py-fastcore/package.py index b6d7578daf..1511047c46 100644 --- a/var/spack/repos/builtin/packages/py-fastcore/package.py +++ b/var/spack/repos/builtin/packages/py-fastcore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastcore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastcov/package.py b/var/spack/repos/builtin/packages/py-fastcov/package.py index 1f8c0ea4f3..e512759257 100644 --- a/var/spack/repos/builtin/packages/py-fastcov/package.py +++ b/var/spack/repos/builtin/packages/py-fastcov/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastcov(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastdownload/package.py b/var/spack/repos/builtin/packages/py-fastdownload/package.py index eec4df547f..a65e7457d1 100644 --- a/var/spack/repos/builtin/packages/py-fastdownload/package.py +++ b/var/spack/repos/builtin/packages/py-fastdownload/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastdownload(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastdtw/package.py b/var/spack/repos/builtin/packages/py-fastdtw/package.py index ee70a84540..3875eb91f4 100644 --- a/var/spack/repos/builtin/packages/py-fastdtw/package.py +++ b/var/spack/repos/builtin/packages/py-fastdtw/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyFastdtw(PythonPackage): """Python implementation of FastDTW (http://cs.fit.edu/~pkc/papers/tdm04.pdf), which is an approximate diff --git a/var/spack/repos/builtin/packages/py-fasteners/package.py b/var/spack/repos/builtin/packages/py-fasteners/package.py index 9b18417578..16ffff3684 100644 --- a/var/spack/repos/builtin/packages/py-fasteners/package.py +++ b/var/spack/repos/builtin/packages/py-fasteners/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFasteners(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastjsonschema/package.py b/var/spack/repos/builtin/packages/py-fastjsonschema/package.py index 7906ddcde6..9e30f5ca5d 100644 --- a/var/spack/repos/builtin/packages/py-fastjsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-fastjsonschema/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyFastjsonschema(PythonPackage): """Fast JSON schema validator for Python.""" diff --git a/var/spack/repos/builtin/packages/py-fastprogress/package.py b/var/spack/repos/builtin/packages/py-fastprogress/package.py index 2a752e2149..53cbb339df 100644 --- a/var/spack/repos/builtin/packages/py-fastprogress/package.py +++ b/var/spack/repos/builtin/packages/py-fastprogress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastprogress(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fastrlock/package.py b/var/spack/repos/builtin/packages/py-fastrlock/package.py index d173d94f39..4141ca63f6 100644 --- a/var/spack/repos/builtin/packages/py-fastrlock/package.py +++ b/var/spack/repos/builtin/packages/py-fastrlock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFastrlock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-faststructure/package.py b/var/spack/repos/builtin/packages/py-faststructure/package.py index 2bd03bfa2d..d8105ee433 100644 --- a/var/spack/repos/builtin/packages/py-faststructure/package.py +++ b/var/spack/repos/builtin/packages/py-faststructure/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFaststructure(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fava/package.py b/var/spack/repos/builtin/packages/py-fava/package.py index 2135cc8ab7..e2acb81399 100644 --- a/var/spack/repos/builtin/packages/py-fava/package.py +++ b/var/spack/repos/builtin/packages/py-fava/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFava(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fenics-basix/package.py b/var/spack/repos/builtin/packages/py-fenics-basix/package.py index c58d8ae357..b9bfe183fc 100644 --- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFenicsBasix(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fenics-dijitso/package.py b/var/spack/repos/builtin/packages/py-fenics-dijitso/package.py index 5d59c29135..4756b83516 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dijitso/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dijitso/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFenicsDijitso(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py index b0b26a5b24..91dc5052ee 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFenicsDolfinx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fenics-ffc/package.py b/var/spack/repos/builtin/packages/py-fenics-ffc/package.py index 780683aa4b..8d3894b1dd 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffc/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFenicsFfc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py index 8f4cf3150c..065a966aac 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFenicsFfcx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fenics-fiat/package.py b/var/spack/repos/builtin/packages/py-fenics-fiat/package.py index e7da9c9bc8..f6f82fdea6 100644 --- a/var/spack/repos/builtin/packages/py-fenics-fiat/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-fiat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFenicsFiat(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fenics-instant/package.py b/var/spack/repos/builtin/packages/py-fenics-instant/package.py index 26f55832a9..061258df61 100644 --- a/var/spack/repos/builtin/packages/py-fenics-instant/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-instant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFenicsInstant(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fenics-ufl/package.py b/var/spack/repos/builtin/packages/py-fenics-ufl/package.py index fa86887ee9..2f02972f66 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ufl/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ufl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFenicsUfl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-filelock/package.py b/var/spack/repos/builtin/packages/py-filelock/package.py index a37af63d1f..c89cb7b505 100644 --- a/var/spack/repos/builtin/packages/py-filelock/package.py +++ b/var/spack/repos/builtin/packages/py-filelock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFilelock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-filemagic/package.py b/var/spack/repos/builtin/packages/py-filemagic/package.py index 62955f47fc..689618d002 100644 --- a/var/spack/repos/builtin/packages/py-filemagic/package.py +++ b/var/spack/repos/builtin/packages/py-filemagic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFilemagic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-filterpy/package.py b/var/spack/repos/builtin/packages/py-filterpy/package.py index 5fa52b9e05..15cb277072 100644 --- a/var/spack/repos/builtin/packages/py-filterpy/package.py +++ b/var/spack/repos/builtin/packages/py-filterpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFilterpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-findlibs/package.py b/var/spack/repos/builtin/packages/py-findlibs/package.py index 9d21770275..2776015011 100644 --- a/var/spack/repos/builtin/packages/py-findlibs/package.py +++ b/var/spack/repos/builtin/packages/py-findlibs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFindlibs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fiona/package.py b/var/spack/repos/builtin/packages/py-fiona/package.py index 16c922d701..e6cd7f60b1 100644 --- a/var/spack/repos/builtin/packages/py-fiona/package.py +++ b/var/spack/repos/builtin/packages/py-fiona/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFiona(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fire/package.py b/var/spack/repos/builtin/packages/py-fire/package.py index d8b5876526..5b4119e024 100644 --- a/var/spack/repos/builtin/packages/py-fire/package.py +++ b/var/spack/repos/builtin/packages/py-fire/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFire(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fiscalyear/package.py b/var/spack/repos/builtin/packages/py-fiscalyear/package.py index c4ab2b10a0..2f45fbd640 100644 --- a/var/spack/repos/builtin/packages/py-fiscalyear/package.py +++ b/var/spack/repos/builtin/packages/py-fiscalyear/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFiscalyear(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fisher/package.py b/var/spack/repos/builtin/packages/py-fisher/package.py index 52e1950c25..1c23ab98f0 100644 --- a/var/spack/repos/builtin/packages/py-fisher/package.py +++ b/var/spack/repos/builtin/packages/py-fisher/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFisher(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fits-tools/package.py b/var/spack/repos/builtin/packages/py-fits-tools/package.py index bbab58b445..b1b6b1c72c 100644 --- a/var/spack/repos/builtin/packages/py-fits-tools/package.py +++ b/var/spack/repos/builtin/packages/py-fits-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFitsTools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fixtures/package.py b/var/spack/repos/builtin/packages/py-fixtures/package.py index c0803f1bdc..0ee77caac9 100644 --- a/var/spack/repos/builtin/packages/py-fixtures/package.py +++ b/var/spack/repos/builtin/packages/py-fixtures/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFixtures(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flake8-import-order/package.py b/var/spack/repos/builtin/packages/py-flake8-import-order/package.py index 95caf6aec7..73d4a06e03 100644 --- a/var/spack/repos/builtin/packages/py-flake8-import-order/package.py +++ b/var/spack/repos/builtin/packages/py-flake8-import-order/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlake8ImportOrder(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py index 05ece33452..41b607915b 100644 --- a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py +++ b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlake8Polyfill(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index cb55674386..a3585ea82e 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlake8(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flameprof/package.py b/var/spack/repos/builtin/packages/py-flameprof/package.py index 741f899867..f2f811b43b 100644 --- a/var/spack/repos/builtin/packages/py-flameprof/package.py +++ b/var/spack/repos/builtin/packages/py-flameprof/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlameprof(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flask-babel/package.py b/var/spack/repos/builtin/packages/py-flask-babel/package.py index c7f92fd6c6..384a399572 100644 --- a/var/spack/repos/builtin/packages/py-flask-babel/package.py +++ b/var/spack/repos/builtin/packages/py-flask-babel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlaskBabel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flask-compress/package.py b/var/spack/repos/builtin/packages/py-flask-compress/package.py index 5fc6721676..4c7228e092 100644 --- a/var/spack/repos/builtin/packages/py-flask-compress/package.py +++ b/var/spack/repos/builtin/packages/py-flask-compress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlaskCompress(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flask-cors/package.py b/var/spack/repos/builtin/packages/py-flask-cors/package.py index 865d0be047..5ff27120ec 100644 --- a/var/spack/repos/builtin/packages/py-flask-cors/package.py +++ b/var/spack/repos/builtin/packages/py-flask-cors/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlaskCors(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flask-restful/package.py b/var/spack/repos/builtin/packages/py-flask-restful/package.py index 23a657185d..34b79ecc8a 100644 --- a/var/spack/repos/builtin/packages/py-flask-restful/package.py +++ b/var/spack/repos/builtin/packages/py-flask-restful/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlaskRestful(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flask-socketio/package.py b/var/spack/repos/builtin/packages/py-flask-socketio/package.py index 4bf3d1b0dc..fd52577f78 100644 --- a/var/spack/repos/builtin/packages/py-flask-socketio/package.py +++ b/var/spack/repos/builtin/packages/py-flask-socketio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlaskSocketio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flask/package.py b/var/spack/repos/builtin/packages/py-flask/package.py index a9c2e7501a..b54ac498f5 100644 --- a/var/spack/repos/builtin/packages/py-flask/package.py +++ b/var/spack/repos/builtin/packages/py-flask/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlask(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flatbuffers/package.py b/var/spack/repos/builtin/packages/py-flatbuffers/package.py index b7f94a28e0..40e2c52237 100644 --- a/var/spack/repos/builtin/packages/py-flatbuffers/package.py +++ b/var/spack/repos/builtin/packages/py-flatbuffers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlatbuffers(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flatten-dict/package.py b/var/spack/repos/builtin/packages/py-flatten-dict/package.py index 2feaf7dc96..51f4afc0a2 100644 --- a/var/spack/repos/builtin/packages/py-flatten-dict/package.py +++ b/var/spack/repos/builtin/packages/py-flatten-dict/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlattenDict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flawfinder/package.py b/var/spack/repos/builtin/packages/py-flawfinder/package.py index a62ba2a792..aa3efda6e0 100644 --- a/var/spack/repos/builtin/packages/py-flawfinder/package.py +++ b/var/spack/repos/builtin/packages/py-flawfinder/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlawfinder(PythonPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/py-flexmock/package.py b/var/spack/repos/builtin/packages/py-flexmock/package.py index 25545232d4..50cf7e4d46 100644 --- a/var/spack/repos/builtin/packages/py-flexmock/package.py +++ b/var/spack/repos/builtin/packages/py-flexmock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlexmock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flexx/package.py b/var/spack/repos/builtin/packages/py-flexx/package.py index a1c73242b2..24f61060a4 100644 --- a/var/spack/repos/builtin/packages/py-flexx/package.py +++ b/var/spack/repos/builtin/packages/py-flexx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlexx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flit-core/package.py b/var/spack/repos/builtin/packages/py-flit-core/package.py index a970836b04..0a08dd2db6 100644 --- a/var/spack/repos/builtin/packages/py-flit-core/package.py +++ b/var/spack/repos/builtin/packages/py-flit-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlitCore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flit/package.py b/var/spack/repos/builtin/packages/py-flit/package.py index 59407cfc1c..be77d82eb0 100644 --- a/var/spack/repos/builtin/packages/py-flit/package.py +++ b/var/spack/repos/builtin/packages/py-flit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flufl-lock/package.py b/var/spack/repos/builtin/packages/py-flufl-lock/package.py index ff6c784587..ef8921d9b6 100644 --- a/var/spack/repos/builtin/packages/py-flufl-lock/package.py +++ b/var/spack/repos/builtin/packages/py-flufl-lock/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFluflLock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-flye/package.py b/var/spack/repos/builtin/packages/py-flye/package.py index ac0c3aefcf..e42549478f 100644 --- a/var/spack/repos/builtin/packages/py-flye/package.py +++ b/var/spack/repos/builtin/packages/py-flye/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFlye(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fn-py/package.py b/var/spack/repos/builtin/packages/py-fn-py/package.py index 6243152350..9a7ed60538 100644 --- a/var/spack/repos/builtin/packages/py-fn-py/package.py +++ b/var/spack/repos/builtin/packages/py-fn-py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFnPy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fonttools/package.py b/var/spack/repos/builtin/packages/py-fonttools/package.py index 3800b1194c..728671e2da 100644 --- a/var/spack/repos/builtin/packages/py-fonttools/package.py +++ b/var/spack/repos/builtin/packages/py-fonttools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFonttools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-formatizer/package.py b/var/spack/repos/builtin/packages/py-formatizer/package.py index f324e85014..1eebaf5d9a 100644 --- a/var/spack/repos/builtin/packages/py-formatizer/package.py +++ b/var/spack/repos/builtin/packages/py-formatizer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFormatizer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-formulaic/package.py b/var/spack/repos/builtin/packages/py-formulaic/package.py index 241cae9bd2..06ac7810fa 100644 --- a/var/spack/repos/builtin/packages/py-formulaic/package.py +++ b/var/spack/repos/builtin/packages/py-formulaic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFormulaic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fortran-language-server/package.py b/var/spack/repos/builtin/packages/py-fortran-language-server/package.py index 7e716ba97e..1cae0f9f23 100644 --- a/var/spack/repos/builtin/packages/py-fortran-language-server/package.py +++ b/var/spack/repos/builtin/packages/py-fortran-language-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFortranLanguageServer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fortranformat/package.py b/var/spack/repos/builtin/packages/py-fortranformat/package.py index 9eb2e145f9..02ec5b97f6 100644 --- a/var/spack/repos/builtin/packages/py-fortranformat/package.py +++ b/var/spack/repos/builtin/packages/py-fortranformat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFortranformat(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fparser/package.py b/var/spack/repos/builtin/packages/py-fparser/package.py index 23bd6a20c3..0e8e3977c6 100644 --- a/var/spack/repos/builtin/packages/py-fparser/package.py +++ b/var/spack/repos/builtin/packages/py-fparser/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyFparser(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fprettify/package.py b/var/spack/repos/builtin/packages/py-fprettify/package.py index 52560c8345..ba170e6af1 100644 --- a/var/spack/repos/builtin/packages/py-fprettify/package.py +++ b/var/spack/repos/builtin/packages/py-fprettify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFprettify(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fracridge/package.py b/var/spack/repos/builtin/packages/py-fracridge/package.py index 07b622ee45..efacc18bad 100644 --- a/var/spack/repos/builtin/packages/py-fracridge/package.py +++ b/var/spack/repos/builtin/packages/py-fracridge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFracridge(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-freezegun/package.py b/var/spack/repos/builtin/packages/py-freezegun/package.py index 3abad2f093..dfcd94996d 100644 --- a/var/spack/repos/builtin/packages/py-freezegun/package.py +++ b/var/spack/repos/builtin/packages/py-freezegun/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFreezegun(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-frozenlist/package.py b/var/spack/repos/builtin/packages/py-frozenlist/package.py index b7e3e97836..0672302786 100644 --- a/var/spack/repos/builtin/packages/py-frozenlist/package.py +++ b/var/spack/repos/builtin/packages/py-frozenlist/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFrozenlist(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fs/package.py b/var/spack/repos/builtin/packages/py-fs/package.py index 24a5acd3e1..d21cd80691 100644 --- a/var/spack/repos/builtin/packages/py-fs/package.py +++ b/var/spack/repos/builtin/packages/py-fs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fsspec/package.py b/var/spack/repos/builtin/packages/py-fsspec/package.py index 9d6206309f..da07207a3f 100644 --- a/var/spack/repos/builtin/packages/py-fsspec/package.py +++ b/var/spack/repos/builtin/packages/py-fsspec/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFsspec(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ftfy/package.py b/var/spack/repos/builtin/packages/py-ftfy/package.py index 0d5dacdf86..b7ab70eb33 100644 --- a/var/spack/repos/builtin/packages/py-ftfy/package.py +++ b/var/spack/repos/builtin/packages/py-ftfy/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFtfy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-funcsigs/package.py b/var/spack/repos/builtin/packages/py-funcsigs/package.py index 2494c2f2fa..976e11e705 100644 --- a/var/spack/repos/builtin/packages/py-funcsigs/package.py +++ b/var/spack/repos/builtin/packages/py-funcsigs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFuncsigs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-functools32/package.py b/var/spack/repos/builtin/packages/py-functools32/package.py index 7c38a2ed1b..aacfe1cf62 100644 --- a/var/spack/repos/builtin/packages/py-functools32/package.py +++ b/var/spack/repos/builtin/packages/py-functools32/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFunctools32(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-funcy/package.py b/var/spack/repos/builtin/packages/py-funcy/package.py index 01b204d9b7..c26c474fd6 100644 --- a/var/spack/repos/builtin/packages/py-funcy/package.py +++ b/var/spack/repos/builtin/packages/py-funcy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFuncy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fury/package.py b/var/spack/repos/builtin/packages/py-fury/package.py index 1693c58e66..b51cd39866 100644 --- a/var/spack/repos/builtin/packages/py-fury/package.py +++ b/var/spack/repos/builtin/packages/py-fury/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFury(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fusepy/package.py b/var/spack/repos/builtin/packages/py-fusepy/package.py index 249bd568aa..172015fb3d 100644 --- a/var/spack/repos/builtin/packages/py-fusepy/package.py +++ b/var/spack/repos/builtin/packages/py-fusepy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFusepy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-future/package.py b/var/spack/repos/builtin/packages/py-future/package.py index 1ae3b84230..6a8bb1c062 100644 --- a/var/spack/repos/builtin/packages/py-future/package.py +++ b/var/spack/repos/builtin/packages/py-future/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFuture(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-futures/package.py b/var/spack/repos/builtin/packages/py-futures/package.py index d7c1118e38..e6ea700ab3 100644 --- a/var/spack/repos/builtin/packages/py-futures/package.py +++ b/var/spack/repos/builtin/packages/py-futures/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFutures(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fuzzywuzzy/package.py b/var/spack/repos/builtin/packages/py-fuzzywuzzy/package.py index d006ff1473..2175f663a9 100644 --- a/var/spack/repos/builtin/packages/py-fuzzywuzzy/package.py +++ b/var/spack/repos/builtin/packages/py-fuzzywuzzy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFuzzywuzzy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-fypp/package.py b/var/spack/repos/builtin/packages/py-fypp/package.py index 21e500a779..68273242f4 100644 --- a/var/spack/repos/builtin/packages/py-fypp/package.py +++ b/var/spack/repos/builtin/packages/py-fypp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyFypp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gast/package.py b/var/spack/repos/builtin/packages/py-gast/package.py index ea6f565af8..35a6c52cf7 100644 --- a/var/spack/repos/builtin/packages/py-gast/package.py +++ b/var/spack/repos/builtin/packages/py-gast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGast(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gcovr/package.py b/var/spack/repos/builtin/packages/py-gcovr/package.py index f95a5dbe89..e280f1f53f 100644 --- a/var/spack/repos/builtin/packages/py-gcovr/package.py +++ b/var/spack/repos/builtin/packages/py-gcovr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGcovr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py b/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py index 224a2eb7a2..0cefd8896d 100644 --- a/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py +++ b/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGcsOauth2BotoPlugin(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gdbgui/package.py b/var/spack/repos/builtin/packages/py-gdbgui/package.py index e20c6284e4..965571a3cb 100644 --- a/var/spack/repos/builtin/packages/py-gdbgui/package.py +++ b/var/spack/repos/builtin/packages/py-gdbgui/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGdbgui(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gdc-client/package.py b/var/spack/repos/builtin/packages/py-gdc-client/package.py index 675535e3e0..36a221a34b 100644 --- a/var/spack/repos/builtin/packages/py-gdc-client/package.py +++ b/var/spack/repos/builtin/packages/py-gdc-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGdcClient(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gee-asset-manager/package.py b/var/spack/repos/builtin/packages/py-gee-asset-manager/package.py index 23a976fc30..7e38425ecd 100644 --- a/var/spack/repos/builtin/packages/py-gee-asset-manager/package.py +++ b/var/spack/repos/builtin/packages/py-gee-asset-manager/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeeAssetManager(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-geeadd/package.py b/var/spack/repos/builtin/packages/py-geeadd/package.py index 8ca78159c4..45d8017609 100644 --- a/var/spack/repos/builtin/packages/py-geeadd/package.py +++ b/var/spack/repos/builtin/packages/py-geeadd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeeadd(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-geeup/package.py b/var/spack/repos/builtin/packages/py-geeup/package.py index efdc696bb8..00dfc47a14 100644 --- a/var/spack/repos/builtin/packages/py-geeup/package.py +++ b/var/spack/repos/builtin/packages/py-geeup/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeeup(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gemini/package.py b/var/spack/repos/builtin/packages/py-gemini/package.py index befab8a3dd..028377e838 100644 --- a/var/spack/repos/builtin/packages/py-gemini/package.py +++ b/var/spack/repos/builtin/packages/py-gemini/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGemini(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-genders/package.py b/var/spack/repos/builtin/packages/py-genders/package.py index d86d655455..8728a8d174 100644 --- a/var/spack/repos/builtin/packages/py-genders/package.py +++ b/var/spack/repos/builtin/packages/py-genders/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGenders(Package): diff --git a/var/spack/repos/builtin/packages/py-geneimpacts/package.py b/var/spack/repos/builtin/packages/py-geneimpacts/package.py index 8407a063da..0774bdef44 100644 --- a/var/spack/repos/builtin/packages/py-geneimpacts/package.py +++ b/var/spack/repos/builtin/packages/py-geneimpacts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeneimpacts(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-genshi/package.py b/var/spack/repos/builtin/packages/py-genshi/package.py index f40cd6a6a2..bcf35f72ca 100644 --- a/var/spack/repos/builtin/packages/py-genshi/package.py +++ b/var/spack/repos/builtin/packages/py-genshi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGenshi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gensim/package.py b/var/spack/repos/builtin/packages/py-gensim/package.py index b7ea52cf8c..c38f56b5fd 100644 --- a/var/spack/repos/builtin/packages/py-gensim/package.py +++ b/var/spack/repos/builtin/packages/py-gensim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGensim(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-geoalchemy2/package.py b/var/spack/repos/builtin/packages/py-geoalchemy2/package.py index ae5cec185b..22d9819101 100644 --- a/var/spack/repos/builtin/packages/py-geoalchemy2/package.py +++ b/var/spack/repos/builtin/packages/py-geoalchemy2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeoalchemy2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-geocube/package.py b/var/spack/repos/builtin/packages/py-geocube/package.py index 0e357e96d6..9c5d7fc992 100644 --- a/var/spack/repos/builtin/packages/py-geocube/package.py +++ b/var/spack/repos/builtin/packages/py-geocube/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeocube(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-geographiclib/package.py b/var/spack/repos/builtin/packages/py-geographiclib/package.py index d8293adbda..81c0c9fe6d 100644 --- a/var/spack/repos/builtin/packages/py-geographiclib/package.py +++ b/var/spack/repos/builtin/packages/py-geographiclib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeographiclib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-geopandas/package.py b/var/spack/repos/builtin/packages/py-geopandas/package.py index 3f7294f2bf..d0b9b2ed74 100644 --- a/var/spack/repos/builtin/packages/py-geopandas/package.py +++ b/var/spack/repos/builtin/packages/py-geopandas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeopandas(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-geoplot/package.py b/var/spack/repos/builtin/packages/py-geoplot/package.py index 2ef3b5cc29..9ca0c6b2ed 100644 --- a/var/spack/repos/builtin/packages/py-geoplot/package.py +++ b/var/spack/repos/builtin/packages/py-geoplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeoplot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-geopy/package.py b/var/spack/repos/builtin/packages/py-geopy/package.py index d798ab73ce..4f4f5b7a9b 100644 --- a/var/spack/repos/builtin/packages/py-geopy/package.py +++ b/var/spack/repos/builtin/packages/py-geopy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGeopy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-getorganelle/package.py b/var/spack/repos/builtin/packages/py-getorganelle/package.py index 493a553f6a..336e534ea1 100644 --- a/var/spack/repos/builtin/packages/py-getorganelle/package.py +++ b/var/spack/repos/builtin/packages/py-getorganelle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGetorganelle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gevent/package.py b/var/spack/repos/builtin/packages/py-gevent/package.py index 55189d4d73..dafb598df7 100644 --- a/var/spack/repos/builtin/packages/py-gevent/package.py +++ b/var/spack/repos/builtin/packages/py-gevent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGevent(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gf256/package.py b/var/spack/repos/builtin/packages/py-gf256/package.py index ce98d06bc3..88d6500ee9 100644 --- a/var/spack/repos/builtin/packages/py-gf256/package.py +++ b/var/spack/repos/builtin/packages/py-gf256/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGf256(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gffutils/package.py b/var/spack/repos/builtin/packages/py-gffutils/package.py index 315e0a8125..19daff5b50 100644 --- a/var/spack/repos/builtin/packages/py-gffutils/package.py +++ b/var/spack/repos/builtin/packages/py-gffutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGffutils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gimmik/package.py b/var/spack/repos/builtin/packages/py-gimmik/package.py index 30744e54e2..2a61245fbb 100644 --- a/var/spack/repos/builtin/packages/py-gimmik/package.py +++ b/var/spack/repos/builtin/packages/py-gimmik/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGimmik(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gin-config/package.py b/var/spack/repos/builtin/packages/py-gin-config/package.py index 7dd492a2ab..23d3aae0c1 100644 --- a/var/spack/repos/builtin/packages/py-gin-config/package.py +++ b/var/spack/repos/builtin/packages/py-gin-config/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGinConfig(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-git-review/package.py b/var/spack/repos/builtin/packages/py-git-review/package.py index c13971448e..4c3d257bb0 100644 --- a/var/spack/repos/builtin/packages/py-git-review/package.py +++ b/var/spack/repos/builtin/packages/py-git-review/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGitReview(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gitdb/package.py b/var/spack/repos/builtin/packages/py-gitdb/package.py index 78a09f555e..6be57181fb 100644 --- a/var/spack/repos/builtin/packages/py-gitdb/package.py +++ b/var/spack/repos/builtin/packages/py-gitdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGitdb(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gitpython/package.py b/var/spack/repos/builtin/packages/py-gitpython/package.py index b3c74ed3a0..0eda44884e 100644 --- a/var/spack/repos/builtin/packages/py-gitpython/package.py +++ b/var/spack/repos/builtin/packages/py-gitpython/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGitpython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-glmnet/package.py b/var/spack/repos/builtin/packages/py-glmnet/package.py index 1c678fb9d6..acbe668dc4 100644 --- a/var/spack/repos/builtin/packages/py-glmnet/package.py +++ b/var/spack/repos/builtin/packages/py-glmnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGlmnet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-glob2/package.py b/var/spack/repos/builtin/packages/py-glob2/package.py index f91e2b6cce..57c146492b 100644 --- a/var/spack/repos/builtin/packages/py-glob2/package.py +++ b/var/spack/repos/builtin/packages/py-glob2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGlob2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-globus-sdk/package.py b/var/spack/repos/builtin/packages/py-globus-sdk/package.py index f9909ea5d8..ec8294f600 100644 --- a/var/spack/repos/builtin/packages/py-globus-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-globus-sdk/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGlobusSdk(PythonPackage): """ Globus SDK for Python diff --git a/var/spack/repos/builtin/packages/py-gluoncv/package.py b/var/spack/repos/builtin/packages/py-gluoncv/package.py index 41621dd5db..5cbadcfd38 100644 --- a/var/spack/repos/builtin/packages/py-gluoncv/package.py +++ b/var/spack/repos/builtin/packages/py-gluoncv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGluoncv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gnuplot/package.py b/var/spack/repos/builtin/packages/py-gnuplot/package.py index b6607a59fb..8a1e3e5d5d 100644 --- a/var/spack/repos/builtin/packages/py-gnuplot/package.py +++ b/var/spack/repos/builtin/packages/py-gnuplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGnuplot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-goatools/package.py b/var/spack/repos/builtin/packages/py-goatools/package.py index 1f4ffa8a81..358b445f5b 100644 --- a/var/spack/repos/builtin/packages/py-goatools/package.py +++ b/var/spack/repos/builtin/packages/py-goatools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoatools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gooey/package.py b/var/spack/repos/builtin/packages/py-gooey/package.py index 12d3e7119c..fb1a5716a9 100644 --- a/var/spack/repos/builtin/packages/py-gooey/package.py +++ b/var/spack/repos/builtin/packages/py-gooey/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGooey(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-api-core/package.py b/var/spack/repos/builtin/packages/py-google-api-core/package.py index a283ce0f7c..6c3e0f8af5 100644 --- a/var/spack/repos/builtin/packages/py-google-api-core/package.py +++ b/var/spack/repos/builtin/packages/py-google-api-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleApiCore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-api-python-client/package.py b/var/spack/repos/builtin/packages/py-google-api-python-client/package.py index 970ec22f9b..92268c07d5 100644 --- a/var/spack/repos/builtin/packages/py-google-api-python-client/package.py +++ b/var/spack/repos/builtin/packages/py-google-api-python-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleApiPythonClient(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-apitools/package.py b/var/spack/repos/builtin/packages/py-google-apitools/package.py index 7a417f3b55..6f778eb9df 100644 --- a/var/spack/repos/builtin/packages/py-google-apitools/package.py +++ b/var/spack/repos/builtin/packages/py-google-apitools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleApitools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-auth-httplib2/package.py b/var/spack/repos/builtin/packages/py-google-auth-httplib2/package.py index 2b0000faca..1d8d7b52c5 100644 --- a/var/spack/repos/builtin/packages/py-google-auth-httplib2/package.py +++ b/var/spack/repos/builtin/packages/py-google-auth-httplib2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleAuthHttplib2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-auth-oauthlib/package.py b/var/spack/repos/builtin/packages/py-google-auth-oauthlib/package.py index 1938580c6c..e09b70733c 100644 --- a/var/spack/repos/builtin/packages/py-google-auth-oauthlib/package.py +++ b/var/spack/repos/builtin/packages/py-google-auth-oauthlib/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGoogleAuthOauthlib(PythonPackage): """This library provides oauthlib integration with google-auth.""" diff --git a/var/spack/repos/builtin/packages/py-google-auth/package.py b/var/spack/repos/builtin/packages/py-google-auth/package.py index bacc89053a..8552f701ea 100644 --- a/var/spack/repos/builtin/packages/py-google-auth/package.py +++ b/var/spack/repos/builtin/packages/py-google-auth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleAuth(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-cloud-core/package.py b/var/spack/repos/builtin/packages/py-google-cloud-core/package.py index 1070a556db..77a25a1b58 100644 --- a/var/spack/repos/builtin/packages/py-google-cloud-core/package.py +++ b/var/spack/repos/builtin/packages/py-google-cloud-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleCloudCore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py b/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py index d3ea6806fa..647689aa42 100644 --- a/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py +++ b/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleCloudStorage(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-crc32c/package.py b/var/spack/repos/builtin/packages/py-google-crc32c/package.py index b7d8047971..94e5a46a6b 100644 --- a/var/spack/repos/builtin/packages/py-google-crc32c/package.py +++ b/var/spack/repos/builtin/packages/py-google-crc32c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleCrc32c(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-pasta/package.py b/var/spack/repos/builtin/packages/py-google-pasta/package.py index 174a5cc47e..158e064578 100644 --- a/var/spack/repos/builtin/packages/py-google-pasta/package.py +++ b/var/spack/repos/builtin/packages/py-google-pasta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGooglePasta(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google-resumable-media/package.py b/var/spack/repos/builtin/packages/py-google-resumable-media/package.py index affd0a491d..2409ccaf83 100644 --- a/var/spack/repos/builtin/packages/py-google-resumable-media/package.py +++ b/var/spack/repos/builtin/packages/py-google-resumable-media/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleResumableMedia(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-google/package.py b/var/spack/repos/builtin/packages/py-google/package.py index df7f397852..612676c24c 100644 --- a/var/spack/repos/builtin/packages/py-google/package.py +++ b/var/spack/repos/builtin/packages/py-google/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGoogle(PythonPackage): """Python bindings to the Google search engine.""" diff --git a/var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py b/var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py index e397584198..4152b2ad7c 100644 --- a/var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py +++ b/var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGoogleapisCommonProtos(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-googledrivedownloader/package.py b/var/spack/repos/builtin/packages/py-googledrivedownloader/package.py index 9ef01b7717..ea9f5eae6c 100644 --- a/var/spack/repos/builtin/packages/py-googledrivedownloader/package.py +++ b/var/spack/repos/builtin/packages/py-googledrivedownloader/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGoogledrivedownloader(PythonPackage): """Minimal class to download shared files from Google Drive.""" diff --git a/var/spack/repos/builtin/packages/py-gosam/package.py b/var/spack/repos/builtin/packages/py-gosam/package.py index afbbf5532b..930491e410 100644 --- a/var/spack/repos/builtin/packages/py-gosam/package.py +++ b/var/spack/repos/builtin/packages/py-gosam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGosam(Package): diff --git a/var/spack/repos/builtin/packages/py-gpaw/package.py b/var/spack/repos/builtin/packages/py-gpaw/package.py index d3a215298b..2c6d7d7657 100644 --- a/var/spack/repos/builtin/packages/py-gpaw/package.py +++ b/var/spack/repos/builtin/packages/py-gpaw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGpaw(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gpustat/package.py b/var/spack/repos/builtin/packages/py-gpustat/package.py index 79d9264b88..d141ade352 100644 --- a/var/spack/repos/builtin/packages/py-gpustat/package.py +++ b/var/spack/repos/builtin/packages/py-gpustat/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGpustat(PythonPackage): """An utility to monitor NVIDIA GPU status and usage.""" diff --git a/var/spack/repos/builtin/packages/py-gputil/package.py b/var/spack/repos/builtin/packages/py-gputil/package.py index 5af7aeff94..098ad4ced7 100644 --- a/var/spack/repos/builtin/packages/py-gputil/package.py +++ b/var/spack/repos/builtin/packages/py-gputil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGputil(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gpy/package.py b/var/spack/repos/builtin/packages/py-gpy/package.py index e7ff0563c6..fb35558fa1 100644 --- a/var/spack/repos/builtin/packages/py-gpy/package.py +++ b/var/spack/repos/builtin/packages/py-gpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gpyopt/package.py b/var/spack/repos/builtin/packages/py-gpyopt/package.py index 36587f7099..4597b9e736 100644 --- a/var/spack/repos/builtin/packages/py-gpyopt/package.py +++ b/var/spack/repos/builtin/packages/py-gpyopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGpyopt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gpytorch/package.py b/var/spack/repos/builtin/packages/py-gpytorch/package.py index 0667c16558..e72659dfbc 100644 --- a/var/spack/repos/builtin/packages/py-gpytorch/package.py +++ b/var/spack/repos/builtin/packages/py-gpytorch/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGpytorch(PythonPackage): """GPyTorch is a Gaussian process library implemented using PyTorch. GPyTorch is designed for creating scalable, flexible, and modular Gaussian diff --git a/var/spack/repos/builtin/packages/py-gql/package.py b/var/spack/repos/builtin/packages/py-gql/package.py index b249f3dd00..e50c477392 100644 --- a/var/spack/repos/builtin/packages/py-gql/package.py +++ b/var/spack/repos/builtin/packages/py-gql/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGql(PythonPackage): """This is a GraphQL client for Python. Plays nicely with graphene, graphql-core, graphql-js and any other GraphQL diff --git a/var/spack/repos/builtin/packages/py-grandalf/package.py b/var/spack/repos/builtin/packages/py-grandalf/package.py index 754370bff7..e2b6028d56 100644 --- a/var/spack/repos/builtin/packages/py-grandalf/package.py +++ b/var/spack/repos/builtin/packages/py-grandalf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGrandalf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-graphql-core/package.py b/var/spack/repos/builtin/packages/py-graphql-core/package.py index ef9d56c5f0..8e9fbbe8c0 100644 --- a/var/spack/repos/builtin/packages/py-graphql-core/package.py +++ b/var/spack/repos/builtin/packages/py-graphql-core/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGraphqlCore(PythonPackage): """GraphQL-core 3 is a Python 3.6+ port of GraphQL.js, the JavaScript reference implementation for GraphQL, a query language diff --git a/var/spack/repos/builtin/packages/py-graphviz/package.py b/var/spack/repos/builtin/packages/py-graphviz/package.py index f2ccfb782d..6264d3f569 100644 --- a/var/spack/repos/builtin/packages/py-graphviz/package.py +++ b/var/spack/repos/builtin/packages/py-graphviz/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGraphviz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-greenlet/package.py b/var/spack/repos/builtin/packages/py-greenlet/package.py index 2044044aeb..7b1994bdfe 100644 --- a/var/spack/repos/builtin/packages/py-greenlet/package.py +++ b/var/spack/repos/builtin/packages/py-greenlet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGreenlet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-grequests/package.py b/var/spack/repos/builtin/packages/py-grequests/package.py index 2e8c497230..3f795e7019 100644 --- a/var/spack/repos/builtin/packages/py-grequests/package.py +++ b/var/spack/repos/builtin/packages/py-grequests/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGrequests(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-griddataformats/package.py b/var/spack/repos/builtin/packages/py-griddataformats/package.py index f8bd1fefb9..82d8c25b56 100644 --- a/var/spack/repos/builtin/packages/py-griddataformats/package.py +++ b/var/spack/repos/builtin/packages/py-griddataformats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGriddataformats(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-grpcio-tools/package.py b/var/spack/repos/builtin/packages/py-grpcio-tools/package.py index 30bd927371..876da4280b 100644 --- a/var/spack/repos/builtin/packages/py-grpcio-tools/package.py +++ b/var/spack/repos/builtin/packages/py-grpcio-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGrpcioTools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-grpcio/package.py b/var/spack/repos/builtin/packages/py-grpcio/package.py index 8dff157e9e..adcea8b43e 100644 --- a/var/spack/repos/builtin/packages/py-grpcio/package.py +++ b/var/spack/repos/builtin/packages/py-grpcio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGrpcio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gsd/package.py b/var/spack/repos/builtin/packages/py-gsd/package.py index 123c4139aa..e7b26fa2a2 100644 --- a/var/spack/repos/builtin/packages/py-gsd/package.py +++ b/var/spack/repos/builtin/packages/py-gsd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGsd(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gsi/package.py b/var/spack/repos/builtin/packages/py-gsi/package.py index 41ac2eefca..17154e2031 100644 --- a/var/spack/repos/builtin/packages/py-gsi/package.py +++ b/var/spack/repos/builtin/packages/py-gsi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGsi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gsutil/package.py b/var/spack/repos/builtin/packages/py-gsutil/package.py index 7248d68e6f..d254145584 100644 --- a/var/spack/repos/builtin/packages/py-gsutil/package.py +++ b/var/spack/repos/builtin/packages/py-gsutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGsutil(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-guidata/package.py b/var/spack/repos/builtin/packages/py-guidata/package.py index 5924c5cb4d..55c92a009e 100644 --- a/var/spack/repos/builtin/packages/py-guidata/package.py +++ b/var/spack/repos/builtin/packages/py-guidata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGuidata(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-guiqwt/package.py b/var/spack/repos/builtin/packages/py-guiqwt/package.py index 3465e51e48..d06af6c21d 100644 --- a/var/spack/repos/builtin/packages/py-guiqwt/package.py +++ b/var/spack/repos/builtin/packages/py-guiqwt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyGuiqwt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-gym/package.py b/var/spack/repos/builtin/packages/py-gym/package.py index 64dec8e2ba..6d9e614a46 100644 --- a/var/spack/repos/builtin/packages/py-gym/package.py +++ b/var/spack/repos/builtin/packages/py-gym/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyGym(PythonPackage): """OpenAI Gym is a toolkit for developing and comparing reinforcement learning algorithms. This is the gym open-source diff --git a/var/spack/repos/builtin/packages/py-h11/package.py b/var/spack/repos/builtin/packages/py-h11/package.py index 775699af57..0601a21bfc 100644 --- a/var/spack/repos/builtin/packages/py-h11/package.py +++ b/var/spack/repos/builtin/packages/py-h11/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyH11(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-h2/package.py b/var/spack/repos/builtin/packages/py-h2/package.py index 80ec858786..dea8e71432 100644 --- a/var/spack/repos/builtin/packages/py-h2/package.py +++ b/var/spack/repos/builtin/packages/py-h2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyH2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-h5glance/package.py b/var/spack/repos/builtin/packages/py-h5glance/package.py index 38a3924699..7fba9af67f 100644 --- a/var/spack/repos/builtin/packages/py-h5glance/package.py +++ b/var/spack/repos/builtin/packages/py-h5glance/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyH5glance(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-h5netcdf/package.py b/var/spack/repos/builtin/packages/py-h5netcdf/package.py index 06478acc35..8183db9e02 100644 --- a/var/spack/repos/builtin/packages/py-h5netcdf/package.py +++ b/var/spack/repos/builtin/packages/py-h5netcdf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyH5netcdf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 0e71e29617..a99760c643 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyH5py(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-h5sh/package.py b/var/spack/repos/builtin/packages/py-h5sh/package.py index bf5d32d3d5..70be24f7e0 100644 --- a/var/spack/repos/builtin/packages/py-h5sh/package.py +++ b/var/spack/repos/builtin/packages/py-h5sh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyH5sh(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hacking/package.py b/var/spack/repos/builtin/packages/py-hacking/package.py index 3bf356abe1..4a20757b23 100644 --- a/var/spack/repos/builtin/packages/py-hacking/package.py +++ b/var/spack/repos/builtin/packages/py-hacking/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHacking(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-haphpipe/package.py b/var/spack/repos/builtin/packages/py-haphpipe/package.py index a6c68e055b..749f3b1798 100644 --- a/var/spack/repos/builtin/packages/py-haphpipe/package.py +++ b/var/spack/repos/builtin/packages/py-haphpipe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHaphpipe(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hatchet/package.py b/var/spack/repos/builtin/packages/py-hatchet/package.py index 084ab68717..f30578d1d2 100644 --- a/var/spack/repos/builtin/packages/py-hatchet/package.py +++ b/var/spack/repos/builtin/packages/py-hatchet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHatchet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hdbscan/package.py b/var/spack/repos/builtin/packages/py-hdbscan/package.py index ca7507bc34..203ff77e95 100644 --- a/var/spack/repos/builtin/packages/py-hdbscan/package.py +++ b/var/spack/repos/builtin/packages/py-hdbscan/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyHdbscan(PythonPackage): """HDBSCAN - Hierarchical Density-Based Spatial Clustering of Applications with Noise. Performs DBSCAN over varying epsilon diff --git a/var/spack/repos/builtin/packages/py-hdfs/package.py b/var/spack/repos/builtin/packages/py-hdfs/package.py index dfbf522074..4bb1998114 100644 --- a/var/spack/repos/builtin/packages/py-hdfs/package.py +++ b/var/spack/repos/builtin/packages/py-hdfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHdfs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-healpy/package.py b/var/spack/repos/builtin/packages/py-healpy/package.py index 2c5fb82297..548113e952 100644 --- a/var/spack/repos/builtin/packages/py-healpy/package.py +++ b/var/spack/repos/builtin/packages/py-healpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHealpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-heapdict/package.py b/var/spack/repos/builtin/packages/py-heapdict/package.py index 2d2467f0a6..b60a87c015 100644 --- a/var/spack/repos/builtin/packages/py-heapdict/package.py +++ b/var/spack/repos/builtin/packages/py-heapdict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHeapdict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hep-ml/package.py b/var/spack/repos/builtin/packages/py-hep-ml/package.py index f20e31e8ab..3520fcfcd8 100644 --- a/var/spack/repos/builtin/packages/py-hep-ml/package.py +++ b/var/spack/repos/builtin/packages/py-hep-ml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHepMl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hepdata-converter/package.py b/var/spack/repos/builtin/packages/py-hepdata-converter/package.py index 81cd35c458..d2eadbd3df 100644 --- a/var/spack/repos/builtin/packages/py-hepdata-converter/package.py +++ b/var/spack/repos/builtin/packages/py-hepdata-converter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHepdataConverter(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hepdata-lib/package.py b/var/spack/repos/builtin/packages/py-hepdata-lib/package.py index e6bc981bfe..b25fe44032 100644 --- a/var/spack/repos/builtin/packages/py-hepdata-lib/package.py +++ b/var/spack/repos/builtin/packages/py-hepdata-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHepdataLib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hepdata-validator/package.py b/var/spack/repos/builtin/packages/py-hepdata-validator/package.py index a3b4b10b98..128844c05c 100644 --- a/var/spack/repos/builtin/packages/py-hepdata-validator/package.py +++ b/var/spack/repos/builtin/packages/py-hepdata-validator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHepdataValidator(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hepunits/package.py b/var/spack/repos/builtin/packages/py-hepunits/package.py index a02141e21b..4090335272 100644 --- a/var/spack/repos/builtin/packages/py-hepunits/package.py +++ b/var/spack/repos/builtin/packages/py-hepunits/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHepunits(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hieroglyph/package.py b/var/spack/repos/builtin/packages/py-hieroglyph/package.py index 9741679a30..e6237a353b 100644 --- a/var/spack/repos/builtin/packages/py-hieroglyph/package.py +++ b/var/spack/repos/builtin/packages/py-hieroglyph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHieroglyph(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hiredis/package.py b/var/spack/repos/builtin/packages/py-hiredis/package.py index 875c860030..31fc3099fb 100644 --- a/var/spack/repos/builtin/packages/py-hiredis/package.py +++ b/var/spack/repos/builtin/packages/py-hiredis/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyHiredis(PythonPackage): """Python extension that wraps protocol parsing code in hiredis. It primarily speeds up parsing of multi bulk replies.""" diff --git a/var/spack/repos/builtin/packages/py-hist/package.py b/var/spack/repos/builtin/packages/py-hist/package.py index 993a748a7c..77e37cb3a4 100644 --- a/var/spack/repos/builtin/packages/py-hist/package.py +++ b/var/spack/repos/builtin/packages/py-hist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHist(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-histbook/package.py b/var/spack/repos/builtin/packages/py-histbook/package.py index 083d7c14bf..5ea7583141 100644 --- a/var/spack/repos/builtin/packages/py-histbook/package.py +++ b/var/spack/repos/builtin/packages/py-histbook/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHistbook(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-histogrammar/package.py b/var/spack/repos/builtin/packages/py-histogrammar/package.py index 197cddf246..96ecc8972b 100644 --- a/var/spack/repos/builtin/packages/py-histogrammar/package.py +++ b/var/spack/repos/builtin/packages/py-histogrammar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHistogrammar(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-histoprint/package.py b/var/spack/repos/builtin/packages/py-histoprint/package.py index 56295a0f72..288caf16eb 100644 --- a/var/spack/repos/builtin/packages/py-histoprint/package.py +++ b/var/spack/repos/builtin/packages/py-histoprint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHistoprint(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-holland-backup/package.py b/var/spack/repos/builtin/packages/py-holland-backup/package.py index bee95935eb..e794d1deb5 100644 --- a/var/spack/repos/builtin/packages/py-holland-backup/package.py +++ b/var/spack/repos/builtin/packages/py-holland-backup/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHollandBackup(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-horovod/package.py b/var/spack/repos/builtin/packages/py-horovod/package.py index eed7ca386d..993882bafe 100644 --- a/var/spack/repos/builtin/packages/py-horovod/package.py +++ b/var/spack/repos/builtin/packages/py-horovod/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyHorovod(PythonPackage, CudaPackage): """Horovod is a distributed deep learning training framework for TensorFlow, Keras, PyTorch, and Apache MXNet.""" diff --git a/var/spack/repos/builtin/packages/py-hpack/package.py b/var/spack/repos/builtin/packages/py-hpack/package.py index 66c4c8058a..855b232f05 100644 --- a/var/spack/repos/builtin/packages/py-hpack/package.py +++ b/var/spack/repos/builtin/packages/py-hpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHpack(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hpbandster/package.py b/var/spack/repos/builtin/packages/py-hpbandster/package.py index 14fd5d7b5b..bd786f637c 100644 --- a/var/spack/repos/builtin/packages/py-hpbandster/package.py +++ b/var/spack/repos/builtin/packages/py-hpbandster/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # Package automatically generated using 'pip2spack' converter diff --git a/var/spack/repos/builtin/packages/py-hpcbench/package.py b/var/spack/repos/builtin/packages/py-hpcbench/package.py index c46122eb1a..92ce2208b2 100644 --- a/var/spack/repos/builtin/packages/py-hpcbench/package.py +++ b/var/spack/repos/builtin/packages/py-hpcbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHpcbench(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hpccm/package.py b/var/spack/repos/builtin/packages/py-hpccm/package.py index dbab9d5b35..697585ee3f 100644 --- a/var/spack/repos/builtin/packages/py-hpccm/package.py +++ b/var/spack/repos/builtin/packages/py-hpccm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHpccm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hstspreload/package.py b/var/spack/repos/builtin/packages/py-hstspreload/package.py index 6c72bca71b..1492fbca80 100644 --- a/var/spack/repos/builtin/packages/py-hstspreload/package.py +++ b/var/spack/repos/builtin/packages/py-hstspreload/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHstspreload(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-html2text/package.py b/var/spack/repos/builtin/packages/py-html2text/package.py index 960957aa73..5e82046b83 100644 --- a/var/spack/repos/builtin/packages/py-html2text/package.py +++ b/var/spack/repos/builtin/packages/py-html2text/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHtml2text(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-html5lib/package.py b/var/spack/repos/builtin/packages/py-html5lib/package.py index 86c512b6f8..4f912843f2 100644 --- a/var/spack/repos/builtin/packages/py-html5lib/package.py +++ b/var/spack/repos/builtin/packages/py-html5lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHtml5lib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-htmlgen/package.py b/var/spack/repos/builtin/packages/py-htmlgen/package.py index 1d5f9c0d16..e6f37cc8dd 100644 --- a/var/spack/repos/builtin/packages/py-htmlgen/package.py +++ b/var/spack/repos/builtin/packages/py-htmlgen/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHtmlgen(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-htseq/package.py b/var/spack/repos/builtin/packages/py-htseq/package.py index 8b998f17ed..692518fa71 100644 --- a/var/spack/repos/builtin/packages/py-htseq/package.py +++ b/var/spack/repos/builtin/packages/py-htseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHtseq(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-httpbin/package.py b/var/spack/repos/builtin/packages/py-httpbin/package.py index 8dccda5c6c..c4af3fe246 100644 --- a/var/spack/repos/builtin/packages/py-httpbin/package.py +++ b/var/spack/repos/builtin/packages/py-httpbin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHttpbin(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-httpcore/package.py b/var/spack/repos/builtin/packages/py-httpcore/package.py index 0fe289a88d..0f0f60b25e 100644 --- a/var/spack/repos/builtin/packages/py-httpcore/package.py +++ b/var/spack/repos/builtin/packages/py-httpcore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHttpcore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-httplib2/package.py b/var/spack/repos/builtin/packages/py-httplib2/package.py index 421d6d0b46..447d31f708 100644 --- a/var/spack/repos/builtin/packages/py-httplib2/package.py +++ b/var/spack/repos/builtin/packages/py-httplib2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHttplib2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-httpretty/package.py b/var/spack/repos/builtin/packages/py-httpretty/package.py index 111039285b..bdaec8e736 100644 --- a/var/spack/repos/builtin/packages/py-httpretty/package.py +++ b/var/spack/repos/builtin/packages/py-httpretty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHttpretty(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-httpstan/package.py b/var/spack/repos/builtin/packages/py-httpstan/package.py index 66fa636cf9..4c922fba4a 100644 --- a/var/spack/repos/builtin/packages/py-httpstan/package.py +++ b/var/spack/repos/builtin/packages/py-httpstan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHttpstan(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-httptools/package.py b/var/spack/repos/builtin/packages/py-httptools/package.py index 2377011913..9f497577ef 100644 --- a/var/spack/repos/builtin/packages/py-httptools/package.py +++ b/var/spack/repos/builtin/packages/py-httptools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHttptools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-httpx/package.py b/var/spack/repos/builtin/packages/py-httpx/package.py index 7d50670cfc..6266bd0edd 100644 --- a/var/spack/repos/builtin/packages/py-httpx/package.py +++ b/var/spack/repos/builtin/packages/py-httpx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHttpx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-huggingface-hub/package.py b/var/spack/repos/builtin/packages/py-huggingface-hub/package.py index 7d96ab622a..92d4f533c9 100644 --- a/var/spack/repos/builtin/packages/py-huggingface-hub/package.py +++ b/var/spack/repos/builtin/packages/py-huggingface-hub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHuggingfaceHub(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-humanfriendly/package.py b/var/spack/repos/builtin/packages/py-humanfriendly/package.py index 0e532d467c..fae53dbc1f 100644 --- a/var/spack/repos/builtin/packages/py-humanfriendly/package.py +++ b/var/spack/repos/builtin/packages/py-humanfriendly/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHumanfriendly(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-humanize/package.py b/var/spack/repos/builtin/packages/py-humanize/package.py index 74d5638f3e..772940628f 100644 --- a/var/spack/repos/builtin/packages/py-humanize/package.py +++ b/var/spack/repos/builtin/packages/py-humanize/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHumanize(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hvac/package.py b/var/spack/repos/builtin/packages/py-hvac/package.py index fcda022c5e..280deec28b 100644 --- a/var/spack/repos/builtin/packages/py-hvac/package.py +++ b/var/spack/repos/builtin/packages/py-hvac/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHvac(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hypercorn/package.py b/var/spack/repos/builtin/packages/py-hypercorn/package.py index 176ad5e325..cd2781f63d 100644 --- a/var/spack/repos/builtin/packages/py-hypercorn/package.py +++ b/var/spack/repos/builtin/packages/py-hypercorn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHypercorn(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hyperframe/package.py b/var/spack/repos/builtin/packages/py-hyperframe/package.py index 0334b22b0f..8ec5d5f0c3 100644 --- a/var/spack/repos/builtin/packages/py-hyperframe/package.py +++ b/var/spack/repos/builtin/packages/py-hyperframe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHyperframe(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hyperlink/package.py b/var/spack/repos/builtin/packages/py-hyperlink/package.py index a132b7dc42..0625888b86 100644 --- a/var/spack/repos/builtin/packages/py-hyperlink/package.py +++ b/var/spack/repos/builtin/packages/py-hyperlink/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHyperlink(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hyperopt/package.py b/var/spack/repos/builtin/packages/py-hyperopt/package.py index 1edfd1bcf0..2f2cf3f7eb 100644 --- a/var/spack/repos/builtin/packages/py-hyperopt/package.py +++ b/var/spack/repos/builtin/packages/py-hyperopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHyperopt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-hypothesis/package.py b/var/spack/repos/builtin/packages/py-hypothesis/package.py index 8a3ca553f0..f675ccfa94 100644 --- a/var/spack/repos/builtin/packages/py-hypothesis/package.py +++ b/var/spack/repos/builtin/packages/py-hypothesis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyHypothesis(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py b/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py index ad50ae375b..b1de616eff 100644 --- a/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py +++ b/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIbmCloudSdkCore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ibm-watson/package.py b/var/spack/repos/builtin/packages/py-ibm-watson/package.py index 64104cc9fd..40854a8181 100644 --- a/var/spack/repos/builtin/packages/py-ibm-watson/package.py +++ b/var/spack/repos/builtin/packages/py-ibm-watson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIbmWatson(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ics/package.py b/var/spack/repos/builtin/packages/py-ics/package.py index dbd3c3df02..5b8bbc8e6e 100644 --- a/var/spack/repos/builtin/packages/py-ics/package.py +++ b/var/spack/repos/builtin/packages/py-ics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIcs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-identify/package.py b/var/spack/repos/builtin/packages/py-identify/package.py index f9c02ac382..b8968c927e 100644 --- a/var/spack/repos/builtin/packages/py-identify/package.py +++ b/var/spack/repos/builtin/packages/py-identify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIdentify(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-idna-ssl/package.py b/var/spack/repos/builtin/packages/py-idna-ssl/package.py index 4cf438e332..a1bc8f6582 100644 --- a/var/spack/repos/builtin/packages/py-idna-ssl/package.py +++ b/var/spack/repos/builtin/packages/py-idna-ssl/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyIdnaSsl(PythonPackage): """Patch ssl.match_hostname for Unicode(idna) domains support""" diff --git a/var/spack/repos/builtin/packages/py-idna/package.py b/var/spack/repos/builtin/packages/py-idna/package.py index 567be35d23..9077c99f52 100644 --- a/var/spack/repos/builtin/packages/py-idna/package.py +++ b/var/spack/repos/builtin/packages/py-idna/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyIdna(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-illumina-utils/package.py b/var/spack/repos/builtin/packages/py-illumina-utils/package.py index 1945397766..552a39b2e1 100644 --- a/var/spack/repos/builtin/packages/py-illumina-utils/package.py +++ b/var/spack/repos/builtin/packages/py-illumina-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIlluminaUtils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ilmbase/package.py b/var/spack/repos/builtin/packages/py-ilmbase/package.py index e335a22bd8..996ed36503 100644 --- a/var/spack/repos/builtin/packages/py-ilmbase/package.py +++ b/var/spack/repos/builtin/packages/py-ilmbase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIlmbase(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/py-imageio-ffmpeg/package.py b/var/spack/repos/builtin/packages/py-imageio-ffmpeg/package.py index 56943c687f..88062c2f70 100644 --- a/var/spack/repos/builtin/packages/py-imageio-ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/py-imageio-ffmpeg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyImageioFfmpeg(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-imageio/package.py b/var/spack/repos/builtin/packages/py-imageio/package.py index 214b9b22d4..5276eb62d5 100644 --- a/var/spack/repos/builtin/packages/py-imageio/package.py +++ b/var/spack/repos/builtin/packages/py-imageio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyImageio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-imagesize/package.py b/var/spack/repos/builtin/packages/py-imagesize/package.py index 6920914eaa..ec13aa092d 100644 --- a/var/spack/repos/builtin/packages/py-imagesize/package.py +++ b/var/spack/repos/builtin/packages/py-imagesize/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyImagesize(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-imgaug/package.py b/var/spack/repos/builtin/packages/py-imgaug/package.py index 1e41d07c31..40406912ed 100644 --- a/var/spack/repos/builtin/packages/py-imgaug/package.py +++ b/var/spack/repos/builtin/packages/py-imgaug/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyImgaug(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-iminuit/package.py b/var/spack/repos/builtin/packages/py-iminuit/package.py index bfc9fbbfff..b4f85ed133 100644 --- a/var/spack/repos/builtin/packages/py-iminuit/package.py +++ b/var/spack/repos/builtin/packages/py-iminuit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIminuit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-immutables/package.py b/var/spack/repos/builtin/packages/py-immutables/package.py index 1639131723..3f567ee546 100644 --- a/var/spack/repos/builtin/packages/py-immutables/package.py +++ b/var/spack/repos/builtin/packages/py-immutables/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyImmutables(PythonPackage): """An immutable mapping type for Python.""" diff --git a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py index 2b2b7698ee..5c75a85503 100644 --- a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyImportlibMetadata(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-importlib-resources/package.py b/var/spack/repos/builtin/packages/py-importlib-resources/package.py index c80772f459..b12f0560b4 100644 --- a/var/spack/repos/builtin/packages/py-importlib-resources/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-resources/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyImportlibResources(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-importlib/package.py b/var/spack/repos/builtin/packages/py-importlib/package.py index a9132801d3..86c3f6de81 100644 --- a/var/spack/repos/builtin/packages/py-importlib/package.py +++ b/var/spack/repos/builtin/packages/py-importlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyImportlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-incremental/package.py b/var/spack/repos/builtin/packages/py-incremental/package.py index 217b768eb8..758ad6ae77 100644 --- a/var/spack/repos/builtin/packages/py-incremental/package.py +++ b/var/spack/repos/builtin/packages/py-incremental/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIncremental(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-inference-schema/package.py b/var/spack/repos/builtin/packages/py-inference-schema/package.py index 52c509cdbc..dcea929ff2 100644 --- a/var/spack/repos/builtin/packages/py-inference-schema/package.py +++ b/var/spack/repos/builtin/packages/py-inference-schema/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyInferenceSchema(PythonPackage): """This package is intended to provide a uniform schema for common machine learning applications, as well as a set of decorators that can be used to diff --git a/var/spack/repos/builtin/packages/py-inheritance/package.py b/var/spack/repos/builtin/packages/py-inheritance/package.py index 439ed45db3..325eb4e82c 100644 --- a/var/spack/repos/builtin/packages/py-inheritance/package.py +++ b/var/spack/repos/builtin/packages/py-inheritance/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyInheritance(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-iniconfig/package.py b/var/spack/repos/builtin/packages/py-iniconfig/package.py index 95a655124b..7158d6382a 100644 --- a/var/spack/repos/builtin/packages/py-iniconfig/package.py +++ b/var/spack/repos/builtin/packages/py-iniconfig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIniconfig(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-iniparse/package.py b/var/spack/repos/builtin/packages/py-iniparse/package.py index 06cc456d37..60b8464d47 100644 --- a/var/spack/repos/builtin/packages/py-iniparse/package.py +++ b/var/spack/repos/builtin/packages/py-iniparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIniparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-installer/package.py b/var/spack/repos/builtin/packages/py-installer/package.py index 8713734453..193bb75fd9 100644 --- a/var/spack/repos/builtin/packages/py-installer/package.py +++ b/var/spack/repos/builtin/packages/py-installer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyInstaller(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-intel-openmp/package.py b/var/spack/repos/builtin/packages/py-intel-openmp/package.py index 837f84c113..18a9608e53 100644 --- a/var/spack/repos/builtin/packages/py-intel-openmp/package.py +++ b/var/spack/repos/builtin/packages/py-intel-openmp/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class PyIntelOpenmp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-intensity-normalization/package.py b/var/spack/repos/builtin/packages/py-intensity-normalization/package.py index f5400e9821..620af79035 100644 --- a/var/spack/repos/builtin/packages/py-intensity-normalization/package.py +++ b/var/spack/repos/builtin/packages/py-intensity-normalization/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIntensityNormalization(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-interface-meta/package.py b/var/spack/repos/builtin/packages/py-interface-meta/package.py index bf76314930..dc513a575a 100644 --- a/var/spack/repos/builtin/packages/py-interface-meta/package.py +++ b/var/spack/repos/builtin/packages/py-interface-meta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyInterfaceMeta(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-intervaltree/package.py b/var/spack/repos/builtin/packages/py-intervaltree/package.py index c5bf5f7ea6..5bb919128c 100644 --- a/var/spack/repos/builtin/packages/py-intervaltree/package.py +++ b/var/spack/repos/builtin/packages/py-intervaltree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIntervaltree(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-invoke/package.py b/var/spack/repos/builtin/packages/py-invoke/package.py index bc687e8a0e..8e87897e00 100644 --- a/var/spack/repos/builtin/packages/py-invoke/package.py +++ b/var/spack/repos/builtin/packages/py-invoke/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyInvoke(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-iocapture/package.py b/var/spack/repos/builtin/packages/py-iocapture/package.py index a400495c45..c90f877abb 100644 --- a/var/spack/repos/builtin/packages/py-iocapture/package.py +++ b/var/spack/repos/builtin/packages/py-iocapture/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIocapture(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipaddress/package.py b/var/spack/repos/builtin/packages/py-ipaddress/package.py index 0d84e7ac86..dbb27dd110 100644 --- a/var/spack/repos/builtin/packages/py-ipaddress/package.py +++ b/var/spack/repos/builtin/packages/py-ipaddress/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyIpaddress(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipdb/package.py b/var/spack/repos/builtin/packages/py-ipdb/package.py index d7d45d6771..00a5ec89c2 100644 --- a/var/spack/repos/builtin/packages/py-ipdb/package.py +++ b/var/spack/repos/builtin/packages/py-ipdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpdb(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipycanvas/package.py b/var/spack/repos/builtin/packages/py-ipycanvas/package.py index 3a09ed7d43..9e0910c511 100644 --- a/var/spack/repos/builtin/packages/py-ipycanvas/package.py +++ b/var/spack/repos/builtin/packages/py-ipycanvas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpycanvas(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipyevents/package.py b/var/spack/repos/builtin/packages/py-ipyevents/package.py index f2fcf5a539..f4fc5e17f0 100644 --- a/var/spack/repos/builtin/packages/py-ipyevents/package.py +++ b/var/spack/repos/builtin/packages/py-ipyevents/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpyevents(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py index d4f4a23c16..0a1d17a4b5 100644 --- a/var/spack/repos/builtin/packages/py-ipykernel/package.py +++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyIpykernel(PythonPackage): """IPython Kernel for Jupyter""" diff --git a/var/spack/repos/builtin/packages/py-ipympl/package.py b/var/spack/repos/builtin/packages/py-ipympl/package.py index ee8b0ab420..c1c38c6d31 100644 --- a/var/spack/repos/builtin/packages/py-ipympl/package.py +++ b/var/spack/repos/builtin/packages/py-ipympl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpympl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipyparallel/package.py b/var/spack/repos/builtin/packages/py-ipyparallel/package.py index f81b183ae4..c6fca8780b 100644 --- a/var/spack/repos/builtin/packages/py-ipyparallel/package.py +++ b/var/spack/repos/builtin/packages/py-ipyparallel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpyparallel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py b/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py index 306a0e874c..775e32f78a 100644 --- a/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py +++ b/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpythonClusterHelper(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py index 0b21863ba3..0ed975bb51 100644 --- a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py +++ b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpythonGenutils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index e04861955f..1bbc1e0a9b 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyIpython(PythonPackage): """IPython provides a rich toolkit to help you make the most out of using Python interactively.""" diff --git a/var/spack/repos/builtin/packages/py-ipyvtk-simple/package.py b/var/spack/repos/builtin/packages/py-ipyvtk-simple/package.py index 4840233460..d0c8cb5608 100644 --- a/var/spack/repos/builtin/packages/py-ipyvtk-simple/package.py +++ b/var/spack/repos/builtin/packages/py-ipyvtk-simple/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpyvtkSimple(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ipywidgets/package.py b/var/spack/repos/builtin/packages/py-ipywidgets/package.py index 655a6f19af..92bb7ea0e5 100644 --- a/var/spack/repos/builtin/packages/py-ipywidgets/package.py +++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIpywidgets(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-irpf90/package.py b/var/spack/repos/builtin/packages/py-irpf90/package.py index 25c1f814da..79eaab9cc2 100644 --- a/var/spack/repos/builtin/packages/py-irpf90/package.py +++ b/var/spack/repos/builtin/packages/py-irpf90/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIrpf90(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-iso8601/package.py b/var/spack/repos/builtin/packages/py-iso8601/package.py index 0f0adeac8c..03ff16fe0a 100644 --- a/var/spack/repos/builtin/packages/py-iso8601/package.py +++ b/var/spack/repos/builtin/packages/py-iso8601/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIso8601(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-isodate/package.py b/var/spack/repos/builtin/packages/py-isodate/package.py index e4776801ba..140ec003fc 100644 --- a/var/spack/repos/builtin/packages/py-isodate/package.py +++ b/var/spack/repos/builtin/packages/py-isodate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIsodate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index 8f143875a3..44489670e6 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyIsort(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-itk/package.py b/var/spack/repos/builtin/packages/py-itk/package.py index cf5cbfaacb..c732374a21 100644 --- a/var/spack/repos/builtin/packages/py-itk/package.py +++ b/var/spack/repos/builtin/packages/py-itk/package.py @@ -7,7 +7,7 @@ import sys import archspec -from spack import * +from spack.package import * class PyItk(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-itsdangerous/package.py b/var/spack/repos/builtin/packages/py-itsdangerous/package.py index dc011e03a0..5699a3c55b 100644 --- a/var/spack/repos/builtin/packages/py-itsdangerous/package.py +++ b/var/spack/repos/builtin/packages/py-itsdangerous/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyItsdangerous(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jaconv/package.py b/var/spack/repos/builtin/packages/py-jaconv/package.py index 319a760a89..48c1822c38 100644 --- a/var/spack/repos/builtin/packages/py-jaconv/package.py +++ b/var/spack/repos/builtin/packages/py-jaconv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJaconv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jamo/package.py b/var/spack/repos/builtin/packages/py-jamo/package.py index 3272703716..b8e7c0bfb3 100644 --- a/var/spack/repos/builtin/packages/py-jamo/package.py +++ b/var/spack/repos/builtin/packages/py-jamo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJamo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jaraco-functools/package.py b/var/spack/repos/builtin/packages/py-jaraco-functools/package.py index 62d9ed3e7f..e8586d3fde 100644 --- a/var/spack/repos/builtin/packages/py-jaraco-functools/package.py +++ b/var/spack/repos/builtin/packages/py-jaraco-functools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJaracoFunctools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-javaproperties/package.py b/var/spack/repos/builtin/packages/py-javaproperties/package.py index 29ef4b5af0..db090bc16b 100644 --- a/var/spack/repos/builtin/packages/py-javaproperties/package.py +++ b/var/spack/repos/builtin/packages/py-javaproperties/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJavaproperties(PythonPackage): """Read & write Java .properties files.""" diff --git a/var/spack/repos/builtin/packages/py-jdatetime/package.py b/var/spack/repos/builtin/packages/py-jdatetime/package.py index ddb0aacbd7..c755622f71 100644 --- a/var/spack/repos/builtin/packages/py-jdatetime/package.py +++ b/var/spack/repos/builtin/packages/py-jdatetime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJdatetime(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jdcal/package.py b/var/spack/repos/builtin/packages/py-jdcal/package.py index a6e48e9848..d72d096550 100644 --- a/var/spack/repos/builtin/packages/py-jdcal/package.py +++ b/var/spack/repos/builtin/packages/py-jdcal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJdcal(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jedi/package.py b/var/spack/repos/builtin/packages/py-jedi/package.py index 31cf4f9fa9..63be3f2892 100644 --- a/var/spack/repos/builtin/packages/py-jedi/package.py +++ b/var/spack/repos/builtin/packages/py-jedi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJedi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jeepney/package.py b/var/spack/repos/builtin/packages/py-jeepney/package.py index fb56d12b36..6b78d50ddd 100644 --- a/var/spack/repos/builtin/packages/py-jeepney/package.py +++ b/var/spack/repos/builtin/packages/py-jeepney/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJeepney(PythonPackage): """Low-level, pure Python DBus protocol wrapper.""" diff --git a/var/spack/repos/builtin/packages/py-jellyfish/package.py b/var/spack/repos/builtin/packages/py-jellyfish/package.py index 3cc4c369e3..05c2cfc360 100644 --- a/var/spack/repos/builtin/packages/py-jellyfish/package.py +++ b/var/spack/repos/builtin/packages/py-jellyfish/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJellyfish(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jinja2-time/package.py b/var/spack/repos/builtin/packages/py-jinja2-time/package.py index 332258bc71..5597cb0a57 100644 --- a/var/spack/repos/builtin/packages/py-jinja2-time/package.py +++ b/var/spack/repos/builtin/packages/py-jinja2-time/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJinja2Time(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jinja2/package.py b/var/spack/repos/builtin/packages/py-jinja2/package.py index 6146fff1b4..6f7675a2f8 100644 --- a/var/spack/repos/builtin/packages/py-jinja2/package.py +++ b/var/spack/repos/builtin/packages/py-jinja2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJinja2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jmespath/package.py b/var/spack/repos/builtin/packages/py-jmespath/package.py index 076004752f..49488c383b 100644 --- a/var/spack/repos/builtin/packages/py-jmespath/package.py +++ b/var/spack/repos/builtin/packages/py-jmespath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJmespath(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-joblib/package.py b/var/spack/repos/builtin/packages/py-joblib/package.py index e7c7612eee..8cd3215dfb 100644 --- a/var/spack/repos/builtin/packages/py-joblib/package.py +++ b/var/spack/repos/builtin/packages/py-joblib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJoblib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jplephem/package.py b/var/spack/repos/builtin/packages/py-jplephem/package.py index da10e44ea5..1b0002e91a 100644 --- a/var/spack/repos/builtin/packages/py-jplephem/package.py +++ b/var/spack/repos/builtin/packages/py-jplephem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJplephem(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jprops/package.py b/var/spack/repos/builtin/packages/py-jprops/package.py index ae7b54a164..20fd855cc9 100644 --- a/var/spack/repos/builtin/packages/py-jprops/package.py +++ b/var/spack/repos/builtin/packages/py-jprops/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJprops(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jpype1/package.py b/var/spack/repos/builtin/packages/py-jpype1/package.py index 785288b3c1..c00111822a 100644 --- a/var/spack/repos/builtin/packages/py-jpype1/package.py +++ b/var/spack/repos/builtin/packages/py-jpype1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJpype1(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jsmin/package.py b/var/spack/repos/builtin/packages/py-jsmin/package.py index 04d355c659..e3f689ace9 100644 --- a/var/spack/repos/builtin/packages/py-jsmin/package.py +++ b/var/spack/repos/builtin/packages/py-jsmin/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJsmin(PythonPackage): """JavaScript minifier.""" diff --git a/var/spack/repos/builtin/packages/py-json-get/package.py b/var/spack/repos/builtin/packages/py-json-get/package.py index e2ae2bf1a2..2c30e030b8 100644 --- a/var/spack/repos/builtin/packages/py-json-get/package.py +++ b/var/spack/repos/builtin/packages/py-json-get/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJsonGet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-json5/package.py b/var/spack/repos/builtin/packages/py-json5/package.py index c07b3c3471..54d016fbaf 100644 --- a/var/spack/repos/builtin/packages/py-json5/package.py +++ b/var/spack/repos/builtin/packages/py-json5/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJson5(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jsondiff/package.py b/var/spack/repos/builtin/packages/py-jsondiff/package.py index c0a4011c25..b241f0272a 100644 --- a/var/spack/repos/builtin/packages/py-jsondiff/package.py +++ b/var/spack/repos/builtin/packages/py-jsondiff/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJsondiff(PythonPackage): """Diff JSON and JSON-like structures in Python.""" diff --git a/var/spack/repos/builtin/packages/py-jsonpatch/package.py b/var/spack/repos/builtin/packages/py-jsonpatch/package.py index 5375a87c0d..938c070ebc 100644 --- a/var/spack/repos/builtin/packages/py-jsonpatch/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpatch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJsonpatch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jsonpath-ng/package.py b/var/spack/repos/builtin/packages/py-jsonpath-ng/package.py index ed16229686..25d70e43cf 100644 --- a/var/spack/repos/builtin/packages/py-jsonpath-ng/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpath-ng/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJsonpathNg(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jsonpickle/package.py b/var/spack/repos/builtin/packages/py-jsonpickle/package.py index 80e4a6e2f5..57995fc7d2 100644 --- a/var/spack/repos/builtin/packages/py-jsonpickle/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpickle/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJsonpickle(PythonPackage): """Python library for serializing any arbitrary object graph into JSON.""" diff --git a/var/spack/repos/builtin/packages/py-jsonpointer/package.py b/var/spack/repos/builtin/packages/py-jsonpointer/package.py index 599f62c6e7..9cf1c736e9 100644 --- a/var/spack/repos/builtin/packages/py-jsonpointer/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpointer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJsonpointer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jsonref/package.py b/var/spack/repos/builtin/packages/py-jsonref/package.py index 5fb1e2b71d..214d40b12a 100644 --- a/var/spack/repos/builtin/packages/py-jsonref/package.py +++ b/var/spack/repos/builtin/packages/py-jsonref/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJsonref(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py index 52c3f893fa..dc130a184c 100644 --- a/var/spack/repos/builtin/packages/py-jsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJsonschema(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-junit-xml/package.py b/var/spack/repos/builtin/packages/py-junit-xml/package.py index e7b148d3d6..d6d7cb5087 100644 --- a/var/spack/repos/builtin/packages/py-junit-xml/package.py +++ b/var/spack/repos/builtin/packages/py-junit-xml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJunitXml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter-client/package.py b/var/spack/repos/builtin/packages/py-jupyter-client/package.py index 799aeecf85..91d19a3bc2 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-client/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-client/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJupyterClient(PythonPackage): """Jupyter protocol client APIs""" diff --git a/var/spack/repos/builtin/packages/py-jupyter-console/package.py b/var/spack/repos/builtin/packages/py-jupyter-console/package.py index 9a4aa811c1..a40f932bf7 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-console/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-console/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterConsole(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter-core/package.py b/var/spack/repos/builtin/packages/py-jupyter-core/package.py index 7b600163df..86b1ce406d 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-core/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterCore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py index 2388caa147..719a16ce80 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterPackaging(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py index 8061de73bf..406596e48f 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterPackaging11(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py index b73ee69f77..8394968a1e 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterPackaging7(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter-server-mathjax/package.py b/var/spack/repos/builtin/packages/py-jupyter-server-mathjax/package.py index 697368b0bd..d07be4792c 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-server-mathjax/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-server-mathjax/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterServerMathjax(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter-server/package.py b/var/spack/repos/builtin/packages/py-jupyter-server/package.py index ee3ceeab8f..1a0e848836 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-server/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterServer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py b/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py index 1407cf9959..3358602f6b 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterTelemetry(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyter/package.py b/var/spack/repos/builtin/packages/py-jupyter/package.py index 386d5541aa..96b2e248f0 100644 --- a/var/spack/repos/builtin/packages/py-jupyter/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyter(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyterhub/package.py b/var/spack/repos/builtin/packages/py-jupyterhub/package.py index 6f14e01135..68ca5a4e72 100644 --- a/var/spack/repos/builtin/packages/py-jupyterhub/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterhub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterhub(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py index 945c8cfd8a..42fd52d628 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJupyterlabPygments(PythonPackage): """Pygments theme using JupyterLab CSS variables.""" diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py index 356a1a94a4..084f61e0c2 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJupyterlabServer(PythonPackage): """A set of server components for JupyterLab and JupyterLab like applications""" diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py index 81657e1d83..cb3daa1b5b 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupyterlabWidgets(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-jupyterlab/package.py b/var/spack/repos/builtin/packages/py-jupyterlab/package.py index 4bdcc0d9ae..517f74f4c8 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyJupyterlab(PythonPackage): """JupyterLab is the next-generation web-based user interface for Project Jupyter.""" diff --git a/var/spack/repos/builtin/packages/py-jupytext/package.py b/var/spack/repos/builtin/packages/py-jupytext/package.py index bf82e4e8d5..4d9486670c 100644 --- a/var/spack/repos/builtin/packages/py-jupytext/package.py +++ b/var/spack/repos/builtin/packages/py-jupytext/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyJupytext(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kaggle/package.py b/var/spack/repos/builtin/packages/py-kaggle/package.py index 44b8abbdc8..8faa888677 100644 --- a/var/spack/repos/builtin/packages/py-kaggle/package.py +++ b/var/spack/repos/builtin/packages/py-kaggle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKaggle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kaldiio/package.py b/var/spack/repos/builtin/packages/py-kaldiio/package.py index b87db14045..443ed7183b 100644 --- a/var/spack/repos/builtin/packages/py-kaldiio/package.py +++ b/var/spack/repos/builtin/packages/py-kaldiio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKaldiio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-keras-applications/package.py b/var/spack/repos/builtin/packages/py-keras-applications/package.py index b8ecbddbf1..0dda067f5c 100644 --- a/var/spack/repos/builtin/packages/py-keras-applications/package.py +++ b/var/spack/repos/builtin/packages/py-keras-applications/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKerasApplications(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-keras-preprocessing/package.py b/var/spack/repos/builtin/packages/py-keras-preprocessing/package.py index 6be1252618..605c387430 100644 --- a/var/spack/repos/builtin/packages/py-keras-preprocessing/package.py +++ b/var/spack/repos/builtin/packages/py-keras-preprocessing/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKerasPreprocessing(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-keras/package.py b/var/spack/repos/builtin/packages/py-keras/package.py index 3671053433..0443509d59 100644 --- a/var/spack/repos/builtin/packages/py-keras/package.py +++ b/var/spack/repos/builtin/packages/py-keras/package.py @@ -5,7 +5,7 @@ import tempfile -from spack import * +from spack.package import * class PyKeras(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-keras2onnx/package.py b/var/spack/repos/builtin/packages/py-keras2onnx/package.py index 85d0f28eb7..71165763d8 100644 --- a/var/spack/repos/builtin/packages/py-keras2onnx/package.py +++ b/var/spack/repos/builtin/packages/py-keras2onnx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKeras2onnx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kerberos/package.py b/var/spack/repos/builtin/packages/py-kerberos/package.py index c981bd6ab8..61bb1501e7 100644 --- a/var/spack/repos/builtin/packages/py-kerberos/package.py +++ b/var/spack/repos/builtin/packages/py-kerberos/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyKerberos(PythonPackage): """This Python package is a high-level wrapper for Kerberos (GSSAPI) operations. The goal is to avoid having to build a module diff --git a/var/spack/repos/builtin/packages/py-keyboard/package.py b/var/spack/repos/builtin/packages/py-keyboard/package.py index 2909b0d0fc..b3d474df27 100644 --- a/var/spack/repos/builtin/packages/py-keyboard/package.py +++ b/var/spack/repos/builtin/packages/py-keyboard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKeyboard(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-keyring/package.py b/var/spack/repos/builtin/packages/py-keyring/package.py index 6c4f34cb0f..3a94e0148a 100644 --- a/var/spack/repos/builtin/packages/py-keyring/package.py +++ b/var/spack/repos/builtin/packages/py-keyring/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKeyring(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-keyrings-alt/package.py b/var/spack/repos/builtin/packages/py-keyrings-alt/package.py index fe2c882353..281857334c 100644 --- a/var/spack/repos/builtin/packages/py-keyrings-alt/package.py +++ b/var/spack/repos/builtin/packages/py-keyrings-alt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKeyringsAlt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-keystoneauth1/package.py b/var/spack/repos/builtin/packages/py-keystoneauth1/package.py index 6e7d654952..d64e129882 100644 --- a/var/spack/repos/builtin/packages/py-keystoneauth1/package.py +++ b/var/spack/repos/builtin/packages/py-keystoneauth1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKeystoneauth1(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kitchen/package.py b/var/spack/repos/builtin/packages/py-kitchen/package.py index 0199c5dc0a..2f30d744d5 100644 --- a/var/spack/repos/builtin/packages/py-kitchen/package.py +++ b/var/spack/repos/builtin/packages/py-kitchen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKitchen(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kiwisolver/package.py b/var/spack/repos/builtin/packages/py-kiwisolver/package.py index 6c428cf0ce..1769f648e4 100644 --- a/var/spack/repos/builtin/packages/py-kiwisolver/package.py +++ b/var/spack/repos/builtin/packages/py-kiwisolver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKiwisolver(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kmodes/package.py b/var/spack/repos/builtin/packages/py-kmodes/package.py index dc03f60ec5..09f534d20e 100644 --- a/var/spack/repos/builtin/packages/py-kmodes/package.py +++ b/var/spack/repos/builtin/packages/py-kmodes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKmodes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-knack/package.py b/var/spack/repos/builtin/packages/py-knack/package.py index b82078dd77..2ab2198eef 100644 --- a/var/spack/repos/builtin/packages/py-knack/package.py +++ b/var/spack/repos/builtin/packages/py-knack/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyKnack(PythonPackage): """A Command-Line Interface framework.""" diff --git a/var/spack/repos/builtin/packages/py-kombu/package.py b/var/spack/repos/builtin/packages/py-kombu/package.py index 3846d24af8..a5929df46e 100644 --- a/var/spack/repos/builtin/packages/py-kombu/package.py +++ b/var/spack/repos/builtin/packages/py-kombu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKombu(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kornia/package.py b/var/spack/repos/builtin/packages/py-kornia/package.py index 2166e56473..4e0d136e2b 100644 --- a/var/spack/repos/builtin/packages/py-kornia/package.py +++ b/var/spack/repos/builtin/packages/py-kornia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKornia(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kosh/package.py b/var/spack/repos/builtin/packages/py-kosh/package.py index ff6eca3d7f..a7f95c7d68 100644 --- a/var/spack/repos/builtin/packages/py-kosh/package.py +++ b/var/spack/repos/builtin/packages/py-kosh/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKosh(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-kubernetes/package.py b/var/spack/repos/builtin/packages/py-kubernetes/package.py index d607a1ef28..2623eac0f8 100644 --- a/var/spack/repos/builtin/packages/py-kubernetes/package.py +++ b/var/spack/repos/builtin/packages/py-kubernetes/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyKubernetes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-labours/package.py b/var/spack/repos/builtin/packages/py-labours/package.py index 076f2fbf83..6384434602 100644 --- a/var/spack/repos/builtin/packages/py-labours/package.py +++ b/var/spack/repos/builtin/packages/py-labours/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyLabours(PythonPackage): """Python module dependency visualization.""" diff --git a/var/spack/repos/builtin/packages/py-lap/package.py b/var/spack/repos/builtin/packages/py-lap/package.py index 864e2745e3..0c634a5b11 100644 --- a/var/spack/repos/builtin/packages/py-lap/package.py +++ b/var/spack/repos/builtin/packages/py-lap/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyLap(PythonPackage): """lap is a linear assignment problem solver using Jonker-Volgenant algorithm for dense (LAPJV) or sparse (LAPMOD) diff --git a/var/spack/repos/builtin/packages/py-lark-parser/package.py b/var/spack/repos/builtin/packages/py-lark-parser/package.py index 3b6c91e6bd..be259b3966 100644 --- a/var/spack/repos/builtin/packages/py-lark-parser/package.py +++ b/var/spack/repos/builtin/packages/py-lark-parser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLarkParser(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-laspy/package.py b/var/spack/repos/builtin/packages/py-laspy/package.py index 57d2a3644b..a9cea4e317 100644 --- a/var/spack/repos/builtin/packages/py-laspy/package.py +++ b/var/spack/repos/builtin/packages/py-laspy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLaspy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-latexcodec/package.py b/var/spack/repos/builtin/packages/py-latexcodec/package.py index 05a1e8906e..2c2f42a1ad 100644 --- a/var/spack/repos/builtin/packages/py-latexcodec/package.py +++ b/var/spack/repos/builtin/packages/py-latexcodec/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLatexcodec(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-law/package.py b/var/spack/repos/builtin/packages/py-law/package.py index 22aa6b1f87..c3a5ef0d1f 100644 --- a/var/spack/repos/builtin/packages/py-law/package.py +++ b/var/spack/repos/builtin/packages/py-law/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLaw(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py index 1819ec4353..37dc841acc 100644 --- a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLazyObjectProxy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lazy-property/package.py b/var/spack/repos/builtin/packages/py-lazy-property/package.py index 1ed74e8af6..a8bd202ecc 100644 --- a/var/spack/repos/builtin/packages/py-lazy-property/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-property/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLazyProperty(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lazy/package.py b/var/spack/repos/builtin/packages/py-lazy/package.py index 99a1dd5d0b..9d400a128b 100644 --- a/var/spack/repos/builtin/packages/py-lazy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLazy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lazyarray/package.py b/var/spack/repos/builtin/packages/py-lazyarray/package.py index df0a76f10b..89a1ae6639 100644 --- a/var/spack/repos/builtin/packages/py-lazyarray/package.py +++ b/var/spack/repos/builtin/packages/py-lazyarray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLazyarray(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-leather/package.py b/var/spack/repos/builtin/packages/py-leather/package.py index 083e4b7716..b2523b0cda 100644 --- a/var/spack/repos/builtin/packages/py-leather/package.py +++ b/var/spack/repos/builtin/packages/py-leather/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLeather(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lerc/package.py b/var/spack/repos/builtin/packages/py-lerc/package.py index dd3790e2f9..fba654d25e 100644 --- a/var/spack/repos/builtin/packages/py-lerc/package.py +++ b/var/spack/repos/builtin/packages/py-lerc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLerc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lhsmdu/package.py b/var/spack/repos/builtin/packages/py-lhsmdu/package.py index 594b427958..f5e648ed6f 100644 --- a/var/spack/repos/builtin/packages/py-lhsmdu/package.py +++ b/var/spack/repos/builtin/packages/py-lhsmdu/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # Package automatically generated using 'pip2spack' converter diff --git a/var/spack/repos/builtin/packages/py-liac-arff/package.py b/var/spack/repos/builtin/packages/py-liac-arff/package.py index 10bc1875d6..926e55a79f 100644 --- a/var/spack/repos/builtin/packages/py-liac-arff/package.py +++ b/var/spack/repos/builtin/packages/py-liac-arff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLiacArff(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-libclang/package.py b/var/spack/repos/builtin/packages/py-libclang/package.py index f3ce59e490..3b6ad2383f 100644 --- a/var/spack/repos/builtin/packages/py-libclang/package.py +++ b/var/spack/repos/builtin/packages/py-libclang/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLibclang(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-libconf/package.py b/var/spack/repos/builtin/packages/py-libconf/package.py index bd08bdd3f6..3f232b7ee4 100644 --- a/var/spack/repos/builtin/packages/py-libconf/package.py +++ b/var/spack/repos/builtin/packages/py-libconf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLibconf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index e0c63619b5..74c1eb87fa 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyLibensemble(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-liblas/package.py b/var/spack/repos/builtin/packages/py-liblas/package.py index dcd48b6032..d1a28fdd07 100644 --- a/var/spack/repos/builtin/packages/py-liblas/package.py +++ b/var/spack/repos/builtin/packages/py-liblas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLiblas(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-librosa/package.py b/var/spack/repos/builtin/packages/py-librosa/package.py index 282c6a40aa..da9005a24d 100644 --- a/var/spack/repos/builtin/packages/py-librosa/package.py +++ b/var/spack/repos/builtin/packages/py-librosa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLibrosa(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lifelines/package.py b/var/spack/repos/builtin/packages/py-lifelines/package.py index 1309c37622..a4280d455b 100644 --- a/var/spack/repos/builtin/packages/py-lifelines/package.py +++ b/var/spack/repos/builtin/packages/py-lifelines/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyLifelines(PythonPackage): """Survival analysis was originally developed and applied heavily by the actuarial and medical community. Its purpose was to answer diff --git a/var/spack/repos/builtin/packages/py-lightgbm/package.py b/var/spack/repos/builtin/packages/py-lightgbm/package.py index 25e3ae3754..ad0d89cead 100644 --- a/var/spack/repos/builtin/packages/py-lightgbm/package.py +++ b/var/spack/repos/builtin/packages/py-lightgbm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLightgbm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ligo-segments/package.py b/var/spack/repos/builtin/packages/py-ligo-segments/package.py index a666a486c8..3eb88c803e 100644 --- a/var/spack/repos/builtin/packages/py-ligo-segments/package.py +++ b/var/spack/repos/builtin/packages/py-ligo-segments/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLigoSegments(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-line-profiler/package.py b/var/spack/repos/builtin/packages/py-line-profiler/package.py index 4fe03113e5..1860265d9f 100644 --- a/var/spack/repos/builtin/packages/py-line-profiler/package.py +++ b/var/spack/repos/builtin/packages/py-line-profiler/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyLineProfiler(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-linecache2/package.py b/var/spack/repos/builtin/packages/py-linecache2/package.py index 8887d9d94c..f9c001f253 100644 --- a/var/spack/repos/builtin/packages/py-linecache2/package.py +++ b/var/spack/repos/builtin/packages/py-linecache2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLinecache2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lineenhancer/package.py b/var/spack/repos/builtin/packages/py-lineenhancer/package.py index e30d04b1e7..3e9d3b4d5c 100644 --- a/var/spack/repos/builtin/packages/py-lineenhancer/package.py +++ b/var/spack/repos/builtin/packages/py-lineenhancer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLineenhancer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lit/package.py b/var/spack/repos/builtin/packages/py-lit/package.py index 4d5e40e86c..69d4341bfb 100644 --- a/var/spack/repos/builtin/packages/py-lit/package.py +++ b/var/spack/repos/builtin/packages/py-lit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lizard/package.py b/var/spack/repos/builtin/packages/py-lizard/package.py index a192a025b4..20c24dd88b 100644 --- a/var/spack/repos/builtin/packages/py-lizard/package.py +++ b/var/spack/repos/builtin/packages/py-lizard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLizard(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-llnl-sina/package.py b/var/spack/repos/builtin/packages/py-llnl-sina/package.py index c7c01757e3..d244f4e226 100644 --- a/var/spack/repos/builtin/packages/py-llnl-sina/package.py +++ b/var/spack/repos/builtin/packages/py-llnl-sina/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLlnlSina(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py index aba94f4572..f4e39416ff 100644 --- a/var/spack/repos/builtin/packages/py-llvmlite/package.py +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLlvmlite(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lmdb/package.py b/var/spack/repos/builtin/packages/py-lmdb/package.py index 8fab2e051d..fc8035feb9 100644 --- a/var/spack/repos/builtin/packages/py-lmdb/package.py +++ b/var/spack/repos/builtin/packages/py-lmdb/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyLmdb(PythonPackage): """ Universal Python binding for the LMDB 'Lightning' Database""" diff --git a/var/spack/repos/builtin/packages/py-lmfit/package.py b/var/spack/repos/builtin/packages/py-lmfit/package.py index 88527dc469..6e6ea2afa9 100644 --- a/var/spack/repos/builtin/packages/py-lmfit/package.py +++ b/var/spack/repos/builtin/packages/py-lmfit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLmfit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lmodule/package.py b/var/spack/repos/builtin/packages/py-lmodule/package.py index 8725e91fac..3d3552d925 100644 --- a/var/spack/repos/builtin/packages/py-lmodule/package.py +++ b/var/spack/repos/builtin/packages/py-lmodule/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLmodule(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-localcider/package.py b/var/spack/repos/builtin/packages/py-localcider/package.py index b8d2772a88..e76e9ac795 100644 --- a/var/spack/repos/builtin/packages/py-localcider/package.py +++ b/var/spack/repos/builtin/packages/py-localcider/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLocalcider(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-locket/package.py b/var/spack/repos/builtin/packages/py-locket/package.py index ec89fbff46..4dc2098bc7 100644 --- a/var/spack/repos/builtin/packages/py-locket/package.py +++ b/var/spack/repos/builtin/packages/py-locket/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLocket(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lockfile/package.py b/var/spack/repos/builtin/packages/py-lockfile/package.py index 2fb4ac42dc..b9c78bd8a6 100644 --- a/var/spack/repos/builtin/packages/py-lockfile/package.py +++ b/var/spack/repos/builtin/packages/py-lockfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLockfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-logilab-common/package.py b/var/spack/repos/builtin/packages/py-logilab-common/package.py index b090256c30..9b6e30e8ea 100644 --- a/var/spack/repos/builtin/packages/py-logilab-common/package.py +++ b/var/spack/repos/builtin/packages/py-logilab-common/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLogilabCommon(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-louie/package.py b/var/spack/repos/builtin/packages/py-louie/package.py index fc4527e673..f5e2d8264b 100644 --- a/var/spack/repos/builtin/packages/py-louie/package.py +++ b/var/spack/repos/builtin/packages/py-louie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLouie(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lru-dict/package.py b/var/spack/repos/builtin/packages/py-lru-dict/package.py index eb342d6d39..6eb225e245 100644 --- a/var/spack/repos/builtin/packages/py-lru-dict/package.py +++ b/var/spack/repos/builtin/packages/py-lru-dict/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLruDict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lscsoft-glue/package.py b/var/spack/repos/builtin/packages/py-lscsoft-glue/package.py index 8d224da7c8..308e0e84bf 100644 --- a/var/spack/repos/builtin/packages/py-lscsoft-glue/package.py +++ b/var/spack/repos/builtin/packages/py-lscsoft-glue/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLscsoftGlue(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-luigi/package.py b/var/spack/repos/builtin/packages/py-luigi/package.py index aadadae1ae..b42ce1c6e1 100644 --- a/var/spack/repos/builtin/packages/py-luigi/package.py +++ b/var/spack/repos/builtin/packages/py-luigi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLuigi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lws/package.py b/var/spack/repos/builtin/packages/py-lws/package.py index 718510d2f3..488bf73804 100644 --- a/var/spack/repos/builtin/packages/py-lws/package.py +++ b/var/spack/repos/builtin/packages/py-lws/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLws(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lxml/package.py b/var/spack/repos/builtin/packages/py-lxml/package.py index 029ddd8ed7..487725638d 100644 --- a/var/spack/repos/builtin/packages/py-lxml/package.py +++ b/var/spack/repos/builtin/packages/py-lxml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLxml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lz4/package.py b/var/spack/repos/builtin/packages/py-lz4/package.py index 6845e8e255..4aa7a21566 100644 --- a/var/spack/repos/builtin/packages/py-lz4/package.py +++ b/var/spack/repos/builtin/packages/py-lz4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLz4(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-lzstring/package.py b/var/spack/repos/builtin/packages/py-lzstring/package.py index 4228bebf5e..7bb7438c11 100644 --- a/var/spack/repos/builtin/packages/py-lzstring/package.py +++ b/var/spack/repos/builtin/packages/py-lzstring/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyLzstring(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-m2r/package.py b/var/spack/repos/builtin/packages/py-m2r/package.py index 8a493f52e4..1f72ac7606 100644 --- a/var/spack/repos/builtin/packages/py-m2r/package.py +++ b/var/spack/repos/builtin/packages/py-m2r/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyM2r(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-macholib/package.py b/var/spack/repos/builtin/packages/py-macholib/package.py index 89678d1c8d..9566945fb1 100644 --- a/var/spack/repos/builtin/packages/py-macholib/package.py +++ b/var/spack/repos/builtin/packages/py-macholib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMacholib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-machotools/package.py b/var/spack/repos/builtin/packages/py-machotools/package.py index db157b6f0d..4feb0d05fd 100644 --- a/var/spack/repos/builtin/packages/py-machotools/package.py +++ b/var/spack/repos/builtin/packages/py-machotools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMachotools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-macs2/package.py b/var/spack/repos/builtin/packages/py-macs2/package.py index a89875e54d..679d65b19a 100644 --- a/var/spack/repos/builtin/packages/py-macs2/package.py +++ b/var/spack/repos/builtin/packages/py-macs2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMacs2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py index d8f08aab25..1fd816bbe0 100644 --- a/var/spack/repos/builtin/packages/py-maestrowf/package.py +++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMaestrowf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-magic/package.py b/var/spack/repos/builtin/packages/py-magic/package.py index a1f44eca35..325faf3a45 100644 --- a/var/spack/repos/builtin/packages/py-magic/package.py +++ b/var/spack/repos/builtin/packages/py-magic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMagic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mailchecker/package.py b/var/spack/repos/builtin/packages/py-mailchecker/package.py index d6c292af62..ebe708950c 100644 --- a/var/spack/repos/builtin/packages/py-mailchecker/package.py +++ b/var/spack/repos/builtin/packages/py-mailchecker/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMailchecker(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-make/package.py b/var/spack/repos/builtin/packages/py-make/package.py index 03f06781c2..2e3a494e3d 100644 --- a/var/spack/repos/builtin/packages/py-make/package.py +++ b/var/spack/repos/builtin/packages/py-make/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMake(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mako/package.py b/var/spack/repos/builtin/packages/py-mako/package.py index bc18e87e6d..56feeb186a 100644 --- a/var/spack/repos/builtin/packages/py-mako/package.py +++ b/var/spack/repos/builtin/packages/py-mako/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMako(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mapclassify/package.py b/var/spack/repos/builtin/packages/py-mapclassify/package.py index 0faa6b2b76..419f740d70 100644 --- a/var/spack/repos/builtin/packages/py-mapclassify/package.py +++ b/var/spack/repos/builtin/packages/py-mapclassify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMapclassify(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-markdown-it-py/package.py b/var/spack/repos/builtin/packages/py-markdown-it-py/package.py index 909987835c..f56f244a3c 100644 --- a/var/spack/repos/builtin/packages/py-markdown-it-py/package.py +++ b/var/spack/repos/builtin/packages/py-markdown-it-py/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMarkdownItPy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-markdown/package.py b/var/spack/repos/builtin/packages/py-markdown/package.py index 330ed5e650..e68f26f529 100644 --- a/var/spack/repos/builtin/packages/py-markdown/package.py +++ b/var/spack/repos/builtin/packages/py-markdown/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMarkdown(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-markdown2/package.py b/var/spack/repos/builtin/packages/py-markdown2/package.py index 1deda155bd..f6af893e27 100644 --- a/var/spack/repos/builtin/packages/py-markdown2/package.py +++ b/var/spack/repos/builtin/packages/py-markdown2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMarkdown2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-markovify/package.py b/var/spack/repos/builtin/packages/py-markovify/package.py index f53be6628c..673ccc5070 100644 --- a/var/spack/repos/builtin/packages/py-markovify/package.py +++ b/var/spack/repos/builtin/packages/py-markovify/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMarkovify(PythonPackage): """Markovify is a simple, extensible Markov chain generator. Right now, its primary use is for building Markov models of large diff --git a/var/spack/repos/builtin/packages/py-markupsafe/package.py b/var/spack/repos/builtin/packages/py-markupsafe/package.py index a67c784577..85439fb00b 100644 --- a/var/spack/repos/builtin/packages/py-markupsafe/package.py +++ b/var/spack/repos/builtin/packages/py-markupsafe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMarkupsafe(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-marshmallow/package.py b/var/spack/repos/builtin/packages/py-marshmallow/package.py index c22d01f4d7..246a862b71 100644 --- a/var/spack/repos/builtin/packages/py-marshmallow/package.py +++ b/var/spack/repos/builtin/packages/py-marshmallow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMarshmallow(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-matplotlib-inline/package.py b/var/spack/repos/builtin/packages/py-matplotlib-inline/package.py index defb5fafb1..4b8fd0a08a 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib-inline/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib-inline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMatplotlibInline(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index ec76b4b79d..cb10e1afe4 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -6,6 +6,8 @@ import os import sys +from spack.package import * + class PyMatplotlib(PythonPackage): """Matplotlib is a comprehensive library for creating static, animated, diff --git a/var/spack/repos/builtin/packages/py-mayavi/package.py b/var/spack/repos/builtin/packages/py-mayavi/package.py index fcfa873325..9f3da25963 100644 --- a/var/spack/repos/builtin/packages/py-mayavi/package.py +++ b/var/spack/repos/builtin/packages/py-mayavi/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMayavi(PythonPackage): """Mayavi: 3D visualization of scientific data in Python.""" diff --git a/var/spack/repos/builtin/packages/py-mccabe/package.py b/var/spack/repos/builtin/packages/py-mccabe/package.py index b4c0e9f3c1..a6b9c9226c 100644 --- a/var/spack/repos/builtin/packages/py-mccabe/package.py +++ b/var/spack/repos/builtin/packages/py-mccabe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMccabe(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mdanalysis/package.py b/var/spack/repos/builtin/packages/py-mdanalysis/package.py index 90c3291146..03c3ef07d2 100644 --- a/var/spack/repos/builtin/packages/py-mdanalysis/package.py +++ b/var/spack/repos/builtin/packages/py-mdanalysis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMdanalysis(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mdit-py-plugins/package.py b/var/spack/repos/builtin/packages/py-mdit-py-plugins/package.py index 1761bfcec4..0ec64bf35b 100644 --- a/var/spack/repos/builtin/packages/py-mdit-py-plugins/package.py +++ b/var/spack/repos/builtin/packages/py-mdit-py-plugins/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMditPyPlugins(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mechanize/package.py b/var/spack/repos/builtin/packages/py-mechanize/package.py index 784edf780c..ee581ebcee 100644 --- a/var/spack/repos/builtin/packages/py-mechanize/package.py +++ b/var/spack/repos/builtin/packages/py-mechanize/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMechanize(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-meldmd/package.py b/var/spack/repos/builtin/packages/py-meldmd/package.py index 2a9e235d3c..0d8389fca9 100644 --- a/var/spack/repos/builtin/packages/py-meldmd/package.py +++ b/var/spack/repos/builtin/packages/py-meldmd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMeldmd(PythonPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/py-memory-profiler/package.py b/var/spack/repos/builtin/packages/py-memory-profiler/package.py index 706c9da281..c71c58a07d 100644 --- a/var/spack/repos/builtin/packages/py-memory-profiler/package.py +++ b/var/spack/repos/builtin/packages/py-memory-profiler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMemoryProfiler(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-memprof/package.py b/var/spack/repos/builtin/packages/py-memprof/package.py index 9b374ed218..e61ad60b72 100644 --- a/var/spack/repos/builtin/packages/py-memprof/package.py +++ b/var/spack/repos/builtin/packages/py-memprof/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMemprof(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mercantile/package.py b/var/spack/repos/builtin/packages/py-mercantile/package.py index 5161793e61..05cb276902 100644 --- a/var/spack/repos/builtin/packages/py-mercantile/package.py +++ b/var/spack/repos/builtin/packages/py-mercantile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMercantile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-merlin/package.py b/var/spack/repos/builtin/packages/py-merlin/package.py index 219db44cfc..b3cc6aacce 100644 --- a/var/spack/repos/builtin/packages/py-merlin/package.py +++ b/var/spack/repos/builtin/packages/py-merlin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMerlin(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-meshio/package.py b/var/spack/repos/builtin/packages/py-meshio/package.py index 3d3482e065..bab7e9f648 100644 --- a/var/spack/repos/builtin/packages/py-meshio/package.py +++ b/var/spack/repos/builtin/packages/py-meshio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMeshio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-metasv/package.py b/var/spack/repos/builtin/packages/py-metasv/package.py index 13eb9fa5d6..38eada182a 100644 --- a/var/spack/repos/builtin/packages/py-metasv/package.py +++ b/var/spack/repos/builtin/packages/py-metasv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMetasv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-methylcode/package.py b/var/spack/repos/builtin/packages/py-methylcode/package.py index 2231db2f4c..eae895d86d 100644 --- a/var/spack/repos/builtin/packages/py-methylcode/package.py +++ b/var/spack/repos/builtin/packages/py-methylcode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMethylcode(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-metpy/package.py b/var/spack/repos/builtin/packages/py-metpy/package.py index 824ad7182f..6fa4d6b009 100644 --- a/var/spack/repos/builtin/packages/py-metpy/package.py +++ b/var/spack/repos/builtin/packages/py-metpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMetpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mffpy/package.py b/var/spack/repos/builtin/packages/py-mffpy/package.py index d44251cfeb..23dc1864b9 100644 --- a/var/spack/repos/builtin/packages/py-mffpy/package.py +++ b/var/spack/repos/builtin/packages/py-mffpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMffpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py index 15726ade90..f546656895 100644 --- a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py +++ b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMgRastTools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mido/package.py b/var/spack/repos/builtin/packages/py-mido/package.py index 825b9cd9e7..a50f5866e2 100644 --- a/var/spack/repos/builtin/packages/py-mido/package.py +++ b/var/spack/repos/builtin/packages/py-mido/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMido(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mikado/package.py b/var/spack/repos/builtin/packages/py-mikado/package.py index 7b2df634ed..56472ac4f7 100644 --- a/var/spack/repos/builtin/packages/py-mikado/package.py +++ b/var/spack/repos/builtin/packages/py-mikado/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMikado(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-minio/package.py b/var/spack/repos/builtin/packages/py-minio/package.py index 789d1f4147..92f1c5aa97 100644 --- a/var/spack/repos/builtin/packages/py-minio/package.py +++ b/var/spack/repos/builtin/packages/py-minio/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMinio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-minrpc/package.py b/var/spack/repos/builtin/packages/py-minrpc/package.py index 7ece04b38e..e7c241f73b 100644 --- a/var/spack/repos/builtin/packages/py-minrpc/package.py +++ b/var/spack/repos/builtin/packages/py-minrpc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMinrpc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-misopy/package.py b/var/spack/repos/builtin/packages/py-misopy/package.py index fa0d2b0b2f..e16dc9aafe 100644 --- a/var/spack/repos/builtin/packages/py-misopy/package.py +++ b/var/spack/repos/builtin/packages/py-misopy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMisopy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mistune/package.py b/var/spack/repos/builtin/packages/py-mistune/package.py index 2970ed9185..c483d5efd4 100644 --- a/var/spack/repos/builtin/packages/py-mistune/package.py +++ b/var/spack/repos/builtin/packages/py-mistune/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMistune(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mixedhtseq/package.py b/var/spack/repos/builtin/packages/py-mixedhtseq/package.py index 423bc2e1f6..2f63663889 100644 --- a/var/spack/repos/builtin/packages/py-mixedhtseq/package.py +++ b/var/spack/repos/builtin/packages/py-mixedhtseq/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * class PyMixedhtseq(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mizani/package.py b/var/spack/repos/builtin/packages/py-mizani/package.py index 2d72991971..10bc4e0f4f 100644 --- a/var/spack/repos/builtin/packages/py-mizani/package.py +++ b/var/spack/repos/builtin/packages/py-mizani/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.directives import depends_on, version +from spack.package import * class PyMizani(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ml-collections/package.py b/var/spack/repos/builtin/packages/py-ml-collections/package.py index 22019f2006..a4274103fb 100644 --- a/var/spack/repos/builtin/packages/py-ml-collections/package.py +++ b/var/spack/repos/builtin/packages/py-ml-collections/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMlCollections(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mlperf-logging/package.py b/var/spack/repos/builtin/packages/py-mlperf-logging/package.py index 19e5b72362..be6e0d4bc6 100644 --- a/var/spack/repos/builtin/packages/py-mlperf-logging/package.py +++ b/var/spack/repos/builtin/packages/py-mlperf-logging/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMlperfLogging(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mlxtend/package.py b/var/spack/repos/builtin/packages/py-mlxtend/package.py index ec0ebbe167..8a1c0c1488 100644 --- a/var/spack/repos/builtin/packages/py-mlxtend/package.py +++ b/var/spack/repos/builtin/packages/py-mlxtend/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMlxtend(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mmcv/package.py b/var/spack/repos/builtin/packages/py-mmcv/package.py index 5b56bdf8ad..727295eb50 100644 --- a/var/spack/repos/builtin/packages/py-mmcv/package.py +++ b/var/spack/repos/builtin/packages/py-mmcv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMmcv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mmtf-python/package.py b/var/spack/repos/builtin/packages/py-mmtf-python/package.py index 7b626047ae..3bc1c2db53 100644 --- a/var/spack/repos/builtin/packages/py-mmtf-python/package.py +++ b/var/spack/repos/builtin/packages/py-mmtf-python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMmtfPython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mne/package.py b/var/spack/repos/builtin/packages/py-mne/package.py index dc41274a8b..eee1c4255d 100644 --- a/var/spack/repos/builtin/packages/py-mne/package.py +++ b/var/spack/repos/builtin/packages/py-mne/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMne(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mo-pack/package.py b/var/spack/repos/builtin/packages/py-mo-pack/package.py index ecf7abe0f2..26f6c077d7 100644 --- a/var/spack/repos/builtin/packages/py-mo-pack/package.py +++ b/var/spack/repos/builtin/packages/py-mo-pack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMoPack(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mock/package.py b/var/spack/repos/builtin/packages/py-mock/package.py index c2806699c7..4483a85e81 100644 --- a/var/spack/repos/builtin/packages/py-mock/package.py +++ b/var/spack/repos/builtin/packages/py-mock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-modred/package.py b/var/spack/repos/builtin/packages/py-modred/package.py index 4e9b823845..913e65bbae 100644 --- a/var/spack/repos/builtin/packages/py-modred/package.py +++ b/var/spack/repos/builtin/packages/py-modred/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyModred(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-moltemplate/package.py b/var/spack/repos/builtin/packages/py-moltemplate/package.py index 97a4ce3a62..1a478cbdc6 100644 --- a/var/spack/repos/builtin/packages/py-moltemplate/package.py +++ b/var/spack/repos/builtin/packages/py-moltemplate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMoltemplate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-monotonic/package.py b/var/spack/repos/builtin/packages/py-monotonic/package.py index 6ca37feb13..7a1a8d6455 100644 --- a/var/spack/repos/builtin/packages/py-monotonic/package.py +++ b/var/spack/repos/builtin/packages/py-monotonic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMonotonic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-monty/package.py b/var/spack/repos/builtin/packages/py-monty/package.py index 47b67e3aa1..de3f480928 100644 --- a/var/spack/repos/builtin/packages/py-monty/package.py +++ b/var/spack/repos/builtin/packages/py-monty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMonty(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-more-itertools/package.py b/var/spack/repos/builtin/packages/py-more-itertools/package.py index 1bf6347fde..c966e61d17 100644 --- a/var/spack/repos/builtin/packages/py-more-itertools/package.py +++ b/var/spack/repos/builtin/packages/py-more-itertools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMoreItertools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-motmetrics/package.py b/var/spack/repos/builtin/packages/py-motmetrics/package.py index c5e6bd6caa..5510d9e8ac 100644 --- a/var/spack/repos/builtin/packages/py-motmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-motmetrics/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMotmetrics(PythonPackage): """The py-motmetrics library provides a Python implementation of metrics for benchmarking multiple object trackers (MOT).""" diff --git a/var/spack/repos/builtin/packages/py-motor/package.py b/var/spack/repos/builtin/packages/py-motor/package.py index 1ab7037064..75197e5dbf 100644 --- a/var/spack/repos/builtin/packages/py-motor/package.py +++ b/var/spack/repos/builtin/packages/py-motor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMotor(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mouseinfo/package.py b/var/spack/repos/builtin/packages/py-mouseinfo/package.py index 824f0b7ab7..98514316eb 100644 --- a/var/spack/repos/builtin/packages/py-mouseinfo/package.py +++ b/var/spack/repos/builtin/packages/py-mouseinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMouseinfo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-moviepy/package.py b/var/spack/repos/builtin/packages/py-moviepy/package.py index 07e84696ae..0f328df9d3 100644 --- a/var/spack/repos/builtin/packages/py-moviepy/package.py +++ b/var/spack/repos/builtin/packages/py-moviepy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMoviepy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py index 9cd5949fc3..ff0f29a540 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMpi4py(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mpld3/package.py b/var/spack/repos/builtin/packages/py-mpld3/package.py index 199a3437f5..b2f8f78280 100644 --- a/var/spack/repos/builtin/packages/py-mpld3/package.py +++ b/var/spack/repos/builtin/packages/py-mpld3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMpld3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mplhep-data/package.py b/var/spack/repos/builtin/packages/py-mplhep-data/package.py index 74c1a9bb2d..1a5c24f44f 100644 --- a/var/spack/repos/builtin/packages/py-mplhep-data/package.py +++ b/var/spack/repos/builtin/packages/py-mplhep-data/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMplhepData(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mplhep/package.py b/var/spack/repos/builtin/packages/py-mplhep/package.py index da9027be2b..57a54fdbed 100644 --- a/var/spack/repos/builtin/packages/py-mplhep/package.py +++ b/var/spack/repos/builtin/packages/py-mplhep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMplhep(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mpmath/package.py b/var/spack/repos/builtin/packages/py-mpmath/package.py index 2421252c95..3eac20acf9 100644 --- a/var/spack/repos/builtin/packages/py-mpmath/package.py +++ b/var/spack/repos/builtin/packages/py-mpmath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMpmath(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mrcfile/package.py b/var/spack/repos/builtin/packages/py-mrcfile/package.py index 723e5ea834..209c97662a 100644 --- a/var/spack/repos/builtin/packages/py-mrcfile/package.py +++ b/var/spack/repos/builtin/packages/py-mrcfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMrcfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-msal-extensions/package.py b/var/spack/repos/builtin/packages/py-msal-extensions/package.py index 93f3ea2ff5..a650c09070 100644 --- a/var/spack/repos/builtin/packages/py-msal-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-msal-extensions/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMsalExtensions(PythonPackage): """The Microsoft Authentication Extensions for Python offers secure mechanisms for client applications to perform cross-platform token cache diff --git a/var/spack/repos/builtin/packages/py-msal/package.py b/var/spack/repos/builtin/packages/py-msal/package.py index 5f0ec77736..a68c14bc7f 100644 --- a/var/spack/repos/builtin/packages/py-msal/package.py +++ b/var/spack/repos/builtin/packages/py-msal/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMsal(PythonPackage): """The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of diff --git a/var/spack/repos/builtin/packages/py-msgpack-numpy/package.py b/var/spack/repos/builtin/packages/py-msgpack-numpy/package.py index 186fa9185e..572898f8bf 100644 --- a/var/spack/repos/builtin/packages/py-msgpack-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-msgpack-numpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMsgpackNumpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-msgpack/package.py b/var/spack/repos/builtin/packages/py-msgpack/package.py index 8f383f8c45..4c6ada6596 100644 --- a/var/spack/repos/builtin/packages/py-msgpack/package.py +++ b/var/spack/repos/builtin/packages/py-msgpack/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMsgpack(PythonPackage): """MessagePack (de)serializer.""" diff --git a/var/spack/repos/builtin/packages/py-msrest/package.py b/var/spack/repos/builtin/packages/py-msrest/package.py index fdea44d72d..caf4110216 100644 --- a/var/spack/repos/builtin/packages/py-msrest/package.py +++ b/var/spack/repos/builtin/packages/py-msrest/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMsrest(PythonPackage): """AutoRest swagger generator Python client runtime.""" diff --git a/var/spack/repos/builtin/packages/py-msrestazure/package.py b/var/spack/repos/builtin/packages/py-msrestazure/package.py index 2f067bd494..fdcf6d9987 100644 --- a/var/spack/repos/builtin/packages/py-msrestazure/package.py +++ b/var/spack/repos/builtin/packages/py-msrestazure/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMsrestazure(PythonPackage): """AutoRest swagger generator Python client runtime. Azure-specific module.""" diff --git a/var/spack/repos/builtin/packages/py-multi-key-dict/package.py b/var/spack/repos/builtin/packages/py-multi-key-dict/package.py index 9ff90e6e34..bb4786281d 100644 --- a/var/spack/repos/builtin/packages/py-multi-key-dict/package.py +++ b/var/spack/repos/builtin/packages/py-multi-key-dict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMultiKeyDict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-multidict/package.py b/var/spack/repos/builtin/packages/py-multidict/package.py index 6502fd42b8..4664b9042a 100644 --- a/var/spack/repos/builtin/packages/py-multidict/package.py +++ b/var/spack/repos/builtin/packages/py-multidict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMultidict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-multipledispatch/package.py b/var/spack/repos/builtin/packages/py-multipledispatch/package.py index dbf4ecb219..cb77cf4044 100644 --- a/var/spack/repos/builtin/packages/py-multipledispatch/package.py +++ b/var/spack/repos/builtin/packages/py-multipledispatch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMultipledispatch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-multiprocess/package.py b/var/spack/repos/builtin/packages/py-multiprocess/package.py index e8ef79a333..b6d81b4c9a 100644 --- a/var/spack/repos/builtin/packages/py-multiprocess/package.py +++ b/var/spack/repos/builtin/packages/py-multiprocess/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMultiprocess(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index 6f42b3c634..745611d4ab 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMultiqc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-munch/package.py b/var/spack/repos/builtin/packages/py-munch/package.py index 552c09bde9..7f8c427e3b 100644 --- a/var/spack/repos/builtin/packages/py-munch/package.py +++ b/var/spack/repos/builtin/packages/py-munch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMunch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-murmurhash/package.py b/var/spack/repos/builtin/packages/py-murmurhash/package.py index d15e0f3101..0be3bcf841 100644 --- a/var/spack/repos/builtin/packages/py-murmurhash/package.py +++ b/var/spack/repos/builtin/packages/py-murmurhash/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyMurmurhash(PythonPackage): """Cython bindings for MurmurHash.""" diff --git a/var/spack/repos/builtin/packages/py-mutagen/package.py b/var/spack/repos/builtin/packages/py-mutagen/package.py index 6804a2889f..37ebceb0e7 100644 --- a/var/spack/repos/builtin/packages/py-mutagen/package.py +++ b/var/spack/repos/builtin/packages/py-mutagen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMutagen(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mx/package.py b/var/spack/repos/builtin/packages/py-mx/package.py index 94052fcf76..e72e196253 100644 --- a/var/spack/repos/builtin/packages/py-mx/package.py +++ b/var/spack/repos/builtin/packages/py-mx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mxfold2/package.py b/var/spack/repos/builtin/packages/py-mxfold2/package.py index b9ce73b1e9..d5461607f7 100644 --- a/var/spack/repos/builtin/packages/py-mxfold2/package.py +++ b/var/spack/repos/builtin/packages/py-mxfold2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMxfold2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-myhdl/package.py b/var/spack/repos/builtin/packages/py-myhdl/package.py index 01f3fea3c4..0266ca6ed4 100644 --- a/var/spack/repos/builtin/packages/py-myhdl/package.py +++ b/var/spack/repos/builtin/packages/py-myhdl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMyhdl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mypy-extensions/package.py b/var/spack/repos/builtin/packages/py-mypy-extensions/package.py index 54b17f7ccc..3cd90ce6dd 100644 --- a/var/spack/repos/builtin/packages/py-mypy-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-mypy-extensions/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMypyExtensions(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mypy/package.py b/var/spack/repos/builtin/packages/py-mypy/package.py index e8696facf0..6bc3d9e722 100644 --- a/var/spack/repos/builtin/packages/py-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-mypy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMypy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mysql-connector-python/package.py b/var/spack/repos/builtin/packages/py-mysql-connector-python/package.py index cae956afa6..3247391d4f 100644 --- a/var/spack/repos/builtin/packages/py-mysql-connector-python/package.py +++ b/var/spack/repos/builtin/packages/py-mysql-connector-python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMysqlConnectorPython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mysqlclient/package.py b/var/spack/repos/builtin/packages/py-mysqlclient/package.py index 4cf5462618..975e861760 100644 --- a/var/spack/repos/builtin/packages/py-mysqlclient/package.py +++ b/var/spack/repos/builtin/packages/py-mysqlclient/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMysqlclient(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-mysqldb1/package.py b/var/spack/repos/builtin/packages/py-mysqldb1/package.py index 8ebed8f908..9a93b9f141 100644 --- a/var/spack/repos/builtin/packages/py-mysqldb1/package.py +++ b/var/spack/repos/builtin/packages/py-mysqldb1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyMysqldb1(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nanotime/package.py b/var/spack/repos/builtin/packages/py-nanotime/package.py index 211897bf24..cd62663598 100644 --- a/var/spack/repos/builtin/packages/py-nanotime/package.py +++ b/var/spack/repos/builtin/packages/py-nanotime/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNanotime(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nara-wpe/package.py b/var/spack/repos/builtin/packages/py-nara-wpe/package.py index df322a0be2..68ae3656ee 100644 --- a/var/spack/repos/builtin/packages/py-nara-wpe/package.py +++ b/var/spack/repos/builtin/packages/py-nara-wpe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNaraWpe(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-natsort/package.py b/var/spack/repos/builtin/packages/py-natsort/package.py index 85d54bb447..b0fd2d8998 100644 --- a/var/spack/repos/builtin/packages/py-natsort/package.py +++ b/var/spack/repos/builtin/packages/py-natsort/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNatsort(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nbclassic/package.py b/var/spack/repos/builtin/packages/py-nbclassic/package.py index 96cc0c6710..6917477103 100644 --- a/var/spack/repos/builtin/packages/py-nbclassic/package.py +++ b/var/spack/repos/builtin/packages/py-nbclassic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNbclassic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nbclient/package.py b/var/spack/repos/builtin/packages/py-nbclient/package.py index 8d8fbfe667..fb85832a3e 100644 --- a/var/spack/repos/builtin/packages/py-nbclient/package.py +++ b/var/spack/repos/builtin/packages/py-nbclient/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNbclient(PythonPackage): """A client library for executing notebooks. diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py index 5c0729b9f5..14b913e84c 100644 --- a/var/spack/repos/builtin/packages/py-nbconvert/package.py +++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNbconvert(PythonPackage): """Jupyter Notebook Conversion""" diff --git a/var/spack/repos/builtin/packages/py-nbdime/package.py b/var/spack/repos/builtin/packages/py-nbdime/package.py index 4f232c57c6..40dfb56fd4 100644 --- a/var/spack/repos/builtin/packages/py-nbdime/package.py +++ b/var/spack/repos/builtin/packages/py-nbdime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNbdime(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py index 22c8f4e641..4b4e704773 100644 --- a/var/spack/repos/builtin/packages/py-nbformat/package.py +++ b/var/spack/repos/builtin/packages/py-nbformat/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNbformat(PythonPackage): """The Jupyter Notebook format""" diff --git a/var/spack/repos/builtin/packages/py-nbmake/package.py b/var/spack/repos/builtin/packages/py-nbmake/package.py index e34b2b9d3c..e610ef6086 100644 --- a/var/spack/repos/builtin/packages/py-nbmake/package.py +++ b/var/spack/repos/builtin/packages/py-nbmake/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNbmake(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nbsphinx/package.py b/var/spack/repos/builtin/packages/py-nbsphinx/package.py index 2db682987b..83611d53bc 100644 --- a/var/spack/repos/builtin/packages/py-nbsphinx/package.py +++ b/var/spack/repos/builtin/packages/py-nbsphinx/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNbsphinx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nc-time-axis/package.py b/var/spack/repos/builtin/packages/py-nc-time-axis/package.py index 5c389495bc..a299d292fb 100644 --- a/var/spack/repos/builtin/packages/py-nc-time-axis/package.py +++ b/var/spack/repos/builtin/packages/py-nc-time-axis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNcTimeAxis(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ndg-httpsclient/package.py b/var/spack/repos/builtin/packages/py-ndg-httpsclient/package.py index ab30c4a10a..bc3e68d72f 100644 --- a/var/spack/repos/builtin/packages/py-ndg-httpsclient/package.py +++ b/var/spack/repos/builtin/packages/py-ndg-httpsclient/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNdgHttpsclient(PythonPackage): """Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL.""" diff --git a/var/spack/repos/builtin/packages/py-neo/package.py b/var/spack/repos/builtin/packages/py-neo/package.py index 007adaf12b..a7865183e0 100644 --- a/var/spack/repos/builtin/packages/py-neo/package.py +++ b/var/spack/repos/builtin/packages/py-neo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNeo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-neobolt/package.py b/var/spack/repos/builtin/packages/py-neobolt/package.py index 33ddee0c09..c5ba5477c5 100644 --- a/var/spack/repos/builtin/packages/py-neobolt/package.py +++ b/var/spack/repos/builtin/packages/py-neobolt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNeobolt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-neotime/package.py b/var/spack/repos/builtin/packages/py-neotime/package.py index 7a43ef3cf3..0fac208e05 100644 --- a/var/spack/repos/builtin/packages/py-neotime/package.py +++ b/var/spack/repos/builtin/packages/py-neotime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNeotime(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-neovim-remote/package.py b/var/spack/repos/builtin/packages/py-neovim-remote/package.py index 6b215afcf3..828808d5a2 100644 --- a/var/spack/repos/builtin/packages/py-neovim-remote/package.py +++ b/var/spack/repos/builtin/packages/py-neovim-remote/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNeovimRemote(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nest-asyncio/package.py b/var/spack/repos/builtin/packages/py-nest-asyncio/package.py index 80f11663a3..0bc9343cc4 100644 --- a/var/spack/repos/builtin/packages/py-nest-asyncio/package.py +++ b/var/spack/repos/builtin/packages/py-nest-asyncio/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNestAsyncio(PythonPackage): """Patch asyncio to allow nested event loops.""" diff --git a/var/spack/repos/builtin/packages/py-nestle/package.py b/var/spack/repos/builtin/packages/py-nestle/package.py index 7a50890b97..e9a010967b 100644 --- a/var/spack/repos/builtin/packages/py-nestle/package.py +++ b/var/spack/repos/builtin/packages/py-nestle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNestle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-netaddr/package.py b/var/spack/repos/builtin/packages/py-netaddr/package.py index e0f0345153..70a740faf8 100644 --- a/var/spack/repos/builtin/packages/py-netaddr/package.py +++ b/var/spack/repos/builtin/packages/py-netaddr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNetaddr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-netcdf4/package.py b/var/spack/repos/builtin/packages/py-netcdf4/package.py index 09f186c02f..be95995edd 100644 --- a/var/spack/repos/builtin/packages/py-netcdf4/package.py +++ b/var/spack/repos/builtin/packages/py-netcdf4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNetcdf4(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-netifaces/package.py b/var/spack/repos/builtin/packages/py-netifaces/package.py index b0ee954aef..43eb77f034 100644 --- a/var/spack/repos/builtin/packages/py-netifaces/package.py +++ b/var/spack/repos/builtin/packages/py-netifaces/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNetifaces(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-netket/package.py b/var/spack/repos/builtin/packages/py-netket/package.py index 56b9038c88..b5da493e4f 100644 --- a/var/spack/repos/builtin/packages/py-netket/package.py +++ b/var/spack/repos/builtin/packages/py-netket/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNetket(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-networkit/package.py b/var/spack/repos/builtin/packages/py-networkit/package.py index b1c21d0d7a..dd7300fa0e 100644 --- a/var/spack/repos/builtin/packages/py-networkit/package.py +++ b/var/spack/repos/builtin/packages/py-networkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNetworkit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-networkx/package.py b/var/spack/repos/builtin/packages/py-networkx/package.py index 83cfdab331..149ce48b08 100644 --- a/var/spack/repos/builtin/packages/py-networkx/package.py +++ b/var/spack/repos/builtin/packages/py-networkx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNetworkx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-neurokit2/package.py b/var/spack/repos/builtin/packages/py-neurokit2/package.py index d485c48f20..58da25a57e 100644 --- a/var/spack/repos/builtin/packages/py-neurokit2/package.py +++ b/var/spack/repos/builtin/packages/py-neurokit2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNeurokit2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-neurolab/package.py b/var/spack/repos/builtin/packages/py-neurolab/package.py index 2acf80ed5e..f708b63569 100644 --- a/var/spack/repos/builtin/packages/py-neurolab/package.py +++ b/var/spack/repos/builtin/packages/py-neurolab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNeurolab(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-neurora/package.py b/var/spack/repos/builtin/packages/py-neurora/package.py index bf6040a572..3450410ddb 100644 --- a/var/spack/repos/builtin/packages/py-neurora/package.py +++ b/var/spack/repos/builtin/packages/py-neurora/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNeurora(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nibabel/package.py b/var/spack/repos/builtin/packages/py-nibabel/package.py index a33f4c17ec..2c0118c26b 100644 --- a/var/spack/repos/builtin/packages/py-nibabel/package.py +++ b/var/spack/repos/builtin/packages/py-nibabel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNibabel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nibetaseries/package.py b/var/spack/repos/builtin/packages/py-nibetaseries/package.py index 41a152e6ed..b861d5fe99 100644 --- a/var/spack/repos/builtin/packages/py-nibetaseries/package.py +++ b/var/spack/repos/builtin/packages/py-nibetaseries/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNibetaseries(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nilearn/package.py b/var/spack/repos/builtin/packages/py-nilearn/package.py index ffe2675acc..8f94756371 100644 --- a/var/spack/repos/builtin/packages/py-nilearn/package.py +++ b/var/spack/repos/builtin/packages/py-nilearn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNilearn(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ninja/package.py b/var/spack/repos/builtin/packages/py-ninja/package.py index 56fd555293..37897e140a 100644 --- a/var/spack/repos/builtin/packages/py-ninja/package.py +++ b/var/spack/repos/builtin/packages/py-ninja/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class PyNinja(PythonPackage): """Ninja is a small build system with a focus on speed.""" diff --git a/var/spack/repos/builtin/packages/py-nipype/package.py b/var/spack/repos/builtin/packages/py-nipype/package.py index 68e77c754f..c6e731742f 100644 --- a/var/spack/repos/builtin/packages/py-nipype/package.py +++ b/var/spack/repos/builtin/packages/py-nipype/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNipype(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nistats/package.py b/var/spack/repos/builtin/packages/py-nistats/package.py index 91e86cebf5..84ceb2f3fe 100644 --- a/var/spack/repos/builtin/packages/py-nistats/package.py +++ b/var/spack/repos/builtin/packages/py-nistats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNistats(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nitransforms/package.py b/var/spack/repos/builtin/packages/py-nitransforms/package.py index b9dd3b766b..2e52332f38 100644 --- a/var/spack/repos/builtin/packages/py-nitransforms/package.py +++ b/var/spack/repos/builtin/packages/py-nitransforms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNitransforms(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-niworkflows/package.py b/var/spack/repos/builtin/packages/py-niworkflows/package.py index 03b9d91003..44e03fd75c 100644 --- a/var/spack/repos/builtin/packages/py-niworkflows/package.py +++ b/var/spack/repos/builtin/packages/py-niworkflows/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNiworkflows(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nltk/package.py b/var/spack/repos/builtin/packages/py-nltk/package.py index 3b8e9bf3f3..65fa9eae6c 100644 --- a/var/spack/repos/builtin/packages/py-nltk/package.py +++ b/var/spack/repos/builtin/packages/py-nltk/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNltk(PythonPackage): """The Natural Language Toolkit (NLTK) is a Python package for natural language processing.""" diff --git a/var/spack/repos/builtin/packages/py-nltk/resourcegen.py b/var/spack/repos/builtin/packages/py-nltk/resourcegen.py index 7a1fa49a3c..d2def9fa0b 100644 --- a/var/spack/repos/builtin/packages/py-nltk/resourcegen.py +++ b/var/spack/repos/builtin/packages/py-nltk/resourcegen.py @@ -3,31 +3,39 @@ # Helper script for maintainers to autogenerate resources for py-nltk # import hashlib +import sys import urllib.request import xml.etree.ElementTree +from typing import Optional +url = None # type: Optional[str] url = 'https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/index.xml' -document = urllib.request.urlopen(url).read() -tree = xml.etree.ElementTree.fromstring(document) -packages = tree.findall('./packages/package') -for package in packages: - url = package.get('url') - name = package.get('id') - subdir = package.get('subdir') - packagebody = urllib.request.urlopen(url).read() - meta_checksum = package.get('checksum') - loaded_checksum = hashlib.md5(packagebody).hexdigest() - if (meta_checksum == loaded_checksum): - output_checksum = hashlib.sha256(packagebody).hexdigest() - print(""" - resource(name='{0}', - url='{1}', - when='+data', - sha256='{2}', - destination='nltk_data/{3}', - placement='{0}')""".format(name, - url, - output_checksum, - subdir)) - else: - print("""bad {0}""".format(url)) +if url is not None: + document = urllib.request.urlopen(url).read() + tree = xml.etree.ElementTree.fromstring(document) + packages = tree.findall('./packages/package') + for package in packages: + url = package.get('url') + name = package.get('id') + subdir = package.get('subdir') + if url is None: + continue + packagebody = urllib.request.urlopen(url).read() + meta_checksum = package.get('checksum') + loaded_checksum = hashlib.md5(packagebody).hexdigest() + if (meta_checksum == loaded_checksum): + output_checksum = hashlib.sha256(packagebody).hexdigest() + print(""" + resource(name='{0}', + url='{1}', + when='+data', + sha256='{2}', + destination='nltk_data/{3}', + placement='{0}')""".format(name, + url, + output_checksum, + subdir)) + else: + print("""bad {0}""".format(url)) +else: + sys.exit(1) diff --git a/var/spack/repos/builtin/packages/py-nodeenv/package.py b/var/spack/repos/builtin/packages/py-nodeenv/package.py index 5e61830d00..4b1fbd4e8f 100644 --- a/var/spack/repos/builtin/packages/py-nodeenv/package.py +++ b/var/spack/repos/builtin/packages/py-nodeenv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNodeenv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nose-cov/package.py b/var/spack/repos/builtin/packages/py-nose-cov/package.py index c6c4432f75..16a35c3499 100644 --- a/var/spack/repos/builtin/packages/py-nose-cov/package.py +++ b/var/spack/repos/builtin/packages/py-nose-cov/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNoseCov(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nose/package.py b/var/spack/repos/builtin/packages/py-nose/package.py index 8b1c7ef4f5..5bd42aacc8 100644 --- a/var/spack/repos/builtin/packages/py-nose/package.py +++ b/var/spack/repos/builtin/packages/py-nose/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNose(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nose2/package.py b/var/spack/repos/builtin/packages/py-nose2/package.py index bc09bbbed2..ef1e40432b 100644 --- a/var/spack/repos/builtin/packages/py-nose2/package.py +++ b/var/spack/repos/builtin/packages/py-nose2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNose2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nosexcover/package.py b/var/spack/repos/builtin/packages/py-nosexcover/package.py index 9d901dae26..f4f35712b1 100644 --- a/var/spack/repos/builtin/packages/py-nosexcover/package.py +++ b/var/spack/repos/builtin/packages/py-nosexcover/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNosexcover(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-notebook/package.py b/var/spack/repos/builtin/packages/py-notebook/package.py index fb637af366..85321262a3 100644 --- a/var/spack/repos/builtin/packages/py-notebook/package.py +++ b/var/spack/repos/builtin/packages/py-notebook/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNotebook(PythonPackage): """Jupyter Interactive Notebook""" diff --git a/var/spack/repos/builtin/packages/py-npx/package.py b/var/spack/repos/builtin/packages/py-npx/package.py index c63e3ed380..be30a135b2 100644 --- a/var/spack/repos/builtin/packages/py-npx/package.py +++ b/var/spack/repos/builtin/packages/py-npx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNpx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ntlm-auth/package.py b/var/spack/repos/builtin/packages/py-ntlm-auth/package.py index 533bcea767..f49e2171d0 100644 --- a/var/spack/repos/builtin/packages/py-ntlm-auth/package.py +++ b/var/spack/repos/builtin/packages/py-ntlm-auth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNtlmAuth(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ntplib/package.py b/var/spack/repos/builtin/packages/py-ntplib/package.py index 90913e611d..7725bd8730 100644 --- a/var/spack/repos/builtin/packages/py-ntplib/package.py +++ b/var/spack/repos/builtin/packages/py-ntplib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNtplib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-num2words/package.py b/var/spack/repos/builtin/packages/py-num2words/package.py index 172bafc870..dcab8d4cac 100644 --- a/var/spack/repos/builtin/packages/py-num2words/package.py +++ b/var/spack/repos/builtin/packages/py-num2words/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNum2words(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py index 6af98fe217..7718085a17 100644 --- a/var/spack/repos/builtin/packages/py-numba/package.py +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNumba(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-numcodecs/package.py b/var/spack/repos/builtin/packages/py-numcodecs/package.py index 813400c08f..231f6e9a8f 100644 --- a/var/spack/repos/builtin/packages/py-numcodecs/package.py +++ b/var/spack/repos/builtin/packages/py-numcodecs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNumcodecs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py index 95960982f3..08f0a2b2d6 100644 --- a/var/spack/repos/builtin/packages/py-numexpr/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNumexpr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-numexpr3/package.py b/var/spack/repos/builtin/packages/py-numexpr3/package.py index d18ce58b0f..2ead4f4c35 100644 --- a/var/spack/repos/builtin/packages/py-numexpr3/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNumexpr3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 0738448c64..c543ae2f8d 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -6,7 +6,7 @@ import platform import subprocess -from spack import * +from spack.package import * class PyNumpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-numpydoc/package.py b/var/spack/repos/builtin/packages/py-numpydoc/package.py index 86767970eb..300b2428b8 100644 --- a/var/spack/repos/builtin/packages/py-numpydoc/package.py +++ b/var/spack/repos/builtin/packages/py-numpydoc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyNumpydoc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-nvidia-ml-py/package.py b/var/spack/repos/builtin/packages/py-nvidia-ml-py/package.py index 4022acb3aa..c0151e7d62 100644 --- a/var/spack/repos/builtin/packages/py-nvidia-ml-py/package.py +++ b/var/spack/repos/builtin/packages/py-nvidia-ml-py/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNvidiaMlPy(PythonPackage): """Python Bindings for the NVIDIA Management Library.""" diff --git a/var/spack/repos/builtin/packages/py-nvidia-ml-py3/package.py b/var/spack/repos/builtin/packages/py-nvidia-ml-py3/package.py index a2418c93e7..a732c309e1 100644 --- a/var/spack/repos/builtin/packages/py-nvidia-ml-py3/package.py +++ b/var/spack/repos/builtin/packages/py-nvidia-ml-py3/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyNvidiaMlPy3(PythonPackage): """Python Bindings for the NVIDIA Management Library.""" diff --git a/var/spack/repos/builtin/packages/py-oauth2client/package.py b/var/spack/repos/builtin/packages/py-oauth2client/package.py index b19ca37de6..72732606cc 100644 --- a/var/spack/repos/builtin/packages/py-oauth2client/package.py +++ b/var/spack/repos/builtin/packages/py-oauth2client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOauth2client(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-oauthlib/package.py b/var/spack/repos/builtin/packages/py-oauthlib/package.py index aa995e832b..f80306e1f0 100644 --- a/var/spack/repos/builtin/packages/py-oauthlib/package.py +++ b/var/spack/repos/builtin/packages/py-oauthlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOauthlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-odc-geo/package.py b/var/spack/repos/builtin/packages/py-odc-geo/package.py index 534996ed5e..36dfe555da 100644 --- a/var/spack/repos/builtin/packages/py-odc-geo/package.py +++ b/var/spack/repos/builtin/packages/py-odc-geo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOdcGeo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-olefile/package.py b/var/spack/repos/builtin/packages/py-olefile/package.py index c60c0e3eb4..5fee5b60cc 100644 --- a/var/spack/repos/builtin/packages/py-olefile/package.py +++ b/var/spack/repos/builtin/packages/py-olefile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOlefile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-omegaconf/package.py b/var/spack/repos/builtin/packages/py-omegaconf/package.py index 9eb15f9185..b557240745 100644 --- a/var/spack/repos/builtin/packages/py-omegaconf/package.py +++ b/var/spack/repos/builtin/packages/py-omegaconf/package.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOmegaconf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-onnx-runtime/package.py b/var/spack/repos/builtin/packages/py-onnx-runtime/package.py index e1475eb5cf..d59054db25 100644 --- a/var/spack/repos/builtin/packages/py-onnx-runtime/package.py +++ b/var/spack/repos/builtin/packages/py-onnx-runtime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOnnxRuntime(CMakePackage, PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-onnx/package.py b/var/spack/repos/builtin/packages/py-onnx/package.py index 984f77a918..ad167ff539 100644 --- a/var/spack/repos/builtin/packages/py-onnx/package.py +++ b/var/spack/repos/builtin/packages/py-onnx/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOnnx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-onnxconverter-common/package.py b/var/spack/repos/builtin/packages/py-onnxconverter-common/package.py index dc7f727486..1fea07f002 100644 --- a/var/spack/repos/builtin/packages/py-onnxconverter-common/package.py +++ b/var/spack/repos/builtin/packages/py-onnxconverter-common/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOnnxconverterCommon(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-onnxmltools/package.py b/var/spack/repos/builtin/packages/py-onnxmltools/package.py index 0135d858d4..5c0d856410 100644 --- a/var/spack/repos/builtin/packages/py-onnxmltools/package.py +++ b/var/spack/repos/builtin/packages/py-onnxmltools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOnnxmltools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py b/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py index ee415f7124..6c6e864c98 100644 --- a/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py +++ b/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOntFast5Api(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-opcodes/package.py b/var/spack/repos/builtin/packages/py-opcodes/package.py index b574b1c7e5..afe963a0f5 100644 --- a/var/spack/repos/builtin/packages/py-opcodes/package.py +++ b/var/spack/repos/builtin/packages/py-opcodes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpcodes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-opencensus-context/package.py b/var/spack/repos/builtin/packages/py-opencensus-context/package.py index bab639be13..5eecea88df 100644 --- a/var/spack/repos/builtin/packages/py-opencensus-context/package.py +++ b/var/spack/repos/builtin/packages/py-opencensus-context/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyOpencensusContext(PythonPackage): """OpenCensus Runtime Context.""" diff --git a/var/spack/repos/builtin/packages/py-opencensus/package.py b/var/spack/repos/builtin/packages/py-opencensus/package.py index 3d51568205..8cd75948fd 100644 --- a/var/spack/repos/builtin/packages/py-opencensus/package.py +++ b/var/spack/repos/builtin/packages/py-opencensus/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyOpencensus(PythonPackage): """A stats collection and distributed tracing framework.""" diff --git a/var/spack/repos/builtin/packages/py-openidc-client/package.py b/var/spack/repos/builtin/packages/py-openidc-client/package.py index 2a2833c5b9..7e3e56b637 100644 --- a/var/spack/repos/builtin/packages/py-openidc-client/package.py +++ b/var/spack/repos/builtin/packages/py-openidc-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpenidcClient(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-openmc/package.py b/var/spack/repos/builtin/packages/py-openmc/package.py index 3b7946e687..7577ff3b30 100644 --- a/var/spack/repos/builtin/packages/py-openmc/package.py +++ b/var/spack/repos/builtin/packages/py-openmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpenmc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py index 0d197e003c..53c099af2b 100644 --- a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py +++ b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpenpmdValidator(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-openpmd-viewer/package.py b/var/spack/repos/builtin/packages/py-openpmd-viewer/package.py index 049ef29003..eac1f6d968 100644 --- a/var/spack/repos/builtin/packages/py-openpmd-viewer/package.py +++ b/var/spack/repos/builtin/packages/py-openpmd-viewer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpenpmdViewer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py index 962c9c96b7..cf151f6305 100644 --- a/var/spack/repos/builtin/packages/py-openpyxl/package.py +++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpenpyxl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-openslide-python/package.py b/var/spack/repos/builtin/packages/py-openslide-python/package.py index 0f63badbe8..aff56b2ce9 100644 --- a/var/spack/repos/builtin/packages/py-openslide-python/package.py +++ b/var/spack/repos/builtin/packages/py-openslide-python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpenslidePython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-opentuner/package.py b/var/spack/repos/builtin/packages/py-opentuner/package.py index 3fcd1fb4a4..d132f07cd0 100644 --- a/var/spack/repos/builtin/packages/py-opentuner/package.py +++ b/var/spack/repos/builtin/packages/py-opentuner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpentuner(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-opppy/package.py b/var/spack/repos/builtin/packages/py-opppy/package.py index c3d10787a3..d8e3c743f0 100644 --- a/var/spack/repos/builtin/packages/py-opppy/package.py +++ b/var/spack/repos/builtin/packages/py-opppy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOpppy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-opt-einsum/package.py b/var/spack/repos/builtin/packages/py-opt-einsum/package.py index bbef763374..741c7ef882 100644 --- a/var/spack/repos/builtin/packages/py-opt-einsum/package.py +++ b/var/spack/repos/builtin/packages/py-opt-einsum/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOptEinsum(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-or-tools/package.py b/var/spack/repos/builtin/packages/py-or-tools/package.py index e687e93c01..b326b4ea36 100644 --- a/var/spack/repos/builtin/packages/py-or-tools/package.py +++ b/var/spack/repos/builtin/packages/py-or-tools/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyOrTools(CMakePackage): """This project hosts operations research tools developed at Google and made available as open source under the Apache 2.0 diff --git a/var/spack/repos/builtin/packages/py-ordered-set/package.py b/var/spack/repos/builtin/packages/py-ordered-set/package.py index ee94c45572..985a3daca3 100644 --- a/var/spack/repos/builtin/packages/py-ordered-set/package.py +++ b/var/spack/repos/builtin/packages/py-ordered-set/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOrderedSet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ordereddict/package.py b/var/spack/repos/builtin/packages/py-ordereddict/package.py index 4bb38b0d61..1d9c8ea658 100644 --- a/var/spack/repos/builtin/packages/py-ordereddict/package.py +++ b/var/spack/repos/builtin/packages/py-ordereddict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOrdereddict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-os-service-types/package.py b/var/spack/repos/builtin/packages/py-os-service-types/package.py index 95e95e44e2..ad9cf05f03 100644 --- a/var/spack/repos/builtin/packages/py-os-service-types/package.py +++ b/var/spack/repos/builtin/packages/py-os-service-types/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOsServiceTypes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-oset/package.py b/var/spack/repos/builtin/packages/py-oset/package.py index 30d05302b8..1b0bcff73a 100644 --- a/var/spack/repos/builtin/packages/py-oset/package.py +++ b/var/spack/repos/builtin/packages/py-oset/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOset(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-oslo-config/package.py b/var/spack/repos/builtin/packages/py-oslo-config/package.py index f8cc09aec0..b44e67d65b 100644 --- a/var/spack/repos/builtin/packages/py-oslo-config/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-config/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOsloConfig(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-oslo-i18n/package.py b/var/spack/repos/builtin/packages/py-oslo-i18n/package.py index 163a368554..0939ff818f 100644 --- a/var/spack/repos/builtin/packages/py-oslo-i18n/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-i18n/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOsloI18n(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-oslo-serialization/package.py b/var/spack/repos/builtin/packages/py-oslo-serialization/package.py index 5ca9f20571..37228cea68 100644 --- a/var/spack/repos/builtin/packages/py-oslo-serialization/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-serialization/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOsloSerialization(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-oslo-utils/package.py b/var/spack/repos/builtin/packages/py-oslo-utils/package.py index 37b337ed1c..cda437c067 100644 --- a/var/spack/repos/builtin/packages/py-oslo-utils/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOsloUtils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-osqp/package.py b/var/spack/repos/builtin/packages/py-osqp/package.py index f670682eec..19f0a7ddb8 100644 --- a/var/spack/repos/builtin/packages/py-osqp/package.py +++ b/var/spack/repos/builtin/packages/py-osqp/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOsqp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-overpy/package.py b/var/spack/repos/builtin/packages/py-overpy/package.py index f4608131b0..b0616f973d 100644 --- a/var/spack/repos/builtin/packages/py-overpy/package.py +++ b/var/spack/repos/builtin/packages/py-overpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOverpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py index f96de159ec..88c3d98a7e 100644 --- a/var/spack/repos/builtin/packages/py-owslib/package.py +++ b/var/spack/repos/builtin/packages/py-owslib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyOwslib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pacifica-downloader/package.py b/var/spack/repos/builtin/packages/py-pacifica-downloader/package.py index 8be255af14..4f22674241 100644 --- a/var/spack/repos/builtin/packages/py-pacifica-downloader/package.py +++ b/var/spack/repos/builtin/packages/py-pacifica-downloader/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPacificaDownloader(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pacifica-namespace/package.py b/var/spack/repos/builtin/packages/py-pacifica-namespace/package.py index 66a0799d62..dcabdffb2d 100644 --- a/var/spack/repos/builtin/packages/py-pacifica-namespace/package.py +++ b/var/spack/repos/builtin/packages/py-pacifica-namespace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPacificaNamespace(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pacifica-uploader/package.py b/var/spack/repos/builtin/packages/py-pacifica-uploader/package.py index fb6bfbd4a8..c762e95703 100644 --- a/var/spack/repos/builtin/packages/py-pacifica-uploader/package.py +++ b/var/spack/repos/builtin/packages/py-pacifica-uploader/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPacificaUploader(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-packaging/package.py b/var/spack/repos/builtin/packages/py-packaging/package.py index 7c573228aa..f86d95f848 100644 --- a/var/spack/repos/builtin/packages/py-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-packaging/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPackaging(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pager/package.py b/var/spack/repos/builtin/packages/py-pager/package.py index dd2ec68037..baea2b1658 100644 --- a/var/spack/repos/builtin/packages/py-pager/package.py +++ b/var/spack/repos/builtin/packages/py-pager/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPager(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-palettable/package.py b/var/spack/repos/builtin/packages/py-palettable/package.py index 7cf4a89201..32e0c71add 100644 --- a/var/spack/repos/builtin/packages/py-palettable/package.py +++ b/var/spack/repos/builtin/packages/py-palettable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPalettable(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pamela/package.py b/var/spack/repos/builtin/packages/py-pamela/package.py index 61d9ceaa2d..fec9687a47 100644 --- a/var/spack/repos/builtin/packages/py-pamela/package.py +++ b/var/spack/repos/builtin/packages/py-pamela/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPamela(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 1e60dd2fd1..b267dd30a9 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPandas(PythonPackage): """pandas is a fast, powerful, flexible and easy to use open source data analysis and manipulation tool, built on top of the Python diff --git a/var/spack/repos/builtin/packages/py-pandocfilters/package.py b/var/spack/repos/builtin/packages/py-pandocfilters/package.py index 73e34072f6..1755b702f6 100644 --- a/var/spack/repos/builtin/packages/py-pandocfilters/package.py +++ b/var/spack/repos/builtin/packages/py-pandocfilters/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPandocfilters(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-param/package.py b/var/spack/repos/builtin/packages/py-param/package.py index 6766f805b9..e510cf4457 100644 --- a/var/spack/repos/builtin/packages/py-param/package.py +++ b/var/spack/repos/builtin/packages/py-param/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParam(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-parameterized/package.py b/var/spack/repos/builtin/packages/py-parameterized/package.py index ee6437c072..b16b7674e7 100644 --- a/var/spack/repos/builtin/packages/py-parameterized/package.py +++ b/var/spack/repos/builtin/packages/py-parameterized/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParameterized(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-paramiko/package.py b/var/spack/repos/builtin/packages/py-paramiko/package.py index 3193a5c389..98acfb8a01 100644 --- a/var/spack/repos/builtin/packages/py-paramiko/package.py +++ b/var/spack/repos/builtin/packages/py-paramiko/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyParamiko(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-paramz/package.py b/var/spack/repos/builtin/packages/py-paramz/package.py index 141579e57c..3f33bd23ff 100644 --- a/var/spack/repos/builtin/packages/py-paramz/package.py +++ b/var/spack/repos/builtin/packages/py-paramz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParamz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-parmed/package.py b/var/spack/repos/builtin/packages/py-parmed/package.py index f93794c518..f580ba0ebd 100644 --- a/var/spack/repos/builtin/packages/py-parmed/package.py +++ b/var/spack/repos/builtin/packages/py-parmed/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParmed(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-parse/package.py b/var/spack/repos/builtin/packages/py-parse/package.py index a37ffd8dcc..9be6bc71be 100644 --- a/var/spack/repos/builtin/packages/py-parse/package.py +++ b/var/spack/repos/builtin/packages/py-parse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-parsedatetime/package.py b/var/spack/repos/builtin/packages/py-parsedatetime/package.py index aea4bda7c1..dd73a18a9f 100644 --- a/var/spack/repos/builtin/packages/py-parsedatetime/package.py +++ b/var/spack/repos/builtin/packages/py-parsedatetime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParsedatetime(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-parsimonious/package.py b/var/spack/repos/builtin/packages/py-parsimonious/package.py index 36d75e1ced..869d4cf476 100644 --- a/var/spack/repos/builtin/packages/py-parsimonious/package.py +++ b/var/spack/repos/builtin/packages/py-parsimonious/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParsimonious(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-parsl/package.py b/var/spack/repos/builtin/packages/py-parsl/package.py index 39392e6f1a..e5cfbd4c42 100644 --- a/var/spack/repos/builtin/packages/py-parsl/package.py +++ b/var/spack/repos/builtin/packages/py-parsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParsl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-parso/package.py b/var/spack/repos/builtin/packages/py-parso/package.py index b235f5319f..54b1b31d36 100644 --- a/var/spack/repos/builtin/packages/py-parso/package.py +++ b/var/spack/repos/builtin/packages/py-parso/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParso(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-partd/package.py b/var/spack/repos/builtin/packages/py-partd/package.py index 84c211441d..cb8e9bfb50 100644 --- a/var/spack/repos/builtin/packages/py-partd/package.py +++ b/var/spack/repos/builtin/packages/py-partd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPartd(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-particle/package.py b/var/spack/repos/builtin/packages/py-particle/package.py index 807b8e4518..e268c0eb29 100644 --- a/var/spack/repos/builtin/packages/py-particle/package.py +++ b/var/spack/repos/builtin/packages/py-particle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyParticle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pastel/package.py b/var/spack/repos/builtin/packages/py-pastel/package.py index 5115d5dbb1..4c3b1122ca 100644 --- a/var/spack/repos/builtin/packages/py-pastel/package.py +++ b/var/spack/repos/builtin/packages/py-pastel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPastel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-path-py/package.py b/var/spack/repos/builtin/packages/py-path-py/package.py index 68e1d6c0d2..1d21330553 100644 --- a/var/spack/repos/builtin/packages/py-path-py/package.py +++ b/var/spack/repos/builtin/packages/py-path-py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPathPy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pathlib/package.py b/var/spack/repos/builtin/packages/py-pathlib/package.py index ed652097c4..333d03f4a1 100644 --- a/var/spack/repos/builtin/packages/py-pathlib/package.py +++ b/var/spack/repos/builtin/packages/py-pathlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPathlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pathlib2/package.py b/var/spack/repos/builtin/packages/py-pathlib2/package.py index 3ce1583a18..48017b8bf8 100644 --- a/var/spack/repos/builtin/packages/py-pathlib2/package.py +++ b/var/spack/repos/builtin/packages/py-pathlib2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPathlib2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pathos/package.py b/var/spack/repos/builtin/packages/py-pathos/package.py index 5ecae9620a..c440c61fc7 100644 --- a/var/spack/repos/builtin/packages/py-pathos/package.py +++ b/var/spack/repos/builtin/packages/py-pathos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPathos(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pathspec/package.py b/var/spack/repos/builtin/packages/py-pathspec/package.py index 1dc7a4cf85..970b54cda7 100644 --- a/var/spack/repos/builtin/packages/py-pathspec/package.py +++ b/var/spack/repos/builtin/packages/py-pathspec/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPathspec(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pathtools/package.py b/var/spack/repos/builtin/packages/py-pathtools/package.py index 32eaad9ae2..ce74512be3 100644 --- a/var/spack/repos/builtin/packages/py-pathtools/package.py +++ b/var/spack/repos/builtin/packages/py-pathtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPathtools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-patool/package.py b/var/spack/repos/builtin/packages/py-patool/package.py index 11cae1e227..8e1e01da8e 100644 --- a/var/spack/repos/builtin/packages/py-patool/package.py +++ b/var/spack/repos/builtin/packages/py-patool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPatool(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-patsy/package.py b/var/spack/repos/builtin/packages/py-patsy/package.py index ef4564b3f1..aa8b644e6b 100644 --- a/var/spack/repos/builtin/packages/py-patsy/package.py +++ b/var/spack/repos/builtin/packages/py-patsy/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPatsy(PythonPackage): """A Python package for describing statistical models and for building design matrices.""" diff --git a/var/spack/repos/builtin/packages/py-pauvre/package.py b/var/spack/repos/builtin/packages/py-pauvre/package.py index c0dede8833..e7b35c3032 100644 --- a/var/spack/repos/builtin/packages/py-pauvre/package.py +++ b/var/spack/repos/builtin/packages/py-pauvre/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPauvre(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pbr/package.py b/var/spack/repos/builtin/packages/py-pbr/package.py index ce95688a37..74a4d886ed 100644 --- a/var/spack/repos/builtin/packages/py-pbr/package.py +++ b/var/spack/repos/builtin/packages/py-pbr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPbr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-peachpy/package.py b/var/spack/repos/builtin/packages/py-peachpy/package.py index 18573cefda..80749eb4e7 100644 --- a/var/spack/repos/builtin/packages/py-peachpy/package.py +++ b/var/spack/repos/builtin/packages/py-peachpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPeachpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pem/package.py b/var/spack/repos/builtin/packages/py-pem/package.py index de19c33860..cc35af9be5 100644 --- a/var/spack/repos/builtin/packages/py-pem/package.py +++ b/var/spack/repos/builtin/packages/py-pem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPem(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pep517/package.py b/var/spack/repos/builtin/packages/py-pep517/package.py index 4bf86e20e4..ba507421d8 100644 --- a/var/spack/repos/builtin/packages/py-pep517/package.py +++ b/var/spack/repos/builtin/packages/py-pep517/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPep517(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pep8-naming/package.py b/var/spack/repos/builtin/packages/py-pep8-naming/package.py index d68d8951fc..e5cc8311b3 100644 --- a/var/spack/repos/builtin/packages/py-pep8-naming/package.py +++ b/var/spack/repos/builtin/packages/py-pep8-naming/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPep8Naming(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pep8/package.py b/var/spack/repos/builtin/packages/py-pep8/package.py index e399b18bfb..8c1f9fdba8 100644 --- a/var/spack/repos/builtin/packages/py-pep8/package.py +++ b/var/spack/repos/builtin/packages/py-pep8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPep8(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-performance/package.py b/var/spack/repos/builtin/packages/py-performance/package.py index 863187ae20..5a690c5f00 100644 --- a/var/spack/repos/builtin/packages/py-performance/package.py +++ b/var/spack/repos/builtin/packages/py-performance/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPerformance(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-periodictable/package.py b/var/spack/repos/builtin/packages/py-periodictable/package.py index 5619fa926f..1793aaa9fa 100644 --- a/var/spack/repos/builtin/packages/py-periodictable/package.py +++ b/var/spack/repos/builtin/packages/py-periodictable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPeriodictable(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-petastorm/package.py b/var/spack/repos/builtin/packages/py-petastorm/package.py index 88134b9742..13fa49e9cd 100644 --- a/var/spack/repos/builtin/packages/py-petastorm/package.py +++ b/var/spack/repos/builtin/packages/py-petastorm/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPetastorm(PythonPackage): """Petastorm is a library enabling the use of Parquet storage from Tensorflow, Pytorch, and other Python-based ML training frameworks.""" diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 2ce73c4689..beb7289e41 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPetsc4py(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pexpect/package.py b/var/spack/repos/builtin/packages/py-pexpect/package.py index 7140a75311..262493c8c2 100644 --- a/var/spack/repos/builtin/packages/py-pexpect/package.py +++ b/var/spack/repos/builtin/packages/py-pexpect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPexpect(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-phonenumbers/package.py b/var/spack/repos/builtin/packages/py-phonenumbers/package.py index 23cecc4279..1067d93d05 100644 --- a/var/spack/repos/builtin/packages/py-phonenumbers/package.py +++ b/var/spack/repos/builtin/packages/py-phonenumbers/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPhonenumbers(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-phonopy/package.py b/var/spack/repos/builtin/packages/py-phonopy/package.py index 19b5b02081..18b4759d14 100644 --- a/var/spack/repos/builtin/packages/py-phonopy/package.py +++ b/var/spack/repos/builtin/packages/py-phonopy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPhonopy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pickle5/package.py b/var/spack/repos/builtin/packages/py-pickle5/package.py index 7b366eba44..70d965b139 100644 --- a/var/spack/repos/builtin/packages/py-pickle5/package.py +++ b/var/spack/repos/builtin/packages/py-pickle5/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPickle5(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pickleshare/package.py b/var/spack/repos/builtin/packages/py-pickleshare/package.py index b5b4404ec1..819590b689 100644 --- a/var/spack/repos/builtin/packages/py-pickleshare/package.py +++ b/var/spack/repos/builtin/packages/py-pickleshare/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPickleshare(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-picmistandard/package.py b/var/spack/repos/builtin/packages/py-picmistandard/package.py index 8e1e1b0628..787f0f2550 100644 --- a/var/spack/repos/builtin/packages/py-picmistandard/package.py +++ b/var/spack/repos/builtin/packages/py-picmistandard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPicmistandard(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-picrust/package.py b/var/spack/repos/builtin/packages/py-picrust/package.py index 3490975657..1b82a794c9 100644 --- a/var/spack/repos/builtin/packages/py-picrust/package.py +++ b/var/spack/repos/builtin/packages/py-picrust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPicrust(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-picrust2/package.py b/var/spack/repos/builtin/packages/py-picrust2/package.py index 8ada06116f..a0f584c6e1 100644 --- a/var/spack/repos/builtin/packages/py-picrust2/package.py +++ b/var/spack/repos/builtin/packages/py-picrust2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPicrust2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pid/package.py b/var/spack/repos/builtin/packages/py-pid/package.py index 0156dcf8cc..9df2bea67f 100644 --- a/var/spack/repos/builtin/packages/py-pid/package.py +++ b/var/spack/repos/builtin/packages/py-pid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPid(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pika/package.py b/var/spack/repos/builtin/packages/py-pika/package.py index 6b42ecee39..86b0c6234a 100644 --- a/var/spack/repos/builtin/packages/py-pika/package.py +++ b/var/spack/repos/builtin/packages/py-pika/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPika(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pil/package.py b/var/spack/repos/builtin/packages/py-pil/package.py index c380713be2..96d340706b 100644 --- a/var/spack/repos/builtin/packages/py-pil/package.py +++ b/var/spack/repos/builtin/packages/py-pil/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPil(PythonPackage): """The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library supports many file formats, diff --git a/var/spack/repos/builtin/packages/py-pillow-simd/package.py b/var/spack/repos/builtin/packages/py-pillow-simd/package.py index 0f1944aeba..0083c82d9f 100644 --- a/var/spack/repos/builtin/packages/py-pillow-simd/package.py +++ b/var/spack/repos/builtin/packages/py-pillow-simd/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.py_pillow import PyPillowBase diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 4a31d1bd5a..8daa0f529f 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPillowBase(PythonPackage): """Base class for Pillow and its fork Pillow-SIMD.""" diff --git a/var/spack/repos/builtin/packages/py-pint/package.py b/var/spack/repos/builtin/packages/py-pint/package.py index 508112323c..b09db6a754 100644 --- a/var/spack/repos/builtin/packages/py-pint/package.py +++ b/var/spack/repos/builtin/packages/py-pint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPint(PythonPackage): @@ -16,7 +16,7 @@ class PyPint(PythonPackage): # 'pint' requires 'xarray', creating a circular dependency. Don't bother attempting # any import tests for this package. - import_modules = [] + import_modules = [] # type: List[str] version('0.17', sha256='f4d0caa713239e6847a7c6eefe2427358566451fe56497d533f21fb590a3f313') version('0.11', sha256='308f1070500e102f83b6adfca6db53debfce2ffc5d3cbe3f6c367da359b5cf4d') diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py index c0596746e7..d3fb184a7b 100644 --- a/var/spack/repos/builtin/packages/py-pip/package.py +++ b/var/spack/repos/builtin/packages/py-pip/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyPip(Package): diff --git a/var/spack/repos/builtin/packages/py-pipits/package.py b/var/spack/repos/builtin/packages/py-pipits/package.py index a0effaf254..8c22d2d83d 100644 --- a/var/spack/repos/builtin/packages/py-pipits/package.py +++ b/var/spack/repos/builtin/packages/py-pipits/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPipits(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pispino/package.py b/var/spack/repos/builtin/packages/py-pispino/package.py index e26ca2d14d..c6ad03d4fe 100644 --- a/var/spack/repos/builtin/packages/py-pispino/package.py +++ b/var/spack/repos/builtin/packages/py-pispino/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPispino(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pkgconfig/package.py b/var/spack/repos/builtin/packages/py-pkgconfig/package.py index 5209d70a94..3dae973c55 100644 --- a/var/spack/repos/builtin/packages/py-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/py-pkgconfig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPkgconfig(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pkginfo/package.py b/var/spack/repos/builtin/packages/py-pkginfo/package.py index bbfcb63db2..04123c38bb 100644 --- a/var/spack/repos/builtin/packages/py-pkginfo/package.py +++ b/var/spack/repos/builtin/packages/py-pkginfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPkginfo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-plac/package.py b/var/spack/repos/builtin/packages/py-plac/package.py index 2b4de11ad8..e7ba9904cd 100644 --- a/var/spack/repos/builtin/packages/py-plac/package.py +++ b/var/spack/repos/builtin/packages/py-plac/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPlac(PythonPackage): """The smartest command line arguments parser in the world.""" diff --git a/var/spack/repos/builtin/packages/py-planar/package.py b/var/spack/repos/builtin/packages/py-planar/package.py index 08e8a10afe..15ee274dc8 100644 --- a/var/spack/repos/builtin/packages/py-planar/package.py +++ b/var/spack/repos/builtin/packages/py-planar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPlanar(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-planet/package.py b/var/spack/repos/builtin/packages/py-planet/package.py index 24a0e15e01..a5df8dfcb8 100644 --- a/var/spack/repos/builtin/packages/py-planet/package.py +++ b/var/spack/repos/builtin/packages/py-planet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPlanet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-platformdirs/package.py b/var/spack/repos/builtin/packages/py-platformdirs/package.py index 6c3087d0a3..6d9a639ef8 100644 --- a/var/spack/repos/builtin/packages/py-platformdirs/package.py +++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPlatformdirs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-plotly/package.py b/var/spack/repos/builtin/packages/py-plotly/package.py index 1d31802817..448ba4c991 100644 --- a/var/spack/repos/builtin/packages/py-plotly/package.py +++ b/var/spack/repos/builtin/packages/py-plotly/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPlotly(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-plotnine/package.py b/var/spack/repos/builtin/packages/py-plotnine/package.py index 3ccb7bb9bc..e864d62311 100644 --- a/var/spack/repos/builtin/packages/py-plotnine/package.py +++ b/var/spack/repos/builtin/packages/py-plotnine/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.directives import depends_on, version +from spack.package import * class PyPlotnine(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pluggy/package.py b/var/spack/repos/builtin/packages/py-pluggy/package.py index 07cb881247..259457cc2a 100644 --- a/var/spack/repos/builtin/packages/py-pluggy/package.py +++ b/var/spack/repos/builtin/packages/py-pluggy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPluggy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ply/package.py b/var/spack/repos/builtin/packages/py-ply/package.py index 5d9386054d..2119b36817 100644 --- a/var/spack/repos/builtin/packages/py-ply/package.py +++ b/var/spack/repos/builtin/packages/py-ply/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPly(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pmw-patched/package.py b/var/spack/repos/builtin/packages/py-pmw-patched/package.py index 5b1c2650d1..7f7b246c18 100644 --- a/var/spack/repos/builtin/packages/py-pmw-patched/package.py +++ b/var/spack/repos/builtin/packages/py-pmw-patched/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPmwPatched(PythonPackage): """Schrodinger's Fork of Python megawidgets with essential patches applied. Pmw is a toolkit for building high-level compound widgets, or diff --git a/var/spack/repos/builtin/packages/py-pmw/package.py b/var/spack/repos/builtin/packages/py-pmw/package.py index 8ece9df9ae..61b79adbc6 100644 --- a/var/spack/repos/builtin/packages/py-pmw/package.py +++ b/var/spack/repos/builtin/packages/py-pmw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPmw(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pockets/package.py b/var/spack/repos/builtin/packages/py-pockets/package.py index 249ebc8726..179b985899 100644 --- a/var/spack/repos/builtin/packages/py-pockets/package.py +++ b/var/spack/repos/builtin/packages/py-pockets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPockets(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-poetry-core/package.py b/var/spack/repos/builtin/packages/py-poetry-core/package.py index d546d56234..7c13d82108 100644 --- a/var/spack/repos/builtin/packages/py-poetry-core/package.py +++ b/var/spack/repos/builtin/packages/py-poetry-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPoetryCore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-poetry/package.py b/var/spack/repos/builtin/packages/py-poetry/package.py index 26be0d35e3..48e6c6b654 100644 --- a/var/spack/repos/builtin/packages/py-poetry/package.py +++ b/var/spack/repos/builtin/packages/py-poetry/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPoetry(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pomegranate/package.py b/var/spack/repos/builtin/packages/py-pomegranate/package.py index 5db004bed6..c7fc97aac0 100644 --- a/var/spack/repos/builtin/packages/py-pomegranate/package.py +++ b/var/spack/repos/builtin/packages/py-pomegranate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPomegranate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pooch/package.py b/var/spack/repos/builtin/packages/py-pooch/package.py index 85c07efcfb..5f0ee3d0aa 100644 --- a/var/spack/repos/builtin/packages/py-pooch/package.py +++ b/var/spack/repos/builtin/packages/py-pooch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPooch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-portalocker/package.py b/var/spack/repos/builtin/packages/py-portalocker/package.py index 1c40b2b1ca..5f0d745e37 100644 --- a/var/spack/repos/builtin/packages/py-portalocker/package.py +++ b/var/spack/repos/builtin/packages/py-portalocker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPortalocker(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-portend/package.py b/var/spack/repos/builtin/packages/py-portend/package.py index 49bd63bd60..dd1b636743 100644 --- a/var/spack/repos/builtin/packages/py-portend/package.py +++ b/var/spack/repos/builtin/packages/py-portend/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPortend(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-poster/package.py b/var/spack/repos/builtin/packages/py-poster/package.py index f5abad8653..f27464625e 100644 --- a/var/spack/repos/builtin/packages/py-poster/package.py +++ b/var/spack/repos/builtin/packages/py-poster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPoster(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pot/package.py b/var/spack/repos/builtin/packages/py-pot/package.py index d566d7ddea..3ef43626ee 100644 --- a/var/spack/repos/builtin/packages/py-pot/package.py +++ b/var/spack/repos/builtin/packages/py-pot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pox/package.py b/var/spack/repos/builtin/packages/py-pox/package.py index d79879e1d8..595386df20 100644 --- a/var/spack/repos/builtin/packages/py-pox/package.py +++ b/var/spack/repos/builtin/packages/py-pox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPox(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-poyo/package.py b/var/spack/repos/builtin/packages/py-poyo/package.py index ab007083f8..2e5441ef12 100644 --- a/var/spack/repos/builtin/packages/py-poyo/package.py +++ b/var/spack/repos/builtin/packages/py-poyo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPoyo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ppft/package.py b/var/spack/repos/builtin/packages/py-ppft/package.py index fe41cf3b5c..2015bce15e 100644 --- a/var/spack/repos/builtin/packages/py-ppft/package.py +++ b/var/spack/repos/builtin/packages/py-ppft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPpft(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pre-commit/package.py b/var/spack/repos/builtin/packages/py-pre-commit/package.py index 10a3dc3208..fa3295e50b 100644 --- a/var/spack/repos/builtin/packages/py-pre-commit/package.py +++ b/var/spack/repos/builtin/packages/py-pre-commit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPreCommit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-preshed/package.py b/var/spack/repos/builtin/packages/py-preshed/package.py index 2965c29d39..f16d92ccfc 100644 --- a/var/spack/repos/builtin/packages/py-preshed/package.py +++ b/var/spack/repos/builtin/packages/py-preshed/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPreshed(PythonPackage): """preshed: Cython Hash Table for Pre-Hashed Keys.""" diff --git a/var/spack/repos/builtin/packages/py-pretrainedmodels/package.py b/var/spack/repos/builtin/packages/py-pretrainedmodels/package.py index a5dc8553ba..47adbe0acb 100644 --- a/var/spack/repos/builtin/packages/py-pretrainedmodels/package.py +++ b/var/spack/repos/builtin/packages/py-pretrainedmodels/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPretrainedmodels(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-prettytable/package.py b/var/spack/repos/builtin/packages/py-prettytable/package.py index ee783cc453..9e9d5d8546 100644 --- a/var/spack/repos/builtin/packages/py-prettytable/package.py +++ b/var/spack/repos/builtin/packages/py-prettytable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPrettytable(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-priority/package.py b/var/spack/repos/builtin/packages/py-priority/package.py index 03707a38d5..2bad063bb0 100644 --- a/var/spack/repos/builtin/packages/py-priority/package.py +++ b/var/spack/repos/builtin/packages/py-priority/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPriority(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-profilehooks/package.py b/var/spack/repos/builtin/packages/py-profilehooks/package.py index b0212a4a03..41b9d71f9d 100644 --- a/var/spack/repos/builtin/packages/py-profilehooks/package.py +++ b/var/spack/repos/builtin/packages/py-profilehooks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyProfilehooks(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-proglog/package.py b/var/spack/repos/builtin/packages/py-proglog/package.py index 562f6d36f5..008f98e5bf 100644 --- a/var/spack/repos/builtin/packages/py-proglog/package.py +++ b/var/spack/repos/builtin/packages/py-proglog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyProglog(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-progress/package.py b/var/spack/repos/builtin/packages/py-progress/package.py index 1fea9e3b9e..eca2f343ab 100644 --- a/var/spack/repos/builtin/packages/py-progress/package.py +++ b/var/spack/repos/builtin/packages/py-progress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyProgress(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-progressbar2/package.py b/var/spack/repos/builtin/packages/py-progressbar2/package.py index be83d9bfb9..a6f24f8352 100644 --- a/var/spack/repos/builtin/packages/py-progressbar2/package.py +++ b/var/spack/repos/builtin/packages/py-progressbar2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyProgressbar2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-projectq/package.py b/var/spack/repos/builtin/packages/py-projectq/package.py index 84280fb30a..4772bcdd0d 100644 --- a/var/spack/repos/builtin/packages/py-projectq/package.py +++ b/var/spack/repos/builtin/packages/py-projectq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyProjectq(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-prometheus-client/package.py b/var/spack/repos/builtin/packages/py-prometheus-client/package.py index baf890cdfb..501970520f 100644 --- a/var/spack/repos/builtin/packages/py-prometheus-client/package.py +++ b/var/spack/repos/builtin/packages/py-prometheus-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPrometheusClient(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-promise/package.py b/var/spack/repos/builtin/packages/py-promise/package.py index 62a72bce37..af6e951aba 100644 --- a/var/spack/repos/builtin/packages/py-promise/package.py +++ b/var/spack/repos/builtin/packages/py-promise/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPromise(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py index cd0cdd8048..7ed6ba86ed 100644 --- a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py +++ b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPromptToolkit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-protobuf/package.py b/var/spack/repos/builtin/packages/py-protobuf/package.py index 2373c843dd..5ed4bc0908 100644 --- a/var/spack/repos/builtin/packages/py-protobuf/package.py +++ b/var/spack/repos/builtin/packages/py-protobuf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyProtobuf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-prov/package.py b/var/spack/repos/builtin/packages/py-prov/package.py index 8b9a922064..46e1b08d48 100644 --- a/var/spack/repos/builtin/packages/py-prov/package.py +++ b/var/spack/repos/builtin/packages/py-prov/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyProv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-prwlock/package.py b/var/spack/repos/builtin/packages/py-prwlock/package.py index e7e7a573c6..b365917561 100644 --- a/var/spack/repos/builtin/packages/py-prwlock/package.py +++ b/var/spack/repos/builtin/packages/py-prwlock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPrwlock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pspamm/package.py b/var/spack/repos/builtin/packages/py-pspamm/package.py index 9c385cf7d9..84f04ff584 100644 --- a/var/spack/repos/builtin/packages/py-pspamm/package.py +++ b/var/spack/repos/builtin/packages/py-pspamm/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPspamm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-psutil/package.py b/var/spack/repos/builtin/packages/py-psutil/package.py index edcdc3374a..5fb7689a43 100644 --- a/var/spack/repos/builtin/packages/py-psutil/package.py +++ b/var/spack/repos/builtin/packages/py-psutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPsutil(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-psyclone/package.py b/var/spack/repos/builtin/packages/py-psyclone/package.py index 4a1bcfd976..a21b00566e 100644 --- a/var/spack/repos/builtin/packages/py-psyclone/package.py +++ b/var/spack/repos/builtin/packages/py-psyclone/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyPsyclone(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-psycopg2/package.py b/var/spack/repos/builtin/packages/py-psycopg2/package.py index cf3c032aec..706d54bef3 100644 --- a/var/spack/repos/builtin/packages/py-psycopg2/package.py +++ b/var/spack/repos/builtin/packages/py-psycopg2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPsycopg2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ptyprocess/package.py b/var/spack/repos/builtin/packages/py-ptyprocess/package.py index ce005c032d..dd92c2ce12 100644 --- a/var/spack/repos/builtin/packages/py-ptyprocess/package.py +++ b/var/spack/repos/builtin/packages/py-ptyprocess/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPtyprocess(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pudb/package.py b/var/spack/repos/builtin/packages/py-pudb/package.py index 71a40d1e2e..8d66d6e800 100644 --- a/var/spack/repos/builtin/packages/py-pudb/package.py +++ b/var/spack/repos/builtin/packages/py-pudb/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPudb(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pulp/package.py b/var/spack/repos/builtin/packages/py-pulp/package.py index 884394b7dc..60efba2303 100644 --- a/var/spack/repos/builtin/packages/py-pulp/package.py +++ b/var/spack/repos/builtin/packages/py-pulp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPulp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pure-eval/package.py b/var/spack/repos/builtin/packages/py-pure-eval/package.py index 5a5e4a27fd..060288bac0 100644 --- a/var/spack/repos/builtin/packages/py-pure-eval/package.py +++ b/var/spack/repos/builtin/packages/py-pure-eval/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPureEval(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pure-sasl/package.py b/var/spack/repos/builtin/packages/py-pure-sasl/package.py index 0401e88254..01966c8241 100644 --- a/var/spack/repos/builtin/packages/py-pure-sasl/package.py +++ b/var/spack/repos/builtin/packages/py-pure-sasl/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPureSasl(PythonPackage): """This package provides a reasonably high-level SASL client written in pure Python. New mechanisms may be integrated easily, diff --git a/var/spack/repos/builtin/packages/py-py-cpuinfo/package.py b/var/spack/repos/builtin/packages/py-py-cpuinfo/package.py index c04b39b97d..2997be0c40 100644 --- a/var/spack/repos/builtin/packages/py-py-cpuinfo/package.py +++ b/var/spack/repos/builtin/packages/py-py-cpuinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyCpuinfo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-py-spy/package.py b/var/spack/repos/builtin/packages/py-py-spy/package.py index a95bbaa41c..a33551017a 100644 --- a/var/spack/repos/builtin/packages/py-py-spy/package.py +++ b/var/spack/repos/builtin/packages/py-py-spy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPySpy(Package): diff --git a/var/spack/repos/builtin/packages/py-py/package.py b/var/spack/repos/builtin/packages/py-py/package.py index 684877c0d4..117e6a9aae 100644 --- a/var/spack/repos/builtin/packages/py-py/package.py +++ b/var/spack/repos/builtin/packages/py-py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-py2bit/package.py b/var/spack/repos/builtin/packages/py-py2bit/package.py index 5d3a07af22..e6b9a9b8c8 100644 --- a/var/spack/repos/builtin/packages/py-py2bit/package.py +++ b/var/spack/repos/builtin/packages/py-py2bit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPy2bit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-py2cairo/package.py b/var/spack/repos/builtin/packages/py-py2cairo/package.py index c1e40902e7..a73c6d7c2f 100644 --- a/var/spack/repos/builtin/packages/py-py2cairo/package.py +++ b/var/spack/repos/builtin/packages/py-py2cairo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPy2cairo(WafPackage): diff --git a/var/spack/repos/builtin/packages/py-py2neo/package.py b/var/spack/repos/builtin/packages/py-py2neo/package.py index 5fe5a6475a..45d5af6ff0 100644 --- a/var/spack/repos/builtin/packages/py-py2neo/package.py +++ b/var/spack/repos/builtin/packages/py-py2neo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPy2neo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-py4j/package.py b/var/spack/repos/builtin/packages/py-py4j/package.py index 451eff8379..eef4648458 100644 --- a/var/spack/repos/builtin/packages/py-py4j/package.py +++ b/var/spack/repos/builtin/packages/py-py4j/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPy4j(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-py6s/package.py b/var/spack/repos/builtin/packages/py-py6s/package.py index a7f4cd9ea1..285cd2925e 100644 --- a/var/spack/repos/builtin/packages/py-py6s/package.py +++ b/var/spack/repos/builtin/packages/py-py6s/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPy6s(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyaestro/package.py b/var/spack/repos/builtin/packages/py-pyaestro/package.py index 1200f75caa..c8ae2ff20b 100644 --- a/var/spack/repos/builtin/packages/py-pyaestro/package.py +++ b/var/spack/repos/builtin/packages/py-pyaestro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyaestro(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyamg/package.py b/var/spack/repos/builtin/packages/py-pyamg/package.py index ee44739266..caf21fc565 100644 --- a/var/spack/repos/builtin/packages/py-pyamg/package.py +++ b/var/spack/repos/builtin/packages/py-pyamg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyamg(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyaml/package.py b/var/spack/repos/builtin/packages/py-pyaml/package.py index 057d8d7757..6865404eff 100644 --- a/var/spack/repos/builtin/packages/py-pyaml/package.py +++ b/var/spack/repos/builtin/packages/py-pyaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyaml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyani/package.py b/var/spack/repos/builtin/packages/py-pyani/package.py index 106652ad34..2e7b1aabfb 100644 --- a/var/spack/repos/builtin/packages/py-pyani/package.py +++ b/var/spack/repos/builtin/packages/py-pyani/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyani(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyarrow/package.py b/var/spack/repos/builtin/packages/py-pyarrow/package.py index e20446f479..fdc0305945 100644 --- a/var/spack/repos/builtin/packages/py-pyarrow/package.py +++ b/var/spack/repos/builtin/packages/py-pyarrow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyarrow(PythonPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py b/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py index a7e937b0e4..555917726f 100644 --- a/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py +++ b/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyasn1Modules(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyasn1/package.py b/var/spack/repos/builtin/packages/py-pyasn1/package.py index ccd2f0434e..e29bb0233b 100644 --- a/var/spack/repos/builtin/packages/py-pyasn1/package.py +++ b/var/spack/repos/builtin/packages/py-pyasn1/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyPyasn1(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyautogui/package.py b/var/spack/repos/builtin/packages/py-pyautogui/package.py index 257073afee..c8c7cd0052 100644 --- a/var/spack/repos/builtin/packages/py-pyautogui/package.py +++ b/var/spack/repos/builtin/packages/py-pyautogui/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyautogui(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybedtools/package.py b/var/spack/repos/builtin/packages/py-pybedtools/package.py index 88906a14f8..c725512ca3 100644 --- a/var/spack/repos/builtin/packages/py-pybedtools/package.py +++ b/var/spack/repos/builtin/packages/py-pybedtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPybedtools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybids/package.py b/var/spack/repos/builtin/packages/py-pybids/package.py index 257786a044..262166f96b 100644 --- a/var/spack/repos/builtin/packages/py-pybids/package.py +++ b/var/spack/repos/builtin/packages/py-pybids/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPybids(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybigwig/package.py b/var/spack/repos/builtin/packages/py-pybigwig/package.py index fd65cf7825..a425a8c0b8 100644 --- a/var/spack/repos/builtin/packages/py-pybigwig/package.py +++ b/var/spack/repos/builtin/packages/py-pybigwig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPybigwig(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybind11-stubgen/package.py b/var/spack/repos/builtin/packages/py-pybind11-stubgen/package.py index 8adba28e31..b2c3a12ea8 100644 --- a/var/spack/repos/builtin/packages/py-pybind11-stubgen/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11-stubgen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPybind11Stubgen(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 7f9d167f56..85ad88b404 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyPybind11(CMakePackage, PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybobyqa/package.py b/var/spack/repos/builtin/packages/py-pybobyqa/package.py index 044458ae6d..fa7e908343 100644 --- a/var/spack/repos/builtin/packages/py-pybobyqa/package.py +++ b/var/spack/repos/builtin/packages/py-pybobyqa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPybobyqa(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybrain/package.py b/var/spack/repos/builtin/packages/py-pybrain/package.py index 80c84cbe5a..a5488fe5e9 100644 --- a/var/spack/repos/builtin/packages/py-pybrain/package.py +++ b/var/spack/repos/builtin/packages/py-pybrain/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPybrain(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py b/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py index 6e7f864f44..2b876018a0 100644 --- a/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPybtexDocutils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pybtex/package.py b/var/spack/repos/builtin/packages/py-pybtex/package.py index f5be93d35b..6c5889bffe 100644 --- a/var/spack/repos/builtin/packages/py-pybtex/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPybtex(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycairo/package.py b/var/spack/repos/builtin/packages/py-pycairo/package.py index 3af19e626c..c5cc48c1eb 100644 --- a/var/spack/repos/builtin/packages/py-pycairo/package.py +++ b/var/spack/repos/builtin/packages/py-pycairo/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyPycairo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycares/package.py b/var/spack/repos/builtin/packages/py-pycares/package.py index 4a367381c9..d92e939fd6 100644 --- a/var/spack/repos/builtin/packages/py-pycares/package.py +++ b/var/spack/repos/builtin/packages/py-pycares/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycares(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycbc/package.py b/var/spack/repos/builtin/packages/py-pycbc/package.py index 5ef53c67d8..723ba66a79 100644 --- a/var/spack/repos/builtin/packages/py-pycbc/package.py +++ b/var/spack/repos/builtin/packages/py-pycbc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycbc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pychecker/package.py b/var/spack/repos/builtin/packages/py-pychecker/package.py index c1c89a1a25..a3facd1cdf 100644 --- a/var/spack/repos/builtin/packages/py-pychecker/package.py +++ b/var/spack/repos/builtin/packages/py-pychecker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPychecker(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycifrw/package.py b/var/spack/repos/builtin/packages/py-pycifrw/package.py index c2a2ace8f8..caa3eff910 100644 --- a/var/spack/repos/builtin/packages/py-pycifrw/package.py +++ b/var/spack/repos/builtin/packages/py-pycifrw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycifrw(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycmd/package.py b/var/spack/repos/builtin/packages/py-pycmd/package.py index bdeaef6718..a4fe74db54 100644 --- a/var/spack/repos/builtin/packages/py-pycmd/package.py +++ b/var/spack/repos/builtin/packages/py-pycmd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycmd(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycocotools/package.py b/var/spack/repos/builtin/packages/py-pycocotools/package.py index 6eb9a6310d..26b6edd414 100644 --- a/var/spack/repos/builtin/packages/py-pycocotools/package.py +++ b/var/spack/repos/builtin/packages/py-pycocotools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycocotools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycodestyle/package.py b/var/spack/repos/builtin/packages/py-pycodestyle/package.py index 17e11ec3fa..295650ab0a 100644 --- a/var/spack/repos/builtin/packages/py-pycodestyle/package.py +++ b/var/spack/repos/builtin/packages/py-pycodestyle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycodestyle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycompadre/package.py b/var/spack/repos/builtin/packages/py-pycompadre/package.py index 503cabe99a..daa5cb6238 100644 --- a/var/spack/repos/builtin/packages/py-pycompadre/package.py +++ b/var/spack/repos/builtin/packages/py-pycompadre/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycompadre(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycortex/package.py b/var/spack/repos/builtin/packages/py-pycortex/package.py index 5f9a25892f..37a21e5db9 100644 --- a/var/spack/repos/builtin/packages/py-pycortex/package.py +++ b/var/spack/repos/builtin/packages/py-pycortex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycortex(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycosat/package.py b/var/spack/repos/builtin/packages/py-pycosat/package.py index 950e8ef51e..8ae8eb826a 100644 --- a/var/spack/repos/builtin/packages/py-pycosat/package.py +++ b/var/spack/repos/builtin/packages/py-pycosat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycosat(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycparser/package.py b/var/spack/repos/builtin/packages/py-pycparser/package.py index 21a64b7d42..a754b0452b 100644 --- a/var/spack/repos/builtin/packages/py-pycparser/package.py +++ b/var/spack/repos/builtin/packages/py-pycparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycparser(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycrypto/package.py b/var/spack/repos/builtin/packages/py-pycrypto/package.py index 14d6fcb9df..847896bdbe 100644 --- a/var/spack/repos/builtin/packages/py-pycrypto/package.py +++ b/var/spack/repos/builtin/packages/py-pycrypto/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyPycrypto(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pycuda/package.py b/var/spack/repos/builtin/packages/py-pycuda/package.py index bb5a965840..685938da52 100644 --- a/var/spack/repos/builtin/packages/py-pycuda/package.py +++ b/var/spack/repos/builtin/packages/py-pycuda/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/py-pycurl/package.py b/var/spack/repos/builtin/packages/py-pycurl/package.py index a8bcb1d175..9d2609d69b 100644 --- a/var/spack/repos/builtin/packages/py-pycurl/package.py +++ b/var/spack/repos/builtin/packages/py-pycurl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPycurl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydantic/package.py b/var/spack/repos/builtin/packages/py-pydantic/package.py index 941d7d8a96..03869bd1e5 100644 --- a/var/spack/repos/builtin/packages/py-pydantic/package.py +++ b/var/spack/repos/builtin/packages/py-pydantic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydantic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydap/package.py b/var/spack/repos/builtin/packages/py-pydap/package.py index c6b0c343af..9d622c6cbe 100644 --- a/var/spack/repos/builtin/packages/py-pydap/package.py +++ b/var/spack/repos/builtin/packages/py-pydap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydap(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydatalog/package.py b/var/spack/repos/builtin/packages/py-pydatalog/package.py index a8da1eac0a..e7a3e65c86 100644 --- a/var/spack/repos/builtin/packages/py-pydatalog/package.py +++ b/var/spack/repos/builtin/packages/py-pydatalog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydatalog(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydeprecate/package.py b/var/spack/repos/builtin/packages/py-pydeprecate/package.py index 27b1a1f743..7f29c1530a 100644 --- a/var/spack/repos/builtin/packages/py-pydeprecate/package.py +++ b/var/spack/repos/builtin/packages/py-pydeprecate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydeprecate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydeps/package.py b/var/spack/repos/builtin/packages/py-pydeps/package.py index d31c93821e..23a6750958 100644 --- a/var/spack/repos/builtin/packages/py-pydeps/package.py +++ b/var/spack/repos/builtin/packages/py-pydeps/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPydeps(PythonPackage): """Python module dependency visualization.""" diff --git a/var/spack/repos/builtin/packages/py-pydicom/package.py b/var/spack/repos/builtin/packages/py-pydicom/package.py index 7e93cef8ea..9967f5c033 100644 --- a/var/spack/repos/builtin/packages/py-pydicom/package.py +++ b/var/spack/repos/builtin/packages/py-pydicom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydicom(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydispatcher/package.py b/var/spack/repos/builtin/packages/py-pydispatcher/package.py index 03105cac8c..0cfcc9e514 100644 --- a/var/spack/repos/builtin/packages/py-pydispatcher/package.py +++ b/var/spack/repos/builtin/packages/py-pydispatcher/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydispatcher(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydmd/package.py b/var/spack/repos/builtin/packages/py-pydmd/package.py index 187052c273..56d3490142 100644 --- a/var/spack/repos/builtin/packages/py-pydmd/package.py +++ b/var/spack/repos/builtin/packages/py-pydmd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydmd(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydocstyle/package.py b/var/spack/repos/builtin/packages/py-pydocstyle/package.py index 94fea683d1..7fa31efe94 100644 --- a/var/spack/repos/builtin/packages/py-pydocstyle/package.py +++ b/var/spack/repos/builtin/packages/py-pydocstyle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydocstyle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydoe/package.py b/var/spack/repos/builtin/packages/py-pydoe/package.py index cc13690606..1f39e4a717 100644 --- a/var/spack/repos/builtin/packages/py-pydoe/package.py +++ b/var/spack/repos/builtin/packages/py-pydoe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydoe(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydoe2/package.py b/var/spack/repos/builtin/packages/py-pydoe2/package.py index 07ca5ce60f..437e509fd0 100644 --- a/var/spack/repos/builtin/packages/py-pydoe2/package.py +++ b/var/spack/repos/builtin/packages/py-pydoe2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydoe2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydot/package.py b/var/spack/repos/builtin/packages/py-pydot/package.py index 310c654205..92e43ebb6e 100644 --- a/var/spack/repos/builtin/packages/py-pydot/package.py +++ b/var/spack/repos/builtin/packages/py-pydot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydot2/package.py b/var/spack/repos/builtin/packages/py-pydot2/package.py index 05b309e8a2..1c472a0eb3 100644 --- a/var/spack/repos/builtin/packages/py-pydot2/package.py +++ b/var/spack/repos/builtin/packages/py-pydot2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydot2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydotplus/package.py b/var/spack/repos/builtin/packages/py-pydotplus/package.py index 3236912b6f..73605f86cf 100644 --- a/var/spack/repos/builtin/packages/py-pydotplus/package.py +++ b/var/spack/repos/builtin/packages/py-pydotplus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydotplus(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pydv/package.py b/var/spack/repos/builtin/packages/py-pydv/package.py index 22f3346f6b..0af235934f 100644 --- a/var/spack/repos/builtin/packages/py-pydv/package.py +++ b/var/spack/repos/builtin/packages/py-pydv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPydv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyeda/package.py b/var/spack/repos/builtin/packages/py-pyeda/package.py index 6e6d71df44..749df511b7 100644 --- a/var/spack/repos/builtin/packages/py-pyeda/package.py +++ b/var/spack/repos/builtin/packages/py-pyeda/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyeda(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyelftools/package.py b/var/spack/repos/builtin/packages/py-pyelftools/package.py index 7f9e7f3af6..faad819cf4 100644 --- a/var/spack/repos/builtin/packages/py-pyelftools/package.py +++ b/var/spack/repos/builtin/packages/py-pyelftools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyelftools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyem/package.py b/var/spack/repos/builtin/packages/py-pyem/package.py index b1c497ab11..d8e5ea436b 100644 --- a/var/spack/repos/builtin/packages/py-pyem/package.py +++ b/var/spack/repos/builtin/packages/py-pyem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyem(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyepsg/package.py b/var/spack/repos/builtin/packages/py-pyepsg/package.py index eea6f90a4c..410d0fa5e7 100644 --- a/var/spack/repos/builtin/packages/py-pyepsg/package.py +++ b/var/spack/repos/builtin/packages/py-pyepsg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyepsg(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyface/package.py b/var/spack/repos/builtin/packages/py-pyface/package.py index 0c0cef7dc6..5b4fa42366 100644 --- a/var/spack/repos/builtin/packages/py-pyface/package.py +++ b/var/spack/repos/builtin/packages/py-pyface/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPyface(PythonPackage): """The pyface project contains a toolkit-independent GUI abstraction layer, which is used to support the "visualization" features of the Traits diff --git a/var/spack/repos/builtin/packages/py-pyfaidx/package.py b/var/spack/repos/builtin/packages/py-pyfaidx/package.py index c8d78b5777..48d2d09d67 100644 --- a/var/spack/repos/builtin/packages/py-pyfaidx/package.py +++ b/var/spack/repos/builtin/packages/py-pyfaidx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyfaidx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyfasta/package.py b/var/spack/repos/builtin/packages/py-pyfasta/package.py index d2f064daa2..25e486d200 100644 --- a/var/spack/repos/builtin/packages/py-pyfasta/package.py +++ b/var/spack/repos/builtin/packages/py-pyfasta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyfasta(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyfftw/package.py b/var/spack/repos/builtin/packages/py-pyfftw/package.py index 6b1c3f88e7..f89483c3ed 100644 --- a/var/spack/repos/builtin/packages/py-pyfftw/package.py +++ b/var/spack/repos/builtin/packages/py-pyfftw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyfftw(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyfiglet/package.py b/var/spack/repos/builtin/packages/py-pyfiglet/package.py index 2b95f28387..b03417995a 100644 --- a/var/spack/repos/builtin/packages/py-pyfiglet/package.py +++ b/var/spack/repos/builtin/packages/py-pyfiglet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyfiglet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyfits/package.py b/var/spack/repos/builtin/packages/py-pyfits/package.py index bcc9b1cb7b..36b65fa173 100644 --- a/var/spack/repos/builtin/packages/py-pyfits/package.py +++ b/var/spack/repos/builtin/packages/py-pyfits/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyfits(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyflakes/package.py b/var/spack/repos/builtin/packages/py-pyflakes/package.py index 1294d7ad00..5cdd3abc5d 100644 --- a/var/spack/repos/builtin/packages/py-pyflakes/package.py +++ b/var/spack/repos/builtin/packages/py-pyflakes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyflakes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyfr/package.py b/var/spack/repos/builtin/packages/py-pyfr/package.py index 424c4cb5ef..c70a9da980 100644 --- a/var/spack/repos/builtin/packages/py-pyfr/package.py +++ b/var/spack/repos/builtin/packages/py-pyfr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyfr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygdal/package.py b/var/spack/repos/builtin/packages/py-pygdal/package.py index b1089c112f..d4dd85de51 100644 --- a/var/spack/repos/builtin/packages/py-pygdal/package.py +++ b/var/spack/repos/builtin/packages/py-pygdal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygdal(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygdbmi/package.py b/var/spack/repos/builtin/packages/py-pygdbmi/package.py index 95469976b4..c490f7a8b2 100644 --- a/var/spack/repos/builtin/packages/py-pygdbmi/package.py +++ b/var/spack/repos/builtin/packages/py-pygdbmi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygdbmi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygelf/package.py b/var/spack/repos/builtin/packages/py-pygelf/package.py index 07f15e8926..b26762f6d2 100644 --- a/var/spack/repos/builtin/packages/py-pygelf/package.py +++ b/var/spack/repos/builtin/packages/py-pygelf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygelf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygeos/package.py b/var/spack/repos/builtin/packages/py-pygeos/package.py index 0484cc066a..8f91da4cd9 100644 --- a/var/spack/repos/builtin/packages/py-pygeos/package.py +++ b/var/spack/repos/builtin/packages/py-pygeos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygeos(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygetwindow/package.py b/var/spack/repos/builtin/packages/py-pygetwindow/package.py index 6d2b2d3bfe..71d4679879 100644 --- a/var/spack/repos/builtin/packages/py-pygetwindow/package.py +++ b/var/spack/repos/builtin/packages/py-pygetwindow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygetwindow(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygit2/package.py b/var/spack/repos/builtin/packages/py-pygit2/package.py index 3fa813584a..5fa776edf1 100644 --- a/var/spack/repos/builtin/packages/py-pygit2/package.py +++ b/var/spack/repos/builtin/packages/py-pygit2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygit2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygithub/package.py b/var/spack/repos/builtin/packages/py-pygithub/package.py index d22805f832..b81b7c058d 100644 --- a/var/spack/repos/builtin/packages/py-pygithub/package.py +++ b/var/spack/repos/builtin/packages/py-pygithub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygithub(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyglet/package.py b/var/spack/repos/builtin/packages/py-pyglet/package.py index dae422c2cb..10f59afd85 100644 --- a/var/spack/repos/builtin/packages/py-pyglet/package.py +++ b/var/spack/repos/builtin/packages/py-pyglet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyglet(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygments-pytest/package.py b/var/spack/repos/builtin/packages/py-pygments-pytest/package.py index d5f75e04df..c2bcc2baa4 100644 --- a/var/spack/repos/builtin/packages/py-pygments-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pygments-pytest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygmentsPytest(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygments/package.py b/var/spack/repos/builtin/packages/py-pygments/package.py index 0cec7fc6eb..248c3989a9 100644 --- a/var/spack/repos/builtin/packages/py-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-pygments/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygments(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index ab552f4cba..bedde8f3d9 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygobject(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygps/package.py b/var/spack/repos/builtin/packages/py-pygps/package.py index f1e9100684..d2a8c5647c 100644 --- a/var/spack/repos/builtin/packages/py-pygps/package.py +++ b/var/spack/repos/builtin/packages/py-pygps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygps(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygpu/package.py b/var/spack/repos/builtin/packages/py-pygpu/package.py index b9d9876dc3..411ea72d34 100644 --- a/var/spack/repos/builtin/packages/py-pygpu/package.py +++ b/var/spack/repos/builtin/packages/py-pygpu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygpu(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygraphviz/package.py b/var/spack/repos/builtin/packages/py-pygraphviz/package.py index 8b5dcbf77e..53e694e446 100644 --- a/var/spack/repos/builtin/packages/py-pygraphviz/package.py +++ b/var/spack/repos/builtin/packages/py-pygraphviz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygraphviz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygresql/package.py b/var/spack/repos/builtin/packages/py-pygresql/package.py index 7c7e24c9cc..d57d849b32 100644 --- a/var/spack/repos/builtin/packages/py-pygresql/package.py +++ b/var/spack/repos/builtin/packages/py-pygresql/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygresql(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py index cf0f67d4ad..e0265ec22f 100644 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ b/var/spack/repos/builtin/packages/py-pygtk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygtk(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/py-pygtrie/package.py b/var/spack/repos/builtin/packages/py-pygtrie/package.py index 5b0c59a8ae..b362dc5200 100644 --- a/var/spack/repos/builtin/packages/py-pygtrie/package.py +++ b/var/spack/repos/builtin/packages/py-pygtrie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPygtrie(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyh5md/package.py b/var/spack/repos/builtin/packages/py-pyh5md/package.py index 13f4fd9ae8..de0ad6b2f6 100644 --- a/var/spack/repos/builtin/packages/py-pyh5md/package.py +++ b/var/spack/repos/builtin/packages/py-pyh5md/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyh5md(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyheadtail/package.py b/var/spack/repos/builtin/packages/py-pyheadtail/package.py index 6e2e8f496f..872373d6e1 100644 --- a/var/spack/repos/builtin/packages/py-pyheadtail/package.py +++ b/var/spack/repos/builtin/packages/py-pyheadtail/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyheadtail(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyinstrument-cext/package.py b/var/spack/repos/builtin/packages/py-pyinstrument-cext/package.py index 71ef169c20..18ddf39de9 100644 --- a/var/spack/repos/builtin/packages/py-pyinstrument-cext/package.py +++ b/var/spack/repos/builtin/packages/py-pyinstrument-cext/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyinstrumentCext(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyinstrument/package.py b/var/spack/repos/builtin/packages/py-pyinstrument/package.py index 95525a4299..dca2b989dc 100644 --- a/var/spack/repos/builtin/packages/py-pyinstrument/package.py +++ b/var/spack/repos/builtin/packages/py-pyinstrument/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyinstrument(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyjnius/package.py b/var/spack/repos/builtin/packages/py-pyjnius/package.py index ec10f1d19c..889ac49e7e 100644 --- a/var/spack/repos/builtin/packages/py-pyjnius/package.py +++ b/var/spack/repos/builtin/packages/py-pyjnius/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyjnius(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyjwt/package.py b/var/spack/repos/builtin/packages/py-pyjwt/package.py index 24a08cb79c..f1b71541fe 100644 --- a/var/spack/repos/builtin/packages/py-pyjwt/package.py +++ b/var/spack/repos/builtin/packages/py-pyjwt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyjwt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyke/package.py b/var/spack/repos/builtin/packages/py-pyke/package.py index 5254b3a0c8..1b6af7c108 100644 --- a/var/spack/repos/builtin/packages/py-pyke/package.py +++ b/var/spack/repos/builtin/packages/py-pyke/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyke(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pykml/package.py b/var/spack/repos/builtin/packages/py-pykml/package.py index e42668861a..4268956a87 100644 --- a/var/spack/repos/builtin/packages/py-pykml/package.py +++ b/var/spack/repos/builtin/packages/py-pykml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPykml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pykokkos-base/package.py b/var/spack/repos/builtin/packages/py-pykokkos-base/package.py index df58310fef..83eb03db52 100644 --- a/var/spack/repos/builtin/packages/py-pykokkos-base/package.py +++ b/var/spack/repos/builtin/packages/py-pykokkos-base/package.py @@ -5,7 +5,7 @@ # # ---------------------------------------------------------------------------- -from spack import * +from spack.package import * class PyPykokkosBase(CMakePackage, PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pykwalify/package.py b/var/spack/repos/builtin/packages/py-pykwalify/package.py index 172bd3e36b..229729afac 100644 --- a/var/spack/repos/builtin/packages/py-pykwalify/package.py +++ b/var/spack/repos/builtin/packages/py-pykwalify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPykwalify(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pylev/package.py b/var/spack/repos/builtin/packages/py-pylev/package.py index a56f1ca8cc..20e907f7aa 100644 --- a/var/spack/repos/builtin/packages/py-pylev/package.py +++ b/var/spack/repos/builtin/packages/py-pylev/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPylev(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyliblzma/package.py b/var/spack/repos/builtin/packages/py-pyliblzma/package.py index 425a1c4cb1..3b0b8142ad 100644 --- a/var/spack/repos/builtin/packages/py-pyliblzma/package.py +++ b/var/spack/repos/builtin/packages/py-pyliblzma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyliblzma(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pylikwid/package.py b/var/spack/repos/builtin/packages/py-pylikwid/package.py index 1f0910ce0e..65a004aa3f 100644 --- a/var/spack/repos/builtin/packages/py-pylikwid/package.py +++ b/var/spack/repos/builtin/packages/py-pylikwid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPylikwid(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index cba7f7f37b..fc07a0fe8e 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPylint(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pylops/package.py b/var/spack/repos/builtin/packages/py-pylops/package.py index 88a9528283..069cd4c213 100644 --- a/var/spack/repos/builtin/packages/py-pylops/package.py +++ b/var/spack/repos/builtin/packages/py-pylops/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPylops(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymatgen/package.py b/var/spack/repos/builtin/packages/py-pymatgen/package.py index 249778b53b..2fb36269a9 100644 --- a/var/spack/repos/builtin/packages/py-pymatgen/package.py +++ b/var/spack/repos/builtin/packages/py-pymatgen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymatgen(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymc3/package.py b/var/spack/repos/builtin/packages/py-pymc3/package.py index c6876f43aa..2c96355c92 100644 --- a/var/spack/repos/builtin/packages/py-pymc3/package.py +++ b/var/spack/repos/builtin/packages/py-pymc3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymc3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymeeus/package.py b/var/spack/repos/builtin/packages/py-pymeeus/package.py index 0ad7573ce0..6e3d4f303f 100644 --- a/var/spack/repos/builtin/packages/py-pymeeus/package.py +++ b/var/spack/repos/builtin/packages/py-pymeeus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymeeus(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyminifier/package.py b/var/spack/repos/builtin/packages/py-pyminifier/package.py index 35173057a6..21b2243c05 100644 --- a/var/spack/repos/builtin/packages/py-pyminifier/package.py +++ b/var/spack/repos/builtin/packages/py-pyminifier/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyminifier(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymol/package.py b/var/spack/repos/builtin/packages/py-pymol/package.py index 2717fffe81..f346541c28 100644 --- a/var/spack/repos/builtin/packages/py-pymol/package.py +++ b/var/spack/repos/builtin/packages/py-pymol/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymol(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymongo/package.py b/var/spack/repos/builtin/packages/py-pymongo/package.py index 941121e90a..28c6316b32 100644 --- a/var/spack/repos/builtin/packages/py-pymongo/package.py +++ b/var/spack/repos/builtin/packages/py-pymongo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymongo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymoo/package.py b/var/spack/repos/builtin/packages/py-pymoo/package.py index 03fdd2a89e..ebc0406b45 100644 --- a/var/spack/repos/builtin/packages/py-pymoo/package.py +++ b/var/spack/repos/builtin/packages/py-pymoo/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # Package automatically generated using 'pip2spack' converter diff --git a/var/spack/repos/builtin/packages/py-pymorph/package.py b/var/spack/repos/builtin/packages/py-pymorph/package.py index bb6ac11bc0..ac2ac62b49 100644 --- a/var/spack/repos/builtin/packages/py-pymorph/package.py +++ b/var/spack/repos/builtin/packages/py-pymorph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymorph(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pympler/package.py b/var/spack/repos/builtin/packages/py-pympler/package.py index d561b10738..02e682e391 100644 --- a/var/spack/repos/builtin/packages/py-pympler/package.py +++ b/var/spack/repos/builtin/packages/py-pympler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPympler(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymsgbox/package.py b/var/spack/repos/builtin/packages/py-pymsgbox/package.py index b5a0639be8..4497dcf42b 100644 --- a/var/spack/repos/builtin/packages/py-pymsgbox/package.py +++ b/var/spack/repos/builtin/packages/py-pymsgbox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymsgbox(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymumps/package.py b/var/spack/repos/builtin/packages/py-pymumps/package.py index 20c6205bbf..d620cbe2ba 100644 --- a/var/spack/repos/builtin/packages/py-pymumps/package.py +++ b/var/spack/repos/builtin/packages/py-pymumps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymumps(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pymysql/package.py b/var/spack/repos/builtin/packages/py-pymysql/package.py index ad17a14e28..5d3085aca0 100644 --- a/var/spack/repos/builtin/packages/py-pymysql/package.py +++ b/var/spack/repos/builtin/packages/py-pymysql/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPymysql(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pynacl/package.py b/var/spack/repos/builtin/packages/py-pynacl/package.py index e8f3613228..adae6639fe 100644 --- a/var/spack/repos/builtin/packages/py-pynacl/package.py +++ b/var/spack/repos/builtin/packages/py-pynacl/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPynacl(PythonPackage): """Python binding to the Networking and Cryptography (NaCl) library.""" diff --git a/var/spack/repos/builtin/packages/py-pynio/package.py b/var/spack/repos/builtin/packages/py-pynio/package.py index 8b8ad45faf..9d796b56d4 100644 --- a/var/spack/repos/builtin/packages/py-pynio/package.py +++ b/var/spack/repos/builtin/packages/py-pynio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPynio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pynisher/package.py b/var/spack/repos/builtin/packages/py-pynisher/package.py index 928d861553..7090e305e0 100644 --- a/var/spack/repos/builtin/packages/py-pynisher/package.py +++ b/var/spack/repos/builtin/packages/py-pynisher/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPynisher(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py index fc550cd055..9063dcd6a4 100644 --- a/var/spack/repos/builtin/packages/py-pynn/package.py +++ b/var/spack/repos/builtin/packages/py-pynn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPynn(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pynvim/package.py b/var/spack/repos/builtin/packages/py-pynvim/package.py index a269d83b67..e44aed6521 100644 --- a/var/spack/repos/builtin/packages/py-pynvim/package.py +++ b/var/spack/repos/builtin/packages/py-pynvim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPynvim(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pynvml/package.py b/var/spack/repos/builtin/packages/py-pynvml/package.py index 75892abd33..b1160ef022 100644 --- a/var/spack/repos/builtin/packages/py-pynvml/package.py +++ b/var/spack/repos/builtin/packages/py-pynvml/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPynvml(PythonPackage): """Provides a Python interface to GPU management and monitoring functions. This is a wrapper around the NVML library. For diff --git a/var/spack/repos/builtin/packages/py-pyodbc/package.py b/var/spack/repos/builtin/packages/py-pyodbc/package.py index 1d9d509f14..ec83dfaaea 100644 --- a/var/spack/repos/builtin/packages/py-pyodbc/package.py +++ b/var/spack/repos/builtin/packages/py-pyodbc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyodbc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyomo/package.py b/var/spack/repos/builtin/packages/py-pyomo/package.py index 24b910f56a..d07d529bec 100644 --- a/var/spack/repos/builtin/packages/py-pyomo/package.py +++ b/var/spack/repos/builtin/packages/py-pyomo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyomo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyopencl/package.py b/var/spack/repos/builtin/packages/py-pyopencl/package.py index f92ac15414..a8eccc9dd1 100644 --- a/var/spack/repos/builtin/packages/py-pyopencl/package.py +++ b/var/spack/repos/builtin/packages/py-pyopencl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyopencl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyopenssl/package.py b/var/spack/repos/builtin/packages/py-pyopenssl/package.py index 9f89828e54..1cbb58b205 100644 --- a/var/spack/repos/builtin/packages/py-pyopenssl/package.py +++ b/var/spack/repos/builtin/packages/py-pyopenssl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyopenssl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pypar/package.py b/var/spack/repos/builtin/packages/py-pypar/package.py index 4424956858..9267b668df 100644 --- a/var/spack/repos/builtin/packages/py-pypar/package.py +++ b/var/spack/repos/builtin/packages/py-pypar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPypar(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyparsing/package.py b/var/spack/repos/builtin/packages/py-pyparsing/package.py index 01bce747a6..6d151ec685 100644 --- a/var/spack/repos/builtin/packages/py-pyparsing/package.py +++ b/var/spack/repos/builtin/packages/py-pyparsing/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyparsing(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pypeflow/package.py b/var/spack/repos/builtin/packages/py-pypeflow/package.py index c0716ed159..ca485d7123 100644 --- a/var/spack/repos/builtin/packages/py-pypeflow/package.py +++ b/var/spack/repos/builtin/packages/py-pypeflow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPypeflow(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pypeg2/package.py b/var/spack/repos/builtin/packages/py-pypeg2/package.py index 402bc69169..c76cdec5f7 100644 --- a/var/spack/repos/builtin/packages/py-pypeg2/package.py +++ b/var/spack/repos/builtin/packages/py-pypeg2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPypeg2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyperclip/package.py b/var/spack/repos/builtin/packages/py-pyperclip/package.py index 5a5104c559..a65261ec4c 100644 --- a/var/spack/repos/builtin/packages/py-pyperclip/package.py +++ b/var/spack/repos/builtin/packages/py-pyperclip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyperclip(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyperf/package.py b/var/spack/repos/builtin/packages/py-pyperf/package.py index 9d3fa89d4e..52b5ac0eb1 100644 --- a/var/spack/repos/builtin/packages/py-pyperf/package.py +++ b/var/spack/repos/builtin/packages/py-pyperf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyperf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pypinyin/package.py b/var/spack/repos/builtin/packages/py-pypinyin/package.py index c201d89e31..e75a0741b9 100644 --- a/var/spack/repos/builtin/packages/py-pypinyin/package.py +++ b/var/spack/repos/builtin/packages/py-pypinyin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPypinyin(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyprecice/package.py b/var/spack/repos/builtin/packages/py-pyprecice/package.py index 9fa5cb6bc6..73ba32bfc4 100644 --- a/var/spack/repos/builtin/packages/py-pyprecice/package.py +++ b/var/spack/repos/builtin/packages/py-pyprecice/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyprecice(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyprof2html/package.py b/var/spack/repos/builtin/packages/py-pyprof2html/package.py index ab434f98d5..75dba28618 100644 --- a/var/spack/repos/builtin/packages/py-pyprof2html/package.py +++ b/var/spack/repos/builtin/packages/py-pyprof2html/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyprof2html(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyproj/package.py b/var/spack/repos/builtin/packages/py-pyproj/package.py index 81f93c5375..39150f538c 100644 --- a/var/spack/repos/builtin/packages/py-pyproj/package.py +++ b/var/spack/repos/builtin/packages/py-pyproj/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyproj(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pypulse/package.py b/var/spack/repos/builtin/packages/py-pypulse/package.py index 0b14270dfd..7309e4246d 100644 --- a/var/spack/repos/builtin/packages/py-pypulse/package.py +++ b/var/spack/repos/builtin/packages/py-pypulse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPypulse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyqi/package.py b/var/spack/repos/builtin/packages/py-pyqi/package.py index d0c514ac3e..54bdcaaa51 100644 --- a/var/spack/repos/builtin/packages/py-pyqi/package.py +++ b/var/spack/repos/builtin/packages/py-pyqi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyqi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyqt-builder/package.py b/var/spack/repos/builtin/packages/py-pyqt-builder/package.py index f50c22800b..5950bb922b 100644 --- a/var/spack/repos/builtin/packages/py-pyqt-builder/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt-builder/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyqtBuilder(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyqt4/package.py b/var/spack/repos/builtin/packages/py-pyqt4/package.py index af1fc42803..5c047f9067 100644 --- a/var/spack/repos/builtin/packages/py-pyqt4/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyqt4(SIPPackage): diff --git a/var/spack/repos/builtin/packages/py-pyqt5-sip/package.py b/var/spack/repos/builtin/packages/py-pyqt5-sip/package.py index 229c022fbd..721dc00204 100644 --- a/var/spack/repos/builtin/packages/py-pyqt5-sip/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt5-sip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyqt5Sip(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyqt5/package.py b/var/spack/repos/builtin/packages/py-pyqt5/package.py index 46188f1a26..b05b67ef2a 100644 --- a/var/spack/repos/builtin/packages/py-pyqt5/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt5/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyqt5(SIPPackage): diff --git a/var/spack/repos/builtin/packages/py-pyquaternion/package.py b/var/spack/repos/builtin/packages/py-pyquaternion/package.py index d2e6f45554..732338d137 100644 --- a/var/spack/repos/builtin/packages/py-pyquaternion/package.py +++ b/var/spack/repos/builtin/packages/py-pyquaternion/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyquaternion(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyrad/package.py b/var/spack/repos/builtin/packages/py-pyrad/package.py index 917de4707f..cfcc85b8a3 100644 --- a/var/spack/repos/builtin/packages/py-pyrad/package.py +++ b/var/spack/repos/builtin/packages/py-pyrad/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyrad(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyrect/package.py b/var/spack/repos/builtin/packages/py-pyrect/package.py index 1dfc20b762..61ca7b8fcd 100644 --- a/var/spack/repos/builtin/packages/py-pyrect/package.py +++ b/var/spack/repos/builtin/packages/py-pyrect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyrect(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyrfr/package.py b/var/spack/repos/builtin/packages/py-pyrfr/package.py index c1265ec96c..cf6e828880 100644 --- a/var/spack/repos/builtin/packages/py-pyrfr/package.py +++ b/var/spack/repos/builtin/packages/py-pyrfr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyrfr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyro4/package.py b/var/spack/repos/builtin/packages/py-pyro4/package.py index 6ac792f5cc..7834cf49c9 100644 --- a/var/spack/repos/builtin/packages/py-pyro4/package.py +++ b/var/spack/repos/builtin/packages/py-pyro4/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # Package automatically generated using 'pip2spack' converter diff --git a/var/spack/repos/builtin/packages/py-pyrosar/package.py b/var/spack/repos/builtin/packages/py-pyrosar/package.py index 2df9a97963..ccd71ae02f 100644 --- a/var/spack/repos/builtin/packages/py-pyrosar/package.py +++ b/var/spack/repos/builtin/packages/py-pyrosar/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyrosar(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyrsistent/package.py b/var/spack/repos/builtin/packages/py-pyrsistent/package.py index 3ade4a7351..05a39cf6fe 100644 --- a/var/spack/repos/builtin/packages/py-pyrsistent/package.py +++ b/var/spack/repos/builtin/packages/py-pyrsistent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyrsistent(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pysam/package.py b/var/spack/repos/builtin/packages/py-pysam/package.py index d0a8302838..2ecc78a48d 100644 --- a/var/spack/repos/builtin/packages/py-pysam/package.py +++ b/var/spack/repos/builtin/packages/py-pysam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPysam(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyscaf/package.py b/var/spack/repos/builtin/packages/py-pyscaf/package.py index e8d4546eca..a3d20cb6fd 100644 --- a/var/spack/repos/builtin/packages/py-pyscaf/package.py +++ b/var/spack/repos/builtin/packages/py-pyscaf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyscaf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyscf/package.py b/var/spack/repos/builtin/packages/py-pyscf/package.py index 76621481c1..3561dac42e 100644 --- a/var/spack/repos/builtin/packages/py-pyscf/package.py +++ b/var/spack/repos/builtin/packages/py-pyscf/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyscf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyscipopt/package.py b/var/spack/repos/builtin/packages/py-pyscipopt/package.py index c54773a573..39ec5cc38e 100644 --- a/var/spack/repos/builtin/packages/py-pyscipopt/package.py +++ b/var/spack/repos/builtin/packages/py-pyscipopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyscipopt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyscreeze/package.py b/var/spack/repos/builtin/packages/py-pyscreeze/package.py index f278bf8f32..76147c3a47 100644 --- a/var/spack/repos/builtin/packages/py-pyscreeze/package.py +++ b/var/spack/repos/builtin/packages/py-pyscreeze/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyscreeze(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyserial/package.py b/var/spack/repos/builtin/packages/py-pyserial/package.py index 604932694f..41196bfe8f 100644 --- a/var/spack/repos/builtin/packages/py-pyserial/package.py +++ b/var/spack/repos/builtin/packages/py-pyserial/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyserial(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyshp/package.py b/var/spack/repos/builtin/packages/py-pyshp/package.py index b9607f75d2..82301a731e 100644 --- a/var/spack/repos/builtin/packages/py-pyshp/package.py +++ b/var/spack/repos/builtin/packages/py-pyshp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyshp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py index d12af26264..e2fdb26013 100644 --- a/var/spack/repos/builtin/packages/py-pyside/package.py +++ b/var/spack/repos/builtin/packages/py-pyside/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyPyside(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyside2/package.py b/var/spack/repos/builtin/packages/py-pyside2/package.py index 19de2d0e57..00a47b8bbc 100644 --- a/var/spack/repos/builtin/packages/py-pyside2/package.py +++ b/var/spack/repos/builtin/packages/py-pyside2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyside2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pysimdjson/package.py b/var/spack/repos/builtin/packages/py-pysimdjson/package.py index cacb629bd7..15869d7aeb 100644 --- a/var/spack/repos/builtin/packages/py-pysimdjson/package.py +++ b/var/spack/repos/builtin/packages/py-pysimdjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPysimdjson(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pysmartdl/package.py b/var/spack/repos/builtin/packages/py-pysmartdl/package.py index 040e37bd6c..1b34979021 100644 --- a/var/spack/repos/builtin/packages/py-pysmartdl/package.py +++ b/var/spack/repos/builtin/packages/py-pysmartdl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPysmartdl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pysocks/package.py b/var/spack/repos/builtin/packages/py-pysocks/package.py index 5a25c866b7..f837f9e4de 100644 --- a/var/spack/repos/builtin/packages/py-pysocks/package.py +++ b/var/spack/repos/builtin/packages/py-pysocks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPysocks(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pysolar/package.py b/var/spack/repos/builtin/packages/py-pysolar/package.py index 2a3c5f9019..ec600472b1 100644 --- a/var/spack/repos/builtin/packages/py-pysolar/package.py +++ b/var/spack/repos/builtin/packages/py-pysolar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPysolar(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyspark/package.py b/var/spack/repos/builtin/packages/py-pyspark/package.py index cd5a30f748..3740d962a8 100644 --- a/var/spack/repos/builtin/packages/py-pyspark/package.py +++ b/var/spack/repos/builtin/packages/py-pyspark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyspark(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyspellchecker/package.py b/var/spack/repos/builtin/packages/py-pyspellchecker/package.py index 9a51e6eb9a..e1dfbbe2bd 100644 --- a/var/spack/repos/builtin/packages/py-pyspellchecker/package.py +++ b/var/spack/repos/builtin/packages/py-pyspellchecker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyspellchecker(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pysqlite/package.py b/var/spack/repos/builtin/packages/py-pysqlite/package.py index 5dea72ab95..a690748342 100644 --- a/var/spack/repos/builtin/packages/py-pysqlite/package.py +++ b/var/spack/repos/builtin/packages/py-pysqlite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPysqlite(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pysqlite3/package.py b/var/spack/repos/builtin/packages/py-pysqlite3/package.py index 025bb05517..6f92c3b8dc 100644 --- a/var/spack/repos/builtin/packages/py-pysqlite3/package.py +++ b/var/spack/repos/builtin/packages/py-pysqlite3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPysqlite3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pystac/package.py b/var/spack/repos/builtin/packages/py-pystac/package.py index 020252e4df..025477061c 100644 --- a/var/spack/repos/builtin/packages/py-pystac/package.py +++ b/var/spack/repos/builtin/packages/py-pystac/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPystac(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pystan/package.py b/var/spack/repos/builtin/packages/py-pystan/package.py index 50812956be..7af6b917e3 100644 --- a/var/spack/repos/builtin/packages/py-pystan/package.py +++ b/var/spack/repos/builtin/packages/py-pystan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPystan(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pysurfer/package.py b/var/spack/repos/builtin/packages/py-pysurfer/package.py index 4fc3add531..5b4b91a80c 100644 --- a/var/spack/repos/builtin/packages/py-pysurfer/package.py +++ b/var/spack/repos/builtin/packages/py-pysurfer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPysurfer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytailf/package.py b/var/spack/repos/builtin/packages/py-pytailf/package.py index 51d55919e1..9fcc466db2 100644 --- a/var/spack/repos/builtin/packages/py-pytailf/package.py +++ b/var/spack/repos/builtin/packages/py-pytailf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytailf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytaridx/package.py b/var/spack/repos/builtin/packages/py-pytaridx/package.py index 14cf9f252b..f78ae35b6e 100644 --- a/var/spack/repos/builtin/packages/py-pytaridx/package.py +++ b/var/spack/repos/builtin/packages/py-pytaridx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytaridx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytecplot/package.py b/var/spack/repos/builtin/packages/py-pytecplot/package.py index fc4b78e2e7..dda50da0a2 100644 --- a/var/spack/repos/builtin/packages/py-pytecplot/package.py +++ b/var/spack/repos/builtin/packages/py-pytecplot/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytecplot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-arraydiff/package.py b/var/spack/repos/builtin/packages/py-pytest-arraydiff/package.py index 0ff8708571..85d46dc5d1 100644 --- a/var/spack/repos/builtin/packages/py-pytest-arraydiff/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-arraydiff/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestArraydiff(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-benchmark/package.py b/var/spack/repos/builtin/packages/py-pytest-benchmark/package.py index 68ee78564c..069c6141a8 100644 --- a/var/spack/repos/builtin/packages/py-pytest-benchmark/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-benchmark/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestBenchmark(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-cache/package.py b/var/spack/repos/builtin/packages/py-pytest-cache/package.py index 7a488295a3..6f1192d53b 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cache/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestCache(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-check-links/package.py b/var/spack/repos/builtin/packages/py-pytest-check-links/package.py index d29fbb741c..6c103f6070 100644 --- a/var/spack/repos/builtin/packages/py-pytest-check-links/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-check-links/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestCheckLinks(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-cov/package.py b/var/spack/repos/builtin/packages/py-pytest-cov/package.py index 0c1c7cfb76..87db6fc09d 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cov/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cov/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestCov(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-cpp/package.py b/var/spack/repos/builtin/packages/py-pytest-cpp/package.py index 3e390e2f2d..e639a30e81 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cpp/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cpp/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestCpp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-doctestplus/package.py b/var/spack/repos/builtin/packages/py-pytest-doctestplus/package.py index 47d088b5e6..b1c275c15c 100644 --- a/var/spack/repos/builtin/packages/py-pytest-doctestplus/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-doctestplus/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestDoctestplus(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-flake8/package.py b/var/spack/repos/builtin/packages/py-pytest-flake8/package.py index d062ff79ec..991aa8eb9a 100644 --- a/var/spack/repos/builtin/packages/py-pytest-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-flake8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestFlake8(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-flakes/package.py b/var/spack/repos/builtin/packages/py-pytest-flakes/package.py index 31d769d2ce..baf6bcfd54 100644 --- a/var/spack/repos/builtin/packages/py-pytest-flakes/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-flakes/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestFlakes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-forked/package.py b/var/spack/repos/builtin/packages/py-pytest-forked/package.py index 9734553993..dfe02d070b 100644 --- a/var/spack/repos/builtin/packages/py-pytest-forked/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-forked/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestForked(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-html/package.py b/var/spack/repos/builtin/packages/py-pytest-html/package.py index bdc7ac658b..3dbd536198 100644 --- a/var/spack/repos/builtin/packages/py-pytest-html/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-html/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestHtml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py index fcfa33e059..c9b211c8ee 100644 --- a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestHttpbin(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-isort/package.py b/var/spack/repos/builtin/packages/py-pytest-isort/package.py index 6133e1f51f..c258845bf6 100644 --- a/var/spack/repos/builtin/packages/py-pytest-isort/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-isort/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestIsort(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-metadata/package.py b/var/spack/repos/builtin/packages/py-pytest-metadata/package.py index 79d10eb8e6..b7187fb7b0 100644 --- a/var/spack/repos/builtin/packages/py-pytest-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-metadata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestMetadata(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-mock/package.py b/var/spack/repos/builtin/packages/py-pytest-mock/package.py index 5592edcb71..2f0e164d78 100644 --- a/var/spack/repos/builtin/packages/py-pytest-mock/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-mock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestMock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-mypy/package.py b/var/spack/repos/builtin/packages/py-pytest-mypy/package.py index 504ac78877..49edea2510 100644 --- a/var/spack/repos/builtin/packages/py-pytest-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-mypy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestMypy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-openfiles/package.py b/var/spack/repos/builtin/packages/py-pytest-openfiles/package.py index 4e8fdb7ac8..456216eda1 100644 --- a/var/spack/repos/builtin/packages/py-pytest-openfiles/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-openfiles/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestOpenfiles(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-parallel/package.py b/var/spack/repos/builtin/packages/py-pytest-parallel/package.py index 2271617b64..5fbf659c92 100644 --- a/var/spack/repos/builtin/packages/py-pytest-parallel/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-parallel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestParallel(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-pep8/package.py b/var/spack/repos/builtin/packages/py-pytest-pep8/package.py index 8d94bdd136..98d6982826 100644 --- a/var/spack/repos/builtin/packages/py-pytest-pep8/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-pep8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestPep8(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-qt/package.py b/var/spack/repos/builtin/packages/py-pytest-qt/package.py index 04f578f040..d7a4e45d18 100644 --- a/var/spack/repos/builtin/packages/py-pytest-qt/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-qt/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestQt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-random-order/package.py b/var/spack/repos/builtin/packages/py-pytest-random-order/package.py index ef63b9b60e..d76696d07b 100644 --- a/var/spack/repos/builtin/packages/py-pytest-random-order/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-random-order/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPytestRandomOrder(PythonPackage): """ Randomise the order in which pytest tests are run. diff --git a/var/spack/repos/builtin/packages/py-pytest-runner/package.py b/var/spack/repos/builtin/packages/py-pytest-runner/package.py index da616788be..0290ab48e8 100644 --- a/var/spack/repos/builtin/packages/py-pytest-runner/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-runner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestRunner(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-timeout/package.py b/var/spack/repos/builtin/packages/py-pytest-timeout/package.py index cd6cfe42e9..064ca3c847 100644 --- a/var/spack/repos/builtin/packages/py-pytest-timeout/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-timeout/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestTimeout(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest-xdist/package.py b/var/spack/repos/builtin/packages/py-pytest-xdist/package.py index 47aff66da9..e9028ea0fa 100644 --- a/var/spack/repos/builtin/packages/py-pytest-xdist/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-xdist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytestXdist(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index 32dab65eea..3fd6717d46 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytest(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-benedict/package.py b/var/spack/repos/builtin/packages/py-python-benedict/package.py index 0e2e6b57bd..4e74e0ed1a 100644 --- a/var/spack/repos/builtin/packages/py-python-benedict/package.py +++ b/var/spack/repos/builtin/packages/py-python-benedict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonBenedict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-box/package.py b/var/spack/repos/builtin/packages/py-python-box/package.py index a3d4472715..71a1fedfd7 100644 --- a/var/spack/repos/builtin/packages/py-python-box/package.py +++ b/var/spack/repos/builtin/packages/py-python-box/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonBox(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py b/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py index 5629a9fea0..41370cb512 100644 --- a/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py +++ b/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonCertifiWin32(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-constraint/package.py b/var/spack/repos/builtin/packages/py-python-constraint/package.py index 422991370c..a4d2d9ca61 100644 --- a/var/spack/repos/builtin/packages/py-python-constraint/package.py +++ b/var/spack/repos/builtin/packages/py-python-constraint/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPythonConstraint(PythonPackage): """Constraint Solving Problem resolver for Python""" diff --git a/var/spack/repos/builtin/packages/py-python-crfsuite/package.py b/var/spack/repos/builtin/packages/py-python-crfsuite/package.py index 5c3472373c..e638a7620d 100644 --- a/var/spack/repos/builtin/packages/py-python-crfsuite/package.py +++ b/var/spack/repos/builtin/packages/py-python-crfsuite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonCrfsuite(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-daemon/package.py b/var/spack/repos/builtin/packages/py-python-daemon/package.py index 1ee6a76ad1..fbdd014c2c 100644 --- a/var/spack/repos/builtin/packages/py-python-daemon/package.py +++ b/var/spack/repos/builtin/packages/py-python-daemon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonDaemon(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-dateutil/package.py b/var/spack/repos/builtin/packages/py-python-dateutil/package.py index 3501fd0701..9801bd0d22 100644 --- a/var/spack/repos/builtin/packages/py-python-dateutil/package.py +++ b/var/spack/repos/builtin/packages/py-python-dateutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonDateutil(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-docs-theme/package.py b/var/spack/repos/builtin/packages/py-python-docs-theme/package.py index 1949e33dbf..20384dce0b 100644 --- a/var/spack/repos/builtin/packages/py-python-docs-theme/package.py +++ b/var/spack/repos/builtin/packages/py-python-docs-theme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonDocsTheme(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-dotenv/package.py b/var/spack/repos/builtin/packages/py-python-dotenv/package.py index 514154d93f..4ff0e7f83f 100644 --- a/var/spack/repos/builtin/packages/py-python-dotenv/package.py +++ b/var/spack/repos/builtin/packages/py-python-dotenv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonDotenv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-editor/package.py b/var/spack/repos/builtin/packages/py-python-editor/package.py index be29ac7acd..4b76ff6394 100644 --- a/var/spack/repos/builtin/packages/py-python-editor/package.py +++ b/var/spack/repos/builtin/packages/py-python-editor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonEditor(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-engineio/package.py b/var/spack/repos/builtin/packages/py-python-engineio/package.py index 0663f7fe53..747f6a52b8 100644 --- a/var/spack/repos/builtin/packages/py-python-engineio/package.py +++ b/var/spack/repos/builtin/packages/py-python-engineio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonEngineio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-fmask/package.py b/var/spack/repos/builtin/packages/py-python-fmask/package.py index ec4f33c3a1..c0f9f83695 100644 --- a/var/spack/repos/builtin/packages/py-python-fmask/package.py +++ b/var/spack/repos/builtin/packages/py-python-fmask/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonFmask(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-fsutil/package.py b/var/spack/repos/builtin/packages/py-python-fsutil/package.py index 62dbb19f7d..7631ccc935 100644 --- a/var/spack/repos/builtin/packages/py-python-fsutil/package.py +++ b/var/spack/repos/builtin/packages/py-python-fsutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonFsutil(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-gitlab/package.py b/var/spack/repos/builtin/packages/py-python-gitlab/package.py index 641c72bbd9..d2204dda10 100644 --- a/var/spack/repos/builtin/packages/py-python-gitlab/package.py +++ b/var/spack/repos/builtin/packages/py-python-gitlab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonGitlab(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-igraph/package.py b/var/spack/repos/builtin/packages/py-python-igraph/package.py index 425838a243..88152d4c5c 100644 --- a/var/spack/repos/builtin/packages/py-python-igraph/package.py +++ b/var/spack/repos/builtin/packages/py-python-igraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonIgraph(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-jenkins/package.py b/var/spack/repos/builtin/packages/py-python-jenkins/package.py index db35294b5c..f0f173a8ab 100644 --- a/var/spack/repos/builtin/packages/py-python-jenkins/package.py +++ b/var/spack/repos/builtin/packages/py-python-jenkins/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonJenkins(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-json-logger/package.py b/var/spack/repos/builtin/packages/py-python-json-logger/package.py index 85ad3e11cf..b128252902 100644 --- a/var/spack/repos/builtin/packages/py-python-json-logger/package.py +++ b/var/spack/repos/builtin/packages/py-python-json-logger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonJsonLogger(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py b/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py index b0c8501938..471c0721c2 100644 --- a/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py +++ b/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonKeystoneclient(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-ldap/package.py b/var/spack/repos/builtin/packages/py-python-ldap/package.py index ca39ddf0fc..a138da95ca 100644 --- a/var/spack/repos/builtin/packages/py-python-ldap/package.py +++ b/var/spack/repos/builtin/packages/py-python-ldap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonLdap(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py index 713ea397b3..5397967287 100644 --- a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py +++ b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonLevenshtein(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-logstash/package.py b/var/spack/repos/builtin/packages/py-python-logstash/package.py index a1266fd55b..ec3bf05ead 100644 --- a/var/spack/repos/builtin/packages/py-python-logstash/package.py +++ b/var/spack/repos/builtin/packages/py-python-logstash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonLogstash(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-louvain/package.py b/var/spack/repos/builtin/packages/py-python-louvain/package.py index 4efe41d583..c1ef658868 100644 --- a/var/spack/repos/builtin/packages/py-python-louvain/package.py +++ b/var/spack/repos/builtin/packages/py-python-louvain/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyPythonLouvain(PythonPackage): """This module implements community detection. It uses the louvain method described in Fast unfolding of communities diff --git a/var/spack/repos/builtin/packages/py-python-lzo/package.py b/var/spack/repos/builtin/packages/py-python-lzo/package.py index b1c79d683f..7b618cff1f 100644 --- a/var/spack/repos/builtin/packages/py-python-lzo/package.py +++ b/var/spack/repos/builtin/packages/py-python-lzo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonLzo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-magic/package.py b/var/spack/repos/builtin/packages/py-python-magic/package.py index a2a9a5dbce..b3d246acc5 100644 --- a/var/spack/repos/builtin/packages/py-python-magic/package.py +++ b/var/spack/repos/builtin/packages/py-python-magic/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonMagic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-mapnik/package.py b/var/spack/repos/builtin/packages/py-python-mapnik/package.py index c603e2a2cb..25d1d316bc 100644 --- a/var/spack/repos/builtin/packages/py-python-mapnik/package.py +++ b/var/spack/repos/builtin/packages/py-python-mapnik/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/py-python-meep/package.py b/var/spack/repos/builtin/packages/py-python-meep/package.py index 66f89a3d51..7b3ee7dca3 100644 --- a/var/spack/repos/builtin/packages/py-python-meep/package.py +++ b/var/spack/repos/builtin/packages/py-python-meep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonMeep(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-memcached/package.py b/var/spack/repos/builtin/packages/py-python-memcached/package.py index f412f20198..c7c3356885 100644 --- a/var/spack/repos/builtin/packages/py-python-memcached/package.py +++ b/var/spack/repos/builtin/packages/py-python-memcached/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonMemcached(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-oauth2/package.py b/var/spack/repos/builtin/packages/py-python-oauth2/package.py index 01549cae77..baccfec4d4 100644 --- a/var/spack/repos/builtin/packages/py-python-oauth2/package.py +++ b/var/spack/repos/builtin/packages/py-python-oauth2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonOauth2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-picard/package.py b/var/spack/repos/builtin/packages/py-python-picard/package.py index 8200c75929..3181c7eae8 100644 --- a/var/spack/repos/builtin/packages/py-python-picard/package.py +++ b/var/spack/repos/builtin/packages/py-python-picard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonPicard(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-rapidjson/package.py b/var/spack/repos/builtin/packages/py-python-rapidjson/package.py index c12d6db18d..e588c22292 100644 --- a/var/spack/repos/builtin/packages/py-python-rapidjson/package.py +++ b/var/spack/repos/builtin/packages/py-python-rapidjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonRapidjson(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-slugify/package.py b/var/spack/repos/builtin/packages/py-python-slugify/package.py index 830738e14c..da11f84738 100644 --- a/var/spack/repos/builtin/packages/py-python-slugify/package.py +++ b/var/spack/repos/builtin/packages/py-python-slugify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonSlugify(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-socketio/package.py b/var/spack/repos/builtin/packages/py-python-socketio/package.py index 85376a9a64..0006aaffd9 100644 --- a/var/spack/repos/builtin/packages/py-python-socketio/package.py +++ b/var/spack/repos/builtin/packages/py-python-socketio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonSocketio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-subunit/package.py b/var/spack/repos/builtin/packages/py-python-subunit/package.py index a79135d2a6..55df709499 100644 --- a/var/spack/repos/builtin/packages/py-python-subunit/package.py +++ b/var/spack/repos/builtin/packages/py-python-subunit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonSubunit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-swiftclient/package.py b/var/spack/repos/builtin/packages/py-python-swiftclient/package.py index e767645dce..d5c57e7651 100644 --- a/var/spack/repos/builtin/packages/py-python-swiftclient/package.py +++ b/var/spack/repos/builtin/packages/py-python-swiftclient/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonSwiftclient(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-utils/package.py b/var/spack/repos/builtin/packages/py-python-utils/package.py index 925fc66bee..fce4239229 100644 --- a/var/spack/repos/builtin/packages/py-python-utils/package.py +++ b/var/spack/repos/builtin/packages/py-python-utils/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonUtils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-xlib/package.py b/var/spack/repos/builtin/packages/py-python-xlib/package.py index 41f6279ce2..3cd29aec0b 100644 --- a/var/spack/repos/builtin/packages/py-python-xlib/package.py +++ b/var/spack/repos/builtin/packages/py-python-xlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonXlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python-xmp-toolkit/package.py b/var/spack/repos/builtin/packages/py-python-xmp-toolkit/package.py index 063b1de3a4..e2254f90cb 100644 --- a/var/spack/repos/builtin/packages/py-python-xmp-toolkit/package.py +++ b/var/spack/repos/builtin/packages/py-python-xmp-toolkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonXmpToolkit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-python3-xlib/package.py b/var/spack/repos/builtin/packages/py-python3-xlib/package.py index e365d6935b..b283a07d93 100644 --- a/var/spack/repos/builtin/packages/py-python3-xlib/package.py +++ b/var/spack/repos/builtin/packages/py-python3-xlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPython3Xlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pythonqwt/package.py b/var/spack/repos/builtin/packages/py-pythonqwt/package.py index 703fc81b50..3c18e1d7f6 100644 --- a/var/spack/repos/builtin/packages/py-pythonqwt/package.py +++ b/var/spack/repos/builtin/packages/py-pythonqwt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonqwt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pythonsollya/package.py b/var/spack/repos/builtin/packages/py-pythonsollya/package.py index d3e8c54fe9..7060947873 100644 --- a/var/spack/repos/builtin/packages/py-pythonsollya/package.py +++ b/var/spack/repos/builtin/packages/py-pythonsollya/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPythonsollya(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pythran/package.py b/var/spack/repos/builtin/packages/py-pythran/package.py index 1de1622b1f..0f4e5dba01 100644 --- a/var/spack/repos/builtin/packages/py-pythran/package.py +++ b/var/spack/repos/builtin/packages/py-pythran/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class PyPythran(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytimeparse/package.py b/var/spack/repos/builtin/packages/py-pytimeparse/package.py index 72333554c3..c726df3757 100644 --- a/var/spack/repos/builtin/packages/py-pytimeparse/package.py +++ b/var/spack/repos/builtin/packages/py-pytimeparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytimeparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytoml/package.py b/var/spack/repos/builtin/packages/py-pytoml/package.py index 0015250c9b..f0edbe0f0a 100644 --- a/var/spack/repos/builtin/packages/py-pytoml/package.py +++ b/var/spack/repos/builtin/packages/py-pytoml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytoml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytools/package.py b/var/spack/repos/builtin/packages/py-pytools/package.py index 12c2470011..c974e47f4b 100644 --- a/var/spack/repos/builtin/packages/py-pytools/package.py +++ b/var/spack/repos/builtin/packages/py-pytools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytorch-gradual-warmup-lr/package.py b/var/spack/repos/builtin/packages/py-pytorch-gradual-warmup-lr/package.py index afc6aea8df..2bc8152d35 100644 --- a/var/spack/repos/builtin/packages/py-pytorch-gradual-warmup-lr/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch-gradual-warmup-lr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytorchGradualWarmupLr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py index 458363faea..7f4c816731 100644 --- a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytorchLightning(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytorch-sphinx-theme/package.py b/var/spack/repos/builtin/packages/py-pytorch-sphinx-theme/package.py index 26a7baac15..7a0ee0c4ed 100644 --- a/var/spack/repos/builtin/packages/py-pytorch-sphinx-theme/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch-sphinx-theme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytorchSphinxTheme(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyts/package.py b/var/spack/repos/builtin/packages/py-pyts/package.py index 0a27d143ea..0bc54d09da 100644 --- a/var/spack/repos/builtin/packages/py-pyts/package.py +++ b/var/spack/repos/builtin/packages/py-pyts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyts(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytweening/package.py b/var/spack/repos/builtin/packages/py-pytweening/package.py index 4418134b9d..f4801d5121 100644 --- a/var/spack/repos/builtin/packages/py-pytweening/package.py +++ b/var/spack/repos/builtin/packages/py-pytweening/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytweening(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pytz/package.py b/var/spack/repos/builtin/packages/py-pytz/package.py index e1ad02e172..a46a0a9c93 100644 --- a/var/spack/repos/builtin/packages/py-pytz/package.py +++ b/var/spack/repos/builtin/packages/py-pytz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPytz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyudev/package.py b/var/spack/repos/builtin/packages/py-pyudev/package.py index 4099eeb1a4..2b2446ff74 100644 --- a/var/spack/repos/builtin/packages/py-pyudev/package.py +++ b/var/spack/repos/builtin/packages/py-pyudev/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyudev(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyugrid/package.py b/var/spack/repos/builtin/packages/py-pyugrid/package.py index cf9847d192..a3092a2f40 100644 --- a/var/spack/repos/builtin/packages/py-pyugrid/package.py +++ b/var/spack/repos/builtin/packages/py-pyugrid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyugrid(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyupgrade/package.py b/var/spack/repos/builtin/packages/py-pyupgrade/package.py index 6094a5b5a2..2ef391419d 100644 --- a/var/spack/repos/builtin/packages/py-pyupgrade/package.py +++ b/var/spack/repos/builtin/packages/py-pyupgrade/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyupgrade(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyusb/package.py b/var/spack/repos/builtin/packages/py-pyusb/package.py index 044109c5cc..60fe38b495 100644 --- a/var/spack/repos/builtin/packages/py-pyusb/package.py +++ b/var/spack/repos/builtin/packages/py-pyusb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyusb(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyutilib/package.py b/var/spack/repos/builtin/packages/py-pyutilib/package.py index b802fc8193..1cfb296364 100644 --- a/var/spack/repos/builtin/packages/py-pyutilib/package.py +++ b/var/spack/repos/builtin/packages/py-pyutilib/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyutilib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyvcf/package.py b/var/spack/repos/builtin/packages/py-pyvcf/package.py index a07e781153..cf8f407c7f 100644 --- a/var/spack/repos/builtin/packages/py-pyvcf/package.py +++ b/var/spack/repos/builtin/packages/py-pyvcf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyvcf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyvista/package.py b/var/spack/repos/builtin/packages/py-pyvista/package.py index d4cfedabbc..05579ef83b 100644 --- a/var/spack/repos/builtin/packages/py-pyvista/package.py +++ b/var/spack/repos/builtin/packages/py-pyvista/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyvista(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyvistaqt/package.py b/var/spack/repos/builtin/packages/py-pyvistaqt/package.py index 8f87685b33..83fed3f6f4 100644 --- a/var/spack/repos/builtin/packages/py-pyvistaqt/package.py +++ b/var/spack/repos/builtin/packages/py-pyvistaqt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyvistaqt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pywavelets/package.py b/var/spack/repos/builtin/packages/py-pywavelets/package.py index 2c37e114a4..732eb3a442 100644 --- a/var/spack/repos/builtin/packages/py-pywavelets/package.py +++ b/var/spack/repos/builtin/packages/py-pywavelets/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPywavelets(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pywcs/package.py b/var/spack/repos/builtin/packages/py-pywcs/package.py index 725fb4d552..61c762e590 100644 --- a/var/spack/repos/builtin/packages/py-pywcs/package.py +++ b/var/spack/repos/builtin/packages/py-pywcs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPywcs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyworld/package.py b/var/spack/repos/builtin/packages/py-pyworld/package.py index 6e578187c5..2bca65949d 100644 --- a/var/spack/repos/builtin/packages/py-pyworld/package.py +++ b/var/spack/repos/builtin/packages/py-pyworld/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyworld(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py index c2e22d26c3..b6fe0bd092 100644 --- a/var/spack/repos/builtin/packages/py-pyyaml/package.py +++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyyaml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-pyzmq/package.py b/var/spack/repos/builtin/packages/py-pyzmq/package.py index 1e9eb5d045..7ef61721c2 100644 --- a/var/spack/repos/builtin/packages/py-pyzmq/package.py +++ b/var/spack/repos/builtin/packages/py-pyzmq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyPyzmq(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-qiskit-aer/package.py b/var/spack/repos/builtin/packages/py-qiskit-aer/package.py index 676147b8d3..24052d0293 100644 --- a/var/spack/repos/builtin/packages/py-qiskit-aer/package.py +++ b/var/spack/repos/builtin/packages/py-qiskit-aer/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyQiskitAer(PythonPackage, CudaPackage): """Aer is a high performance simulator for quantum circuits that includes noise models""" diff --git a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py index feb72d990c..d24bd219bd 100644 --- a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py +++ b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyQiskitTerra(PythonPackage): """Qiskit is an open-source SDK for working with quantum computers at the level of extended quantum circuits, operators, and diff --git a/var/spack/repos/builtin/packages/py-qmtest/package.py b/var/spack/repos/builtin/packages/py-qmtest/package.py index 9498575448..9d73589bf0 100644 --- a/var/spack/repos/builtin/packages/py-qmtest/package.py +++ b/var/spack/repos/builtin/packages/py-qmtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQmtest(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-qpth/package.py b/var/spack/repos/builtin/packages/py-qpth/package.py index 72b7bf96a1..00e339fd22 100644 --- a/var/spack/repos/builtin/packages/py-qpth/package.py +++ b/var/spack/repos/builtin/packages/py-qpth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQpth(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-qrcode/package.py b/var/spack/repos/builtin/packages/py-qrcode/package.py index 24f09d8dd2..ae342f07e8 100644 --- a/var/spack/repos/builtin/packages/py-qrcode/package.py +++ b/var/spack/repos/builtin/packages/py-qrcode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQrcode(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-qsymm/package.py b/var/spack/repos/builtin/packages/py-qsymm/package.py index 40cccd6d1f..61094eacfd 100644 --- a/var/spack/repos/builtin/packages/py-qsymm/package.py +++ b/var/spack/repos/builtin/packages/py-qsymm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQsymm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-qtawesome/package.py b/var/spack/repos/builtin/packages/py-qtawesome/package.py index ddaeb7922e..91e8b04d35 100644 --- a/var/spack/repos/builtin/packages/py-qtawesome/package.py +++ b/var/spack/repos/builtin/packages/py-qtawesome/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQtawesome(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index aa23b77cc3..c2c63332f9 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQtconsole(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-qtpy/package.py b/var/spack/repos/builtin/packages/py-qtpy/package.py index cfd0735767..836abae8c4 100644 --- a/var/spack/repos/builtin/packages/py-qtpy/package.py +++ b/var/spack/repos/builtin/packages/py-qtpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQtpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-quantities/package.py b/var/spack/repos/builtin/packages/py-quantities/package.py index 6bc6c11b1c..1055b2335e 100644 --- a/var/spack/repos/builtin/packages/py-quantities/package.py +++ b/var/spack/repos/builtin/packages/py-quantities/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQuantities(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-quart/package.py b/var/spack/repos/builtin/packages/py-quart/package.py index bccf02c4ce..8f4b6d2941 100644 --- a/var/spack/repos/builtin/packages/py-quart/package.py +++ b/var/spack/repos/builtin/packages/py-quart/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQuart(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-quast/package.py b/var/spack/repos/builtin/packages/py-quast/package.py index bc5042b644..73fab671cf 100644 --- a/var/spack/repos/builtin/packages/py-quast/package.py +++ b/var/spack/repos/builtin/packages/py-quast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/py-quaternionic/package.py b/var/spack/repos/builtin/packages/py-quaternionic/package.py index 0ad590ebb8..0698aa9ff7 100644 --- a/var/spack/repos/builtin/packages/py-quaternionic/package.py +++ b/var/spack/repos/builtin/packages/py-quaternionic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQuaternionic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-queryablelist/package.py b/var/spack/repos/builtin/packages/py-queryablelist/package.py index 0ebd73b359..f873805a73 100644 --- a/var/spack/repos/builtin/packages/py-queryablelist/package.py +++ b/var/spack/repos/builtin/packages/py-queryablelist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQueryablelist(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-questionary/package.py b/var/spack/repos/builtin/packages/py-questionary/package.py index 3c1599fd70..dd0dd6c41b 100644 --- a/var/spack/repos/builtin/packages/py-questionary/package.py +++ b/var/spack/repos/builtin/packages/py-questionary/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyQuestionary(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py b/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py index dd0103101a..5ec32fc71f 100644 --- a/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py +++ b/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRadiantMlhub(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-radical-entk/package.py b/var/spack/repos/builtin/packages/py-radical-entk/package.py index b58aaa4bbe..e6ba83aa32 100644 --- a/var/spack/repos/builtin/packages/py-radical-entk/package.py +++ b/var/spack/repos/builtin/packages/py-radical-entk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRadicalEntk(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-radical-gtod/package.py b/var/spack/repos/builtin/packages/py-radical-gtod/package.py index aa1a797588..0b850a5a26 100644 --- a/var/spack/repos/builtin/packages/py-radical-gtod/package.py +++ b/var/spack/repos/builtin/packages/py-radical-gtod/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRadicalGtod(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-radical-pilot/package.py b/var/spack/repos/builtin/packages/py-radical-pilot/package.py index a8faede99a..7d1aab75f7 100644 --- a/var/spack/repos/builtin/packages/py-radical-pilot/package.py +++ b/var/spack/repos/builtin/packages/py-radical-pilot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRadicalPilot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-radical-saga/package.py b/var/spack/repos/builtin/packages/py-radical-saga/package.py index 389f539362..2cd812655a 100644 --- a/var/spack/repos/builtin/packages/py-radical-saga/package.py +++ b/var/spack/repos/builtin/packages/py-radical-saga/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRadicalSaga(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-radical-utils/package.py b/var/spack/repos/builtin/packages/py-radical-utils/package.py index 7a7aa9732b..7cc0dc5acf 100644 --- a/var/spack/repos/builtin/packages/py-radical-utils/package.py +++ b/var/spack/repos/builtin/packages/py-radical-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRadicalUtils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ranger-fm/package.py b/var/spack/repos/builtin/packages/py-ranger-fm/package.py index f8412f8182..60fd68f7fd 100644 --- a/var/spack/repos/builtin/packages/py-ranger-fm/package.py +++ b/var/spack/repos/builtin/packages/py-ranger-fm/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class PyRangerFm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rapidfuzz/package.py b/var/spack/repos/builtin/packages/py-rapidfuzz/package.py index 2550e86ebf..e39640df90 100644 --- a/var/spack/repos/builtin/packages/py-rapidfuzz/package.py +++ b/var/spack/repos/builtin/packages/py-rapidfuzz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRapidfuzz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rarfile/package.py b/var/spack/repos/builtin/packages/py-rarfile/package.py index f83faf3af5..4a15aca110 100644 --- a/var/spack/repos/builtin/packages/py-rarfile/package.py +++ b/var/spack/repos/builtin/packages/py-rarfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRarfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py index 50766129c7..ae3992df86 100644 --- a/var/spack/repos/builtin/packages/py-rasterio/package.py +++ b/var/spack/repos/builtin/packages/py-rasterio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRasterio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ratelim/package.py b/var/spack/repos/builtin/packages/py-ratelim/package.py index 425969f58d..03e6b34ca4 100644 --- a/var/spack/repos/builtin/packages/py-ratelim/package.py +++ b/var/spack/repos/builtin/packages/py-ratelim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRatelim(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ratelimiter/package.py b/var/spack/repos/builtin/packages/py-ratelimiter/package.py index 20c5a31213..6850d2d5b1 100644 --- a/var/spack/repos/builtin/packages/py-ratelimiter/package.py +++ b/var/spack/repos/builtin/packages/py-ratelimiter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRatelimiter(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-raven/package.py b/var/spack/repos/builtin/packages/py-raven/package.py index 4ac31217bc..d65c6010d0 100644 --- a/var/spack/repos/builtin/packages/py-raven/package.py +++ b/var/spack/repos/builtin/packages/py-raven/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRaven(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ray/package.py b/var/spack/repos/builtin/packages/py-ray/package.py index 81436e2c1c..8158d6fdda 100644 --- a/var/spack/repos/builtin/packages/py-ray/package.py +++ b/var/spack/repos/builtin/packages/py-ray/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRay(PythonPackage): """A system for parallel and distributed Python that unifies the ML ecosystem.""" diff --git a/var/spack/repos/builtin/packages/py-rbtools/package.py b/var/spack/repos/builtin/packages/py-rbtools/package.py index d918f61b23..862cc8e532 100644 --- a/var/spack/repos/builtin/packages/py-rbtools/package.py +++ b/var/spack/repos/builtin/packages/py-rbtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRbtools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rdflib/package.py b/var/spack/repos/builtin/packages/py-rdflib/package.py index 7b02a7c008..a369266cd3 100644 --- a/var/spack/repos/builtin/packages/py-rdflib/package.py +++ b/var/spack/repos/builtin/packages/py-rdflib/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRdflib(PythonPackage): """RDFLib is a pure Python package for working with RDF. RDFLib contains most things you need to work with RDF, including: diff --git a/var/spack/repos/builtin/packages/py-rdt/package.py b/var/spack/repos/builtin/packages/py-rdt/package.py index 88093e62b2..82eee5ec93 100644 --- a/var/spack/repos/builtin/packages/py-rdt/package.py +++ b/var/spack/repos/builtin/packages/py-rdt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRdt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-readme-renderer/package.py b/var/spack/repos/builtin/packages/py-readme-renderer/package.py index 7f1573fd38..0b21b86acc 100644 --- a/var/spack/repos/builtin/packages/py-readme-renderer/package.py +++ b/var/spack/repos/builtin/packages/py-readme-renderer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyReadmeRenderer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-recommonmark/package.py b/var/spack/repos/builtin/packages/py-recommonmark/package.py index d684371978..0fc3608651 100644 --- a/var/spack/repos/builtin/packages/py-recommonmark/package.py +++ b/var/spack/repos/builtin/packages/py-recommonmark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRecommonmark(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-redis/package.py b/var/spack/repos/builtin/packages/py-redis/package.py index 157b7d3a85..6d98f673a6 100644 --- a/var/spack/repos/builtin/packages/py-redis/package.py +++ b/var/spack/repos/builtin/packages/py-redis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRedis(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-regex/package.py b/var/spack/repos/builtin/packages/py-regex/package.py index c3adccd74b..ff33340421 100644 --- a/var/spack/repos/builtin/packages/py-regex/package.py +++ b/var/spack/repos/builtin/packages/py-regex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRegex(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-reindent/package.py b/var/spack/repos/builtin/packages/py-reindent/package.py index 9a554a019a..9fb7bac26e 100644 --- a/var/spack/repos/builtin/packages/py-reindent/package.py +++ b/var/spack/repos/builtin/packages/py-reindent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyReindent(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-reportlab/package.py b/var/spack/repos/builtin/packages/py-reportlab/package.py index 95d2c8fc8b..43672be8bf 100644 --- a/var/spack/repos/builtin/packages/py-reportlab/package.py +++ b/var/spack/repos/builtin/packages/py-reportlab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyReportlab(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-repoze-lru/package.py b/var/spack/repos/builtin/packages/py-repoze-lru/package.py index ff8c265593..3867f53ea4 100644 --- a/var/spack/repos/builtin/packages/py-repoze-lru/package.py +++ b/var/spack/repos/builtin/packages/py-repoze-lru/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRepozeLru(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-reproject/package.py b/var/spack/repos/builtin/packages/py-reproject/package.py index 30150d2f0c..5ac04c654a 100644 --- a/var/spack/repos/builtin/packages/py-reproject/package.py +++ b/var/spack/repos/builtin/packages/py-reproject/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyReproject(PythonPackage): """The reproject package is a Python package to reproject astronomical images using various techniques via a uniform diff --git a/var/spack/repos/builtin/packages/py-requests-ftp/package.py b/var/spack/repos/builtin/packages/py-requests-ftp/package.py index a871e0e7aa..5556c467ba 100644 --- a/var/spack/repos/builtin/packages/py-requests-ftp/package.py +++ b/var/spack/repos/builtin/packages/py-requests-ftp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRequestsFtp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-requests-futures/package.py b/var/spack/repos/builtin/packages/py-requests-futures/package.py index 290ebdef8a..61c5155e67 100644 --- a/var/spack/repos/builtin/packages/py-requests-futures/package.py +++ b/var/spack/repos/builtin/packages/py-requests-futures/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRequestsFutures(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-requests-mock/package.py b/var/spack/repos/builtin/packages/py-requests-mock/package.py index ae60a374ff..1badb48e60 100644 --- a/var/spack/repos/builtin/packages/py-requests-mock/package.py +++ b/var/spack/repos/builtin/packages/py-requests-mock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRequestsMock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-requests-ntlm/package.py b/var/spack/repos/builtin/packages/py-requests-ntlm/package.py index 207e7d85bc..cf1fb6e259 100644 --- a/var/spack/repos/builtin/packages/py-requests-ntlm/package.py +++ b/var/spack/repos/builtin/packages/py-requests-ntlm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRequestsNtlm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-requests-oauthlib/package.py b/var/spack/repos/builtin/packages/py-requests-oauthlib/package.py index 9de052720f..f2f6f2d724 100644 --- a/var/spack/repos/builtin/packages/py-requests-oauthlib/package.py +++ b/var/spack/repos/builtin/packages/py-requests-oauthlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRequestsOauthlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py index 0fb8e6b5c5..7e5c07da0c 100644 --- a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py +++ b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRequestsToolbelt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py b/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py index c1bf43e0a7..2ae0280194 100644 --- a/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py +++ b/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRequestsUnixsocket(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py index dc016bf6fd..2967846a44 100644 --- a/var/spack/repos/builtin/packages/py-requests/package.py +++ b/var/spack/repos/builtin/packages/py-requests/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRequests(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-resampy/package.py b/var/spack/repos/builtin/packages/py-resampy/package.py index 7c0d183600..76d7812d3a 100644 --- a/var/spack/repos/builtin/packages/py-resampy/package.py +++ b/var/spack/repos/builtin/packages/py-resampy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyResampy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-responses/package.py b/var/spack/repos/builtin/packages/py-responses/package.py index 0254b216be..2117bc0611 100644 --- a/var/spack/repos/builtin/packages/py-responses/package.py +++ b/var/spack/repos/builtin/packages/py-responses/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyResponses(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-restview/package.py b/var/spack/repos/builtin/packages/py-restview/package.py index bc8cd9232e..f9b66f0e18 100644 --- a/var/spack/repos/builtin/packages/py-restview/package.py +++ b/var/spack/repos/builtin/packages/py-restview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRestview(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-resultsfile/package.py b/var/spack/repos/builtin/packages/py-resultsfile/package.py index 7bd41737ba..1781c49c04 100644 --- a/var/spack/repos/builtin/packages/py-resultsfile/package.py +++ b/var/spack/repos/builtin/packages/py-resultsfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyResultsfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-retry-decorator/package.py b/var/spack/repos/builtin/packages/py-retry-decorator/package.py index dd809acfd0..7dbde14a73 100644 --- a/var/spack/repos/builtin/packages/py-retry-decorator/package.py +++ b/var/spack/repos/builtin/packages/py-retry-decorator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRetryDecorator(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-retry/package.py b/var/spack/repos/builtin/packages/py-retry/package.py index e6a105b3d2..b00a254632 100644 --- a/var/spack/repos/builtin/packages/py-retry/package.py +++ b/var/spack/repos/builtin/packages/py-retry/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRetry(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-retrying/package.py b/var/spack/repos/builtin/packages/py-retrying/package.py index 6f4bb913a6..956cb4e3a4 100644 --- a/var/spack/repos/builtin/packages/py-retrying/package.py +++ b/var/spack/repos/builtin/packages/py-retrying/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRetrying(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-retworkx/package.py b/var/spack/repos/builtin/packages/py-retworkx/package.py index 37658c45d0..c277ab924f 100644 --- a/var/spack/repos/builtin/packages/py-retworkx/package.py +++ b/var/spack/repos/builtin/packages/py-retworkx/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRetworkx(PythonPackage): """A high performance Python graph library implemented in Rust.""" diff --git a/var/spack/repos/builtin/packages/py-rfc3986/package.py b/var/spack/repos/builtin/packages/py-rfc3986/package.py index 1501f75662..39c4f895c9 100644 --- a/var/spack/repos/builtin/packages/py-rfc3986/package.py +++ b/var/spack/repos/builtin/packages/py-rfc3986/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRfc3986(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rich/package.py b/var/spack/repos/builtin/packages/py-rich/package.py index 47e27bfc02..331387dee0 100644 --- a/var/spack/repos/builtin/packages/py-rich/package.py +++ b/var/spack/repos/builtin/packages/py-rich/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRich(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rios/package.py b/var/spack/repos/builtin/packages/py-rios/package.py index 24285b24c0..ebfdcf12d3 100644 --- a/var/spack/repos/builtin/packages/py-rios/package.py +++ b/var/spack/repos/builtin/packages/py-rios/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRios(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rioxarray/package.py b/var/spack/repos/builtin/packages/py-rioxarray/package.py index dcc5e133a1..1d68b4ec8a 100644 --- a/var/spack/repos/builtin/packages/py-rioxarray/package.py +++ b/var/spack/repos/builtin/packages/py-rioxarray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRioxarray(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rise/package.py b/var/spack/repos/builtin/packages/py-rise/package.py index 5727866aa8..143154e8fd 100644 --- a/var/spack/repos/builtin/packages/py-rise/package.py +++ b/var/spack/repos/builtin/packages/py-rise/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRise(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rmm/package.py b/var/spack/repos/builtin/packages/py-rmm/package.py index aed31e96b6..d842e467d9 100644 --- a/var/spack/repos/builtin/packages/py-rmm/package.py +++ b/var/spack/repos/builtin/packages/py-rmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRmm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rnacocktail/package.py b/var/spack/repos/builtin/packages/py-rnacocktail/package.py index bb83feab4e..0afcca077c 100644 --- a/var/spack/repos/builtin/packages/py-rnacocktail/package.py +++ b/var/spack/repos/builtin/packages/py-rnacocktail/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRnacocktail(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rnc2rng/package.py b/var/spack/repos/builtin/packages/py-rnc2rng/package.py index 2b04a6a251..2f45089054 100644 --- a/var/spack/repos/builtin/packages/py-rnc2rng/package.py +++ b/var/spack/repos/builtin/packages/py-rnc2rng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRnc2rng(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-robotframework/package.py b/var/spack/repos/builtin/packages/py-robotframework/package.py index a01bc95c28..f28f0e7ac5 100644 --- a/var/spack/repos/builtin/packages/py-robotframework/package.py +++ b/var/spack/repos/builtin/packages/py-robotframework/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRobotframework(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rope/package.py b/var/spack/repos/builtin/packages/py-rope/package.py index 2321b0c932..29e4823683 100644 --- a/var/spack/repos/builtin/packages/py-rope/package.py +++ b/var/spack/repos/builtin/packages/py-rope/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRope(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rosdep/package.py b/var/spack/repos/builtin/packages/py-rosdep/package.py index 2932b025bc..0aa932aca8 100644 --- a/var/spack/repos/builtin/packages/py-rosdep/package.py +++ b/var/spack/repos/builtin/packages/py-rosdep/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRosdep(PythonPackage): """rosdep package manager abstraction tool for ROS.""" diff --git a/var/spack/repos/builtin/packages/py-rosdistro/package.py b/var/spack/repos/builtin/packages/py-rosdistro/package.py index 0060476719..efcb43f832 100644 --- a/var/spack/repos/builtin/packages/py-rosdistro/package.py +++ b/var/spack/repos/builtin/packages/py-rosdistro/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRosdistro(PythonPackage): """A tool to work with rosdistro files.""" diff --git a/var/spack/repos/builtin/packages/py-rosinstall-generator/package.py b/var/spack/repos/builtin/packages/py-rosinstall-generator/package.py index 5d8c3afec9..9b0111d7c9 100644 --- a/var/spack/repos/builtin/packages/py-rosinstall-generator/package.py +++ b/var/spack/repos/builtin/packages/py-rosinstall-generator/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRosinstallGenerator(PythonPackage): """A tool for generating rosinstall files.""" diff --git a/var/spack/repos/builtin/packages/py-rosinstall/package.py b/var/spack/repos/builtin/packages/py-rosinstall/package.py index 453fc5e098..38bff965ae 100644 --- a/var/spack/repos/builtin/packages/py-rosinstall/package.py +++ b/var/spack/repos/builtin/packages/py-rosinstall/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRosinstall(PythonPackage): """The installer for ROS.""" diff --git a/var/spack/repos/builtin/packages/py-rospkg/package.py b/var/spack/repos/builtin/packages/py-rospkg/package.py index 47cec36590..73b60ff1b4 100644 --- a/var/spack/repos/builtin/packages/py-rospkg/package.py +++ b/var/spack/repos/builtin/packages/py-rospkg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRospkg(PythonPackage): """Library for retrieving information about ROS packages and stacks.""" diff --git a/var/spack/repos/builtin/packages/py-rply/package.py b/var/spack/repos/builtin/packages/py-rply/package.py index 4ec8763512..65d5ccc76d 100644 --- a/var/spack/repos/builtin/packages/py-rply/package.py +++ b/var/spack/repos/builtin/packages/py-rply/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRply(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index 1cfb8b3c7f..854f89425b 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRpy2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rq/package.py b/var/spack/repos/builtin/packages/py-rq/package.py index fe3895dfbb..2c969558c3 100644 --- a/var/spack/repos/builtin/packages/py-rq/package.py +++ b/var/spack/repos/builtin/packages/py-rq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRq(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rsa/package.py b/var/spack/repos/builtin/packages/py-rsa/package.py index c9d89c6cc1..a0b124608a 100644 --- a/var/spack/repos/builtin/packages/py-rsa/package.py +++ b/var/spack/repos/builtin/packages/py-rsa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRsa(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rsatoolbox/package.py b/var/spack/repos/builtin/packages/py-rsatoolbox/package.py index 215ace1d53..a971cf7bbf 100644 --- a/var/spack/repos/builtin/packages/py-rsatoolbox/package.py +++ b/var/spack/repos/builtin/packages/py-rsatoolbox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRsatoolbox(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rseqc/package.py b/var/spack/repos/builtin/packages/py-rseqc/package.py index af3f9a1e83..9e8201ba80 100644 --- a/var/spack/repos/builtin/packages/py-rseqc/package.py +++ b/var/spack/repos/builtin/packages/py-rseqc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRseqc(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rst2pdf/package.py b/var/spack/repos/builtin/packages/py-rst2pdf/package.py index 50dd6ceacb..22c4a10f32 100644 --- a/var/spack/repos/builtin/packages/py-rst2pdf/package.py +++ b/var/spack/repos/builtin/packages/py-rst2pdf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRst2pdf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rtree/package.py b/var/spack/repos/builtin/packages/py-rtree/package.py index b337045bb8..120023f855 100644 --- a/var/spack/repos/builtin/packages/py-rtree/package.py +++ b/var/spack/repos/builtin/packages/py-rtree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRtree(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ruamel-ordereddict/package.py b/var/spack/repos/builtin/packages/py-ruamel-ordereddict/package.py index 436c3bd2a6..92bd7be4a8 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-ordereddict/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-ordereddict/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRuamelOrdereddict(PythonPackage): """This is an implementation of an ordered dictionary with Key Insertion Order (KIO: updates of values do not affect the position of the key), Key diff --git a/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py b/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py index efb928b957..99787b0169 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyRuamelYamlClib(PythonPackage): """C version of reader, parser and emitter for ruamel.yaml derived from libyaml.""" diff --git a/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py b/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py index 239c60d886..f48dae5c8a 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRuamelYaml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-rx/package.py b/var/spack/repos/builtin/packages/py-rx/package.py index 48bae4b8fe..9e3ef5c4c7 100644 --- a/var/spack/repos/builtin/packages/py-rx/package.py +++ b/var/spack/repos/builtin/packages/py-rx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyRx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-s3cmd/package.py b/var/spack/repos/builtin/packages/py-s3cmd/package.py index 22b8e987db..59c52861d7 100644 --- a/var/spack/repos/builtin/packages/py-s3cmd/package.py +++ b/var/spack/repos/builtin/packages/py-s3cmd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyS3cmd(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-s3fs/package.py b/var/spack/repos/builtin/packages/py-s3fs/package.py index a2cb07fa93..420915d1c3 100644 --- a/var/spack/repos/builtin/packages/py-s3fs/package.py +++ b/var/spack/repos/builtin/packages/py-s3fs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyS3fs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-s3transfer/package.py b/var/spack/repos/builtin/packages/py-s3transfer/package.py index 1130386bab..18b13e7685 100644 --- a/var/spack/repos/builtin/packages/py-s3transfer/package.py +++ b/var/spack/repos/builtin/packages/py-s3transfer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyS3transfer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sacremoses/package.py b/var/spack/repos/builtin/packages/py-sacremoses/package.py index 5afcbc87ce..64966fe168 100644 --- a/var/spack/repos/builtin/packages/py-sacremoses/package.py +++ b/var/spack/repos/builtin/packages/py-sacremoses/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySacremoses(PythonPackage): """LGPL MosesTokenizer in Python.""" diff --git a/var/spack/repos/builtin/packages/py-saga-python/package.py b/var/spack/repos/builtin/packages/py-saga-python/package.py index b4b8005b79..d8b3030e7e 100644 --- a/var/spack/repos/builtin/packages/py-saga-python/package.py +++ b/var/spack/repos/builtin/packages/py-saga-python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySagaPython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-salib/package.py b/var/spack/repos/builtin/packages/py-salib/package.py index baf86c17a9..c45719295a 100644 --- a/var/spack/repos/builtin/packages/py-salib/package.py +++ b/var/spack/repos/builtin/packages/py-salib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySalib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sanic/package.py b/var/spack/repos/builtin/packages/py-sanic/package.py index 0bf17106ea..f1f08c1de4 100644 --- a/var/spack/repos/builtin/packages/py-sanic/package.py +++ b/var/spack/repos/builtin/packages/py-sanic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySanic(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scandir/package.py b/var/spack/repos/builtin/packages/py-scandir/package.py index 3acd9cd043..bf74409e80 100644 --- a/var/spack/repos/builtin/packages/py-scandir/package.py +++ b/var/spack/repos/builtin/packages/py-scandir/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScandir(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-schema/package.py b/var/spack/repos/builtin/packages/py-schema/package.py index 864ca2fddf..90492305a6 100644 --- a/var/spack/repos/builtin/packages/py-schema/package.py +++ b/var/spack/repos/builtin/packages/py-schema/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySchema(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scientificpython/package.py b/var/spack/repos/builtin/packages/py-scientificpython/package.py index 535c6f0b49..6d2ac0d94c 100644 --- a/var/spack/repos/builtin/packages/py-scientificpython/package.py +++ b/var/spack/repos/builtin/packages/py-scientificpython/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScientificpython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scikit-build/package.py b/var/spack/repos/builtin/packages/py-scikit-build/package.py index e019ee9b91..e815b06010 100644 --- a/var/spack/repos/builtin/packages/py-scikit-build/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-build/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScikitBuild(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scikit-fmm/package.py b/var/spack/repos/builtin/packages/py-scikit-fmm/package.py index b5d2cb36ca..4d16935d1c 100644 --- a/var/spack/repos/builtin/packages/py-scikit-fmm/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-fmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScikitFmm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scikit-fuzzy/package.py b/var/spack/repos/builtin/packages/py-scikit-fuzzy/package.py index 59875cf041..e534df9f1b 100644 --- a/var/spack/repos/builtin/packages/py-scikit-fuzzy/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-fuzzy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScikitFuzzy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py index 210f75efd0..f31a174cd1 100644 --- a/var/spack/repos/builtin/packages/py-scikit-image/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScikitImage(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scikit-learn-extra/package.py b/var/spack/repos/builtin/packages/py-scikit-learn-extra/package.py index 30f0ef38d7..7fa86c53e8 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn-extra/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn-extra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScikitLearnExtra(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py index b68e0b700a..ac03a1cb90 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyScikitLearn(PythonPackage): """A set of python modules for machine learning and data mining.""" diff --git a/var/spack/repos/builtin/packages/py-scikit-optimize/package.py b/var/spack/repos/builtin/packages/py-scikit-optimize/package.py index 905587b638..179f91098d 100644 --- a/var/spack/repos/builtin/packages/py-scikit-optimize/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-optimize/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScikitOptimize(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scinum/package.py b/var/spack/repos/builtin/packages/py-scinum/package.py index 23cdeb356e..ebb1699a62 100644 --- a/var/spack/repos/builtin/packages/py-scinum/package.py +++ b/var/spack/repos/builtin/packages/py-scinum/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScinum(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 63bbc4f40e..e08bbdc0c7 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -2,6 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * class PyScipy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scooby/package.py b/var/spack/repos/builtin/packages/py-scooby/package.py index 593dd42a82..78ddda0dfc 100644 --- a/var/spack/repos/builtin/packages/py-scooby/package.py +++ b/var/spack/repos/builtin/packages/py-scooby/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScooby(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scoop/package.py b/var/spack/repos/builtin/packages/py-scoop/package.py index e4353dbf19..42d98aeb01 100644 --- a/var/spack/repos/builtin/packages/py-scoop/package.py +++ b/var/spack/repos/builtin/packages/py-scoop/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScoop(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scp/package.py b/var/spack/repos/builtin/packages/py-scp/package.py index 398895d815..61203fbb06 100644 --- a/var/spack/repos/builtin/packages/py-scp/package.py +++ b/var/spack/repos/builtin/packages/py-scp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-scs/package.py b/var/spack/repos/builtin/packages/py-scs/package.py index 624e904aa4..c6bac3da12 100644 --- a/var/spack/repos/builtin/packages/py-scs/package.py +++ b/var/spack/repos/builtin/packages/py-scs/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyScs(PythonPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/py-sdmetrics/package.py b/var/spack/repos/builtin/packages/py-sdmetrics/package.py index bcaf0e5cda..ff51fcaabb 100644 --- a/var/spack/repos/builtin/packages/py-sdmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-sdmetrics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySdmetrics(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sdv/package.py b/var/spack/repos/builtin/packages/py-sdv/package.py index 16627f219b..6cacff468d 100644 --- a/var/spack/repos/builtin/packages/py-sdv/package.py +++ b/var/spack/repos/builtin/packages/py-sdv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySdv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-seaborn/package.py b/var/spack/repos/builtin/packages/py-seaborn/package.py index ba9d340165..179ad78ca8 100644 --- a/var/spack/repos/builtin/packages/py-seaborn/package.py +++ b/var/spack/repos/builtin/packages/py-seaborn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySeaborn(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-secretstorage/package.py b/var/spack/repos/builtin/packages/py-secretstorage/package.py index aae82bf931..eed169667d 100644 --- a/var/spack/repos/builtin/packages/py-secretstorage/package.py +++ b/var/spack/repos/builtin/packages/py-secretstorage/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySecretstorage(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py b/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py index ca6112ed26..2e50627f92 100644 --- a/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySegmentationModelsPytorch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-selectors34/package.py b/var/spack/repos/builtin/packages/py-selectors34/package.py index 4f2b4feb77..c4bcb5809d 100644 --- a/var/spack/repos/builtin/packages/py-selectors34/package.py +++ b/var/spack/repos/builtin/packages/py-selectors34/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # Package automatically generated using 'pip2spack' converter diff --git a/var/spack/repos/builtin/packages/py-selenium/package.py b/var/spack/repos/builtin/packages/py-selenium/package.py index 87d1339e12..b6032543f7 100644 --- a/var/spack/repos/builtin/packages/py-selenium/package.py +++ b/var/spack/repos/builtin/packages/py-selenium/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySelenium(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-semantic-version/package.py b/var/spack/repos/builtin/packages/py-semantic-version/package.py index feece030e8..a9b946a85d 100644 --- a/var/spack/repos/builtin/packages/py-semantic-version/package.py +++ b/var/spack/repos/builtin/packages/py-semantic-version/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySemanticVersion(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-semver/package.py b/var/spack/repos/builtin/packages/py-semver/package.py index 0e3fa4ff49..6a01a0e0e5 100644 --- a/var/spack/repos/builtin/packages/py-semver/package.py +++ b/var/spack/repos/builtin/packages/py-semver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySemver(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-send2trash/package.py b/var/spack/repos/builtin/packages/py-send2trash/package.py index 5a2cb6c3f0..62ff3c3abc 100644 --- a/var/spack/repos/builtin/packages/py-send2trash/package.py +++ b/var/spack/repos/builtin/packages/py-send2trash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySend2trash(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sentencepiece/package.py b/var/spack/repos/builtin/packages/py-sentencepiece/package.py index 6d493d2c10..2e45406c49 100644 --- a/var/spack/repos/builtin/packages/py-sentencepiece/package.py +++ b/var/spack/repos/builtin/packages/py-sentencepiece/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySentencepiece(PythonPackage): """Unsupervised text tokenizer for Neural Network-based text generation. diff --git a/var/spack/repos/builtin/packages/py-sentry-sdk/package.py b/var/spack/repos/builtin/packages/py-sentry-sdk/package.py index c103b13706..fe50a2c341 100644 --- a/var/spack/repos/builtin/packages/py-sentry-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-sentry-sdk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySentrySdk(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-seqeval/package.py b/var/spack/repos/builtin/packages/py-seqeval/package.py index cc23790e8a..aa58a48a90 100644 --- a/var/spack/repos/builtin/packages/py-seqeval/package.py +++ b/var/spack/repos/builtin/packages/py-seqeval/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySeqeval(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-seriate/package.py b/var/spack/repos/builtin/packages/py-seriate/package.py index f0c7bb5292..5b8d0bca84 100644 --- a/var/spack/repos/builtin/packages/py-seriate/package.py +++ b/var/spack/repos/builtin/packages/py-seriate/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySeriate(PythonPackage): """This is a Python implementation of Seriation algorithm. Seriation is an approach for ordering elements in a set diff --git a/var/spack/repos/builtin/packages/py-serpent/package.py b/var/spack/repos/builtin/packages/py-serpent/package.py index 93aee93bd9..85f28c9377 100644 --- a/var/spack/repos/builtin/packages/py-serpent/package.py +++ b/var/spack/repos/builtin/packages/py-serpent/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + # Package automatically generated using 'pip2spack' converter diff --git a/var/spack/repos/builtin/packages/py-setproctitle/package.py b/var/spack/repos/builtin/packages/py-setproctitle/package.py index 5c2e3f5a60..5c1f5481f9 100644 --- a/var/spack/repos/builtin/packages/py-setproctitle/package.py +++ b/var/spack/repos/builtin/packages/py-setproctitle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySetproctitle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-setupmeta/package.py b/var/spack/repos/builtin/packages/py-setupmeta/package.py index 08b42ed925..fa86cdbdb7 100644 --- a/var/spack/repos/builtin/packages/py-setupmeta/package.py +++ b/var/spack/repos/builtin/packages/py-setupmeta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySetupmeta(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py b/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py index 091381f81a..70c76f46ac 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySetuptoolsCpp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-setuptools-git/package.py b/var/spack/repos/builtin/packages/py-setuptools-git/package.py index dda62c9423..4fabd9b6ea 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-git/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-git/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySetuptoolsGit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-setuptools-rust/package.py b/var/spack/repos/builtin/packages/py-setuptools-rust/package.py index 6a17377293..daa0102519 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-rust/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-rust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySetuptoolsRust(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm-git-archive/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm-git-archive/package.py index 7bcc878b5d..b8dd71689f 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-scm-git-archive/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-scm-git-archive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySetuptoolsScmGitArchive(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py index 47934ade6c..dc48d9c5db 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySetuptoolsScm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index 7b7b475fc7..194ac780fa 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySetuptools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sfepy/package.py b/var/spack/repos/builtin/packages/py-sfepy/package.py index bd756b881e..2ec738c55c 100644 --- a/var/spack/repos/builtin/packages/py-sfepy/package.py +++ b/var/spack/repos/builtin/packages/py-sfepy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySfepy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sgp4/package.py b/var/spack/repos/builtin/packages/py-sgp4/package.py index 869b96ac50..85ebef6515 100644 --- a/var/spack/repos/builtin/packages/py-sgp4/package.py +++ b/var/spack/repos/builtin/packages/py-sgp4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySgp4(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sh/package.py b/var/spack/repos/builtin/packages/py-sh/package.py index f8adce86b1..8691c3c444 100644 --- a/var/spack/repos/builtin/packages/py-sh/package.py +++ b/var/spack/repos/builtin/packages/py-sh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySh(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-shapely/package.py b/var/spack/repos/builtin/packages/py-shapely/package.py index 9919d9b719..700dcbf83a 100644 --- a/var/spack/repos/builtin/packages/py-shapely/package.py +++ b/var/spack/repos/builtin/packages/py-shapely/package.py @@ -6,6 +6,8 @@ import os import sys +from spack.package import * + class PyShapely(PythonPackage): """Manipulation and analysis of geometric objects in the Cartesian plane. diff --git a/var/spack/repos/builtin/packages/py-shellingham/package.py b/var/spack/repos/builtin/packages/py-shellingham/package.py index 070a2dd9d2..3cc2f3b8df 100644 --- a/var/spack/repos/builtin/packages/py-shellingham/package.py +++ b/var/spack/repos/builtin/packages/py-shellingham/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyShellingham(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-shiboken/package.py b/var/spack/repos/builtin/packages/py-shiboken/package.py index 971ee93334..07da2e9d9f 100644 --- a/var/spack/repos/builtin/packages/py-shiboken/package.py +++ b/var/spack/repos/builtin/packages/py-shiboken/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyShiboken(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-shiboken2/package.py b/var/spack/repos/builtin/packages/py-shiboken2/package.py index 832f3d6935..400479f438 100644 --- a/var/spack/repos/builtin/packages/py-shiboken2/package.py +++ b/var/spack/repos/builtin/packages/py-shiboken2/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class PyShiboken2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-shortuuid/package.py b/var/spack/repos/builtin/packages/py-shortuuid/package.py index 1f5631a345..ebd47f4ba6 100644 --- a/var/spack/repos/builtin/packages/py-shortuuid/package.py +++ b/var/spack/repos/builtin/packages/py-shortuuid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyShortuuid(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-shroud/package.py b/var/spack/repos/builtin/packages/py-shroud/package.py index 8e9c059429..7a8c3249b3 100644 --- a/var/spack/repos/builtin/packages/py-shroud/package.py +++ b/var/spack/repos/builtin/packages/py-shroud/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyShroud(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-shtab/package.py b/var/spack/repos/builtin/packages/py-shtab/package.py index cac483a9b7..c082ec8701 100644 --- a/var/spack/repos/builtin/packages/py-shtab/package.py +++ b/var/spack/repos/builtin/packages/py-shtab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyShtab(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sierrapy/package.py b/var/spack/repos/builtin/packages/py-sierrapy/package.py index cbdd31aeb3..223637a8cb 100644 --- a/var/spack/repos/builtin/packages/py-sierrapy/package.py +++ b/var/spack/repos/builtin/packages/py-sierrapy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySierrapy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-simplegeneric/package.py b/var/spack/repos/builtin/packages/py-simplegeneric/package.py index 8de390cc31..c0ceecc1fe 100644 --- a/var/spack/repos/builtin/packages/py-simplegeneric/package.py +++ b/var/spack/repos/builtin/packages/py-simplegeneric/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySimplegeneric(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-simplejson/package.py b/var/spack/repos/builtin/packages/py-simplejson/package.py index fb10edd647..ef686f58fb 100644 --- a/var/spack/repos/builtin/packages/py-simplejson/package.py +++ b/var/spack/repos/builtin/packages/py-simplejson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySimplejson(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-simplekml/package.py b/var/spack/repos/builtin/packages/py-simplekml/package.py index f1e79ba5da..3d45035a37 100644 --- a/var/spack/repos/builtin/packages/py-simplekml/package.py +++ b/var/spack/repos/builtin/packages/py-simplekml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySimplekml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-singledispatch/package.py b/var/spack/repos/builtin/packages/py-singledispatch/package.py index 775f2e7058..0492e72840 100644 --- a/var/spack/repos/builtin/packages/py-singledispatch/package.py +++ b/var/spack/repos/builtin/packages/py-singledispatch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySingledispatch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sip/package.py b/var/spack/repos/builtin/packages/py-sip/package.py index 427e450aba..9c091939fd 100644 --- a/var/spack/repos/builtin/packages/py-sip/package.py +++ b/var/spack/repos/builtin/packages/py-sip/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PySip(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-six/package.py b/var/spack/repos/builtin/packages/py-six/package.py index addf699b15..a61a8cbeff 100644 --- a/var/spack/repos/builtin/packages/py-six/package.py +++ b/var/spack/repos/builtin/packages/py-six/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySix(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-skl2onnx/package.py b/var/spack/repos/builtin/packages/py-skl2onnx/package.py index 260ccf5c46..5d5a49ae2b 100644 --- a/var/spack/repos/builtin/packages/py-skl2onnx/package.py +++ b/var/spack/repos/builtin/packages/py-skl2onnx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySkl2onnx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-slepc4py/package.py b/var/spack/repos/builtin/packages/py-slepc4py/package.py index 03c309caeb..060ed0dd34 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/package.py +++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySlepc4py(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py index 06a736345b..d2f8ed812d 100644 --- a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py +++ b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySlurmPipeline(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-smac/package.py b/var/spack/repos/builtin/packages/py-smac/package.py index f1b5c1e5bf..ae993b3790 100644 --- a/var/spack/repos/builtin/packages/py-smac/package.py +++ b/var/spack/repos/builtin/packages/py-smac/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySmac(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-smart-open/package.py b/var/spack/repos/builtin/packages/py-smart-open/package.py index a2a6aa651c..43314e893f 100644 --- a/var/spack/repos/builtin/packages/py-smart-open/package.py +++ b/var/spack/repos/builtin/packages/py-smart-open/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySmartOpen(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-smartypants/package.py b/var/spack/repos/builtin/packages/py-smartypants/package.py index d27a264a78..82df812874 100644 --- a/var/spack/repos/builtin/packages/py-smartypants/package.py +++ b/var/spack/repos/builtin/packages/py-smartypants/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySmartypants(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-smmap/package.py b/var/spack/repos/builtin/packages/py-smmap/package.py index 82e225eb15..c62f4361b2 100644 --- a/var/spack/repos/builtin/packages/py-smmap/package.py +++ b/var/spack/repos/builtin/packages/py-smmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySmmap(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-snappy/package.py b/var/spack/repos/builtin/packages/py-snappy/package.py index 5fae6110e2..20984d931c 100644 --- a/var/spack/repos/builtin/packages/py-snappy/package.py +++ b/var/spack/repos/builtin/packages/py-snappy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySnappy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sncosmo/package.py b/var/spack/repos/builtin/packages/py-sncosmo/package.py index 836d65a17b..b281004b49 100644 --- a/var/spack/repos/builtin/packages/py-sncosmo/package.py +++ b/var/spack/repos/builtin/packages/py-sncosmo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySncosmo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sniffio/package.py b/var/spack/repos/builtin/packages/py-sniffio/package.py index ccb0b0d1c1..d1286a90d3 100644 --- a/var/spack/repos/builtin/packages/py-sniffio/package.py +++ b/var/spack/repos/builtin/packages/py-sniffio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySniffio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-snowballstemmer/package.py b/var/spack/repos/builtin/packages/py-snowballstemmer/package.py index 95525e2712..293d62c07c 100644 --- a/var/spack/repos/builtin/packages/py-snowballstemmer/package.py +++ b/var/spack/repos/builtin/packages/py-snowballstemmer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySnowballstemmer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-snuggs/package.py b/var/spack/repos/builtin/packages/py-snuggs/package.py index 0605002578..75edda3e00 100644 --- a/var/spack/repos/builtin/packages/py-snuggs/package.py +++ b/var/spack/repos/builtin/packages/py-snuggs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySnuggs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sobol-seq/package.py b/var/spack/repos/builtin/packages/py-sobol-seq/package.py index 296bbaa034..b149576ee9 100644 --- a/var/spack/repos/builtin/packages/py-sobol-seq/package.py +++ b/var/spack/repos/builtin/packages/py-sobol-seq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySobolSeq(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sonlib/package.py b/var/spack/repos/builtin/packages/py-sonlib/package.py index 58a2a9c7bc..2922b0889a 100644 --- a/var/spack/repos/builtin/packages/py-sonlib/package.py +++ b/var/spack/repos/builtin/packages/py-sonlib/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySonlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sortedcollections/package.py b/var/spack/repos/builtin/packages/py-sortedcollections/package.py index 8de02f5976..377ad21716 100644 --- a/var/spack/repos/builtin/packages/py-sortedcollections/package.py +++ b/var/spack/repos/builtin/packages/py-sortedcollections/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySortedcollections(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sortedcontainers/package.py b/var/spack/repos/builtin/packages/py-sortedcontainers/package.py index 68ef7133bd..d0e14b97db 100644 --- a/var/spack/repos/builtin/packages/py-sortedcontainers/package.py +++ b/var/spack/repos/builtin/packages/py-sortedcontainers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySortedcontainers(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-soundfile/package.py b/var/spack/repos/builtin/packages/py-soundfile/package.py index 7bd8131aa8..9e8baeb636 100644 --- a/var/spack/repos/builtin/packages/py-soundfile/package.py +++ b/var/spack/repos/builtin/packages/py-soundfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySoundfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-soupsieve/package.py b/var/spack/repos/builtin/packages/py-soupsieve/package.py index 5721a3cc9c..3e25a7f6ae 100644 --- a/var/spack/repos/builtin/packages/py-soupsieve/package.py +++ b/var/spack/repos/builtin/packages/py-soupsieve/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySoupsieve(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py b/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py index 150c1038e5..912d1a7337 100644 --- a/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py +++ b/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySpacyModelsEnCoreWebSm(PythonPackage): """English multi-task CNN trained on OntoNotes. Assigns context-specific token vectors, POS tags, dependency parse and named entities.""" diff --git a/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py b/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py index c835352a81..33490bd4a8 100644 --- a/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py +++ b/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySpacyModelsEnVectorsWebLg(PythonPackage): """1.2m 300d vectors trained on Common Crawl with GloVe""" diff --git a/var/spack/repos/builtin/packages/py-spacy/package.py b/var/spack/repos/builtin/packages/py-spacy/package.py index 2270caf475..8299e6bd74 100644 --- a/var/spack/repos/builtin/packages/py-spacy/package.py +++ b/var/spack/repos/builtin/packages/py-spacy/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySpacy(PythonPackage): """spaCy is a library for advanced Natural Language Processing in Python and Cython.""" diff --git a/var/spack/repos/builtin/packages/py-sparse/package.py b/var/spack/repos/builtin/packages/py-sparse/package.py index 2a2d5902de..51f90f6ad5 100644 --- a/var/spack/repos/builtin/packages/py-sparse/package.py +++ b/var/spack/repos/builtin/packages/py-sparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spatialist/package.py b/var/spack/repos/builtin/packages/py-spatialist/package.py index be200a3cb0..0b0a975e1f 100644 --- a/var/spack/repos/builtin/packages/py-spatialist/package.py +++ b/var/spack/repos/builtin/packages/py-spatialist/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpatialist(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spatialite/package.py b/var/spack/repos/builtin/packages/py-spatialite/package.py index b298a327e3..93ddbda30c 100644 --- a/var/spack/repos/builtin/packages/py-spatialite/package.py +++ b/var/spack/repos/builtin/packages/py-spatialite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpatialite(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spdlog/package.py b/var/spack/repos/builtin/packages/py-spdlog/package.py index 9bffbd001d..779f28d2eb 100644 --- a/var/spack/repos/builtin/packages/py-spdlog/package.py +++ b/var/spack/repos/builtin/packages/py-spdlog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpdlog(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spectra/package.py b/var/spack/repos/builtin/packages/py-spectra/package.py index 4284673bec..78adbbf833 100644 --- a/var/spack/repos/builtin/packages/py-spectra/package.py +++ b/var/spack/repos/builtin/packages/py-spectra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpectra(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spectral/package.py b/var/spack/repos/builtin/packages/py-spectral/package.py index 0722843b70..020fc7426d 100644 --- a/var/spack/repos/builtin/packages/py-spectral/package.py +++ b/var/spack/repos/builtin/packages/py-spectral/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpectral(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-speech-recognition/package.py b/var/spack/repos/builtin/packages/py-speech-recognition/package.py index 8b40f344f1..d6c43c2c09 100644 --- a/var/spack/repos/builtin/packages/py-speech-recognition/package.py +++ b/var/spack/repos/builtin/packages/py-speech-recognition/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpeechRecognition(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spefile/package.py b/var/spack/repos/builtin/packages/py-spefile/package.py index 72dd03324a..659c254902 100644 --- a/var/spack/repos/builtin/packages/py-spefile/package.py +++ b/var/spack/repos/builtin/packages/py-spefile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpefile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spgl1/package.py b/var/spack/repos/builtin/packages/py-spgl1/package.py index c5581388c0..054e7aeb9d 100644 --- a/var/spack/repos/builtin/packages/py-spgl1/package.py +++ b/var/spack/repos/builtin/packages/py-spgl1/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpgl1(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spglib/package.py b/var/spack/repos/builtin/packages/py-spglib/package.py index 5fb50e7177..eb26c71e83 100644 --- a/var/spack/repos/builtin/packages/py-spglib/package.py +++ b/var/spack/repos/builtin/packages/py-spglib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpglib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spherical/package.py b/var/spack/repos/builtin/packages/py-spherical/package.py index 157b89c93a..ac6e3d998c 100644 --- a/var/spack/repos/builtin/packages/py-spherical/package.py +++ b/var/spack/repos/builtin/packages/py-spherical/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpherical(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinx-argparse/package.py b/var/spack/repos/builtin/packages/py-sphinx-argparse/package.py index 6ac0c39d67..67d831314c 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-argparse/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-argparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxArgparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinx-autodoc-typehints/package.py b/var/spack/repos/builtin/packages/py-sphinx-autodoc-typehints/package.py index eb13db8a45..4cbfcbe2c6 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-autodoc-typehints/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-autodoc-typehints/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySphinxAutodocTypehints(PythonPackage): """ Type hints (PEP 484) support for the Sphinx autodoc extension diff --git a/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py index ee0b704c6c..26b8cb8635 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxBootstrapTheme(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinx-copybutton/package.py b/var/spack/repos/builtin/packages/py-sphinx-copybutton/package.py index 0fd34a4f43..18700e79ab 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-copybutton/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-copybutton/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxCopybutton(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinx-gallery/package.py b/var/spack/repos/builtin/packages/py-sphinx-gallery/package.py index 589952d2b9..7c2aa53cd9 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-gallery/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-gallery/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxGallery(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinx-multiversion/package.py b/var/spack/repos/builtin/packages/py-sphinx-multiversion/package.py index 04465c47b1..0151243b42 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-multiversion/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-multiversion/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxMultiversion(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py index df2d16aeef..ea36e7db64 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxRtdTheme(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinx-tabs/package.py b/var/spack/repos/builtin/packages/py-sphinx-tabs/package.py index 485fc617a5..d2c40f342d 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-tabs/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-tabs/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxTabs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index 9b72623018..854d20bb50 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinxautomodapi/package.py b/var/spack/repos/builtin/packages/py-sphinxautomodapi/package.py index aaa6f25d61..41319c2c32 100644 --- a/var/spack/repos/builtin/packages/py-sphinxautomodapi/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxautomodapi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxautomodapi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py index f10689fcca..77d8a4ab06 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py @@ -2,8 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from typing import List -from spack import * +from spack.package import * class PySphinxcontribApplehelp(PythonPackage): @@ -16,7 +17,7 @@ class PySphinxcontribApplehelp(PythonPackage): # 'sphinx' requires 'sphinxcontrib-applehelp' at build-time, but # 'sphinxcontrib-applehelp' requires 'sphinx' at run-time. Don't bother trying to # import any modules for this package. - import_modules = [] + import_modules = [] # type: List[str] version('1.0.1', sha256='edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897') diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py index c3371ae5ba..60459d2e7a 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxcontribBibtex(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py index 4d86b4559e..48f480c578 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py @@ -2,8 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from typing import List -from spack import * +from spack.package import * class PySphinxcontribDevhelp(PythonPackage): @@ -16,7 +17,7 @@ class PySphinxcontribDevhelp(PythonPackage): # 'sphinx' requires 'sphinxcontrib-devhelp' at build-time, but # 'sphinxcontrib-devhelp' requires 'sphinx' at run-time. Don't bother trying to # import any modules. - import_modules = [] + import_modules = [] # type: List[str] version('1.0.1', sha256='6c64b077937330a9128a4da74586e8c2130262f014689b4b89e2d08ee7294a34') diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py index 42f2ebc5e7..7c36459a96 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py @@ -2,8 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from typing import List -from spack import * +from spack.package import * class PySphinxcontribHtmlhelp(PythonPackage): @@ -16,7 +17,7 @@ class PySphinxcontribHtmlhelp(PythonPackage): # 'sphinx' requires 'sphinxcontrib-htmlhelp' at build-time, but # 'sphinxcontrib-htmlhelp' requires 'sphinx' at run-time. Don't bother trying to # import any modules. - import_modules = [] + import_modules = [] # type: List[str] version('2.0.0', sha256='f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2') version('1.0.2', sha256='4670f99f8951bd78cd4ad2ab962f798f5618b17675c35c5ac3b2132a14ea8422') diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-issuetracker/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-issuetracker/package.py index e2ce48bfb1..6e7ab2d2ba 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-issuetracker/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-issuetracker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxcontribIssuetracker(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-jsmath/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-jsmath/package.py index 591fa4ceab..c437e975c2 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-jsmath/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-jsmath/package.py @@ -2,8 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from typing import List -from spack import * +from spack.package import * class PySphinxcontribJsmath(PythonPackage): @@ -15,7 +16,7 @@ class PySphinxcontribJsmath(PythonPackage): # 'sphinx' requires 'sphinxcontrib-jsmath' at build-time, but # 'sphinxcontrib-jsmath' requires 'sphinx' at run-time. Don't bother trying to # import any modules. - import_modules = [] + import_modules = [] # type: List[str] version('1.0.1', sha256='a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8') diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-mermaid/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-mermaid/package.py index 7d619e7112..518db962d0 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-mermaid/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-mermaid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxcontribMermaid(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-napoleon/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-napoleon/package.py index b8f805f06c..6722c7a39c 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-napoleon/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-napoleon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxcontribNapoleon(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py index 24f47276dd..8dde00fb6a 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxcontribProgramoutput(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py index bab19eafa9..a20a9c4501 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py @@ -2,8 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from typing import List -from spack import * +from spack.package import * class PySphinxcontribQthelp(PythonPackage): @@ -16,7 +17,7 @@ class PySphinxcontribQthelp(PythonPackage): # 'sphinx' requires 'sphinxcontrib-qthelp' at build-time, but # 'sphinxcontrib-qthelp' requires 'sphinx' at run-time. Don't bother trying to # import any modules. - import_modules = [] + import_modules = [] # type: List[str] version('1.0.2', sha256='79465ce11ae5694ff165becda529a600c754f4bc459778778c7017374d4d406f') diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py index 670a526ad8..f7b37da254 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py @@ -2,8 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from typing import List -from spack import * +from spack.package import * class PySphinxcontribSerializinghtml(PythonPackage): @@ -16,7 +17,7 @@ class PySphinxcontribSerializinghtml(PythonPackage): # 'sphinx' requires 'sphinxcontrib-serializinghtml' at build-time, but # 'sphinxcontrib-serializinghtml' requires 'sphinx' at run-time. Don't bother trying # to import any modules. - import_modules = [] + import_modules = [] # type: List[str] version('1.1.5', sha256='aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952') version('1.1.3', sha256='c0efb33f8052c04fd7a26c0a07f1678e8512e0faec19f4aa8f2473a8b81d5227') diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py index ddb543bf9d..4f1305569b 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxcontribTrio(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py index 858da5607f..1f65092fcf 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphinxcontribWebsupport(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sphobjinv/package.py b/var/spack/repos/builtin/packages/py-sphobjinv/package.py index 102e3edd6f..4e5c1ccd07 100644 --- a/var/spack/repos/builtin/packages/py-sphobjinv/package.py +++ b/var/spack/repos/builtin/packages/py-sphobjinv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySphobjinv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spyder/package.py b/var/spack/repos/builtin/packages/py-spyder/package.py index 015739497e..dd0dd43d7e 100644 --- a/var/spack/repos/builtin/packages/py-spyder/package.py +++ b/var/spack/repos/builtin/packages/py-spyder/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpyder(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-spykeutils/package.py b/var/spack/repos/builtin/packages/py-spykeutils/package.py index cb45e83afc..aaefdfb8d3 100644 --- a/var/spack/repos/builtin/packages/py-spykeutils/package.py +++ b/var/spack/repos/builtin/packages/py-spykeutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySpykeutils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy-stubs/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy-stubs/package.py index 90dbec645d..5a47e8697b 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy-stubs/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy-stubs/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySqlalchemyStubs(PythonPackage): """ Mypy plugin and stubs for SQLAlchemy diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy-utils/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy-utils/package.py index d40da2bb74..97809c38d0 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy-utils/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySqlalchemyUtils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py index 5b2a133db1..06ee3af1ec 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySqlalchemy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sqlparse/package.py b/var/spack/repos/builtin/packages/py-sqlparse/package.py index fe8e52c58a..783a051371 100644 --- a/var/spack/repos/builtin/packages/py-sqlparse/package.py +++ b/var/spack/repos/builtin/packages/py-sqlparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySqlparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-srsly/package.py b/var/spack/repos/builtin/packages/py-srsly/package.py index c4df67bf18..447bcab84f 100644 --- a/var/spack/repos/builtin/packages/py-srsly/package.py +++ b/var/spack/repos/builtin/packages/py-srsly/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySrsly(PythonPackage): """srsly: Modern high-performance serialization utilities for Python.""" diff --git a/var/spack/repos/builtin/packages/py-sshtunnel/package.py b/var/spack/repos/builtin/packages/py-sshtunnel/package.py index 9a310025be..c58af29516 100644 --- a/var/spack/repos/builtin/packages/py-sshtunnel/package.py +++ b/var/spack/repos/builtin/packages/py-sshtunnel/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PySshtunnel(PythonPackage): """Pure python SSH tunnels.""" diff --git a/var/spack/repos/builtin/packages/py-stack-data/package.py b/var/spack/repos/builtin/packages/py-stack-data/package.py index 3d9645dbd2..c0eb15383e 100644 --- a/var/spack/repos/builtin/packages/py-stack-data/package.py +++ b/var/spack/repos/builtin/packages/py-stack-data/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStackData(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-statsmodels/package.py b/var/spack/repos/builtin/packages/py-statsmodels/package.py index 16636840ea..d419490df9 100644 --- a/var/spack/repos/builtin/packages/py-statsmodels/package.py +++ b/var/spack/repos/builtin/packages/py-statsmodels/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStatsmodels(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-stdlib-list/package.py b/var/spack/repos/builtin/packages/py-stdlib-list/package.py index 22df68ad16..41de386f9d 100644 --- a/var/spack/repos/builtin/packages/py-stdlib-list/package.py +++ b/var/spack/repos/builtin/packages/py-stdlib-list/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyStdlibList(PythonPackage): """This package includes lists of all of the standard libraries for Python, along with the code for scraping the official Python diff --git a/var/spack/repos/builtin/packages/py-stestr/package.py b/var/spack/repos/builtin/packages/py-stestr/package.py index acc1f92b78..ae8d88d08f 100644 --- a/var/spack/repos/builtin/packages/py-stestr/package.py +++ b/var/spack/repos/builtin/packages/py-stestr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStestr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-stevedore/package.py b/var/spack/repos/builtin/packages/py-stevedore/package.py index c5057298e0..ab7affedf5 100644 --- a/var/spack/repos/builtin/packages/py-stevedore/package.py +++ b/var/spack/repos/builtin/packages/py-stevedore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStevedore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-stomp-py/package.py b/var/spack/repos/builtin/packages/py-stomp-py/package.py index 6c01425c29..f128e80ab8 100644 --- a/var/spack/repos/builtin/packages/py-stomp-py/package.py +++ b/var/spack/repos/builtin/packages/py-stomp-py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStompPy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-stopit/package.py b/var/spack/repos/builtin/packages/py-stopit/package.py index 35ac19b5e6..1324730fcd 100644 --- a/var/spack/repos/builtin/packages/py-stopit/package.py +++ b/var/spack/repos/builtin/packages/py-stopit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStopit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-storm/package.py b/var/spack/repos/builtin/packages/py-storm/package.py index be864d66cf..bd9db6b74f 100644 --- a/var/spack/repos/builtin/packages/py-storm/package.py +++ b/var/spack/repos/builtin/packages/py-storm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStorm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-stratify/package.py b/var/spack/repos/builtin/packages/py-stratify/package.py index b1de059c2c..4b22032c8a 100644 --- a/var/spack/repos/builtin/packages/py-stratify/package.py +++ b/var/spack/repos/builtin/packages/py-stratify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStratify(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-stsci-distutils/package.py b/var/spack/repos/builtin/packages/py-stsci-distutils/package.py index d37188e327..e33b5903fa 100644 --- a/var/spack/repos/builtin/packages/py-stsci-distutils/package.py +++ b/var/spack/repos/builtin/packages/py-stsci-distutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyStsciDistutils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-submitit/package.py b/var/spack/repos/builtin/packages/py-submitit/package.py index fb1bf3a4da..30880505ae 100644 --- a/var/spack/repos/builtin/packages/py-submitit/package.py +++ b/var/spack/repos/builtin/packages/py-submitit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySubmitit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-subprocess32/package.py b/var/spack/repos/builtin/packages/py-subprocess32/package.py index 1186b39a00..cb65eddaf0 100644 --- a/var/spack/repos/builtin/packages/py-subprocess32/package.py +++ b/var/spack/repos/builtin/packages/py-subprocess32/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySubprocess32(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-subrosa/package.py b/var/spack/repos/builtin/packages/py-subrosa/package.py index 6b2162b395..945b92852a 100644 --- a/var/spack/repos/builtin/packages/py-subrosa/package.py +++ b/var/spack/repos/builtin/packages/py-subrosa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySubrosa(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-svgpathtools/package.py b/var/spack/repos/builtin/packages/py-svgpathtools/package.py index 25f195bd14..fa40e3c3c1 100644 --- a/var/spack/repos/builtin/packages/py-svgpathtools/package.py +++ b/var/spack/repos/builtin/packages/py-svgpathtools/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySvgpathtools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-svgutils/package.py b/var/spack/repos/builtin/packages/py-svgutils/package.py index 6faab008cc..a12cce6aab 100644 --- a/var/spack/repos/builtin/packages/py-svgutils/package.py +++ b/var/spack/repos/builtin/packages/py-svgutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySvgutils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-svgwrite/package.py b/var/spack/repos/builtin/packages/py-svgwrite/package.py index d77afaf4ec..07d031066c 100644 --- a/var/spack/repos/builtin/packages/py-svgwrite/package.py +++ b/var/spack/repos/builtin/packages/py-svgwrite/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySvgwrite(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py index 65328e6955..79750500d0 100644 --- a/var/spack/repos/builtin/packages/py-symengine/package.py +++ b/var/spack/repos/builtin/packages/py-symengine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySymengine(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-symfit/package.py b/var/spack/repos/builtin/packages/py-symfit/package.py index 4d1191f913..ff1b51da75 100644 --- a/var/spack/repos/builtin/packages/py-symfit/package.py +++ b/var/spack/repos/builtin/packages/py-symfit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySymfit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-sympy/package.py b/var/spack/repos/builtin/packages/py-sympy/package.py index 1c56c9b690..620d44fb01 100644 --- a/var/spack/repos/builtin/packages/py-sympy/package.py +++ b/var/spack/repos/builtin/packages/py-sympy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySympy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-syned/package.py b/var/spack/repos/builtin/packages/py-syned/package.py index ff78afdaa2..2d1574b7d1 100644 --- a/var/spack/repos/builtin/packages/py-syned/package.py +++ b/var/spack/repos/builtin/packages/py-syned/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySyned(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-systemd-python/package.py b/var/spack/repos/builtin/packages/py-systemd-python/package.py index d4434122ea..0e44ad4fd5 100644 --- a/var/spack/repos/builtin/packages/py-systemd-python/package.py +++ b/var/spack/repos/builtin/packages/py-systemd-python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PySystemdPython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tables/package.py b/var/spack/repos/builtin/packages/py-tables/package.py index 4d91041364..80188499dc 100644 --- a/var/spack/repos/builtin/packages/py-tables/package.py +++ b/var/spack/repos/builtin/packages/py-tables/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTables(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tabulate/package.py b/var/spack/repos/builtin/packages/py-tabulate/package.py index 0ed2ac73e9..f50a5c1907 100644 --- a/var/spack/repos/builtin/packages/py-tabulate/package.py +++ b/var/spack/repos/builtin/packages/py-tabulate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTabulate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tap-py/package.py b/var/spack/repos/builtin/packages/py-tap-py/package.py index 1df2b42aad..d28059549f 100644 --- a/var/spack/repos/builtin/packages/py-tap-py/package.py +++ b/var/spack/repos/builtin/packages/py-tap-py/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTapPy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tatsu/package.py b/var/spack/repos/builtin/packages/py-tatsu/package.py index cef9125ca2..0486ff950c 100644 --- a/var/spack/repos/builtin/packages/py-tatsu/package.py +++ b/var/spack/repos/builtin/packages/py-tatsu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTatsu(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tblib/package.py b/var/spack/repos/builtin/packages/py-tblib/package.py index e82aa088f3..5b3299be42 100644 --- a/var/spack/repos/builtin/packages/py-tblib/package.py +++ b/var/spack/repos/builtin/packages/py-tblib/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTblib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-templateflow/package.py b/var/spack/repos/builtin/packages/py-templateflow/package.py index 6bd1c94917..9f982b25b4 100644 --- a/var/spack/repos/builtin/packages/py-templateflow/package.py +++ b/var/spack/repos/builtin/packages/py-templateflow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTemplateflow(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tempora/package.py b/var/spack/repos/builtin/packages/py-tempora/package.py index 812c576cd0..a75f91034c 100644 --- a/var/spack/repos/builtin/packages/py-tempora/package.py +++ b/var/spack/repos/builtin/packages/py-tempora/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTempora(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tenacity/package.py b/var/spack/repos/builtin/packages/py-tenacity/package.py index a3662b0a44..904a009839 100644 --- a/var/spack/repos/builtin/packages/py-tenacity/package.py +++ b/var/spack/repos/builtin/packages/py-tenacity/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTenacity(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tensorboard-data-server/package.py b/var/spack/repos/builtin/packages/py-tensorboard-data-server/package.py index 1409be6087..f53255a4fe 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard-data-server/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard-data-server/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * class PyTensorboardDataServer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py b/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py index 5328e4cd50..d39fec6be2 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTensorboardPluginWit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tensorboard/package.py b/var/spack/repos/builtin/packages/py-tensorboard/package.py index 882d39e1d3..667ca5d01f 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard/package.py @@ -5,6 +5,8 @@ import tempfile +from spack.package import * + class PyTensorboard(Package): """TensorBoard is a suite of web applications for diff --git a/var/spack/repos/builtin/packages/py-tensorboardx/package.py b/var/spack/repos/builtin/packages/py-tensorboardx/package.py index d8b720b362..e451eae990 100644 --- a/var/spack/repos/builtin/packages/py-tensorboardx/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboardx/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTensorboardx(PythonPackage): """The purpose of this package is to let researchers use a simple interface to log events within PyTorch (and diff --git a/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py b/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py index a8039880ca..f6c9fcae57 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTensorflowDatasets(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py index 88c321cbba..dd6b8cd847 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py @@ -5,7 +5,7 @@ import tempfile -from spack import * +from spack.package import * class PyTensorflowEstimator(Package): diff --git a/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py b/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py index 3f57826bf8..656e4b25ee 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py @@ -5,6 +5,8 @@ import tempfile +from spack.package import * + class PyTensorflowHub(Package): """TensorFlow Hub is a library to foster the publication, discovery, and diff --git a/var/spack/repos/builtin/packages/py-tensorflow-metadata/package.py b/var/spack/repos/builtin/packages/py-tensorflow-metadata/package.py index 46b2a220ad..f8a97552d2 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-metadata/package.py @@ -5,7 +5,7 @@ import tempfile -from spack import * +from spack.package import * class PyTensorflowMetadata(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py b/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py index 0c7db4ed7b..f793b26d42 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py @@ -5,6 +5,8 @@ import tempfile +from spack.package import * + class PyTensorflowProbability(Package): """TensorFlow Probability (TFP) is a Python library built on diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index 38452d9c22..a9d5b6918a 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -6,6 +6,8 @@ import sys import tempfile +from spack.package import * + class PyTensorflow(Package, CudaPackage): """TensorFlow is an Open Source Software Library for Machine Intelligence diff --git a/var/spack/repos/builtin/packages/py-termcolor/package.py b/var/spack/repos/builtin/packages/py-termcolor/package.py index 03295e5599..0927bea331 100644 --- a/var/spack/repos/builtin/packages/py-termcolor/package.py +++ b/var/spack/repos/builtin/packages/py-termcolor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTermcolor(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-terminado/package.py b/var/spack/repos/builtin/packages/py-terminado/package.py index a8e127ed74..e7acc806c1 100644 --- a/var/spack/repos/builtin/packages/py-terminado/package.py +++ b/var/spack/repos/builtin/packages/py-terminado/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTerminado(PythonPackage): """Terminals served to term.js using Tornado websockets""" diff --git a/var/spack/repos/builtin/packages/py-terminaltables/package.py b/var/spack/repos/builtin/packages/py-terminaltables/package.py index 5df1b8b00e..a52d3f922f 100644 --- a/var/spack/repos/builtin/packages/py-terminaltables/package.py +++ b/var/spack/repos/builtin/packages/py-terminaltables/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTerminaltables(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tern/package.py b/var/spack/repos/builtin/packages/py-tern/package.py index 16660136fb..b5c9b4546c 100644 --- a/var/spack/repos/builtin/packages/py-tern/package.py +++ b/var/spack/repos/builtin/packages/py-tern/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTern(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-testfixtures/package.py b/var/spack/repos/builtin/packages/py-testfixtures/package.py index 4a84e2c11c..96a69c5074 100644 --- a/var/spack/repos/builtin/packages/py-testfixtures/package.py +++ b/var/spack/repos/builtin/packages/py-testfixtures/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTestfixtures(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-testinfra/package.py b/var/spack/repos/builtin/packages/py-testinfra/package.py index 33dd6a6a1d..4e23e1090b 100644 --- a/var/spack/repos/builtin/packages/py-testinfra/package.py +++ b/var/spack/repos/builtin/packages/py-testinfra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTestinfra(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-testpath/package.py b/var/spack/repos/builtin/packages/py-testpath/package.py index 57f3c9386a..b7a75c7149 100644 --- a/var/spack/repos/builtin/packages/py-testpath/package.py +++ b/var/spack/repos/builtin/packages/py-testpath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTestpath(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-testrepository/package.py b/var/spack/repos/builtin/packages/py-testrepository/package.py index 6b9592b8a0..092b172437 100644 --- a/var/spack/repos/builtin/packages/py-testrepository/package.py +++ b/var/spack/repos/builtin/packages/py-testrepository/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTestrepository(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-testresources/package.py b/var/spack/repos/builtin/packages/py-testresources/package.py index 5ab5aa25de..7df600a068 100644 --- a/var/spack/repos/builtin/packages/py-testresources/package.py +++ b/var/spack/repos/builtin/packages/py-testresources/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTestresources(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-testscenarios/package.py b/var/spack/repos/builtin/packages/py-testscenarios/package.py index 70cc11103e..ce76f746d4 100644 --- a/var/spack/repos/builtin/packages/py-testscenarios/package.py +++ b/var/spack/repos/builtin/packages/py-testscenarios/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTestscenarios(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-testtools/package.py b/var/spack/repos/builtin/packages/py-testtools/package.py index c4f962947c..4285704c3d 100644 --- a/var/spack/repos/builtin/packages/py-testtools/package.py +++ b/var/spack/repos/builtin/packages/py-testtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTesttools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tetoolkit/package.py b/var/spack/repos/builtin/packages/py-tetoolkit/package.py index 2ff24d3d82..bbdbe94f9e 100644 --- a/var/spack/repos/builtin/packages/py-tetoolkit/package.py +++ b/var/spack/repos/builtin/packages/py-tetoolkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTetoolkit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-text-unidecode/package.py b/var/spack/repos/builtin/packages/py-text-unidecode/package.py index b1ba5ef017..be6979c820 100644 --- a/var/spack/repos/builtin/packages/py-text-unidecode/package.py +++ b/var/spack/repos/builtin/packages/py-text-unidecode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTextUnidecode(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-textblob/package.py b/var/spack/repos/builtin/packages/py-textblob/package.py index 0055c8fa7b..9945ec3b51 100644 --- a/var/spack/repos/builtin/packages/py-textblob/package.py +++ b/var/spack/repos/builtin/packages/py-textblob/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTextblob(PythonPackage): """TextBlob is a Python (2 and 3) library for processing textual data. It provides a simple API for diving into common natural diff --git a/var/spack/repos/builtin/packages/py-texttable/package.py b/var/spack/repos/builtin/packages/py-texttable/package.py index d74266f3a0..d2c5043d65 100644 --- a/var/spack/repos/builtin/packages/py-texttable/package.py +++ b/var/spack/repos/builtin/packages/py-texttable/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTexttable(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tfdlpack/package.py b/var/spack/repos/builtin/packages/py-tfdlpack/package.py index e2a7a7627e..432d1e5de7 100644 --- a/var/spack/repos/builtin/packages/py-tfdlpack/package.py +++ b/var/spack/repos/builtin/packages/py-tfdlpack/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTfdlpack(CMakePackage, PythonPackage): """Tensorflow plugin for DLPack.""" diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index f015b7ed80..5243ae6603 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTheano(PythonPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/py-thinc/package.py b/var/spack/repos/builtin/packages/py-thinc/package.py index 4375722cb9..3c75ef1f63 100644 --- a/var/spack/repos/builtin/packages/py-thinc/package.py +++ b/var/spack/repos/builtin/packages/py-thinc/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyThinc(PythonPackage): """Thinc: Practical Machine Learning for NLP in Python.""" diff --git a/var/spack/repos/builtin/packages/py-thirdorder/package.py b/var/spack/repos/builtin/packages/py-thirdorder/package.py index 174412e8e8..f166f1932b 100644 --- a/var/spack/repos/builtin/packages/py-thirdorder/package.py +++ b/var/spack/repos/builtin/packages/py-thirdorder/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyThirdorder(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-threadpoolctl/package.py b/var/spack/repos/builtin/packages/py-threadpoolctl/package.py index 0a067df186..bd57acdeca 100644 --- a/var/spack/repos/builtin/packages/py-threadpoolctl/package.py +++ b/var/spack/repos/builtin/packages/py-threadpoolctl/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyThreadpoolctl(PythonPackage): """Python helpers to limit the number of threads used in the threadpool-backed of common native libraries used for scientific diff --git a/var/spack/repos/builtin/packages/py-tifffile/package.py b/var/spack/repos/builtin/packages/py-tifffile/package.py index 5abbf1915b..e71a217577 100644 --- a/var/spack/repos/builtin/packages/py-tifffile/package.py +++ b/var/spack/repos/builtin/packages/py-tifffile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTifffile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-timm/package.py b/var/spack/repos/builtin/packages/py-timm/package.py index 6b3f29ba39..c14681ea41 100644 --- a/var/spack/repos/builtin/packages/py-timm/package.py +++ b/var/spack/repos/builtin/packages/py-timm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTimm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tinyarray/package.py b/var/spack/repos/builtin/packages/py-tinyarray/package.py index c0f046a268..c6d2425e63 100644 --- a/var/spack/repos/builtin/packages/py-tinyarray/package.py +++ b/var/spack/repos/builtin/packages/py-tinyarray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTinyarray(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tokenize-rt/package.py b/var/spack/repos/builtin/packages/py-tokenize-rt/package.py index d2379d584a..640ff0d787 100644 --- a/var/spack/repos/builtin/packages/py-tokenize-rt/package.py +++ b/var/spack/repos/builtin/packages/py-tokenize-rt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTokenizeRt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tokenizers/package.py b/var/spack/repos/builtin/packages/py-tokenizers/package.py index dbc501bcb4..5c3d43e561 100644 --- a/var/spack/repos/builtin/packages/py-tokenizers/package.py +++ b/var/spack/repos/builtin/packages/py-tokenizers/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTokenizers(PythonPackage): """Fast and Customizable Tokenizers.""" diff --git a/var/spack/repos/builtin/packages/py-toml/package.py b/var/spack/repos/builtin/packages/py-toml/package.py index 2d84254077..9a1c6caf83 100644 --- a/var/spack/repos/builtin/packages/py-toml/package.py +++ b/var/spack/repos/builtin/packages/py-toml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyToml(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tomli-w/package.py b/var/spack/repos/builtin/packages/py-tomli-w/package.py index 9093d39458..525a6a8684 100644 --- a/var/spack/repos/builtin/packages/py-tomli-w/package.py +++ b/var/spack/repos/builtin/packages/py-tomli-w/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTomliW(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tomli/package.py b/var/spack/repos/builtin/packages/py-tomli/package.py index 53da838e9b..23dff1b873 100644 --- a/var/spack/repos/builtin/packages/py-tomli/package.py +++ b/var/spack/repos/builtin/packages/py-tomli/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTomli(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tomlkit/package.py b/var/spack/repos/builtin/packages/py-tomlkit/package.py index 3ff51afa39..3ac780cc7f 100644 --- a/var/spack/repos/builtin/packages/py-tomlkit/package.py +++ b/var/spack/repos/builtin/packages/py-tomlkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTomlkit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tomopy/package.py b/var/spack/repos/builtin/packages/py-tomopy/package.py index f0e43efb23..fdda099fed 100644 --- a/var/spack/repos/builtin/packages/py-tomopy/package.py +++ b/var/spack/repos/builtin/packages/py-tomopy/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTomopy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-toolz/package.py b/var/spack/repos/builtin/packages/py-toolz/package.py index badeed8aec..5b03d7d117 100644 --- a/var/spack/repos/builtin/packages/py-toolz/package.py +++ b/var/spack/repos/builtin/packages/py-toolz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyToolz(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-toposort/package.py b/var/spack/repos/builtin/packages/py-toposort/package.py index efa1c3b235..4a2aa62dc7 100644 --- a/var/spack/repos/builtin/packages/py-toposort/package.py +++ b/var/spack/repos/builtin/packages/py-toposort/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyToposort(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torch-cluster/package.py b/var/spack/repos/builtin/packages/py-torch-cluster/package.py index a64c407ac2..4f59e5cdfc 100644 --- a/var/spack/repos/builtin/packages/py-torch-cluster/package.py +++ b/var/spack/repos/builtin/packages/py-torch-cluster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTorchCluster(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torch-geometric/package.py b/var/spack/repos/builtin/packages/py-torch-geometric/package.py index 6432343590..976b170a49 100644 --- a/var/spack/repos/builtin/packages/py-torch-geometric/package.py +++ b/var/spack/repos/builtin/packages/py-torch-geometric/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTorchGeometric(PythonPackage): """PyTorch Geometric (PyG) is a geometric deep learning extension library for PyTorch. It consists of various methods for deep diff --git a/var/spack/repos/builtin/packages/py-torch-nvidia-apex/package.py b/var/spack/repos/builtin/packages/py-torch-nvidia-apex/package.py index 633d1babe3..81135e265e 100644 --- a/var/spack/repos/builtin/packages/py-torch-nvidia-apex/package.py +++ b/var/spack/repos/builtin/packages/py-torch-nvidia-apex/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTorchNvidiaApex(PythonPackage, CudaPackage): """A PyTorch Extension: Tools for easy mixed precision and distributed training in Pytorch """ diff --git a/var/spack/repos/builtin/packages/py-torch-scatter/package.py b/var/spack/repos/builtin/packages/py-torch-scatter/package.py index 3e31a9f6d0..8e65947ec3 100644 --- a/var/spack/repos/builtin/packages/py-torch-scatter/package.py +++ b/var/spack/repos/builtin/packages/py-torch-scatter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTorchScatter(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torch-sparse/package.py b/var/spack/repos/builtin/packages/py-torch-sparse/package.py index 602f948ea7..73f73f96ec 100644 --- a/var/spack/repos/builtin/packages/py-torch-sparse/package.py +++ b/var/spack/repos/builtin/packages/py-torch-sparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTorchSparse(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torch-spline-conv/package.py b/var/spack/repos/builtin/packages/py-torch-spline-conv/package.py index a3e87ba275..191484fdc5 100644 --- a/var/spack/repos/builtin/packages/py-torch-spline-conv/package.py +++ b/var/spack/repos/builtin/packages/py-torch-spline-conv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTorchSplineConv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index 5bf7432e93..8a89e31468 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class PyTorch(PythonPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/py-torchaudio/package.py b/var/spack/repos/builtin/packages/py-torchaudio/package.py index 7873fc625d..8375e512eb 100644 --- a/var/spack/repos/builtin/packages/py-torchaudio/package.py +++ b/var/spack/repos/builtin/packages/py-torchaudio/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTorchaudio(PythonPackage): """The aim of torchaudio is to apply PyTorch to the audio domain. By supporting PyTorch, torchaudio follows the same diff --git a/var/spack/repos/builtin/packages/py-torchfile/package.py b/var/spack/repos/builtin/packages/py-torchfile/package.py index 9b0d4e81d5..a01ccb902e 100644 --- a/var/spack/repos/builtin/packages/py-torchfile/package.py +++ b/var/spack/repos/builtin/packages/py-torchfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTorchfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torchgeo/package.py b/var/spack/repos/builtin/packages/py-torchgeo/package.py index 596840d98a..24ed850e2f 100644 --- a/var/spack/repos/builtin/packages/py-torchgeo/package.py +++ b/var/spack/repos/builtin/packages/py-torchgeo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTorchgeo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torchmeta/package.py b/var/spack/repos/builtin/packages/py-torchmeta/package.py index 7c28d40fdd..12367c8969 100644 --- a/var/spack/repos/builtin/packages/py-torchmeta/package.py +++ b/var/spack/repos/builtin/packages/py-torchmeta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTorchmeta(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torchmetrics/package.py b/var/spack/repos/builtin/packages/py-torchmetrics/package.py index d2199bcd0a..a1250a615a 100644 --- a/var/spack/repos/builtin/packages/py-torchmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-torchmetrics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTorchmetrics(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-torchsummary/package.py b/var/spack/repos/builtin/packages/py-torchsummary/package.py index b1f464148b..096e80dd1c 100644 --- a/var/spack/repos/builtin/packages/py-torchsummary/package.py +++ b/var/spack/repos/builtin/packages/py-torchsummary/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTorchsummary(PythonPackage): """Keras has a neat API to view the visualization of the model which is very helpful while debugging your network. Here is a diff --git a/var/spack/repos/builtin/packages/py-torchtext/package.py b/var/spack/repos/builtin/packages/py-torchtext/package.py index e246f0af48..c8e726ae51 100644 --- a/var/spack/repos/builtin/packages/py-torchtext/package.py +++ b/var/spack/repos/builtin/packages/py-torchtext/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTorchtext(PythonPackage): """Text utilities and datasets for PyTorch.""" diff --git a/var/spack/repos/builtin/packages/py-torchvision/package.py b/var/spack/repos/builtin/packages/py-torchvision/package.py index b1bc5908a9..509ae1a23c 100644 --- a/var/spack/repos/builtin/packages/py-torchvision/package.py +++ b/var/spack/repos/builtin/packages/py-torchvision/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTorchvision(PythonPackage): """The torchvision package consists of popular datasets, model architectures, and common image transformations for computer vision.""" diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py index 61a533862c..65922f6e97 100644 --- a/var/spack/repos/builtin/packages/py-tornado/package.py +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTornado(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tox/package.py b/var/spack/repos/builtin/packages/py-tox/package.py index 0e935b95eb..61b1407c3b 100644 --- a/var/spack/repos/builtin/packages/py-tox/package.py +++ b/var/spack/repos/builtin/packages/py-tox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTox(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tpot/package.py b/var/spack/repos/builtin/packages/py-tpot/package.py index 16023ab975..6c0c42add6 100644 --- a/var/spack/repos/builtin/packages/py-tpot/package.py +++ b/var/spack/repos/builtin/packages/py-tpot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTpot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tqdm/package.py b/var/spack/repos/builtin/packages/py-tqdm/package.py index 6b0e67330d..0bee79eed3 100644 --- a/var/spack/repos/builtin/packages/py-tqdm/package.py +++ b/var/spack/repos/builtin/packages/py-tqdm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTqdm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-traceback2/package.py b/var/spack/repos/builtin/packages/py-traceback2/package.py index 434496e67a..952f5c2ce4 100644 --- a/var/spack/repos/builtin/packages/py-traceback2/package.py +++ b/var/spack/repos/builtin/packages/py-traceback2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTraceback2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py index 6bd7ba042a..895950d9dc 100644 --- a/var/spack/repos/builtin/packages/py-traitlets/package.py +++ b/var/spack/repos/builtin/packages/py-traitlets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTraitlets(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-traits/package.py b/var/spack/repos/builtin/packages/py-traits/package.py index 04299eb68e..9c6978178a 100644 --- a/var/spack/repos/builtin/packages/py-traits/package.py +++ b/var/spack/repos/builtin/packages/py-traits/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTraits(PythonPackage): """Explicitly typed attributes for Python.""" diff --git a/var/spack/repos/builtin/packages/py-traitsui/package.py b/var/spack/repos/builtin/packages/py-traitsui/package.py index ba017bed66..53882e16f8 100644 --- a/var/spack/repos/builtin/packages/py-traitsui/package.py +++ b/var/spack/repos/builtin/packages/py-traitsui/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTraitsui(PythonPackage): """The TraitsUI project contains a toolkit-independent GUI abstraction layer, which is used to support the "visualization" features of the Traits diff --git a/var/spack/repos/builtin/packages/py-transformers/package.py b/var/spack/repos/builtin/packages/py-transformers/package.py index 3dd1600d12..f90397b56c 100644 --- a/var/spack/repos/builtin/packages/py-transformers/package.py +++ b/var/spack/repos/builtin/packages/py-transformers/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTransformers(PythonPackage): """State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch""" diff --git a/var/spack/repos/builtin/packages/py-transforms3d/package.py b/var/spack/repos/builtin/packages/py-transforms3d/package.py index 965b6bf2fe..71dc2e2aab 100644 --- a/var/spack/repos/builtin/packages/py-transforms3d/package.py +++ b/var/spack/repos/builtin/packages/py-transforms3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTransforms3d(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-treehash/package.py b/var/spack/repos/builtin/packages/py-treehash/package.py index 7ad2928979..6481caa29f 100644 --- a/var/spack/repos/builtin/packages/py-treehash/package.py +++ b/var/spack/repos/builtin/packages/py-treehash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTreehash(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-triangle/package.py b/var/spack/repos/builtin/packages/py-triangle/package.py index b64a8a2404..a44b18582c 100644 --- a/var/spack/repos/builtin/packages/py-triangle/package.py +++ b/var/spack/repos/builtin/packages/py-triangle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTriangle(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-trojanzoo-sphinx-theme/package.py b/var/spack/repos/builtin/packages/py-trojanzoo-sphinx-theme/package.py index 54216f41ed..23b27b25f0 100644 --- a/var/spack/repos/builtin/packages/py-trojanzoo-sphinx-theme/package.py +++ b/var/spack/repos/builtin/packages/py-trojanzoo-sphinx-theme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTrojanzooSphinxTheme(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tuiview/package.py b/var/spack/repos/builtin/packages/py-tuiview/package.py index e41bf21d64..42d854e5ac 100644 --- a/var/spack/repos/builtin/packages/py-tuiview/package.py +++ b/var/spack/repos/builtin/packages/py-tuiview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTuiview(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tweedledum/package.py b/var/spack/repos/builtin/packages/py-tweedledum/package.py index f5b694fb7a..385c6a2e3d 100644 --- a/var/spack/repos/builtin/packages/py-tweedledum/package.py +++ b/var/spack/repos/builtin/packages/py-tweedledum/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTweedledum(PythonPackage): """tweedledum is a library for synthesis, compilation, and optimization of quantum circuits. The library is written to be diff --git a/var/spack/repos/builtin/packages/py-twine/package.py b/var/spack/repos/builtin/packages/py-twine/package.py index 8d05d296d7..972f65f7c4 100644 --- a/var/spack/repos/builtin/packages/py-twine/package.py +++ b/var/spack/repos/builtin/packages/py-twine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTwine(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-twisted/package.py b/var/spack/repos/builtin/packages/py-twisted/package.py index 2568335ebc..9fcd5c933b 100644 --- a/var/spack/repos/builtin/packages/py-twisted/package.py +++ b/var/spack/repos/builtin/packages/py-twisted/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTwisted(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-typed-ast/package.py b/var/spack/repos/builtin/packages/py-typed-ast/package.py index a72099e0da..90f0c41ad7 100644 --- a/var/spack/repos/builtin/packages/py-typed-ast/package.py +++ b/var/spack/repos/builtin/packages/py-typed-ast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTypedAst(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-typeguard/package.py b/var/spack/repos/builtin/packages/py-typeguard/package.py index 27cacc0a25..5bea6c2d5b 100644 --- a/var/spack/repos/builtin/packages/py-typeguard/package.py +++ b/var/spack/repos/builtin/packages/py-typeguard/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyTypeguard(PythonPackage): """ Run-time type checker for Python diff --git a/var/spack/repos/builtin/packages/py-typesentry/package.py b/var/spack/repos/builtin/packages/py-typesentry/package.py index fc713cc366..a8e3eb15f8 100644 --- a/var/spack/repos/builtin/packages/py-typesentry/package.py +++ b/var/spack/repos/builtin/packages/py-typesentry/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTypesentry(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-typing-extensions/package.py b/var/spack/repos/builtin/packages/py-typing-extensions/package.py index bd4696a228..24e5b1c356 100644 --- a/var/spack/repos/builtin/packages/py-typing-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-typing-extensions/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTypingExtensions(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-typing/package.py b/var/spack/repos/builtin/packages/py-typing/package.py index b52369f794..9bcc1d7968 100644 --- a/var/spack/repos/builtin/packages/py-typing/package.py +++ b/var/spack/repos/builtin/packages/py-typing/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTyping(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-tzlocal/package.py b/var/spack/repos/builtin/packages/py-tzlocal/package.py index 48df30fcef..4d13f4ee44 100644 --- a/var/spack/repos/builtin/packages/py-tzlocal/package.py +++ b/var/spack/repos/builtin/packages/py-tzlocal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyTzlocal(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ucsf-pyem/package.py b/var/spack/repos/builtin/packages/py-ucsf-pyem/package.py index c87468edb0..e00d4931c4 100644 --- a/var/spack/repos/builtin/packages/py-ucsf-pyem/package.py +++ b/var/spack/repos/builtin/packages/py-ucsf-pyem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUcsfPyem(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ucx-py/package.py b/var/spack/repos/builtin/packages/py-ucx-py/package.py index 3b031a28ef..f92f1f021c 100644 --- a/var/spack/repos/builtin/packages/py-ucx-py/package.py +++ b/var/spack/repos/builtin/packages/py-ucx-py/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyUcxPy(PythonPackage): """UCX-Py is the Python interface for UCX, a low-level high-performance networking library. UCX and UCX-Py supports diff --git a/var/spack/repos/builtin/packages/py-uhi/package.py b/var/spack/repos/builtin/packages/py-uhi/package.py index 97ca52bdd7..592d7e3c2b 100644 --- a/var/spack/repos/builtin/packages/py-uhi/package.py +++ b/var/spack/repos/builtin/packages/py-uhi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUhi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ujson/package.py b/var/spack/repos/builtin/packages/py-ujson/package.py index 5227859baa..f8991731b6 100644 --- a/var/spack/repos/builtin/packages/py-ujson/package.py +++ b/var/spack/repos/builtin/packages/py-ujson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUjson(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-umalqurra/package.py b/var/spack/repos/builtin/packages/py-umalqurra/package.py index 1ab27227e4..2e2697b793 100644 --- a/var/spack/repos/builtin/packages/py-umalqurra/package.py +++ b/var/spack/repos/builtin/packages/py-umalqurra/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUmalqurra(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-umi-tools/package.py b/var/spack/repos/builtin/packages/py-umi-tools/package.py index a4bae2e1ac..66ece6fafb 100644 --- a/var/spack/repos/builtin/packages/py-umi-tools/package.py +++ b/var/spack/repos/builtin/packages/py-umi-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUmiTools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uncertainties/package.py b/var/spack/repos/builtin/packages/py-uncertainties/package.py index e94ee846ae..d35cf7f96e 100644 --- a/var/spack/repos/builtin/packages/py-uncertainties/package.py +++ b/var/spack/repos/builtin/packages/py-uncertainties/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUncertainties(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-unicycler/package.py b/var/spack/repos/builtin/packages/py-unicycler/package.py index 912ebdf5c7..16789a83cf 100644 --- a/var/spack/repos/builtin/packages/py-unicycler/package.py +++ b/var/spack/repos/builtin/packages/py-unicycler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUnicycler(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-unidecode/package.py b/var/spack/repos/builtin/packages/py-unidecode/package.py index c60cc52a37..5824ea53cb 100644 --- a/var/spack/repos/builtin/packages/py-unidecode/package.py +++ b/var/spack/repos/builtin/packages/py-unidecode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUnidecode(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-unittest2/package.py b/var/spack/repos/builtin/packages/py-unittest2/package.py index 2be8fa35ef..470c250b7c 100644 --- a/var/spack/repos/builtin/packages/py-unittest2/package.py +++ b/var/spack/repos/builtin/packages/py-unittest2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUnittest2(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-unittest2py3k/package.py b/var/spack/repos/builtin/packages/py-unittest2py3k/package.py index fcbe111b81..681cc7fda0 100644 --- a/var/spack/repos/builtin/packages/py-unittest2py3k/package.py +++ b/var/spack/repos/builtin/packages/py-unittest2py3k/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUnittest2py3k(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-unshare/package.py b/var/spack/repos/builtin/packages/py-unshare/package.py index 2c38279090..ff14d5b528 100644 --- a/var/spack/repos/builtin/packages/py-unshare/package.py +++ b/var/spack/repos/builtin/packages/py-unshare/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyUnshare(PythonPackage): """Python extension for Linux kernel's unshare syscall.""" diff --git a/var/spack/repos/builtin/packages/py-update-checker/package.py b/var/spack/repos/builtin/packages/py-update-checker/package.py index 2b2d1a7883..a799268590 100644 --- a/var/spack/repos/builtin/packages/py-update-checker/package.py +++ b/var/spack/repos/builtin/packages/py-update-checker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUpdateChecker(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uproot/package.py b/var/spack/repos/builtin/packages/py-uproot/package.py index b0cf55d156..832f516ce7 100644 --- a/var/spack/repos/builtin/packages/py-uproot/package.py +++ b/var/spack/repos/builtin/packages/py-uproot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUproot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uproot3-methods/package.py b/var/spack/repos/builtin/packages/py-uproot3-methods/package.py index 5e464bc42f..044f7fb203 100644 --- a/var/spack/repos/builtin/packages/py-uproot3-methods/package.py +++ b/var/spack/repos/builtin/packages/py-uproot3-methods/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUproot3Methods(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uproot3/package.py b/var/spack/repos/builtin/packages/py-uproot3/package.py index b8f326c140..641c8d4f3d 100644 --- a/var/spack/repos/builtin/packages/py-uproot3/package.py +++ b/var/spack/repos/builtin/packages/py-uproot3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUproot3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uproot4/package.py b/var/spack/repos/builtin/packages/py-uproot4/package.py index cf730310a4..204da1325d 100644 --- a/var/spack/repos/builtin/packages/py-uproot4/package.py +++ b/var/spack/repos/builtin/packages/py-uproot4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUproot4(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uritemplate/package.py b/var/spack/repos/builtin/packages/py-uritemplate/package.py index e50a189bfa..fd5bc4413a 100644 --- a/var/spack/repos/builtin/packages/py-uritemplate/package.py +++ b/var/spack/repos/builtin/packages/py-uritemplate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUritemplate(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-urllib3/package.py b/var/spack/repos/builtin/packages/py-urllib3/package.py index 12db02c1fd..fe33b162a3 100644 --- a/var/spack/repos/builtin/packages/py-urllib3/package.py +++ b/var/spack/repos/builtin/packages/py-urllib3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUrllib3(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-urwid/package.py b/var/spack/repos/builtin/packages/py-urwid/package.py index 6493dbf38e..9a0d4edb78 100644 --- a/var/spack/repos/builtin/packages/py-urwid/package.py +++ b/var/spack/repos/builtin/packages/py-urwid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUrwid(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-us/package.py b/var/spack/repos/builtin/packages/py-us/package.py index 3da6726f1e..64dbc429bb 100644 --- a/var/spack/repos/builtin/packages/py-us/package.py +++ b/var/spack/repos/builtin/packages/py-us/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-usgs/package.py b/var/spack/repos/builtin/packages/py-usgs/package.py index 90e6e6e3ba..fba1f5df8f 100644 --- a/var/spack/repos/builtin/packages/py-usgs/package.py +++ b/var/spack/repos/builtin/packages/py-usgs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUsgs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-utils/package.py b/var/spack/repos/builtin/packages/py-utils/package.py index 2d00fdc868..e197e33b91 100644 --- a/var/spack/repos/builtin/packages/py-utils/package.py +++ b/var/spack/repos/builtin/packages/py-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUtils(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uvloop/package.py b/var/spack/repos/builtin/packages/py-uvloop/package.py index 077a4f2e7b..12694a4e18 100644 --- a/var/spack/repos/builtin/packages/py-uvloop/package.py +++ b/var/spack/repos/builtin/packages/py-uvloop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUvloop(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uvw/package.py b/var/spack/repos/builtin/packages/py-uvw/package.py index 262de29e0a..7753a67072 100644 --- a/var/spack/repos/builtin/packages/py-uvw/package.py +++ b/var/spack/repos/builtin/packages/py-uvw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUvw(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-uwsgi/package.py b/var/spack/repos/builtin/packages/py-uwsgi/package.py index df92956bce..5b511724f4 100644 --- a/var/spack/repos/builtin/packages/py-uwsgi/package.py +++ b/var/spack/repos/builtin/packages/py-uwsgi/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyUwsgi(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vcf-kit/package.py b/var/spack/repos/builtin/packages/py-vcf-kit/package.py index da8e4522ff..2f06a4a88a 100644 --- a/var/spack/repos/builtin/packages/py-vcf-kit/package.py +++ b/var/spack/repos/builtin/packages/py-vcf-kit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVcfKit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vcrpy/package.py b/var/spack/repos/builtin/packages/py-vcrpy/package.py index 1740d685d6..d72e024214 100644 --- a/var/spack/repos/builtin/packages/py-vcrpy/package.py +++ b/var/spack/repos/builtin/packages/py-vcrpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVcrpy(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vcstool/package.py b/var/spack/repos/builtin/packages/py-vcstool/package.py index 78328a8d2d..51244b4425 100644 --- a/var/spack/repos/builtin/packages/py-vcstool/package.py +++ b/var/spack/repos/builtin/packages/py-vcstool/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyVcstool(PythonPackage): """vcstool enables batch commands on multiple different vcs repositories. diff --git a/var/spack/repos/builtin/packages/py-vcstools/package.py b/var/spack/repos/builtin/packages/py-vcstools/package.py index b2c2bcfee7..4016be0738 100644 --- a/var/spack/repos/builtin/packages/py-vcstools/package.py +++ b/var/spack/repos/builtin/packages/py-vcstools/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyVcstools(PythonPackage): """VCS/SCM source control library for svn, git, hg, and bzr.""" diff --git a/var/spack/repos/builtin/packages/py-vcversioner/package.py b/var/spack/repos/builtin/packages/py-vcversioner/package.py index 4e83273377..a2fa5be95e 100644 --- a/var/spack/repos/builtin/packages/py-vcversioner/package.py +++ b/var/spack/repos/builtin/packages/py-vcversioner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVcversioner(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vector-quantize-pytorch/package.py b/var/spack/repos/builtin/packages/py-vector-quantize-pytorch/package.py index 4a6c81f389..3f4f8c1f6b 100644 --- a/var/spack/repos/builtin/packages/py-vector-quantize-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-vector-quantize-pytorch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVectorQuantizePytorch(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vector/package.py b/var/spack/repos/builtin/packages/py-vector/package.py index f7d476c5f5..b6b41b3f13 100644 --- a/var/spack/repos/builtin/packages/py-vector/package.py +++ b/var/spack/repos/builtin/packages/py-vector/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVector(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vermin/package.py b/var/spack/repos/builtin/packages/py-vermin/package.py index c70a5c9814..e5769d04e3 100644 --- a/var/spack/repos/builtin/packages/py-vermin/package.py +++ b/var/spack/repos/builtin/packages/py-vermin/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyVermin(PythonPackage): """Concurrently detect the minimum Python versions needed to run code.""" diff --git a/var/spack/repos/builtin/packages/py-versioneer/package.py b/var/spack/repos/builtin/packages/py-versioneer/package.py index 0baa1a41ff..5db6e79785 100644 --- a/var/spack/repos/builtin/packages/py-versioneer/package.py +++ b/var/spack/repos/builtin/packages/py-versioneer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVersioneer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vine/package.py b/var/spack/repos/builtin/packages/py-vine/package.py index 6e093e1dea..d457261f4a 100644 --- a/var/spack/repos/builtin/packages/py-vine/package.py +++ b/var/spack/repos/builtin/packages/py-vine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVine(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py index 619730fba3..a405c278ec 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVirtualenvClone(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-virtualenv/package.py b/var/spack/repos/builtin/packages/py-virtualenv/package.py index d0d27c7eb2..44aac7ffaa 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVirtualenv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py index 87bf368b80..177f520f10 100644 --- a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVirtualenvwrapper(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-visdom/package.py b/var/spack/repos/builtin/packages/py-visdom/package.py index b9c5debb4f..8c8811b8a9 100644 --- a/var/spack/repos/builtin/packages/py-visdom/package.py +++ b/var/spack/repos/builtin/packages/py-visdom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVisdom(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-voluptuous/package.py b/var/spack/repos/builtin/packages/py-voluptuous/package.py index cf97afe888..c955132724 100644 --- a/var/spack/repos/builtin/packages/py-voluptuous/package.py +++ b/var/spack/repos/builtin/packages/py-voluptuous/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVoluptuous(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vsc-base/package.py b/var/spack/repos/builtin/packages/py-vsc-base/package.py index e0db0a53cd..fa84f82331 100644 --- a/var/spack/repos/builtin/packages/py-vsc-base/package.py +++ b/var/spack/repos/builtin/packages/py-vsc-base/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVscBase(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vsc-install/package.py b/var/spack/repos/builtin/packages/py-vsc-install/package.py index d4d8856ff2..845285bf24 100644 --- a/var/spack/repos/builtin/packages/py-vsc-install/package.py +++ b/var/spack/repos/builtin/packages/py-vsc-install/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyVscInstall(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-vsts-cd-manager/package.py b/var/spack/repos/builtin/packages/py-vsts-cd-manager/package.py index 0d463a6dd8..a37b49ce5a 100644 --- a/var/spack/repos/builtin/packages/py-vsts-cd-manager/package.py +++ b/var/spack/repos/builtin/packages/py-vsts-cd-manager/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyVstsCdManager(PythonPackage): """Python wrapper around some of the VSTS APIs.""" diff --git a/var/spack/repos/builtin/packages/py-vsts/package.py b/var/spack/repos/builtin/packages/py-vsts/package.py index 99e477d039..b9328eeb28 100644 --- a/var/spack/repos/builtin/packages/py-vsts/package.py +++ b/var/spack/repos/builtin/packages/py-vsts/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyVsts(PythonPackage): """Python wrapper around the VSTS APIs.""" diff --git a/var/spack/repos/builtin/packages/py-walinuxagent/package.py b/var/spack/repos/builtin/packages/py-walinuxagent/package.py index 6742fbc29c..ec1da0d85e 100644 --- a/var/spack/repos/builtin/packages/py-walinuxagent/package.py +++ b/var/spack/repos/builtin/packages/py-walinuxagent/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWalinuxagent(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wand/package.py b/var/spack/repos/builtin/packages/py-wand/package.py index a038bff24a..edec5ddca9 100644 --- a/var/spack/repos/builtin/packages/py-wand/package.py +++ b/var/spack/repos/builtin/packages/py-wand/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWand(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wandb/package.py b/var/spack/repos/builtin/packages/py-wandb/package.py index 37a3e8e266..28f28e52a6 100644 --- a/var/spack/repos/builtin/packages/py-wandb/package.py +++ b/var/spack/repos/builtin/packages/py-wandb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWandb(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-warlock/package.py b/var/spack/repos/builtin/packages/py-warlock/package.py index 1b2ec217f7..b415fbac94 100644 --- a/var/spack/repos/builtin/packages/py-warlock/package.py +++ b/var/spack/repos/builtin/packages/py-warlock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWarlock(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-warpx/package.py b/var/spack/repos/builtin/packages/py-warpx/package.py index ea8cab0a3d..b5267b656a 100644 --- a/var/spack/repos/builtin/packages/py-warpx/package.py +++ b/var/spack/repos/builtin/packages/py-warpx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWarpx(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wasabi/package.py b/var/spack/repos/builtin/packages/py-wasabi/package.py index ceba437eba..4c58e1a277 100644 --- a/var/spack/repos/builtin/packages/py-wasabi/package.py +++ b/var/spack/repos/builtin/packages/py-wasabi/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyWasabi(PythonPackage): """wasabi: A lightweight console printing and formatting toolkit.""" diff --git a/var/spack/repos/builtin/packages/py-watchdog/package.py b/var/spack/repos/builtin/packages/py-watchdog/package.py index 559206c7ef..296301894d 100644 --- a/var/spack/repos/builtin/packages/py-watchdog/package.py +++ b/var/spack/repos/builtin/packages/py-watchdog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWatchdog(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wcsaxes/package.py b/var/spack/repos/builtin/packages/py-wcsaxes/package.py index bce5a696b7..8d3a0b8d5a 100644 --- a/var/spack/repos/builtin/packages/py-wcsaxes/package.py +++ b/var/spack/repos/builtin/packages/py-wcsaxes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWcsaxes(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wcwidth/package.py b/var/spack/repos/builtin/packages/py-wcwidth/package.py index 3782d2118d..e3e9f6d9ed 100644 --- a/var/spack/repos/builtin/packages/py-wcwidth/package.py +++ b/var/spack/repos/builtin/packages/py-wcwidth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWcwidth(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-weave/package.py b/var/spack/repos/builtin/packages/py-weave/package.py index c38d29ac28..fb858cc395 100644 --- a/var/spack/repos/builtin/packages/py-weave/package.py +++ b/var/spack/repos/builtin/packages/py-weave/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWeave(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-webargs/package.py b/var/spack/repos/builtin/packages/py-webargs/package.py index a3b78152cd..5103742b4d 100644 --- a/var/spack/repos/builtin/packages/py-webargs/package.py +++ b/var/spack/repos/builtin/packages/py-webargs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWebargs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-webencodings/package.py b/var/spack/repos/builtin/packages/py-webencodings/package.py index 0536d2d272..6e7aed5712 100644 --- a/var/spack/repos/builtin/packages/py-webencodings/package.py +++ b/var/spack/repos/builtin/packages/py-webencodings/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWebencodings(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-webkit-server/package.py b/var/spack/repos/builtin/packages/py-webkit-server/package.py index 126b90528b..4cfdbbbcd2 100644 --- a/var/spack/repos/builtin/packages/py-webkit-server/package.py +++ b/var/spack/repos/builtin/packages/py-webkit-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWebkitServer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-weblogo/package.py b/var/spack/repos/builtin/packages/py-weblogo/package.py index 1f20b8a761..4a67047fa6 100644 --- a/var/spack/repos/builtin/packages/py-weblogo/package.py +++ b/var/spack/repos/builtin/packages/py-weblogo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWeblogo(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-webob/package.py b/var/spack/repos/builtin/packages/py-webob/package.py index fe57817120..aa9663d651 100644 --- a/var/spack/repos/builtin/packages/py-webob/package.py +++ b/var/spack/repos/builtin/packages/py-webob/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWebob(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-websocket-client/package.py b/var/spack/repos/builtin/packages/py-websocket-client/package.py index 9581d2f078..ca27bb2540 100644 --- a/var/spack/repos/builtin/packages/py-websocket-client/package.py +++ b/var/spack/repos/builtin/packages/py-websocket-client/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyWebsocketClient(PythonPackage): """WebSocket client for Python. hybi13 is supported.""" diff --git a/var/spack/repos/builtin/packages/py-websockets/package.py b/var/spack/repos/builtin/packages/py-websockets/package.py index f18126e071..ae45d9249d 100644 --- a/var/spack/repos/builtin/packages/py-websockets/package.py +++ b/var/spack/repos/builtin/packages/py-websockets/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyWebsockets(PythonPackage): """websockets is a library for building WebSocket servers and clients in Python with a focus on correctness and simplicity.""" diff --git a/var/spack/repos/builtin/packages/py-werkzeug/package.py b/var/spack/repos/builtin/packages/py-werkzeug/package.py index ff535842e8..f53a17c334 100644 --- a/var/spack/repos/builtin/packages/py-werkzeug/package.py +++ b/var/spack/repos/builtin/packages/py-werkzeug/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWerkzeug(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wget/package.py b/var/spack/repos/builtin/packages/py-wget/package.py index 4a21e1ed89..f87c593fb6 100644 --- a/var/spack/repos/builtin/packages/py-wget/package.py +++ b/var/spack/repos/builtin/packages/py-wget/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWget(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-whatshap/package.py b/var/spack/repos/builtin/packages/py-whatshap/package.py index 03e35be832..c776fe9c9d 100644 --- a/var/spack/repos/builtin/packages/py-whatshap/package.py +++ b/var/spack/repos/builtin/packages/py-whatshap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWhatshap(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wheel/package.py b/var/spack/repos/builtin/packages/py-wheel/package.py index 8290e0a76c..5a3c08e0d5 100644 --- a/var/spack/repos/builtin/packages/py-wheel/package.py +++ b/var/spack/repos/builtin/packages/py-wheel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWheel(Package): diff --git a/var/spack/repos/builtin/packages/py-whichcraft/package.py b/var/spack/repos/builtin/packages/py-whichcraft/package.py index 0965d961c0..c0ed94af4d 100644 --- a/var/spack/repos/builtin/packages/py-whichcraft/package.py +++ b/var/spack/repos/builtin/packages/py-whichcraft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWhichcraft(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-whoosh/package.py b/var/spack/repos/builtin/packages/py-whoosh/package.py index d7f8371972..ea42ad36ee 100644 --- a/var/spack/repos/builtin/packages/py-whoosh/package.py +++ b/var/spack/repos/builtin/packages/py-whoosh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWhoosh(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py index df585add3f..e87945c764 100644 --- a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py +++ b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWidgetsnbextension(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wincertstore/package.py b/var/spack/repos/builtin/packages/py-wincertstore/package.py index 8ce3d99794..657dd3dcdd 100644 --- a/var/spack/repos/builtin/packages/py-wincertstore/package.py +++ b/var/spack/repos/builtin/packages/py-wincertstore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWincertstore(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-word2number/package.py b/var/spack/repos/builtin/packages/py-word2number/package.py index 1df8bd069a..2a13297354 100644 --- a/var/spack/repos/builtin/packages/py-word2number/package.py +++ b/var/spack/repos/builtin/packages/py-word2number/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWord2number(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wordcloud/package.py b/var/spack/repos/builtin/packages/py-wordcloud/package.py index f6dc36be76..5d4bd73034 100644 --- a/var/spack/repos/builtin/packages/py-wordcloud/package.py +++ b/var/spack/repos/builtin/packages/py-wordcloud/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWordcloud(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-workload-automation/package.py b/var/spack/repos/builtin/packages/py-workload-automation/package.py index 2736896c3a..c5a65d5313 100644 --- a/var/spack/repos/builtin/packages/py-workload-automation/package.py +++ b/var/spack/repos/builtin/packages/py-workload-automation/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWorkloadAutomation(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wradlib/package.py b/var/spack/repos/builtin/packages/py-wradlib/package.py index 1f7a00cfb1..7244eadb7d 100644 --- a/var/spack/repos/builtin/packages/py-wradlib/package.py +++ b/var/spack/repos/builtin/packages/py-wradlib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWradlib(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wrapt/package.py b/var/spack/repos/builtin/packages/py-wrapt/package.py index b81e13078b..10d7195c6e 100644 --- a/var/spack/repos/builtin/packages/py-wrapt/package.py +++ b/var/spack/repos/builtin/packages/py-wrapt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWrapt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wsproto/package.py b/var/spack/repos/builtin/packages/py-wsproto/package.py index 86158dcc84..920a608858 100644 --- a/var/spack/repos/builtin/packages/py-wsproto/package.py +++ b/var/spack/repos/builtin/packages/py-wsproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWsproto(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wstool/package.py b/var/spack/repos/builtin/packages/py-wstool/package.py index a0c0bf71cb..181fd3e94f 100644 --- a/var/spack/repos/builtin/packages/py-wstool/package.py +++ b/var/spack/repos/builtin/packages/py-wstool/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyWstool(PythonPackage): """A tool for managing a workspace of multiple heterogenous SCM repositories.""" diff --git a/var/spack/repos/builtin/packages/py-wub/package.py b/var/spack/repos/builtin/packages/py-wub/package.py index 0a65ec7d4e..f92f992475 100644 --- a/var/spack/repos/builtin/packages/py-wub/package.py +++ b/var/spack/repos/builtin/packages/py-wub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWub(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wurlitzer/package.py b/var/spack/repos/builtin/packages/py-wurlitzer/package.py index 9ef5930490..35f2978927 100644 --- a/var/spack/repos/builtin/packages/py-wurlitzer/package.py +++ b/var/spack/repos/builtin/packages/py-wurlitzer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWurlitzer(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ww/package.py b/var/spack/repos/builtin/packages/py-ww/package.py index 8371d12458..6664576485 100644 --- a/var/spack/repos/builtin/packages/py-ww/package.py +++ b/var/spack/repos/builtin/packages/py-ww/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWw(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wxmplot/package.py b/var/spack/repos/builtin/packages/py-wxmplot/package.py index a70c359d1e..857a6d2b7c 100644 --- a/var/spack/repos/builtin/packages/py-wxmplot/package.py +++ b/var/spack/repos/builtin/packages/py-wxmplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWxmplot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-wxpython/package.py b/var/spack/repos/builtin/packages/py-wxpython/package.py index a7246b5d90..d780d74091 100644 --- a/var/spack/repos/builtin/packages/py-wxpython/package.py +++ b/var/spack/repos/builtin/packages/py-wxpython/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyWxpython(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-x21/package.py b/var/spack/repos/builtin/packages/py-x21/package.py index eca24d127b..2ae98127ba 100644 --- a/var/spack/repos/builtin/packages/py-x21/package.py +++ b/var/spack/repos/builtin/packages/py-x21/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class PyX21(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xarray/package.py b/var/spack/repos/builtin/packages/py-xarray/package.py index 6f2d6b2838..09baf8efac 100644 --- a/var/spack/repos/builtin/packages/py-xarray/package.py +++ b/var/spack/repos/builtin/packages/py-xarray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXarray(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py index f8d9bfca1f..df4c03194a 100644 --- a/var/spack/repos/builtin/packages/py-xattr/package.py +++ b/var/spack/repos/builtin/packages/py-xattr/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyXattr(PythonPackage): """A python interface to access extended file attributes, sans libattr dependency. diff --git a/var/spack/repos/builtin/packages/py-xdot/package.py b/var/spack/repos/builtin/packages/py-xdot/package.py index 2ded45085f..4549f80819 100644 --- a/var/spack/repos/builtin/packages/py-xdot/package.py +++ b/var/spack/repos/builtin/packages/py-xdot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXdot(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xenv/package.py b/var/spack/repos/builtin/packages/py-xenv/package.py index 16922471ce..73bd99c8f1 100644 --- a/var/spack/repos/builtin/packages/py-xenv/package.py +++ b/var/spack/repos/builtin/packages/py-xenv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXenv(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xgboost/package.py b/var/spack/repos/builtin/packages/py-xgboost/package.py index 02240f8e08..aa11a80914 100644 --- a/var/spack/repos/builtin/packages/py-xgboost/package.py +++ b/var/spack/repos/builtin/packages/py-xgboost/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class PyXgboost(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xlrd/package.py b/var/spack/repos/builtin/packages/py-xlrd/package.py index 26b84ee23c..a3bc546113 100644 --- a/var/spack/repos/builtin/packages/py-xlrd/package.py +++ b/var/spack/repos/builtin/packages/py-xlrd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXlrd(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py index 2805bc2422..3799030917 100644 --- a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py +++ b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXlsxwriter(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xlwt/package.py b/var/spack/repos/builtin/packages/py-xlwt/package.py index ca76c946c5..a9a71aa05e 100644 --- a/var/spack/repos/builtin/packages/py-xlwt/package.py +++ b/var/spack/repos/builtin/packages/py-xlwt/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXlwt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xmlrunner/package.py b/var/spack/repos/builtin/packages/py-xmlrunner/package.py index eb5a097db6..7c8aff0758 100644 --- a/var/spack/repos/builtin/packages/py-xmlrunner/package.py +++ b/var/spack/repos/builtin/packages/py-xmlrunner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXmlrunner(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xmltodict/package.py b/var/spack/repos/builtin/packages/py-xmltodict/package.py index 8bbfbf1d02..f1d23fc4c9 100644 --- a/var/spack/repos/builtin/packages/py-xmltodict/package.py +++ b/var/spack/repos/builtin/packages/py-xmltodict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXmltodict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xonsh/package.py b/var/spack/repos/builtin/packages/py-xonsh/package.py index d0ac8b70a4..5ce506a52e 100644 --- a/var/spack/repos/builtin/packages/py-xonsh/package.py +++ b/var/spack/repos/builtin/packages/py-xonsh/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXonsh(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xopen/package.py b/var/spack/repos/builtin/packages/py-xopen/package.py index 72bcdc2b35..e6d9cadae3 100644 --- a/var/spack/repos/builtin/packages/py-xopen/package.py +++ b/var/spack/repos/builtin/packages/py-xopen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXopen(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xpyb/package.py b/var/spack/repos/builtin/packages/py-xpyb/package.py index 69192a9903..83ba50f36d 100644 --- a/var/spack/repos/builtin/packages/py-xpyb/package.py +++ b/var/spack/repos/builtin/packages/py-xpyb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXpyb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/py-xrootdpyfs/package.py b/var/spack/repos/builtin/packages/py-xrootdpyfs/package.py index f5919c3183..571423736f 100644 --- a/var/spack/repos/builtin/packages/py-xrootdpyfs/package.py +++ b/var/spack/repos/builtin/packages/py-xrootdpyfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXrootdpyfs(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py b/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py index ab2888b146..b91aff2fef 100644 --- a/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py +++ b/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXvfbwrapper(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-xxhash/package.py b/var/spack/repos/builtin/packages/py-xxhash/package.py index 626c82211b..64ef267c09 100644 --- a/var/spack/repos/builtin/packages/py-xxhash/package.py +++ b/var/spack/repos/builtin/packages/py-xxhash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyXxhash(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-yacs/package.py b/var/spack/repos/builtin/packages/py-yacs/package.py index 3757b24091..99639d9539 100644 --- a/var/spack/repos/builtin/packages/py-yacs/package.py +++ b/var/spack/repos/builtin/packages/py-yacs/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyYacs(PythonPackage): """YACS was created as a lightweight library to define and manage system configurations, such as those commonly found in software diff --git a/var/spack/repos/builtin/packages/py-yahmm/package.py b/var/spack/repos/builtin/packages/py-yahmm/package.py index ab225f9837..73f9183de5 100644 --- a/var/spack/repos/builtin/packages/py-yahmm/package.py +++ b/var/spack/repos/builtin/packages/py-yahmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYahmm(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-yajl/package.py b/var/spack/repos/builtin/packages/py-yajl/package.py index bcd4d97339..9a062ffa36 100644 --- a/var/spack/repos/builtin/packages/py-yajl/package.py +++ b/var/spack/repos/builtin/packages/py-yajl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYajl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-yamlreader/package.py b/var/spack/repos/builtin/packages/py-yamlreader/package.py index 26d1af0b82..20be1b60db 100644 --- a/var/spack/repos/builtin/packages/py-yamlreader/package.py +++ b/var/spack/repos/builtin/packages/py-yamlreader/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYamlreader(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-yapf/package.py b/var/spack/repos/builtin/packages/py-yapf/package.py index ed64e562d5..7148d108f9 100644 --- a/var/spack/repos/builtin/packages/py-yapf/package.py +++ b/var/spack/repos/builtin/packages/py-yapf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYapf(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-yarl/package.py b/var/spack/repos/builtin/packages/py-yarl/package.py index 17b0014e0f..c18007a046 100644 --- a/var/spack/repos/builtin/packages/py-yarl/package.py +++ b/var/spack/repos/builtin/packages/py-yarl/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class PyYarl(PythonPackage): """The module provides handy URL class for URL parsing and changing.""" diff --git a/var/spack/repos/builtin/packages/py-yaspin/package.py b/var/spack/repos/builtin/packages/py-yaspin/package.py index 78d9ea994d..5fd993f4bb 100644 --- a/var/spack/repos/builtin/packages/py-yaspin/package.py +++ b/var/spack/repos/builtin/packages/py-yaspin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYaspin(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-yolk3k/package.py b/var/spack/repos/builtin/packages/py-yolk3k/package.py index d2056ad2cc..c96c2b4303 100644 --- a/var/spack/repos/builtin/packages/py-yolk3k/package.py +++ b/var/spack/repos/builtin/packages/py-yolk3k/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYolk3k(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-youtube-dl/package.py b/var/spack/repos/builtin/packages/py-youtube-dl/package.py index 47af5fc8dc..b91f16c5e2 100644 --- a/var/spack/repos/builtin/packages/py-youtube-dl/package.py +++ b/var/spack/repos/builtin/packages/py-youtube-dl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYoutubeDl(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-yq/package.py b/var/spack/repos/builtin/packages/py-yq/package.py index a124e5af9d..7931b7c57a 100644 --- a/var/spack/repos/builtin/packages/py-yq/package.py +++ b/var/spack/repos/builtin/packages/py-yq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYq(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index af0e8c6716..2a956e355f 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ytopt-autotune/package.py b/var/spack/repos/builtin/packages/py-ytopt-autotune/package.py index 5a56c0103a..7c39e4c052 100644 --- a/var/spack/repos/builtin/packages/py-ytopt-autotune/package.py +++ b/var/spack/repos/builtin/packages/py-ytopt-autotune/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYtoptAutotune(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-ytopt/package.py b/var/spack/repos/builtin/packages/py-ytopt/package.py index 52304bc468..14885ed64d 100644 --- a/var/spack/repos/builtin/packages/py-ytopt/package.py +++ b/var/spack/repos/builtin/packages/py-ytopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyYtopt(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zarr/package.py b/var/spack/repos/builtin/packages/py-zarr/package.py index c564cc3247..e8d634f32e 100644 --- a/var/spack/repos/builtin/packages/py-zarr/package.py +++ b/var/spack/repos/builtin/packages/py-zarr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZarr(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zc-buildout/package.py b/var/spack/repos/builtin/packages/py-zc-buildout/package.py index 5de275dd48..6f3a5ad21e 100644 --- a/var/spack/repos/builtin/packages/py-zc-buildout/package.py +++ b/var/spack/repos/builtin/packages/py-zc-buildout/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZcBuildout(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zc-lockfile/package.py b/var/spack/repos/builtin/packages/py-zc-lockfile/package.py index 269113f701..ebcb97170c 100644 --- a/var/spack/repos/builtin/packages/py-zc-lockfile/package.py +++ b/var/spack/repos/builtin/packages/py-zc-lockfile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZcLockfile(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zict/package.py b/var/spack/repos/builtin/packages/py-zict/package.py index 660ddc9d62..0022a7a994 100644 --- a/var/spack/repos/builtin/packages/py-zict/package.py +++ b/var/spack/repos/builtin/packages/py-zict/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZict(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zipfile-deflate64/package.py b/var/spack/repos/builtin/packages/py-zipfile-deflate64/package.py index c72b014e7d..a6e4b2c576 100644 --- a/var/spack/repos/builtin/packages/py-zipfile-deflate64/package.py +++ b/var/spack/repos/builtin/packages/py-zipfile-deflate64/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZipfileDeflate64(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zipp/package.py b/var/spack/repos/builtin/packages/py-zipp/package.py index 74ca21823e..b234766db5 100644 --- a/var/spack/repos/builtin/packages/py-zipp/package.py +++ b/var/spack/repos/builtin/packages/py-zipp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZipp(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zope-event/package.py b/var/spack/repos/builtin/packages/py-zope-event/package.py index ae87c73b1b..822367dac4 100644 --- a/var/spack/repos/builtin/packages/py-zope-event/package.py +++ b/var/spack/repos/builtin/packages/py-zope-event/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZopeEvent(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zope-interface/package.py b/var/spack/repos/builtin/packages/py-zope-interface/package.py index ccbb0b595b..f4f9683b56 100644 --- a/var/spack/repos/builtin/packages/py-zope-interface/package.py +++ b/var/spack/repos/builtin/packages/py-zope-interface/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZopeInterface(PythonPackage): diff --git a/var/spack/repos/builtin/packages/py-zxcvbn/package.py b/var/spack/repos/builtin/packages/py-zxcvbn/package.py index fe0cff5446..fe0bb079f6 100644 --- a/var/spack/repos/builtin/packages/py-zxcvbn/package.py +++ b/var/spack/repos/builtin/packages/py-zxcvbn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class PyZxcvbn(PythonPackage): diff --git a/var/spack/repos/builtin/packages/pygmo/package.py b/var/spack/repos/builtin/packages/pygmo/package.py index ab23d1749d..776db8af33 100644 --- a/var/spack/repos/builtin/packages/pygmo/package.py +++ b/var/spack/repos/builtin/packages/pygmo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pygmo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/pythia6/package.py b/var/spack/repos/builtin/packages/pythia6/package.py index 44015c2d8d..b4a88f9242 100644 --- a/var/spack/repos/builtin/packages/pythia6/package.py +++ b/var/spack/repos/builtin/packages/pythia6/package.py @@ -9,7 +9,7 @@ import os from six import iteritems from six.moves.urllib.parse import urlparse -from spack import * +from spack.package import * def _is_integral(x): diff --git a/var/spack/repos/builtin/packages/pythia8/package.py b/var/spack/repos/builtin/packages/pythia8/package.py index 5a25655292..dc7ebfbd82 100644 --- a/var/spack/repos/builtin/packages/pythia8/package.py +++ b/var/spack/repos/builtin/packages/pythia8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Pythia8(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 3f0874bf87..c186ce7775 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -11,17 +11,17 @@ import re import subprocess import sys from shutil import copy +from typing import Dict, List import llnl.util.tty as tty from llnl.util.filesystem import ( - copy_tree, is_nonsymlink_exe_with_shebang, path_contains_subdirectory, ) from llnl.util.lang import dedupe, match_predicate -from spack import * from spack.build_environment import dso_suffix +from spack.package import * from spack.util.environment import is_system_path from spack.util.prefix import Prefix @@ -42,7 +42,7 @@ class Python(Package): #: phase install_targets = ['install'] - build_targets = [] + build_targets = [] # type: List[str] version('3.10.4', sha256='f3bcc65b1d5f1dc78675c746c98fcee823c038168fc629c5935b044d0911ad28') version('3.10.3', sha256='5a3b029bad70ba2a019ebff08a65060a8b9b542ffc1a83c697f1449ecca9813b') @@ -277,7 +277,7 @@ class Python(Package): msg='Python 2.7 is too old for Apple Silicon') # Used to cache various attributes that are expensive to compute - _config_vars = {} + _config_vars = {} # type: Dict[str, Dict[str, str]] # An in-source build with --enable-optimizations fails for python@3.X build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/q-e-sirius/package.py b/var/spack/repos/builtin/packages/q-e-sirius/package.py index be042fdc2c..3d40cc832e 100644 --- a/var/spack/repos/builtin/packages/q-e-sirius/package.py +++ b/var/spack/repos/builtin/packages/q-e-sirius/package.py @@ -5,6 +5,9 @@ # adapted from official quantum espresso package +from spack.package import * + + class QESirius(CMakePackage): """SIRIUS enabled fork of QuantumESPRESSO. """ diff --git a/var/spack/repos/builtin/packages/qbank/package.py b/var/spack/repos/builtin/packages/qbank/package.py index 6e2bdda65e..4a4e1b8f0e 100644 --- a/var/spack/repos/builtin/packages/qbank/package.py +++ b/var/spack/repos/builtin/packages/qbank/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Qbank(Package): diff --git a/var/spack/repos/builtin/packages/qbox/package.py b/var/spack/repos/builtin/packages/qbox/package.py index 0e7c891dd8..0306efe1df 100644 --- a/var/spack/repos/builtin/packages/qbox/package.py +++ b/var/spack/repos/builtin/packages/qbox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qbox(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/qca/package.py b/var/spack/repos/builtin/packages/qca/package.py index 7c64215e34..3fb698ef14 100644 --- a/var/spack/repos/builtin/packages/qca/package.py +++ b/var/spack/repos/builtin/packages/qca/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qca(CMakePackage): diff --git a/var/spack/repos/builtin/packages/qcachegrind/package.py b/var/spack/repos/builtin/packages/qcachegrind/package.py index 2aae5140bb..e69b9e8f3b 100644 --- a/var/spack/repos/builtin/packages/qcachegrind/package.py +++ b/var/spack/repos/builtin/packages/qcachegrind/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Qcachegrind(QMakePackage): """{K,Q}Cachegrind is a KDE/Qt GUI to visualize profiling data. It's mainly used as visualization frontend for data measured diff --git a/var/spack/repos/builtin/packages/qd/package.py b/var/spack/repos/builtin/packages/qd/package.py index ae223d14ed..6bf16d0191 100644 --- a/var/spack/repos/builtin/packages/qd/package.py +++ b/var/spack/repos/builtin/packages/qd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/qemu/package.py b/var/spack/repos/builtin/packages/qemu/package.py index ccd2b4ea89..01aad7036a 100644 --- a/var/spack/repos/builtin/packages/qemu/package.py +++ b/var/spack/repos/builtin/packages/qemu/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qemu(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/qgis/package.py b/var/spack/repos/builtin/packages/qgis/package.py index 627619d0da..20c1c859c1 100644 --- a/var/spack/repos/builtin/packages/qgis/package.py +++ b/var/spack/repos/builtin/packages/qgis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qgis(CMakePackage): diff --git a/var/spack/repos/builtin/packages/qgraf/package.py b/var/spack/repos/builtin/packages/qgraf/package.py index fadcdf0fd8..374067d6f3 100644 --- a/var/spack/repos/builtin/packages/qgraf/package.py +++ b/var/spack/repos/builtin/packages/qgraf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qgraf(Package): diff --git a/var/spack/repos/builtin/packages/qhull/package.py b/var/spack/repos/builtin/packages/qhull/package.py index 0497cdb8ae..fc1a9192ab 100644 --- a/var/spack/repos/builtin/packages/qhull/package.py +++ b/var/spack/repos/builtin/packages/qhull/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qhull(CMakePackage): diff --git a/var/spack/repos/builtin/packages/qjson/package.py b/var/spack/repos/builtin/packages/qjson/package.py index 5f9b748a7f..f84fdd5206 100644 --- a/var/spack/repos/builtin/packages/qjson/package.py +++ b/var/spack/repos/builtin/packages/qjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qjson(CMakePackage): diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 579fc04986..4c8b7b39e8 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -5,7 +5,7 @@ import llnl.util.tty as tty -from spack import * +from spack.package import * class Qmcpack(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/qmd-progress/package.py b/var/spack/repos/builtin/packages/qmd-progress/package.py index 6c445fabb5..3faafe6c98 100644 --- a/var/spack/repos/builtin/packages/qmd-progress/package.py +++ b/var/spack/repos/builtin/packages/qmd-progress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class QmdProgress(CMakePackage): diff --git a/var/spack/repos/builtin/packages/qnnpack/package.py b/var/spack/repos/builtin/packages/qnnpack/package.py index 40c93b5eeb..158018f6a7 100644 --- a/var/spack/repos/builtin/packages/qnnpack/package.py +++ b/var/spack/repos/builtin/packages/qnnpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qnnpack(CMakePackage): diff --git a/var/spack/repos/builtin/packages/qorts/package.py b/var/spack/repos/builtin/packages/qorts/package.py index 170e68c22c..f860bce320 100644 --- a/var/spack/repos/builtin/packages/qorts/package.py +++ b/var/spack/repos/builtin/packages/qorts/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Qorts(RPackage): diff --git a/var/spack/repos/builtin/packages/qperf/package.py b/var/spack/repos/builtin/packages/qperf/package.py index 63db507a11..08b3a82073 100644 --- a/var/spack/repos/builtin/packages/qperf/package.py +++ b/var/spack/repos/builtin/packages/qperf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qperf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py index c0e8d22e67..603769ba3e 100644 --- a/var/spack/repos/builtin/packages/qrupdate/package.py +++ b/var/spack/repos/builtin/packages/qrupdate/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Qrupdate(MakefilePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/qscintilla/package.py b/var/spack/repos/builtin/packages/qscintilla/package.py index 979f73bb1b..f20cdaeeee 100644 --- a/var/spack/repos/builtin/packages/qscintilla/package.py +++ b/var/spack/repos/builtin/packages/qscintilla/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Qscintilla(QMakePackage): diff --git a/var/spack/repos/builtin/packages/qt-creator/package.py b/var/spack/repos/builtin/packages/qt-creator/package.py index 4216d6db13..53bf9ba4ab 100644 --- a/var/spack/repos/builtin/packages/qt-creator/package.py +++ b/var/spack/repos/builtin/packages/qt-creator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class QtCreator(QMakePackage): diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index b01652e271..f936c8abb2 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -9,9 +9,9 @@ import sys import llnl.util.tty as tty -from spack import * from spack.operating_systems.linux_distro import kernel_version from spack.operating_systems.mac_os import macos_version +from spack.package import * MACOS_VERSION = macos_version() if sys.platform == 'darwin' else None LINUX_VERSION = kernel_version() if platform.system() == 'Linux' else None diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py index f7e46df3c8..75653217c3 100644 --- a/var/spack/repos/builtin/packages/qtgraph/package.py +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Qtgraph(QMakePackage): diff --git a/var/spack/repos/builtin/packages/qthreads/package.py b/var/spack/repos/builtin/packages/qthreads/package.py index 072b014679..207be9e1ea 100644 --- a/var/spack/repos/builtin/packages/qthreads/package.py +++ b/var/spack/repos/builtin/packages/qthreads/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * def is_integer(x): diff --git a/var/spack/repos/builtin/packages/qtkeychain/package.py b/var/spack/repos/builtin/packages/qtkeychain/package.py index 209780943e..fb5599c553 100644 --- a/var/spack/repos/builtin/packages/qtkeychain/package.py +++ b/var/spack/repos/builtin/packages/qtkeychain/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qtkeychain(CMakePackage): diff --git a/var/spack/repos/builtin/packages/qualimap/package.py b/var/spack/repos/builtin/packages/qualimap/package.py index c990a820cf..08648c7a2b 100644 --- a/var/spack/repos/builtin/packages/qualimap/package.py +++ b/var/spack/repos/builtin/packages/qualimap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qualimap(Package): diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py index 674cb45fa8..c19e1f2af9 100644 --- a/var/spack/repos/builtin/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class QuantumEspresso(CMakePackage): """Quantum ESPRESSO is an integrated suite of Open-Source computer codes for electronic-structure calculations and materials modeling at the diff --git a/var/spack/repos/builtin/packages/quartz/package.py b/var/spack/repos/builtin/packages/quartz/package.py index 2f70f296ad..6fc730836c 100644 --- a/var/spack/repos/builtin/packages/quartz/package.py +++ b/var/spack/repos/builtin/packages/quartz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Quartz(MavenPackage): diff --git a/var/spack/repos/builtin/packages/qucs/package.py b/var/spack/repos/builtin/packages/qucs/package.py index ace1305108..1fee3bee0c 100644 --- a/var/spack/repos/builtin/packages/qucs/package.py +++ b/var/spack/repos/builtin/packages/qucs/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class Qucs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/quicksilver/package.py b/var/spack/repos/builtin/packages/quicksilver/package.py index 04c43c0d84..3aeec9900c 100644 --- a/var/spack/repos/builtin/packages/quicksilver/package.py +++ b/var/spack/repos/builtin/packages/quicksilver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Quicksilver(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/quinoa/package.py b/var/spack/repos/builtin/packages/quinoa/package.py index 6d7fb58bc0..57a94b60c7 100644 --- a/var/spack/repos/builtin/packages/quinoa/package.py +++ b/var/spack/repos/builtin/packages/quinoa/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/quota/package.py b/var/spack/repos/builtin/packages/quota/package.py index 89e4a9db78..e1bb9149c3 100644 --- a/var/spack/repos/builtin/packages/quota/package.py +++ b/var/spack/repos/builtin/packages/quota/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Quota(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/qwt/package.py b/var/spack/repos/builtin/packages/qwt/package.py index 875d2f9f92..e27c89accd 100644 --- a/var/spack/repos/builtin/packages/qwt/package.py +++ b/var/spack/repos/builtin/packages/qwt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qwt(QMakePackage): diff --git a/var/spack/repos/builtin/packages/qwtpolar/package.py b/var/spack/repos/builtin/packages/qwtpolar/package.py index fabb96b55f..d0d384002a 100644 --- a/var/spack/repos/builtin/packages/qwtpolar/package.py +++ b/var/spack/repos/builtin/packages/qwtpolar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Qwtpolar(QMakePackage): diff --git a/var/spack/repos/builtin/packages/r-a4/package.py b/var/spack/repos/builtin/packages/r-a4/package.py index eb71a3f894..da65ee420d 100644 --- a/var/spack/repos/builtin/packages/r-a4/package.py +++ b/var/spack/repos/builtin/packages/r-a4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RA4(RPackage): diff --git a/var/spack/repos/builtin/packages/r-a4base/package.py b/var/spack/repos/builtin/packages/r-a4base/package.py index ae17ec8bc4..c4a8b8c854 100644 --- a/var/spack/repos/builtin/packages/r-a4base/package.py +++ b/var/spack/repos/builtin/packages/r-a4base/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RA4base(RPackage): diff --git a/var/spack/repos/builtin/packages/r-a4classif/package.py b/var/spack/repos/builtin/packages/r-a4classif/package.py index 4a3a0207fa..12bfbd27e6 100644 --- a/var/spack/repos/builtin/packages/r-a4classif/package.py +++ b/var/spack/repos/builtin/packages/r-a4classif/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RA4classif(RPackage): diff --git a/var/spack/repos/builtin/packages/r-a4core/package.py b/var/spack/repos/builtin/packages/r-a4core/package.py index 8e36d4d69a..bd95da50f2 100644 --- a/var/spack/repos/builtin/packages/r-a4core/package.py +++ b/var/spack/repos/builtin/packages/r-a4core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RA4core(RPackage): diff --git a/var/spack/repos/builtin/packages/r-a4preproc/package.py b/var/spack/repos/builtin/packages/r-a4preproc/package.py index 76ebcb3469..e7a063ef89 100644 --- a/var/spack/repos/builtin/packages/r-a4preproc/package.py +++ b/var/spack/repos/builtin/packages/r-a4preproc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RA4preproc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-a4reporting/package.py b/var/spack/repos/builtin/packages/r-a4reporting/package.py index 2216c3364e..fd6629bf75 100644 --- a/var/spack/repos/builtin/packages/r-a4reporting/package.py +++ b/var/spack/repos/builtin/packages/r-a4reporting/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RA4reporting(RPackage): diff --git a/var/spack/repos/builtin/packages/r-abadata/package.py b/var/spack/repos/builtin/packages/r-abadata/package.py index 9695cc41ea..58a2b03fdd 100644 --- a/var/spack/repos/builtin/packages/r-abadata/package.py +++ b/var/spack/repos/builtin/packages/r-abadata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAbadata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-abaenrichment/package.py b/var/spack/repos/builtin/packages/r-abaenrichment/package.py index b9501c29bb..c5ec3cbefa 100644 --- a/var/spack/repos/builtin/packages/r-abaenrichment/package.py +++ b/var/spack/repos/builtin/packages/r-abaenrichment/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAbaenrichment(RPackage): diff --git a/var/spack/repos/builtin/packages/r-abind/package.py b/var/spack/repos/builtin/packages/r-abind/package.py index 791a125495..8d3ba7adbf 100644 --- a/var/spack/repos/builtin/packages/r-abind/package.py +++ b/var/spack/repos/builtin/packages/r-abind/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAbind(RPackage): diff --git a/var/spack/repos/builtin/packages/r-absseq/package.py b/var/spack/repos/builtin/packages/r-absseq/package.py index a78748aca5..63ba9a8a69 100644 --- a/var/spack/repos/builtin/packages/r-absseq/package.py +++ b/var/spack/repos/builtin/packages/r-absseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAbsseq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-acde/package.py b/var/spack/repos/builtin/packages/r-acde/package.py index 7143029d67..be9ad2e438 100644 --- a/var/spack/repos/builtin/packages/r-acde/package.py +++ b/var/spack/repos/builtin/packages/r-acde/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAcde(RPackage): diff --git a/var/spack/repos/builtin/packages/r-acepack/package.py b/var/spack/repos/builtin/packages/r-acepack/package.py index 7283792512..846c803bb8 100644 --- a/var/spack/repos/builtin/packages/r-acepack/package.py +++ b/var/spack/repos/builtin/packages/r-acepack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAcepack(RPackage): diff --git a/var/spack/repos/builtin/packages/r-acgh/package.py b/var/spack/repos/builtin/packages/r-acgh/package.py index 5ab1245868..b6f3ac516f 100644 --- a/var/spack/repos/builtin/packages/r-acgh/package.py +++ b/var/spack/repos/builtin/packages/r-acgh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAcgh(RPackage): diff --git a/var/spack/repos/builtin/packages/r-acme/package.py b/var/spack/repos/builtin/packages/r-acme/package.py index a3e79454da..764c9b0665 100644 --- a/var/spack/repos/builtin/packages/r-acme/package.py +++ b/var/spack/repos/builtin/packages/r-acme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAcme(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ada/package.py b/var/spack/repos/builtin/packages/r-ada/package.py index 2b2d40f778..290d88924e 100644 --- a/var/spack/repos/builtin/packages/r-ada/package.py +++ b/var/spack/repos/builtin/packages/r-ada/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAda(RPackage): diff --git a/var/spack/repos/builtin/packages/r-adabag/package.py b/var/spack/repos/builtin/packages/r-adabag/package.py index adb0c7b1dd..e87206781f 100644 --- a/var/spack/repos/builtin/packages/r-adabag/package.py +++ b/var/spack/repos/builtin/packages/r-adabag/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAdabag(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ade4/package.py b/var/spack/repos/builtin/packages/r-ade4/package.py index 16caa08e36..54d7f54efe 100644 --- a/var/spack/repos/builtin/packages/r-ade4/package.py +++ b/var/spack/repos/builtin/packages/r-ade4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAde4(RPackage): diff --git a/var/spack/repos/builtin/packages/r-adegenet/package.py b/var/spack/repos/builtin/packages/r-adegenet/package.py index 9c17c86f09..58dc9402e5 100644 --- a/var/spack/repos/builtin/packages/r-adegenet/package.py +++ b/var/spack/repos/builtin/packages/r-adegenet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAdegenet(RPackage): diff --git a/var/spack/repos/builtin/packages/r-adegraphics/package.py b/var/spack/repos/builtin/packages/r-adegraphics/package.py index 9ace764525..11a40da5c9 100644 --- a/var/spack/repos/builtin/packages/r-adegraphics/package.py +++ b/var/spack/repos/builtin/packages/r-adegraphics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAdegraphics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-adephylo/package.py b/var/spack/repos/builtin/packages/r-adephylo/package.py index 8bcf366fd9..b9eba3522e 100644 --- a/var/spack/repos/builtin/packages/r-adephylo/package.py +++ b/var/spack/repos/builtin/packages/r-adephylo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAdephylo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-adespatial/package.py b/var/spack/repos/builtin/packages/r-adespatial/package.py index 52201d7f5a..394cd9716e 100644 --- a/var/spack/repos/builtin/packages/r-adespatial/package.py +++ b/var/spack/repos/builtin/packages/r-adespatial/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAdespatial(RPackage): diff --git a/var/spack/repos/builtin/packages/r-adgoftest/package.py b/var/spack/repos/builtin/packages/r-adgoftest/package.py index 0a97c1fb63..5e6d0dcb9b 100644 --- a/var/spack/repos/builtin/packages/r-adgoftest/package.py +++ b/var/spack/repos/builtin/packages/r-adgoftest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAdgoftest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-adsplit/package.py b/var/spack/repos/builtin/packages/r-adsplit/package.py index 5f21fe1e21..2fde71da20 100644 --- a/var/spack/repos/builtin/packages/r-adsplit/package.py +++ b/var/spack/repos/builtin/packages/r-adsplit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAdsplit(RPackage): diff --git a/var/spack/repos/builtin/packages/r-aer/package.py b/var/spack/repos/builtin/packages/r-aer/package.py index 30cf5ca89f..9cdec514f6 100644 --- a/var/spack/repos/builtin/packages/r-aer/package.py +++ b/var/spack/repos/builtin/packages/r-aer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-afex/package.py b/var/spack/repos/builtin/packages/r-afex/package.py index 55983afb35..d7ceb0fdd6 100644 --- a/var/spack/repos/builtin/packages/r-afex/package.py +++ b/var/spack/repos/builtin/packages/r-afex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAfex(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affxparser/package.py b/var/spack/repos/builtin/packages/r-affxparser/package.py index 6b691d5a4e..5087844228 100644 --- a/var/spack/repos/builtin/packages/r-affxparser/package.py +++ b/var/spack/repos/builtin/packages/r-affxparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffxparser(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affy/package.py b/var/spack/repos/builtin/packages/r-affy/package.py index 5b2b11fbab..38c50e73e9 100644 --- a/var/spack/repos/builtin/packages/r-affy/package.py +++ b/var/spack/repos/builtin/packages/r-affy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affycomp/package.py b/var/spack/repos/builtin/packages/r-affycomp/package.py index 6d2b546be1..7f4ff5826e 100644 --- a/var/spack/repos/builtin/packages/r-affycomp/package.py +++ b/var/spack/repos/builtin/packages/r-affycomp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffycomp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affycompatible/package.py b/var/spack/repos/builtin/packages/r-affycompatible/package.py index cd20e9f0ba..cc027634f5 100644 --- a/var/spack/repos/builtin/packages/r-affycompatible/package.py +++ b/var/spack/repos/builtin/packages/r-affycompatible/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffycompatible(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affycontam/package.py b/var/spack/repos/builtin/packages/r-affycontam/package.py index 810abec572..4366c70c88 100644 --- a/var/spack/repos/builtin/packages/r-affycontam/package.py +++ b/var/spack/repos/builtin/packages/r-affycontam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffycontam(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affycoretools/package.py b/var/spack/repos/builtin/packages/r-affycoretools/package.py index f4eca87f30..99e281e2ad 100644 --- a/var/spack/repos/builtin/packages/r-affycoretools/package.py +++ b/var/spack/repos/builtin/packages/r-affycoretools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffycoretools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affydata/package.py b/var/spack/repos/builtin/packages/r-affydata/package.py index 93dfcfbb2b..6ba098872a 100644 --- a/var/spack/repos/builtin/packages/r-affydata/package.py +++ b/var/spack/repos/builtin/packages/r-affydata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffydata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affyexpress/package.py b/var/spack/repos/builtin/packages/r-affyexpress/package.py index b5c0e0c3e6..07e69b9fdb 100644 --- a/var/spack/repos/builtin/packages/r-affyexpress/package.py +++ b/var/spack/repos/builtin/packages/r-affyexpress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffyexpress(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affyilm/package.py b/var/spack/repos/builtin/packages/r-affyilm/package.py index a996e860be..b247e347ed 100644 --- a/var/spack/repos/builtin/packages/r-affyilm/package.py +++ b/var/spack/repos/builtin/packages/r-affyilm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffyilm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affyio/package.py b/var/spack/repos/builtin/packages/r-affyio/package.py index 6b9cd31341..5c03f50aac 100644 --- a/var/spack/repos/builtin/packages/r-affyio/package.py +++ b/var/spack/repos/builtin/packages/r-affyio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffyio(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affypdnn/package.py b/var/spack/repos/builtin/packages/r-affypdnn/package.py index 5be82ef00e..82a72dc67e 100644 --- a/var/spack/repos/builtin/packages/r-affypdnn/package.py +++ b/var/spack/repos/builtin/packages/r-affypdnn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffypdnn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affyplm/package.py b/var/spack/repos/builtin/packages/r-affyplm/package.py index 2fc2d79231..8d3780ad28 100644 --- a/var/spack/repos/builtin/packages/r-affyplm/package.py +++ b/var/spack/repos/builtin/packages/r-affyplm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffyplm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affyqcreport/package.py b/var/spack/repos/builtin/packages/r-affyqcreport/package.py index 05bc17899b..be084ad5a8 100644 --- a/var/spack/repos/builtin/packages/r-affyqcreport/package.py +++ b/var/spack/repos/builtin/packages/r-affyqcreport/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffyqcreport(RPackage): diff --git a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py index 8669331a78..4b677ebd37 100644 --- a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py +++ b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAffyrnadegradation(RPackage): diff --git a/var/spack/repos/builtin/packages/r-agdex/package.py b/var/spack/repos/builtin/packages/r-agdex/package.py index 53a0442fc2..67f85872a3 100644 --- a/var/spack/repos/builtin/packages/r-agdex/package.py +++ b/var/spack/repos/builtin/packages/r-agdex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAgdex(RPackage): diff --git a/var/spack/repos/builtin/packages/r-agilp/package.py b/var/spack/repos/builtin/packages/r-agilp/package.py index 2f800e6dd0..b473cfe260 100644 --- a/var/spack/repos/builtin/packages/r-agilp/package.py +++ b/var/spack/repos/builtin/packages/r-agilp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAgilp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-agimicrorna/package.py b/var/spack/repos/builtin/packages/r-agimicrorna/package.py index b3ede02ce7..a4f6a5412b 100644 --- a/var/spack/repos/builtin/packages/r-agimicrorna/package.py +++ b/var/spack/repos/builtin/packages/r-agimicrorna/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAgimicrorna(RPackage): diff --git a/var/spack/repos/builtin/packages/r-aims/package.py b/var/spack/repos/builtin/packages/r-aims/package.py index c6558ee15b..7e9c962ccf 100644 --- a/var/spack/repos/builtin/packages/r-aims/package.py +++ b/var/spack/repos/builtin/packages/r-aims/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAims(RPackage): diff --git a/var/spack/repos/builtin/packages/r-aldex2/package.py b/var/spack/repos/builtin/packages/r-aldex2/package.py index 621a4bec5f..3eb61fe76c 100644 --- a/var/spack/repos/builtin/packages/r-aldex2/package.py +++ b/var/spack/repos/builtin/packages/r-aldex2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAldex2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py index fa0de7f212..55061c4064 100644 --- a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py +++ b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAllelicimbalance(RPackage): diff --git a/var/spack/repos/builtin/packages/r-alpine/package.py b/var/spack/repos/builtin/packages/r-alpine/package.py index 5031416049..baae8f4a09 100644 --- a/var/spack/repos/builtin/packages/r-alpine/package.py +++ b/var/spack/repos/builtin/packages/r-alpine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAlpine(RPackage): diff --git a/var/spack/repos/builtin/packages/r-als/package.py b/var/spack/repos/builtin/packages/r-als/package.py index a75631dfa9..5f6afaf2ca 100644 --- a/var/spack/repos/builtin/packages/r-als/package.py +++ b/var/spack/repos/builtin/packages/r-als/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAls(RPackage): diff --git a/var/spack/repos/builtin/packages/r-alsace/package.py b/var/spack/repos/builtin/packages/r-alsace/package.py index e8c1f7fa3d..6a0d52f158 100644 --- a/var/spack/repos/builtin/packages/r-alsace/package.py +++ b/var/spack/repos/builtin/packages/r-alsace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAlsace(RPackage): diff --git a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py index fe9b93a8e1..a6fa1ca9e7 100644 --- a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py +++ b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAltcdfenvs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-amap/package.py b/var/spack/repos/builtin/packages/r-amap/package.py index 0570b9995d..b7b93d2f17 100644 --- a/var/spack/repos/builtin/packages/r-amap/package.py +++ b/var/spack/repos/builtin/packages/r-amap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-amelia/package.py b/var/spack/repos/builtin/packages/r-amelia/package.py index 9cce1e443b..bb4d62cb8b 100644 --- a/var/spack/repos/builtin/packages/r-amelia/package.py +++ b/var/spack/repos/builtin/packages/r-amelia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAmelia(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ampliqueso/package.py b/var/spack/repos/builtin/packages/r-ampliqueso/package.py index 4da54c94e8..8ed8379d1b 100644 --- a/var/spack/repos/builtin/packages/r-ampliqueso/package.py +++ b/var/spack/repos/builtin/packages/r-ampliqueso/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAmpliqueso(RPackage): diff --git a/var/spack/repos/builtin/packages/r-analysispageserver/package.py b/var/spack/repos/builtin/packages/r-analysispageserver/package.py index e626957693..13c7d37f1a 100644 --- a/var/spack/repos/builtin/packages/r-analysispageserver/package.py +++ b/var/spack/repos/builtin/packages/r-analysispageserver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnalysispageserver(RPackage): diff --git a/var/spack/repos/builtin/packages/r-anaquin/package.py b/var/spack/repos/builtin/packages/r-anaquin/package.py index 944494d997..8f01498845 100644 --- a/var/spack/repos/builtin/packages/r-anaquin/package.py +++ b/var/spack/repos/builtin/packages/r-anaquin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnaquin(RPackage): diff --git a/var/spack/repos/builtin/packages/r-aneufinder/package.py b/var/spack/repos/builtin/packages/r-aneufinder/package.py index f24f6bd55c..ab8e18abe3 100644 --- a/var/spack/repos/builtin/packages/r-aneufinder/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinder/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAneufinder(RPackage): diff --git a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py index 47ffd1ee86..513894094d 100644 --- a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAneufinderdata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-animation/package.py b/var/spack/repos/builtin/packages/r-animation/package.py index 301dea0458..bf7eeccb8a 100644 --- a/var/spack/repos/builtin/packages/r-animation/package.py +++ b/var/spack/repos/builtin/packages/r-animation/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnimation(RPackage): diff --git a/var/spack/repos/builtin/packages/r-annaffy/package.py b/var/spack/repos/builtin/packages/r-annaffy/package.py index 87430f1cd6..5bee7d7991 100644 --- a/var/spack/repos/builtin/packages/r-annaffy/package.py +++ b/var/spack/repos/builtin/packages/r-annaffy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnnaffy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-annotate/package.py b/var/spack/repos/builtin/packages/r-annotate/package.py index 9fa7d17adc..2d7c97434c 100644 --- a/var/spack/repos/builtin/packages/r-annotate/package.py +++ b/var/spack/repos/builtin/packages/r-annotate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnnotate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-annotationdbi/package.py b/var/spack/repos/builtin/packages/r-annotationdbi/package.py index 3a19789fa6..3345f17b28 100644 --- a/var/spack/repos/builtin/packages/r-annotationdbi/package.py +++ b/var/spack/repos/builtin/packages/r-annotationdbi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnnotationdbi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-annotationfilter/package.py b/var/spack/repos/builtin/packages/r-annotationfilter/package.py index 6bad6a7aa5..c0f6fb9c36 100644 --- a/var/spack/repos/builtin/packages/r-annotationfilter/package.py +++ b/var/spack/repos/builtin/packages/r-annotationfilter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnnotationfilter(RPackage): diff --git a/var/spack/repos/builtin/packages/r-annotationforge/package.py b/var/spack/repos/builtin/packages/r-annotationforge/package.py index 7682847374..1a2b1e7b88 100644 --- a/var/spack/repos/builtin/packages/r-annotationforge/package.py +++ b/var/spack/repos/builtin/packages/r-annotationforge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnnotationforge(RPackage): diff --git a/var/spack/repos/builtin/packages/r-annotationhub/package.py b/var/spack/repos/builtin/packages/r-annotationhub/package.py index ec6fe1b6a9..bc900f1746 100644 --- a/var/spack/repos/builtin/packages/r-annotationhub/package.py +++ b/var/spack/repos/builtin/packages/r-annotationhub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnnotationhub(RPackage): diff --git a/var/spack/repos/builtin/packages/r-anytime/package.py b/var/spack/repos/builtin/packages/r-anytime/package.py index 5558631c67..808e752a5c 100644 --- a/var/spack/repos/builtin/packages/r-anytime/package.py +++ b/var/spack/repos/builtin/packages/r-anytime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAnytime(RPackage): diff --git a/var/spack/repos/builtin/packages/r-aod/package.py b/var/spack/repos/builtin/packages/r-aod/package.py index 8ce19bf352..bf00c7dee2 100644 --- a/var/spack/repos/builtin/packages/r-aod/package.py +++ b/var/spack/repos/builtin/packages/r-aod/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAod(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ape/package.py b/var/spack/repos/builtin/packages/r-ape/package.py index 4a489a309a..671871ea8a 100644 --- a/var/spack/repos/builtin/packages/r-ape/package.py +++ b/var/spack/repos/builtin/packages/r-ape/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RApe(RPackage): diff --git a/var/spack/repos/builtin/packages/r-aplot/package.py b/var/spack/repos/builtin/packages/r-aplot/package.py index 2b34b8fc79..6d4d238fd0 100644 --- a/var/spack/repos/builtin/packages/r-aplot/package.py +++ b/var/spack/repos/builtin/packages/r-aplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-argparse/package.py b/var/spack/repos/builtin/packages/r-argparse/package.py index 71e75a13ec..56ab2cd0ca 100644 --- a/var/spack/repos/builtin/packages/r-argparse/package.py +++ b/var/spack/repos/builtin/packages/r-argparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RArgparse(RPackage): diff --git a/var/spack/repos/builtin/packages/r-aroma-light/package.py b/var/spack/repos/builtin/packages/r-aroma-light/package.py index e56aa3203d..c2c5b029a4 100644 --- a/var/spack/repos/builtin/packages/r-aroma-light/package.py +++ b/var/spack/repos/builtin/packages/r-aroma-light/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAromaLight(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ash/package.py b/var/spack/repos/builtin/packages/r-ash/package.py index 9b2bc4f602..facace5bb0 100644 --- a/var/spack/repos/builtin/packages/r-ash/package.py +++ b/var/spack/repos/builtin/packages/r-ash/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RAsh(RPackage): """David Scott's ASH Routines. diff --git a/var/spack/repos/builtin/packages/r-askpass/package.py b/var/spack/repos/builtin/packages/r-askpass/package.py index abe0cc3edc..bbdb87d623 100644 --- a/var/spack/repos/builtin/packages/r-askpass/package.py +++ b/var/spack/repos/builtin/packages/r-askpass/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAskpass(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-base/package.py b/var/spack/repos/builtin/packages/r-assertive-base/package.py index f43506932f..5895b9af61 100644 --- a/var/spack/repos/builtin/packages/r-assertive-base/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-base/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveBase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-code/package.py b/var/spack/repos/builtin/packages/r-assertive-code/package.py index bcfdea42b9..b81c18d9a4 100644 --- a/var/spack/repos/builtin/packages/r-assertive-code/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-code/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveCode(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-data-uk/package.py b/var/spack/repos/builtin/packages/r-assertive-data-uk/package.py index 6bdd67fc46..62b4110248 100644 --- a/var/spack/repos/builtin/packages/r-assertive-data-uk/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-data-uk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveDataUk(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-data-us/package.py b/var/spack/repos/builtin/packages/r-assertive-data-us/package.py index 5fa46f6d50..c7a76e8ee4 100644 --- a/var/spack/repos/builtin/packages/r-assertive-data-us/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-data-us/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveDataUs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-data/package.py b/var/spack/repos/builtin/packages/r-assertive-data/package.py index c37636f7f1..e7700797b6 100644 --- a/var/spack/repos/builtin/packages/r-assertive-data/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-data/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveData(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-datetimes/package.py b/var/spack/repos/builtin/packages/r-assertive-datetimes/package.py index 7d1667b519..3f0c53f0c4 100644 --- a/var/spack/repos/builtin/packages/r-assertive-datetimes/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-datetimes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveDatetimes(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-files/package.py b/var/spack/repos/builtin/packages/r-assertive-files/package.py index 01f1c03b7a..e2b16a3128 100644 --- a/var/spack/repos/builtin/packages/r-assertive-files/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-files/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveFiles(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-matrices/package.py b/var/spack/repos/builtin/packages/r-assertive-matrices/package.py index 5a172263d8..36502547ba 100644 --- a/var/spack/repos/builtin/packages/r-assertive-matrices/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-matrices/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveMatrices(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-models/package.py b/var/spack/repos/builtin/packages/r-assertive-models/package.py index 6c34b4f8a3..9b0c745180 100644 --- a/var/spack/repos/builtin/packages/r-assertive-models/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-models/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveModels(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-numbers/package.py b/var/spack/repos/builtin/packages/r-assertive-numbers/package.py index 7d5fb31447..adc6770701 100644 --- a/var/spack/repos/builtin/packages/r-assertive-numbers/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-numbers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveNumbers(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-properties/package.py b/var/spack/repos/builtin/packages/r-assertive-properties/package.py index 32f294cb86..73fd37eae6 100644 --- a/var/spack/repos/builtin/packages/r-assertive-properties/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-properties/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveProperties(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-reflection/package.py b/var/spack/repos/builtin/packages/r-assertive-reflection/package.py index 71d6a0cafc..01c4151f9c 100644 --- a/var/spack/repos/builtin/packages/r-assertive-reflection/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-reflection/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveReflection(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-sets/package.py b/var/spack/repos/builtin/packages/r-assertive-sets/package.py index cb2214c8a9..b466948a63 100644 --- a/var/spack/repos/builtin/packages/r-assertive-sets/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-sets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveSets(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-strings/package.py b/var/spack/repos/builtin/packages/r-assertive-strings/package.py index 2b6d49f2ae..f98bbb0b2d 100644 --- a/var/spack/repos/builtin/packages/r-assertive-strings/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-strings/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveStrings(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive-types/package.py b/var/spack/repos/builtin/packages/r-assertive-types/package.py index a2834f6221..369d654d7b 100644 --- a/var/spack/repos/builtin/packages/r-assertive-types/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-types/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertiveTypes(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertive/package.py b/var/spack/repos/builtin/packages/r-assertive/package.py index 1f979124d9..3f95fcfd48 100644 --- a/var/spack/repos/builtin/packages/r-assertive/package.py +++ b/var/spack/repos/builtin/packages/r-assertive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertive(RPackage): diff --git a/var/spack/repos/builtin/packages/r-assertthat/package.py b/var/spack/repos/builtin/packages/r-assertthat/package.py index fd302e29b4..0210d31a76 100644 --- a/var/spack/repos/builtin/packages/r-assertthat/package.py +++ b/var/spack/repos/builtin/packages/r-assertthat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RAssertthat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-backports/package.py b/var/spack/repos/builtin/packages/r-backports/package.py index 5df7aeda47..11c12fdf53 100644 --- a/var/spack/repos/builtin/packages/r-backports/package.py +++ b/var/spack/repos/builtin/packages/r-backports/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBackports(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bamsignals/package.py b/var/spack/repos/builtin/packages/r-bamsignals/package.py index 79d676cd21..63eae14a06 100644 --- a/var/spack/repos/builtin/packages/r-bamsignals/package.py +++ b/var/spack/repos/builtin/packages/r-bamsignals/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBamsignals(RPackage): diff --git a/var/spack/repos/builtin/packages/r-base64/package.py b/var/spack/repos/builtin/packages/r-base64/package.py index 2dc375af85..056fe61182 100644 --- a/var/spack/repos/builtin/packages/r-base64/package.py +++ b/var/spack/repos/builtin/packages/r-base64/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBase64(RPackage): diff --git a/var/spack/repos/builtin/packages/r-base64enc/package.py b/var/spack/repos/builtin/packages/r-base64enc/package.py index 9f7a2abc56..d1a125871a 100644 --- a/var/spack/repos/builtin/packages/r-base64enc/package.py +++ b/var/spack/repos/builtin/packages/r-base64enc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBase64enc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bayesm/package.py b/var/spack/repos/builtin/packages/r-bayesm/package.py index 7ae38491f4..b79df57218 100644 --- a/var/spack/repos/builtin/packages/r-bayesm/package.py +++ b/var/spack/repos/builtin/packages/r-bayesm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBayesm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bayesplot/package.py b/var/spack/repos/builtin/packages/r-bayesplot/package.py index ba073c77d3..1aef4ce2d3 100644 --- a/var/spack/repos/builtin/packages/r-bayesplot/package.py +++ b/var/spack/repos/builtin/packages/r-bayesplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBayesplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bbmisc/package.py b/var/spack/repos/builtin/packages/r-bbmisc/package.py index 4e194b6165..4f95c6ac58 100644 --- a/var/spack/repos/builtin/packages/r-bbmisc/package.py +++ b/var/spack/repos/builtin/packages/r-bbmisc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBbmisc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-beachmat/package.py b/var/spack/repos/builtin/packages/r-beachmat/package.py index e974fd6227..d9a7421029 100644 --- a/var/spack/repos/builtin/packages/r-beachmat/package.py +++ b/var/spack/repos/builtin/packages/r-beachmat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBeachmat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-beanplot/package.py b/var/spack/repos/builtin/packages/r-beanplot/package.py index d13ad54c8a..b2da347f09 100644 --- a/var/spack/repos/builtin/packages/r-beanplot/package.py +++ b/var/spack/repos/builtin/packages/r-beanplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBeanplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-beeswarm/package.py b/var/spack/repos/builtin/packages/r-beeswarm/package.py index cbcb00777c..83d8ea5fe9 100644 --- a/var/spack/repos/builtin/packages/r-beeswarm/package.py +++ b/var/spack/repos/builtin/packages/r-beeswarm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBeeswarm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bfast/package.py b/var/spack/repos/builtin/packages/r-bfast/package.py index 4dd70c5f16..b9ad3e190b 100644 --- a/var/spack/repos/builtin/packages/r-bfast/package.py +++ b/var/spack/repos/builtin/packages/r-bfast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBfast(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bfastspatial/package.py b/var/spack/repos/builtin/packages/r-bfastspatial/package.py index 40578bd3b4..0c0c4b87c7 100644 --- a/var/spack/repos/builtin/packages/r-bfastspatial/package.py +++ b/var/spack/repos/builtin/packages/r-bfastspatial/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBfastspatial(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bglr/package.py b/var/spack/repos/builtin/packages/r-bglr/package.py index 9013942a46..ba892929a6 100644 --- a/var/spack/repos/builtin/packages/r-bglr/package.py +++ b/var/spack/repos/builtin/packages/r-bglr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBglr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bh/package.py b/var/spack/repos/builtin/packages/r-bh/package.py index 15ef7efdd2..b9a39c197c 100644 --- a/var/spack/repos/builtin/packages/r-bh/package.py +++ b/var/spack/repos/builtin/packages/r-bh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBh(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biasedurn/package.py b/var/spack/repos/builtin/packages/r-biasedurn/package.py index 91fe62d327..1fe9afb023 100644 --- a/var/spack/repos/builtin/packages/r-biasedurn/package.py +++ b/var/spack/repos/builtin/packages/r-biasedurn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiasedurn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bibtex/package.py b/var/spack/repos/builtin/packages/r-bibtex/package.py index 64728425b2..b3fdec46d1 100644 --- a/var/spack/repos/builtin/packages/r-bibtex/package.py +++ b/var/spack/repos/builtin/packages/r-bibtex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBibtex(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bigalgebra/package.py b/var/spack/repos/builtin/packages/r-bigalgebra/package.py index 2893325002..d88f9ac219 100644 --- a/var/spack/repos/builtin/packages/r-bigalgebra/package.py +++ b/var/spack/repos/builtin/packages/r-bigalgebra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBigalgebra(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bigmemory-sri/package.py b/var/spack/repos/builtin/packages/r-bigmemory-sri/package.py index d2ab649def..c3f7e1dc7c 100644 --- a/var/spack/repos/builtin/packages/r-bigmemory-sri/package.py +++ b/var/spack/repos/builtin/packages/r-bigmemory-sri/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBigmemorySri(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bigmemory/package.py b/var/spack/repos/builtin/packages/r-bigmemory/package.py index 6631228eef..c0dd9af947 100644 --- a/var/spack/repos/builtin/packages/r-bigmemory/package.py +++ b/var/spack/repos/builtin/packages/r-bigmemory/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBigmemory(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bindr/package.py b/var/spack/repos/builtin/packages/r-bindr/package.py index 4739fa27bc..4f44fddcbe 100644 --- a/var/spack/repos/builtin/packages/r-bindr/package.py +++ b/var/spack/repos/builtin/packages/r-bindr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBindr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bindrcpp/package.py b/var/spack/repos/builtin/packages/r-bindrcpp/package.py index 63b298a5fc..c7c145c0f9 100644 --- a/var/spack/repos/builtin/packages/r-bindrcpp/package.py +++ b/var/spack/repos/builtin/packages/r-bindrcpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBindrcpp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bio3d/package.py b/var/spack/repos/builtin/packages/r-bio3d/package.py index 847963b16a..3775ad0c9b 100644 --- a/var/spack/repos/builtin/packages/r-bio3d/package.py +++ b/var/spack/repos/builtin/packages/r-bio3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBio3d(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biobase/package.py b/var/spack/repos/builtin/packages/r-biobase/package.py index acde3d0e00..4308ffa4fd 100644 --- a/var/spack/repos/builtin/packages/r-biobase/package.py +++ b/var/spack/repos/builtin/packages/r-biobase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiobase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocfilecache/package.py b/var/spack/repos/builtin/packages/r-biocfilecache/package.py index 29555c0962..5a8d03dc7e 100644 --- a/var/spack/repos/builtin/packages/r-biocfilecache/package.py +++ b/var/spack/repos/builtin/packages/r-biocfilecache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocfilecache(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocgenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py index 0c0e7dc866..666898ea6b 100644 --- a/var/spack/repos/builtin/packages/r-biocgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocgenerics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocinstaller/package.py b/var/spack/repos/builtin/packages/r-biocinstaller/package.py index 4118acc5f1..39ec9cdd07 100644 --- a/var/spack/repos/builtin/packages/r-biocinstaller/package.py +++ b/var/spack/repos/builtin/packages/r-biocinstaller/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocinstaller(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocio/package.py b/var/spack/repos/builtin/packages/r-biocio/package.py index f671dfb2f9..43fb6b7655 100644 --- a/var/spack/repos/builtin/packages/r-biocio/package.py +++ b/var/spack/repos/builtin/packages/r-biocio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocio(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocmanager/package.py b/var/spack/repos/builtin/packages/r-biocmanager/package.py index 73e8e245a7..d5d17cc016 100644 --- a/var/spack/repos/builtin/packages/r-biocmanager/package.py +++ b/var/spack/repos/builtin/packages/r-biocmanager/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocmanager(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocneighbors/package.py b/var/spack/repos/builtin/packages/r-biocneighbors/package.py index 7b9ccaf764..342b0e96c7 100644 --- a/var/spack/repos/builtin/packages/r-biocneighbors/package.py +++ b/var/spack/repos/builtin/packages/r-biocneighbors/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocneighbors(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocparallel/package.py b/var/spack/repos/builtin/packages/r-biocparallel/package.py index 8a8afe43e9..519e5a59fb 100644 --- a/var/spack/repos/builtin/packages/r-biocparallel/package.py +++ b/var/spack/repos/builtin/packages/r-biocparallel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocparallel(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocsingular/package.py b/var/spack/repos/builtin/packages/r-biocsingular/package.py index 0f7d37137a..df221d0b83 100644 --- a/var/spack/repos/builtin/packages/r-biocsingular/package.py +++ b/var/spack/repos/builtin/packages/r-biocsingular/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocsingular(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocstyle/package.py b/var/spack/repos/builtin/packages/r-biocstyle/package.py index c76a386e65..d67301b545 100644 --- a/var/spack/repos/builtin/packages/r-biocstyle/package.py +++ b/var/spack/repos/builtin/packages/r-biocstyle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocstyle(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biocversion/package.py b/var/spack/repos/builtin/packages/r-biocversion/package.py index f72c386148..d7f3f6e097 100644 --- a/var/spack/repos/builtin/packages/r-biocversion/package.py +++ b/var/spack/repos/builtin/packages/r-biocversion/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiocversion(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biom-utils/package.py b/var/spack/repos/builtin/packages/r-biom-utils/package.py index 9592481803..5fe4a146cb 100644 --- a/var/spack/repos/builtin/packages/r-biom-utils/package.py +++ b/var/spack/repos/builtin/packages/r-biom-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiomUtils(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biomart/package.py b/var/spack/repos/builtin/packages/r-biomart/package.py index 2a8f2e22e7..67286cf3ef 100644 --- a/var/spack/repos/builtin/packages/r-biomart/package.py +++ b/var/spack/repos/builtin/packages/r-biomart/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiomart(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biomartr/package.py b/var/spack/repos/builtin/packages/r-biomartr/package.py index e2c93b9182..528e00df00 100644 --- a/var/spack/repos/builtin/packages/r-biomartr/package.py +++ b/var/spack/repos/builtin/packages/r-biomartr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiomartr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biomformat/package.py b/var/spack/repos/builtin/packages/r-biomformat/package.py index d71f420e14..0080b1980d 100644 --- a/var/spack/repos/builtin/packages/r-biomformat/package.py +++ b/var/spack/repos/builtin/packages/r-biomformat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiomformat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biostrings/package.py b/var/spack/repos/builtin/packages/r-biostrings/package.py index e445ba5c61..e7a341eefe 100644 --- a/var/spack/repos/builtin/packages/r-biostrings/package.py +++ b/var/spack/repos/builtin/packages/r-biostrings/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiostrings(RPackage): diff --git a/var/spack/repos/builtin/packages/r-biovizbase/package.py b/var/spack/repos/builtin/packages/r-biovizbase/package.py index d8b6148af5..eb16fed1b0 100644 --- a/var/spack/repos/builtin/packages/r-biovizbase/package.py +++ b/var/spack/repos/builtin/packages/r-biovizbase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBiovizbase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bit/package.py b/var/spack/repos/builtin/packages/r-bit/package.py index c365648b64..0ae8bd95e2 100644 --- a/var/spack/repos/builtin/packages/r-bit/package.py +++ b/var/spack/repos/builtin/packages/r-bit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBit(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bit64/package.py b/var/spack/repos/builtin/packages/r-bit64/package.py index ca6598eae6..c115107ca2 100644 --- a/var/spack/repos/builtin/packages/r-bit64/package.py +++ b/var/spack/repos/builtin/packages/r-bit64/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBit64(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bitops/package.py b/var/spack/repos/builtin/packages/r-bitops/package.py index ce687cc335..e78af74388 100644 --- a/var/spack/repos/builtin/packages/r-bitops/package.py +++ b/var/spack/repos/builtin/packages/r-bitops/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBitops(RPackage): diff --git a/var/spack/repos/builtin/packages/r-blavaan/package.py b/var/spack/repos/builtin/packages/r-blavaan/package.py index eb06e7f84f..469264dbb0 100644 --- a/var/spack/repos/builtin/packages/r-blavaan/package.py +++ b/var/spack/repos/builtin/packages/r-blavaan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBlavaan(RPackage): diff --git a/var/spack/repos/builtin/packages/r-blob/package.py b/var/spack/repos/builtin/packages/r-blob/package.py index 40b494b84e..af46d82047 100644 --- a/var/spack/repos/builtin/packages/r-blob/package.py +++ b/var/spack/repos/builtin/packages/r-blob/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBlob(RPackage): diff --git a/var/spack/repos/builtin/packages/r-blockmodeling/package.py b/var/spack/repos/builtin/packages/r-blockmodeling/package.py index dbc963dbfa..9c05853efa 100644 --- a/var/spack/repos/builtin/packages/r-blockmodeling/package.py +++ b/var/spack/repos/builtin/packages/r-blockmodeling/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBlockmodeling(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bmp/package.py b/var/spack/repos/builtin/packages/r-bmp/package.py index a65ab87c57..6da1bc26df 100644 --- a/var/spack/repos/builtin/packages/r-bmp/package.py +++ b/var/spack/repos/builtin/packages/r-bmp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBmp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bookdown/package.py b/var/spack/repos/builtin/packages/r-bookdown/package.py index 67f8c4015e..0d04327f33 100644 --- a/var/spack/repos/builtin/packages/r-bookdown/package.py +++ b/var/spack/repos/builtin/packages/r-bookdown/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBookdown(RPackage): diff --git a/var/spack/repos/builtin/packages/r-boot/package.py b/var/spack/repos/builtin/packages/r-boot/package.py index 3e617c1a43..1dd5027a86 100644 --- a/var/spack/repos/builtin/packages/r-boot/package.py +++ b/var/spack/repos/builtin/packages/r-boot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBoot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-boruta/package.py b/var/spack/repos/builtin/packages/r-boruta/package.py index e3ea8ff34e..88426392f2 100644 --- a/var/spack/repos/builtin/packages/r-boruta/package.py +++ b/var/spack/repos/builtin/packages/r-boruta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBoruta(RPackage): diff --git a/var/spack/repos/builtin/packages/r-brew/package.py b/var/spack/repos/builtin/packages/r-brew/package.py index ad5b5debbc..6728f4551f 100644 --- a/var/spack/repos/builtin/packages/r-brew/package.py +++ b/var/spack/repos/builtin/packages/r-brew/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBrew(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bridgesampling/package.py b/var/spack/repos/builtin/packages/r-bridgesampling/package.py index 47c3319d64..9a39c40821 100644 --- a/var/spack/repos/builtin/packages/r-bridgesampling/package.py +++ b/var/spack/repos/builtin/packages/r-bridgesampling/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBridgesampling(RPackage): diff --git a/var/spack/repos/builtin/packages/r-brio/package.py b/var/spack/repos/builtin/packages/r-brio/package.py index a7e183fb23..40385fab6c 100644 --- a/var/spack/repos/builtin/packages/r-brio/package.py +++ b/var/spack/repos/builtin/packages/r-brio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBrio(RPackage): diff --git a/var/spack/repos/builtin/packages/r-brms/package.py b/var/spack/repos/builtin/packages/r-brms/package.py index e3ac3ed4fb..bf34b12aea 100644 --- a/var/spack/repos/builtin/packages/r-brms/package.py +++ b/var/spack/repos/builtin/packages/r-brms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBrms(RPackage): diff --git a/var/spack/repos/builtin/packages/r-brobdingnag/package.py b/var/spack/repos/builtin/packages/r-brobdingnag/package.py index e456567ef9..4809a19ba0 100644 --- a/var/spack/repos/builtin/packages/r-brobdingnag/package.py +++ b/var/spack/repos/builtin/packages/r-brobdingnag/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBrobdingnag(RPackage): diff --git a/var/spack/repos/builtin/packages/r-broom/package.py b/var/spack/repos/builtin/packages/r-broom/package.py index 8632aa022e..a646b3aab6 100644 --- a/var/spack/repos/builtin/packages/r-broom/package.py +++ b/var/spack/repos/builtin/packages/r-broom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBroom(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bsgenome-hsapiens-ucsc-hg19/package.py b/var/spack/repos/builtin/packages/r-bsgenome-hsapiens-ucsc-hg19/package.py index 1f52224518..b5ac8ffe02 100644 --- a/var/spack/repos/builtin/packages/r-bsgenome-hsapiens-ucsc-hg19/package.py +++ b/var/spack/repos/builtin/packages/r-bsgenome-hsapiens-ucsc-hg19/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBsgenomeHsapiensUcscHg19(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bsgenome/package.py b/var/spack/repos/builtin/packages/r-bsgenome/package.py index 681f0053f4..b510460deb 100644 --- a/var/spack/repos/builtin/packages/r-bsgenome/package.py +++ b/var/spack/repos/builtin/packages/r-bsgenome/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBsgenome(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bslib/package.py b/var/spack/repos/builtin/packages/r-bslib/package.py index 97437fffc6..f51b4e9408 100644 --- a/var/spack/repos/builtin/packages/r-bslib/package.py +++ b/var/spack/repos/builtin/packages/r-bslib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBslib(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bsseq/package.py b/var/spack/repos/builtin/packages/r-bsseq/package.py index c5d8828f77..e636accfe9 100644 --- a/var/spack/repos/builtin/packages/r-bsseq/package.py +++ b/var/spack/repos/builtin/packages/r-bsseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBsseq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bumphunter/package.py b/var/spack/repos/builtin/packages/r-bumphunter/package.py index 763d41a556..674ffa2100 100644 --- a/var/spack/repos/builtin/packages/r-bumphunter/package.py +++ b/var/spack/repos/builtin/packages/r-bumphunter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBumphunter(RPackage): diff --git a/var/spack/repos/builtin/packages/r-bwstest/package.py b/var/spack/repos/builtin/packages/r-bwstest/package.py index 838646eb3a..0735ad26c9 100644 --- a/var/spack/repos/builtin/packages/r-bwstest/package.py +++ b/var/spack/repos/builtin/packages/r-bwstest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RBwstest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-c50/package.py b/var/spack/repos/builtin/packages/r-c50/package.py index 87f2d16853..1886f223fb 100644 --- a/var/spack/repos/builtin/packages/r-c50/package.py +++ b/var/spack/repos/builtin/packages/r-c50/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RC50(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ca/package.py b/var/spack/repos/builtin/packages/r-ca/package.py index 3fa69c422d..35113b9325 100644 --- a/var/spack/repos/builtin/packages/r-ca/package.py +++ b/var/spack/repos/builtin/packages/r-ca/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) # ---------------------------------------------------------------------------- -from spack import * +from spack.package import * class RCa(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cachem/package.py b/var/spack/repos/builtin/packages/r-cachem/package.py index 461fd9e90d..db4694b09f 100644 --- a/var/spack/repos/builtin/packages/r-cachem/package.py +++ b/var/spack/repos/builtin/packages/r-cachem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCachem(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cairo/package.py b/var/spack/repos/builtin/packages/r-cairo/package.py index 599c7e3f06..08c54f6229 100644 --- a/var/spack/repos/builtin/packages/r-cairo/package.py +++ b/var/spack/repos/builtin/packages/r-cairo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCairo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-callr/package.py b/var/spack/repos/builtin/packages/r-callr/package.py index de4e7e9361..058ff0ece9 100644 --- a/var/spack/repos/builtin/packages/r-callr/package.py +++ b/var/spack/repos/builtin/packages/r-callr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCallr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-car/package.py b/var/spack/repos/builtin/packages/r-car/package.py index 484309ab83..095531690b 100644 --- a/var/spack/repos/builtin/packages/r-car/package.py +++ b/var/spack/repos/builtin/packages/r-car/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCar(RPackage): diff --git a/var/spack/repos/builtin/packages/r-caracas/package.py b/var/spack/repos/builtin/packages/r-caracas/package.py index 72bacbc250..ea83b3c310 100644 --- a/var/spack/repos/builtin/packages/r-caracas/package.py +++ b/var/spack/repos/builtin/packages/r-caracas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCaracas(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cardata/package.py b/var/spack/repos/builtin/packages/r-cardata/package.py index ae19934b51..e0aab0685e 100644 --- a/var/spack/repos/builtin/packages/r-cardata/package.py +++ b/var/spack/repos/builtin/packages/r-cardata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCardata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-caret/package.py b/var/spack/repos/builtin/packages/r-caret/package.py index 51e8b12fd4..31b4f12b31 100644 --- a/var/spack/repos/builtin/packages/r-caret/package.py +++ b/var/spack/repos/builtin/packages/r-caret/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCaret(RPackage): diff --git a/var/spack/repos/builtin/packages/r-caretensemble/package.py b/var/spack/repos/builtin/packages/r-caretensemble/package.py index 51b3025b9a..3fdc5917c4 100644 --- a/var/spack/repos/builtin/packages/r-caretensemble/package.py +++ b/var/spack/repos/builtin/packages/r-caretensemble/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCaretensemble(RPackage): diff --git a/var/spack/repos/builtin/packages/r-caroline/package.py b/var/spack/repos/builtin/packages/r-caroline/package.py index 40e95fbd7c..e6c0c192fb 100644 --- a/var/spack/repos/builtin/packages/r-caroline/package.py +++ b/var/spack/repos/builtin/packages/r-caroline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCaroline(RPackage): diff --git a/var/spack/repos/builtin/packages/r-category/package.py b/var/spack/repos/builtin/packages/r-category/package.py index a38499b48e..5d964d838f 100644 --- a/var/spack/repos/builtin/packages/r-category/package.py +++ b/var/spack/repos/builtin/packages/r-category/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCategory(RPackage): diff --git a/var/spack/repos/builtin/packages/r-catools/package.py b/var/spack/repos/builtin/packages/r-catools/package.py index 0ec682adeb..5606fea5db 100644 --- a/var/spack/repos/builtin/packages/r-catools/package.py +++ b/var/spack/repos/builtin/packages/r-catools/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCatools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cca/package.py b/var/spack/repos/builtin/packages/r-cca/package.py index 7e583170e3..3f6f838d5e 100644 --- a/var/spack/repos/builtin/packages/r-cca/package.py +++ b/var/spack/repos/builtin/packages/r-cca/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RCca(RPackage): """Canonical Correlation Analysis. diff --git a/var/spack/repos/builtin/packages/r-ccp/package.py b/var/spack/repos/builtin/packages/r-ccp/package.py index c206f84964..42e2531536 100644 --- a/var/spack/repos/builtin/packages/r-ccp/package.py +++ b/var/spack/repos/builtin/packages/r-ccp/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RCcp(RPackage): """Significance Tests for Canonical Correlation Analysis (CCA). diff --git a/var/spack/repos/builtin/packages/r-cdcfluview/package.py b/var/spack/repos/builtin/packages/r-cdcfluview/package.py index df99bd5391..a9403f3024 100644 --- a/var/spack/repos/builtin/packages/r-cdcfluview/package.py +++ b/var/spack/repos/builtin/packages/r-cdcfluview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCdcfluview(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cellranger/package.py b/var/spack/repos/builtin/packages/r-cellranger/package.py index d31a6a65ce..1464ce8595 100644 --- a/var/spack/repos/builtin/packages/r-cellranger/package.py +++ b/var/spack/repos/builtin/packages/r-cellranger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCellranger(RPackage): diff --git a/var/spack/repos/builtin/packages/r-champ/package.py b/var/spack/repos/builtin/packages/r-champ/package.py index d94d84c257..ec9ed5724e 100644 --- a/var/spack/repos/builtin/packages/r-champ/package.py +++ b/var/spack/repos/builtin/packages/r-champ/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RChamp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-champdata/package.py b/var/spack/repos/builtin/packages/r-champdata/package.py index b6cb7ddfa0..95ea37c1ef 100644 --- a/var/spack/repos/builtin/packages/r-champdata/package.py +++ b/var/spack/repos/builtin/packages/r-champdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RChampdata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-checkmate/package.py b/var/spack/repos/builtin/packages/r-checkmate/package.py index 4ec0a37f38..d35d7c7633 100644 --- a/var/spack/repos/builtin/packages/r-checkmate/package.py +++ b/var/spack/repos/builtin/packages/r-checkmate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCheckmate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-checkpoint/package.py b/var/spack/repos/builtin/packages/r-checkpoint/package.py index b12dce32e0..706926b798 100644 --- a/var/spack/repos/builtin/packages/r-checkpoint/package.py +++ b/var/spack/repos/builtin/packages/r-checkpoint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCheckpoint(RPackage): diff --git a/var/spack/repos/builtin/packages/r-chemometrics/package.py b/var/spack/repos/builtin/packages/r-chemometrics/package.py index a757e9b7a5..424d10cabf 100644 --- a/var/spack/repos/builtin/packages/r-chemometrics/package.py +++ b/var/spack/repos/builtin/packages/r-chemometrics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RChemometrics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-chipseq/package.py b/var/spack/repos/builtin/packages/r-chipseq/package.py index 217297ef3b..fcda046de5 100644 --- a/var/spack/repos/builtin/packages/r-chipseq/package.py +++ b/var/spack/repos/builtin/packages/r-chipseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RChipseq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-chron/package.py b/var/spack/repos/builtin/packages/r-chron/package.py index 96a3b2c67f..0c78ce8c2f 100644 --- a/var/spack/repos/builtin/packages/r-chron/package.py +++ b/var/spack/repos/builtin/packages/r-chron/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RChron(RPackage): diff --git a/var/spack/repos/builtin/packages/r-circlize/package.py b/var/spack/repos/builtin/packages/r-circlize/package.py index 3690f5610f..187dad174b 100644 --- a/var/spack/repos/builtin/packages/r-circlize/package.py +++ b/var/spack/repos/builtin/packages/r-circlize/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCirclize(RPackage): diff --git a/var/spack/repos/builtin/packages/r-circstats/package.py b/var/spack/repos/builtin/packages/r-circstats/package.py index 721165372a..9a77662492 100644 --- a/var/spack/repos/builtin/packages/r-circstats/package.py +++ b/var/spack/repos/builtin/packages/r-circstats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCircstats(RPackage): diff --git a/var/spack/repos/builtin/packages/r-class/package.py b/var/spack/repos/builtin/packages/r-class/package.py index 771d4b5fac..5dfd354bed 100644 --- a/var/spack/repos/builtin/packages/r-class/package.py +++ b/var/spack/repos/builtin/packages/r-class/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RClass(RPackage): diff --git a/var/spack/repos/builtin/packages/r-classint/package.py b/var/spack/repos/builtin/packages/r-classint/package.py index 75bf07e5ca..1385661b15 100644 --- a/var/spack/repos/builtin/packages/r-classint/package.py +++ b/var/spack/repos/builtin/packages/r-classint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RClassint(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cli/package.py b/var/spack/repos/builtin/packages/r-cli/package.py index c4e84ee483..a7bead40c1 100644 --- a/var/spack/repos/builtin/packages/r-cli/package.py +++ b/var/spack/repos/builtin/packages/r-cli/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCli(RPackage): diff --git a/var/spack/repos/builtin/packages/r-clipr/package.py b/var/spack/repos/builtin/packages/r-clipr/package.py index 7ab04944d7..53a3e4af58 100644 --- a/var/spack/repos/builtin/packages/r-clipr/package.py +++ b/var/spack/repos/builtin/packages/r-clipr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RClipr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-clisymbols/package.py b/var/spack/repos/builtin/packages/r-clisymbols/package.py index d51c0d8560..acd28952ad 100644 --- a/var/spack/repos/builtin/packages/r-clisymbols/package.py +++ b/var/spack/repos/builtin/packages/r-clisymbols/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RClisymbols(RPackage): diff --git a/var/spack/repos/builtin/packages/r-clue/package.py b/var/spack/repos/builtin/packages/r-clue/package.py index 41392115ff..1d143768cc 100644 --- a/var/spack/repos/builtin/packages/r-clue/package.py +++ b/var/spack/repos/builtin/packages/r-clue/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RClue(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cluster/package.py b/var/spack/repos/builtin/packages/r-cluster/package.py index 839fc5315d..e6ff553821 100644 --- a/var/spack/repos/builtin/packages/r-cluster/package.py +++ b/var/spack/repos/builtin/packages/r-cluster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCluster(RPackage): diff --git a/var/spack/repos/builtin/packages/r-clustergeneration/package.py b/var/spack/repos/builtin/packages/r-clustergeneration/package.py index 6f862881a2..2887f7b12e 100644 --- a/var/spack/repos/builtin/packages/r-clustergeneration/package.py +++ b/var/spack/repos/builtin/packages/r-clustergeneration/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RClustergeneration(RPackage): diff --git a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py index 135696279a..3f3a0e0f51 100644 --- a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py +++ b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RClusterprofiler(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cner/package.py b/var/spack/repos/builtin/packages/r-cner/package.py index 04e65f0576..220bbd8ea7 100644 --- a/var/spack/repos/builtin/packages/r-cner/package.py +++ b/var/spack/repos/builtin/packages/r-cner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCner(RPackage): diff --git a/var/spack/repos/builtin/packages/r-coda/package.py b/var/spack/repos/builtin/packages/r-coda/package.py index dcb4439506..9b291fcb36 100644 --- a/var/spack/repos/builtin/packages/r-coda/package.py +++ b/var/spack/repos/builtin/packages/r-coda/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCoda(RPackage): diff --git a/var/spack/repos/builtin/packages/r-codetools/package.py b/var/spack/repos/builtin/packages/r-codetools/package.py index 46b52d3429..b049407a2e 100644 --- a/var/spack/repos/builtin/packages/r-codetools/package.py +++ b/var/spack/repos/builtin/packages/r-codetools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCodetools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-codex/package.py b/var/spack/repos/builtin/packages/r-codex/package.py index 465796e1f9..602af52c61 100644 --- a/var/spack/repos/builtin/packages/r-codex/package.py +++ b/var/spack/repos/builtin/packages/r-codex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCodex(RPackage): diff --git a/var/spack/repos/builtin/packages/r-coin/package.py b/var/spack/repos/builtin/packages/r-coin/package.py index 5892ed16be..e814b57247 100644 --- a/var/spack/repos/builtin/packages/r-coin/package.py +++ b/var/spack/repos/builtin/packages/r-coin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCoin(RPackage): diff --git a/var/spack/repos/builtin/packages/r-colorspace/package.py b/var/spack/repos/builtin/packages/r-colorspace/package.py index 85e19c6851..81ec52fb40 100644 --- a/var/spack/repos/builtin/packages/r-colorspace/package.py +++ b/var/spack/repos/builtin/packages/r-colorspace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RColorspace(RPackage): diff --git a/var/spack/repos/builtin/packages/r-colourpicker/package.py b/var/spack/repos/builtin/packages/r-colourpicker/package.py index 0e8d2d507f..0a9b872906 100644 --- a/var/spack/repos/builtin/packages/r-colourpicker/package.py +++ b/var/spack/repos/builtin/packages/r-colourpicker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RColourpicker(RPackage): diff --git a/var/spack/repos/builtin/packages/r-combinat/package.py b/var/spack/repos/builtin/packages/r-combinat/package.py index 2baae0b0cf..f29947c9a4 100644 --- a/var/spack/repos/builtin/packages/r-combinat/package.py +++ b/var/spack/repos/builtin/packages/r-combinat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCombinat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-commonmark/package.py b/var/spack/repos/builtin/packages/r-commonmark/package.py index 0c7fa616bd..e0b6d9a9e1 100644 --- a/var/spack/repos/builtin/packages/r-commonmark/package.py +++ b/var/spack/repos/builtin/packages/r-commonmark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCommonmark(RPackage): diff --git a/var/spack/repos/builtin/packages/r-complexheatmap/package.py b/var/spack/repos/builtin/packages/r-complexheatmap/package.py index ab51443b52..59d902e7dc 100644 --- a/var/spack/repos/builtin/packages/r-complexheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-complexheatmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RComplexheatmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-compositions/package.py b/var/spack/repos/builtin/packages/r-compositions/package.py index 5e2aaf562b..4bbe3c44c2 100644 --- a/var/spack/repos/builtin/packages/r-compositions/package.py +++ b/var/spack/repos/builtin/packages/r-compositions/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCompositions(RPackage): diff --git a/var/spack/repos/builtin/packages/r-compquadform/package.py b/var/spack/repos/builtin/packages/r-compquadform/package.py index 137359af80..fee53c6ffb 100644 --- a/var/spack/repos/builtin/packages/r-compquadform/package.py +++ b/var/spack/repos/builtin/packages/r-compquadform/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCompquadform(RPackage): diff --git a/var/spack/repos/builtin/packages/r-condop/package.py b/var/spack/repos/builtin/packages/r-condop/package.py index a7935b2c95..15b93bca91 100644 --- a/var/spack/repos/builtin/packages/r-condop/package.py +++ b/var/spack/repos/builtin/packages/r-condop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCondop(RPackage): diff --git a/var/spack/repos/builtin/packages/r-conquer/package.py b/var/spack/repos/builtin/packages/r-conquer/package.py index 0820d1e795..d46abbbb1f 100644 --- a/var/spack/repos/builtin/packages/r-conquer/package.py +++ b/var/spack/repos/builtin/packages/r-conquer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RConquer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-construct/package.py b/var/spack/repos/builtin/packages/r-construct/package.py index fa1a631f0e..414e2482df 100644 --- a/var/spack/repos/builtin/packages/r-construct/package.py +++ b/var/spack/repos/builtin/packages/r-construct/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RConstruct(RPackage): diff --git a/var/spack/repos/builtin/packages/r-convevol/package.py b/var/spack/repos/builtin/packages/r-convevol/package.py index 081c478ed7..3224459745 100644 --- a/var/spack/repos/builtin/packages/r-convevol/package.py +++ b/var/spack/repos/builtin/packages/r-convevol/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RConvevol(RPackage): diff --git a/var/spack/repos/builtin/packages/r-copula/package.py b/var/spack/repos/builtin/packages/r-copula/package.py index 1cfb22e1aa..fa0cd6abba 100644 --- a/var/spack/repos/builtin/packages/r-copula/package.py +++ b/var/spack/repos/builtin/packages/r-copula/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCopula(RPackage): diff --git a/var/spack/repos/builtin/packages/r-corhmm/package.py b/var/spack/repos/builtin/packages/r-corhmm/package.py index ed7200541e..ec747348da 100644 --- a/var/spack/repos/builtin/packages/r-corhmm/package.py +++ b/var/spack/repos/builtin/packages/r-corhmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCorhmm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-corpcor/package.py b/var/spack/repos/builtin/packages/r-corpcor/package.py index 631917e976..a80dc49926 100644 --- a/var/spack/repos/builtin/packages/r-corpcor/package.py +++ b/var/spack/repos/builtin/packages/r-corpcor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCorpcor(RPackage): diff --git a/var/spack/repos/builtin/packages/r-corrplot/package.py b/var/spack/repos/builtin/packages/r-corrplot/package.py index 25649c9cb5..6c3a0fcfe3 100644 --- a/var/spack/repos/builtin/packages/r-corrplot/package.py +++ b/var/spack/repos/builtin/packages/r-corrplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCorrplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-countrycode/package.py b/var/spack/repos/builtin/packages/r-countrycode/package.py index 0d7b8421c0..7edded4ebe 100644 --- a/var/spack/repos/builtin/packages/r-countrycode/package.py +++ b/var/spack/repos/builtin/packages/r-countrycode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCountrycode(RPackage): diff --git a/var/spack/repos/builtin/packages/r-covr/package.py b/var/spack/repos/builtin/packages/r-covr/package.py index 511d5c9f2c..821a25c0bc 100644 --- a/var/spack/repos/builtin/packages/r-covr/package.py +++ b/var/spack/repos/builtin/packages/r-covr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCovr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cowplot/package.py b/var/spack/repos/builtin/packages/r-cowplot/package.py index 5de2356912..2e906915b3 100644 --- a/var/spack/repos/builtin/packages/r-cowplot/package.py +++ b/var/spack/repos/builtin/packages/r-cowplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCowplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cpp11/package.py b/var/spack/repos/builtin/packages/r-cpp11/package.py index b66d6d0a01..e4dd68b46a 100644 --- a/var/spack/repos/builtin/packages/r-cpp11/package.py +++ b/var/spack/repos/builtin/packages/r-cpp11/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCpp11(RPackage): diff --git a/var/spack/repos/builtin/packages/r-crayon/package.py b/var/spack/repos/builtin/packages/r-crayon/package.py index 060e073de7..c6b7ce3a10 100644 --- a/var/spack/repos/builtin/packages/r-crayon/package.py +++ b/var/spack/repos/builtin/packages/r-crayon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCrayon(RPackage): diff --git a/var/spack/repos/builtin/packages/r-credentials/package.py b/var/spack/repos/builtin/packages/r-credentials/package.py index 4f4b67f4e5..b29391d17b 100644 --- a/var/spack/repos/builtin/packages/r-credentials/package.py +++ b/var/spack/repos/builtin/packages/r-credentials/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCredentials(RPackage): diff --git a/var/spack/repos/builtin/packages/r-crosstalk/package.py b/var/spack/repos/builtin/packages/r-crosstalk/package.py index 719d018f1f..4746c10858 100644 --- a/var/spack/repos/builtin/packages/r-crosstalk/package.py +++ b/var/spack/repos/builtin/packages/r-crosstalk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCrosstalk(RPackage): diff --git a/var/spack/repos/builtin/packages/r-crul/package.py b/var/spack/repos/builtin/packages/r-crul/package.py index fa8b4dc2a7..e9b1b3dae6 100644 --- a/var/spack/repos/builtin/packages/r-crul/package.py +++ b/var/spack/repos/builtin/packages/r-crul/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCrul(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ctc/package.py b/var/spack/repos/builtin/packages/r-ctc/package.py index 6e33b7cf0e..6d0e585c46 100644 --- a/var/spack/repos/builtin/packages/r-ctc/package.py +++ b/var/spack/repos/builtin/packages/r-ctc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCtc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cubature/package.py b/var/spack/repos/builtin/packages/r-cubature/package.py index 19747e7113..aa1db67710 100644 --- a/var/spack/repos/builtin/packages/r-cubature/package.py +++ b/var/spack/repos/builtin/packages/r-cubature/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCubature(RPackage): diff --git a/var/spack/repos/builtin/packages/r-cubist/package.py b/var/spack/repos/builtin/packages/r-cubist/package.py index 4b6927cfbe..d717860035 100644 --- a/var/spack/repos/builtin/packages/r-cubist/package.py +++ b/var/spack/repos/builtin/packages/r-cubist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCubist(RPackage): diff --git a/var/spack/repos/builtin/packages/r-curl/package.py b/var/spack/repos/builtin/packages/r-curl/package.py index c94b24d213..ffd4dac220 100644 --- a/var/spack/repos/builtin/packages/r-curl/package.py +++ b/var/spack/repos/builtin/packages/r-curl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RCurl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dada2/package.py b/var/spack/repos/builtin/packages/r-dada2/package.py index a9fb43ee37..7f1667015e 100644 --- a/var/spack/repos/builtin/packages/r-dada2/package.py +++ b/var/spack/repos/builtin/packages/r-dada2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDada2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-data-table/package.py b/var/spack/repos/builtin/packages/r-data-table/package.py index 1f7ee72aa2..8c45caa4cf 100644 --- a/var/spack/repos/builtin/packages/r-data-table/package.py +++ b/var/spack/repos/builtin/packages/r-data-table/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDataTable(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dbi/package.py b/var/spack/repos/builtin/packages/r-dbi/package.py index 71ecf51cfe..4511ee86f2 100644 --- a/var/spack/repos/builtin/packages/r-dbi/package.py +++ b/var/spack/repos/builtin/packages/r-dbi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDbi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dbplyr/package.py b/var/spack/repos/builtin/packages/r-dbplyr/package.py index 7728f420ae..5e1f0824eb 100644 --- a/var/spack/repos/builtin/packages/r-dbplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dbplyr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDbplyr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-debugme/package.py b/var/spack/repos/builtin/packages/r-debugme/package.py index 28dbdb67b4..89650a0a8f 100644 --- a/var/spack/repos/builtin/packages/r-debugme/package.py +++ b/var/spack/repos/builtin/packages/r-debugme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDebugme(RPackage): diff --git a/var/spack/repos/builtin/packages/r-decipher/package.py b/var/spack/repos/builtin/packages/r-decipher/package.py index a467980784..03a6d2429d 100644 --- a/var/spack/repos/builtin/packages/r-decipher/package.py +++ b/var/spack/repos/builtin/packages/r-decipher/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDecipher(RPackage): diff --git a/var/spack/repos/builtin/packages/r-delayedarray/package.py b/var/spack/repos/builtin/packages/r-delayedarray/package.py index 817dde0e7e..51a3a65e88 100644 --- a/var/spack/repos/builtin/packages/r-delayedarray/package.py +++ b/var/spack/repos/builtin/packages/r-delayedarray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDelayedarray(RPackage): diff --git a/var/spack/repos/builtin/packages/r-delayedmatrixstats/package.py b/var/spack/repos/builtin/packages/r-delayedmatrixstats/package.py index a5f108a0e5..767b9b2d2d 100644 --- a/var/spack/repos/builtin/packages/r-delayedmatrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-delayedmatrixstats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDelayedmatrixstats(RPackage): diff --git a/var/spack/repos/builtin/packages/r-deldir/package.py b/var/spack/repos/builtin/packages/r-deldir/package.py index 7fe64faaee..253612a7e0 100644 --- a/var/spack/repos/builtin/packages/r-deldir/package.py +++ b/var/spack/repos/builtin/packages/r-deldir/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDeldir(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dendextend/package.py b/var/spack/repos/builtin/packages/r-dendextend/package.py index 1210c24e0a..e4b98b4d92 100644 --- a/var/spack/repos/builtin/packages/r-dendextend/package.py +++ b/var/spack/repos/builtin/packages/r-dendextend/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDendextend(RPackage): diff --git a/var/spack/repos/builtin/packages/r-deoptim/package.py b/var/spack/repos/builtin/packages/r-deoptim/package.py index c5bbabaf2d..2190ed1801 100644 --- a/var/spack/repos/builtin/packages/r-deoptim/package.py +++ b/var/spack/repos/builtin/packages/r-deoptim/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDeoptim(RPackage): diff --git a/var/spack/repos/builtin/packages/r-deoptimr/package.py b/var/spack/repos/builtin/packages/r-deoptimr/package.py index 13e24dc92a..97e87a15bc 100644 --- a/var/spack/repos/builtin/packages/r-deoptimr/package.py +++ b/var/spack/repos/builtin/packages/r-deoptimr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDeoptimr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-deriv/package.py b/var/spack/repos/builtin/packages/r-deriv/package.py index 7af74312a1..bd7aa64169 100644 --- a/var/spack/repos/builtin/packages/r-deriv/package.py +++ b/var/spack/repos/builtin/packages/r-deriv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDeriv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-desc/package.py b/var/spack/repos/builtin/packages/r-desc/package.py index 23291f795c..53c1d918d4 100644 --- a/var/spack/repos/builtin/packages/r-desc/package.py +++ b/var/spack/repos/builtin/packages/r-desc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDesc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-deseq/package.py b/var/spack/repos/builtin/packages/r-deseq/package.py index 11078e9273..801c2eb85f 100644 --- a/var/spack/repos/builtin/packages/r-deseq/package.py +++ b/var/spack/repos/builtin/packages/r-deseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDeseq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-deseq2/package.py b/var/spack/repos/builtin/packages/r-deseq2/package.py index 0bc46c04bb..22a0608a48 100644 --- a/var/spack/repos/builtin/packages/r-deseq2/package.py +++ b/var/spack/repos/builtin/packages/r-deseq2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDeseq2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-desolve/package.py b/var/spack/repos/builtin/packages/r-desolve/package.py index 841bf43709..00426d68e7 100644 --- a/var/spack/repos/builtin/packages/r-desolve/package.py +++ b/var/spack/repos/builtin/packages/r-desolve/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDesolve(RPackage): diff --git a/var/spack/repos/builtin/packages/r-devtools/package.py b/var/spack/repos/builtin/packages/r-devtools/package.py index 70843d32d0..48b5ac90a5 100644 --- a/var/spack/repos/builtin/packages/r-devtools/package.py +++ b/var/spack/repos/builtin/packages/r-devtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDevtools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dexseq/package.py b/var/spack/repos/builtin/packages/r-dexseq/package.py index b7e0da0ec8..c04d14a68a 100644 --- a/var/spack/repos/builtin/packages/r-dexseq/package.py +++ b/var/spack/repos/builtin/packages/r-dexseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDexseq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-diagrammer/package.py b/var/spack/repos/builtin/packages/r-diagrammer/package.py index 564921f466..c67d442258 100644 --- a/var/spack/repos/builtin/packages/r-diagrammer/package.py +++ b/var/spack/repos/builtin/packages/r-diagrammer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDiagrammer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dicekriging/package.py b/var/spack/repos/builtin/packages/r-dicekriging/package.py index 7ebf99fe7a..3cc4c9b83a 100644 --- a/var/spack/repos/builtin/packages/r-dicekriging/package.py +++ b/var/spack/repos/builtin/packages/r-dicekriging/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDicekriging(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dichromat/package.py b/var/spack/repos/builtin/packages/r-dichromat/package.py index 2163758ae5..be700d02ce 100644 --- a/var/spack/repos/builtin/packages/r-dichromat/package.py +++ b/var/spack/repos/builtin/packages/r-dichromat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDichromat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-diffobj/package.py b/var/spack/repos/builtin/packages/r-diffobj/package.py index 81e5f746dd..23ce2eccce 100644 --- a/var/spack/repos/builtin/packages/r-diffobj/package.py +++ b/var/spack/repos/builtin/packages/r-diffobj/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDiffobj(RPackage): diff --git a/var/spack/repos/builtin/packages/r-diffusionmap/package.py b/var/spack/repos/builtin/packages/r-diffusionmap/package.py index 20cf3ccd5b..5eacec35ff 100644 --- a/var/spack/repos/builtin/packages/r-diffusionmap/package.py +++ b/var/spack/repos/builtin/packages/r-diffusionmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDiffusionmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-digest/package.py b/var/spack/repos/builtin/packages/r-digest/package.py index d9bbadf287..0f5772b0ef 100644 --- a/var/spack/repos/builtin/packages/r-digest/package.py +++ b/var/spack/repos/builtin/packages/r-digest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDigest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-diptest/package.py b/var/spack/repos/builtin/packages/r-diptest/package.py index 7c467d8d73..7da943d8b7 100644 --- a/var/spack/repos/builtin/packages/r-diptest/package.py +++ b/var/spack/repos/builtin/packages/r-diptest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDiptest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py index 7377756b9c..b436ebc408 100644 --- a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py +++ b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDirichletmultinomial(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dismo/package.py b/var/spack/repos/builtin/packages/r-dismo/package.py index d1c3ef1c01..aebd306a06 100644 --- a/var/spack/repos/builtin/packages/r-dismo/package.py +++ b/var/spack/repos/builtin/packages/r-dismo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDismo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-distributional/package.py b/var/spack/repos/builtin/packages/r-distributional/package.py index 5ea286b4c5..b4058af4f1 100644 --- a/var/spack/repos/builtin/packages/r-distributional/package.py +++ b/var/spack/repos/builtin/packages/r-distributional/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDistributional(RPackage): diff --git a/var/spack/repos/builtin/packages/r-diversitree/package.py b/var/spack/repos/builtin/packages/r-diversitree/package.py index d652343aa9..b8508efda8 100644 --- a/var/spack/repos/builtin/packages/r-diversitree/package.py +++ b/var/spack/repos/builtin/packages/r-diversitree/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDiversitree(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dmrcate/package.py b/var/spack/repos/builtin/packages/r-dmrcate/package.py index 86a228a807..a1ee79369b 100644 --- a/var/spack/repos/builtin/packages/r-dmrcate/package.py +++ b/var/spack/repos/builtin/packages/r-dmrcate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDmrcate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dnacopy/package.py b/var/spack/repos/builtin/packages/r-dnacopy/package.py index 5f860f1088..5802a82266 100644 --- a/var/spack/repos/builtin/packages/r-dnacopy/package.py +++ b/var/spack/repos/builtin/packages/r-dnacopy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDnacopy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-do-db/package.py b/var/spack/repos/builtin/packages/r-do-db/package.py index bb49023bed..292205e6fe 100644 --- a/var/spack/repos/builtin/packages/r-do-db/package.py +++ b/var/spack/repos/builtin/packages/r-do-db/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDoDb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-domc/package.py b/var/spack/repos/builtin/packages/r-domc/package.py index c769940bcd..a1d18dc947 100644 --- a/var/spack/repos/builtin/packages/r-domc/package.py +++ b/var/spack/repos/builtin/packages/r-domc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDomc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-doparallel/package.py b/var/spack/repos/builtin/packages/r-doparallel/package.py index 0a203c5da5..8853387558 100644 --- a/var/spack/repos/builtin/packages/r-doparallel/package.py +++ b/var/spack/repos/builtin/packages/r-doparallel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDoparallel(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dorng/package.py b/var/spack/repos/builtin/packages/r-dorng/package.py index 0ebace01c8..c445a226cd 100644 --- a/var/spack/repos/builtin/packages/r-dorng/package.py +++ b/var/spack/repos/builtin/packages/r-dorng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDorng(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dose/package.py b/var/spack/repos/builtin/packages/r-dose/package.py index 43ef1af519..4e11126611 100644 --- a/var/spack/repos/builtin/packages/r-dose/package.py +++ b/var/spack/repos/builtin/packages/r-dose/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDose(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dosnow/package.py b/var/spack/repos/builtin/packages/r-dosnow/package.py index c903dccdf6..3e62dae875 100644 --- a/var/spack/repos/builtin/packages/r-dosnow/package.py +++ b/var/spack/repos/builtin/packages/r-dosnow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDosnow(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dotcall64/package.py b/var/spack/repos/builtin/packages/r-dotcall64/package.py index 72a1dc799d..dd5eb33551 100644 --- a/var/spack/repos/builtin/packages/r-dotcall64/package.py +++ b/var/spack/repos/builtin/packages/r-dotcall64/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDotcall64(RPackage): diff --git a/var/spack/repos/builtin/packages/r-downloader/package.py b/var/spack/repos/builtin/packages/r-downloader/package.py index 8fc18c6715..e58531a350 100644 --- a/var/spack/repos/builtin/packages/r-downloader/package.py +++ b/var/spack/repos/builtin/packages/r-downloader/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDownloader(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index 3ea6b5d5ac..25d61c125f 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDplyr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dqrng/package.py b/var/spack/repos/builtin/packages/r-dqrng/package.py index 9fbbfc7b17..18047e0e68 100644 --- a/var/spack/repos/builtin/packages/r-dqrng/package.py +++ b/var/spack/repos/builtin/packages/r-dqrng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDqrng(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dss/package.py b/var/spack/repos/builtin/packages/r-dss/package.py index 666509197b..266571a0b1 100644 --- a/var/spack/repos/builtin/packages/r-dss/package.py +++ b/var/spack/repos/builtin/packages/r-dss/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDss(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dt/package.py b/var/spack/repos/builtin/packages/r-dt/package.py index f0e0e0d9d5..7595c0f185 100644 --- a/var/spack/repos/builtin/packages/r-dt/package.py +++ b/var/spack/repos/builtin/packages/r-dt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDt(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dtplyr/package.py b/var/spack/repos/builtin/packages/r-dtplyr/package.py index 73190bacc9..cc1fe59d86 100644 --- a/var/spack/repos/builtin/packages/r-dtplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dtplyr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDtplyr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dtw/package.py b/var/spack/repos/builtin/packages/r-dtw/package.py index 289406741c..44cffba3a0 100644 --- a/var/spack/repos/builtin/packages/r-dtw/package.py +++ b/var/spack/repos/builtin/packages/r-dtw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDtw(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dygraphs/package.py b/var/spack/repos/builtin/packages/r-dygraphs/package.py index c1354060a6..79ec3bf306 100644 --- a/var/spack/repos/builtin/packages/r-dygraphs/package.py +++ b/var/spack/repos/builtin/packages/r-dygraphs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDygraphs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-dynamictreecut/package.py b/var/spack/repos/builtin/packages/r-dynamictreecut/package.py index 8e9af85a2e..a8e77c3c95 100644 --- a/var/spack/repos/builtin/packages/r-dynamictreecut/package.py +++ b/var/spack/repos/builtin/packages/r-dynamictreecut/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RDynamictreecut(RPackage): diff --git a/var/spack/repos/builtin/packages/r-e1071/package.py b/var/spack/repos/builtin/packages/r-e1071/package.py index f215e14d4a..9ff36ac470 100644 --- a/var/spack/repos/builtin/packages/r-e1071/package.py +++ b/var/spack/repos/builtin/packages/r-e1071/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RE1071(RPackage): diff --git a/var/spack/repos/builtin/packages/r-earth/package.py b/var/spack/repos/builtin/packages/r-earth/package.py index 33f4f6ad06..8d81bc3b94 100644 --- a/var/spack/repos/builtin/packages/r-earth/package.py +++ b/var/spack/repos/builtin/packages/r-earth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REarth(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ecp/package.py b/var/spack/repos/builtin/packages/r-ecp/package.py index 55b7a72bc0..d483438d2e 100644 --- a/var/spack/repos/builtin/packages/r-ecp/package.py +++ b/var/spack/repos/builtin/packages/r-ecp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REcp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-edger/package.py b/var/spack/repos/builtin/packages/r-edger/package.py index 63506ad9e0..0b04cabdef 100644 --- a/var/spack/repos/builtin/packages/r-edger/package.py +++ b/var/spack/repos/builtin/packages/r-edger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REdger(RPackage): diff --git a/var/spack/repos/builtin/packages/r-effects/package.py b/var/spack/repos/builtin/packages/r-effects/package.py index 5a4e709f93..2783aec2a3 100644 --- a/var/spack/repos/builtin/packages/r-effects/package.py +++ b/var/spack/repos/builtin/packages/r-effects/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REffects(RPackage): diff --git a/var/spack/repos/builtin/packages/r-elemstatlearn/package.py b/var/spack/repos/builtin/packages/r-elemstatlearn/package.py index b540b01f0d..e5cbae0611 100644 --- a/var/spack/repos/builtin/packages/r-elemstatlearn/package.py +++ b/var/spack/repos/builtin/packages/r-elemstatlearn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RElemstatlearn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ellipse/package.py b/var/spack/repos/builtin/packages/r-ellipse/package.py index 1330270ffb..c27182d859 100644 --- a/var/spack/repos/builtin/packages/r-ellipse/package.py +++ b/var/spack/repos/builtin/packages/r-ellipse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REllipse(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ellipsis/package.py b/var/spack/repos/builtin/packages/r-ellipsis/package.py index d2d72d427b..bb9d46f3e8 100644 --- a/var/spack/repos/builtin/packages/r-ellipsis/package.py +++ b/var/spack/repos/builtin/packages/r-ellipsis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REllipsis(RPackage): diff --git a/var/spack/repos/builtin/packages/r-emmeans/package.py b/var/spack/repos/builtin/packages/r-emmeans/package.py index 579eca19c4..c9cd071621 100644 --- a/var/spack/repos/builtin/packages/r-emmeans/package.py +++ b/var/spack/repos/builtin/packages/r-emmeans/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REmmeans(RPackage): diff --git a/var/spack/repos/builtin/packages/r-emmli/package.py b/var/spack/repos/builtin/packages/r-emmli/package.py index 50c983c5fe..a30df95232 100644 --- a/var/spack/repos/builtin/packages/r-emmli/package.py +++ b/var/spack/repos/builtin/packages/r-emmli/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REmmli(RPackage): diff --git a/var/spack/repos/builtin/packages/r-energy/package.py b/var/spack/repos/builtin/packages/r-energy/package.py index 9147f72d20..7ed05d6814 100644 --- a/var/spack/repos/builtin/packages/r-energy/package.py +++ b/var/spack/repos/builtin/packages/r-energy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REnergy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-enrichplot/package.py b/var/spack/repos/builtin/packages/r-enrichplot/package.py index bee8538666..01adf64e87 100644 --- a/var/spack/repos/builtin/packages/r-enrichplot/package.py +++ b/var/spack/repos/builtin/packages/r-enrichplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REnrichplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ensembldb/package.py b/var/spack/repos/builtin/packages/r-ensembldb/package.py index 22605bb67d..2de8e6a9e4 100644 --- a/var/spack/repos/builtin/packages/r-ensembldb/package.py +++ b/var/spack/repos/builtin/packages/r-ensembldb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REnsembldb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-envstats/package.py b/var/spack/repos/builtin/packages/r-envstats/package.py index 3ed79ae904..21a2b1f9f7 100644 --- a/var/spack/repos/builtin/packages/r-envstats/package.py +++ b/var/spack/repos/builtin/packages/r-envstats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REnvstats(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ergm/package.py b/var/spack/repos/builtin/packages/r-ergm/package.py index ca1fcdb275..80798d4081 100644 --- a/var/spack/repos/builtin/packages/r-ergm/package.py +++ b/var/spack/repos/builtin/packages/r-ergm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RErgm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-estimability/package.py b/var/spack/repos/builtin/packages/r-estimability/package.py index 197c30a3de..a8f5eec781 100644 --- a/var/spack/repos/builtin/packages/r-estimability/package.py +++ b/var/spack/repos/builtin/packages/r-estimability/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REstimability(RPackage): diff --git a/var/spack/repos/builtin/packages/r-europepmc/package.py b/var/spack/repos/builtin/packages/r-europepmc/package.py index 1df85568be..5e2752e28a 100644 --- a/var/spack/repos/builtin/packages/r-europepmc/package.py +++ b/var/spack/repos/builtin/packages/r-europepmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REuropepmc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-evaluate/package.py b/var/spack/repos/builtin/packages/r-evaluate/package.py index 46a3a02229..f820461717 100644 --- a/var/spack/repos/builtin/packages/r-evaluate/package.py +++ b/var/spack/repos/builtin/packages/r-evaluate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REvaluate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-evd/package.py b/var/spack/repos/builtin/packages/r-evd/package.py index ff0f241efb..2f5dcd37fb 100644 --- a/var/spack/repos/builtin/packages/r-evd/package.py +++ b/var/spack/repos/builtin/packages/r-evd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class REvd(RPackage): diff --git a/var/spack/repos/builtin/packages/r-exactextractr/package.py b/var/spack/repos/builtin/packages/r-exactextractr/package.py index 425c6dc666..e522f5a302 100644 --- a/var/spack/repos/builtin/packages/r-exactextractr/package.py +++ b/var/spack/repos/builtin/packages/r-exactextractr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RExactextractr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-exomecopy/package.py b/var/spack/repos/builtin/packages/r-exomecopy/package.py index 9d2d5a74bf..dc6ee42e82 100644 --- a/var/spack/repos/builtin/packages/r-exomecopy/package.py +++ b/var/spack/repos/builtin/packages/r-exomecopy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RExomecopy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-exomedepth/package.py b/var/spack/repos/builtin/packages/r-exomedepth/package.py index a9064f2716..4a57e56269 100644 --- a/var/spack/repos/builtin/packages/r-exomedepth/package.py +++ b/var/spack/repos/builtin/packages/r-exomedepth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RExomedepth(RPackage): diff --git a/var/spack/repos/builtin/packages/r-experimenthub/package.py b/var/spack/repos/builtin/packages/r-experimenthub/package.py index a63002b205..0ec999a5c0 100644 --- a/var/spack/repos/builtin/packages/r-experimenthub/package.py +++ b/var/spack/repos/builtin/packages/r-experimenthub/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RExperimenthub(RPackage): diff --git a/var/spack/repos/builtin/packages/r-expint/package.py b/var/spack/repos/builtin/packages/r-expint/package.py index 7bbd6fc966..c332bf93b7 100644 --- a/var/spack/repos/builtin/packages/r-expint/package.py +++ b/var/spack/repos/builtin/packages/r-expint/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) # See the Spack documentation for more information on packaging. -from spack import * +from spack.package import * class RExpint(RPackage): diff --git a/var/spack/repos/builtin/packages/r-expm/package.py b/var/spack/repos/builtin/packages/r-expm/package.py index 082f4b28e8..2173387fdf 100644 --- a/var/spack/repos/builtin/packages/r-expm/package.py +++ b/var/spack/repos/builtin/packages/r-expm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RExpm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-factoextra/package.py b/var/spack/repos/builtin/packages/r-factoextra/package.py index 73225eb8a1..151cab505c 100644 --- a/var/spack/repos/builtin/packages/r-factoextra/package.py +++ b/var/spack/repos/builtin/packages/r-factoextra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFactoextra(RPackage): diff --git a/var/spack/repos/builtin/packages/r-factominer/package.py b/var/spack/repos/builtin/packages/r-factominer/package.py index 3a86f101ee..a099a8de9b 100644 --- a/var/spack/repos/builtin/packages/r-factominer/package.py +++ b/var/spack/repos/builtin/packages/r-factominer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFactominer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fansi/package.py b/var/spack/repos/builtin/packages/r-fansi/package.py index c92497a07f..25245b0cb9 100644 --- a/var/spack/repos/builtin/packages/r-fansi/package.py +++ b/var/spack/repos/builtin/packages/r-fansi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFansi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-farver/package.py b/var/spack/repos/builtin/packages/r-farver/package.py index 9ed8a3e02d..08d2adbe68 100644 --- a/var/spack/repos/builtin/packages/r-farver/package.py +++ b/var/spack/repos/builtin/packages/r-farver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFarver(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fastcluster/package.py b/var/spack/repos/builtin/packages/r-fastcluster/package.py index 40384bf80a..ba803824f5 100644 --- a/var/spack/repos/builtin/packages/r-fastcluster/package.py +++ b/var/spack/repos/builtin/packages/r-fastcluster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFastcluster(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fastdigest/package.py b/var/spack/repos/builtin/packages/r-fastdigest/package.py index 1b2610f949..b0a0bc7bbd 100644 --- a/var/spack/repos/builtin/packages/r-fastdigest/package.py +++ b/var/spack/repos/builtin/packages/r-fastdigest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFastdigest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fastica/package.py b/var/spack/repos/builtin/packages/r-fastica/package.py index c4ac788a25..a84f88e68d 100644 --- a/var/spack/repos/builtin/packages/r-fastica/package.py +++ b/var/spack/repos/builtin/packages/r-fastica/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFastica(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fastmap/package.py b/var/spack/repos/builtin/packages/r-fastmap/package.py index 4a68e9d0a4..5a38990f71 100644 --- a/var/spack/repos/builtin/packages/r-fastmap/package.py +++ b/var/spack/repos/builtin/packages/r-fastmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFastmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fastmatch/package.py b/var/spack/repos/builtin/packages/r-fastmatch/package.py index ae2e4cefdf..f07bb965af 100644 --- a/var/spack/repos/builtin/packages/r-fastmatch/package.py +++ b/var/spack/repos/builtin/packages/r-fastmatch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFastmatch(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fastmatrix/package.py b/var/spack/repos/builtin/packages/r-fastmatrix/package.py index 8cbc2401df..9310f8cfa2 100644 --- a/var/spack/repos/builtin/packages/r-fastmatrix/package.py +++ b/var/spack/repos/builtin/packages/r-fastmatrix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFastmatrix(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fda/package.py b/var/spack/repos/builtin/packages/r-fda/package.py index 6b22e264b0..b4a4b751c5 100644 --- a/var/spack/repos/builtin/packages/r-fda/package.py +++ b/var/spack/repos/builtin/packages/r-fda/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RFda(RPackage): """Functional Data Analysis. diff --git a/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg18/package.py b/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg18/package.py index a312f23c07..3480126107 100644 --- a/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg18/package.py +++ b/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg18/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFdbInfiniummethylationHg18(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg19/package.py b/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg19/package.py index 07d91ead8f..da8ff58bf8 100644 --- a/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg19/package.py +++ b/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg19/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFdbInfiniummethylationHg19(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fds/package.py b/var/spack/repos/builtin/packages/r-fds/package.py index 052d1c1e05..e4924c061c 100644 --- a/var/spack/repos/builtin/packages/r-fds/package.py +++ b/var/spack/repos/builtin/packages/r-fds/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RFds(RPackage): """Functional data sets.""" diff --git a/var/spack/repos/builtin/packages/r-ff/package.py b/var/spack/repos/builtin/packages/r-ff/package.py index 51e012e40a..dc07b73e14 100644 --- a/var/spack/repos/builtin/packages/r-ff/package.py +++ b/var/spack/repos/builtin/packages/r-ff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFf(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fftwtools/package.py b/var/spack/repos/builtin/packages/r-fftwtools/package.py index a5595e07f8..8c09a9d2f0 100644 --- a/var/spack/repos/builtin/packages/r-fftwtools/package.py +++ b/var/spack/repos/builtin/packages/r-fftwtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFftwtools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fgsea/package.py b/var/spack/repos/builtin/packages/r-fgsea/package.py index 9722ed89ce..3bf7e9248b 100644 --- a/var/spack/repos/builtin/packages/r-fgsea/package.py +++ b/var/spack/repos/builtin/packages/r-fgsea/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFgsea(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fields/package.py b/var/spack/repos/builtin/packages/r-fields/package.py index bbb38ed793..5bbebabfed 100644 --- a/var/spack/repos/builtin/packages/r-fields/package.py +++ b/var/spack/repos/builtin/packages/r-fields/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFields(RPackage): diff --git a/var/spack/repos/builtin/packages/r-filehash/package.py b/var/spack/repos/builtin/packages/r-filehash/package.py index b9ec258173..ab59a33946 100644 --- a/var/spack/repos/builtin/packages/r-filehash/package.py +++ b/var/spack/repos/builtin/packages/r-filehash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFilehash(RPackage): diff --git a/var/spack/repos/builtin/packages/r-filelock/package.py b/var/spack/repos/builtin/packages/r-filelock/package.py index 552a3fd654..107ebf51d6 100644 --- a/var/spack/repos/builtin/packages/r-filelock/package.py +++ b/var/spack/repos/builtin/packages/r-filelock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFilelock(RPackage): diff --git a/var/spack/repos/builtin/packages/r-findpython/package.py b/var/spack/repos/builtin/packages/r-findpython/package.py index 516cc65f1b..c189e9c081 100644 --- a/var/spack/repos/builtin/packages/r-findpython/package.py +++ b/var/spack/repos/builtin/packages/r-findpython/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFindpython(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fit-models/package.py b/var/spack/repos/builtin/packages/r-fit-models/package.py index 85933ca59b..f6ff8057d5 100644 --- a/var/spack/repos/builtin/packages/r-fit-models/package.py +++ b/var/spack/repos/builtin/packages/r-fit-models/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFitModels(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fitdistrplus/package.py b/var/spack/repos/builtin/packages/r-fitdistrplus/package.py index 5d21466bb4..f41fe7584a 100644 --- a/var/spack/repos/builtin/packages/r-fitdistrplus/package.py +++ b/var/spack/repos/builtin/packages/r-fitdistrplus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFitdistrplus(RPackage): diff --git a/var/spack/repos/builtin/packages/r-flashclust/package.py b/var/spack/repos/builtin/packages/r-flashclust/package.py index ceb4be7663..2d13e5f806 100644 --- a/var/spack/repos/builtin/packages/r-flashclust/package.py +++ b/var/spack/repos/builtin/packages/r-flashclust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFlashclust(RPackage): diff --git a/var/spack/repos/builtin/packages/r-flexclust/package.py b/var/spack/repos/builtin/packages/r-flexclust/package.py index 04d86bc306..0695fdb3e5 100644 --- a/var/spack/repos/builtin/packages/r-flexclust/package.py +++ b/var/spack/repos/builtin/packages/r-flexclust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFlexclust(RPackage): diff --git a/var/spack/repos/builtin/packages/r-flexmix/package.py b/var/spack/repos/builtin/packages/r-flexmix/package.py index 3aebc2812b..2af6ff2032 100644 --- a/var/spack/repos/builtin/packages/r-flexmix/package.py +++ b/var/spack/repos/builtin/packages/r-flexmix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFlexmix(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fnn/package.py b/var/spack/repos/builtin/packages/r-fnn/package.py index f54d5f881b..0ec946e921 100644 --- a/var/spack/repos/builtin/packages/r-fnn/package.py +++ b/var/spack/repos/builtin/packages/r-fnn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFnn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fontawesome/package.py b/var/spack/repos/builtin/packages/r-fontawesome/package.py index 0e3672d429..c2ed812beb 100644 --- a/var/spack/repos/builtin/packages/r-fontawesome/package.py +++ b/var/spack/repos/builtin/packages/r-fontawesome/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFontawesome(RPackage): diff --git a/var/spack/repos/builtin/packages/r-forcats/package.py b/var/spack/repos/builtin/packages/r-forcats/package.py index 2aa1cbd379..2478eca0b5 100644 --- a/var/spack/repos/builtin/packages/r-forcats/package.py +++ b/var/spack/repos/builtin/packages/r-forcats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RForcats(RPackage): diff --git a/var/spack/repos/builtin/packages/r-foreach/package.py b/var/spack/repos/builtin/packages/r-foreach/package.py index e26cb925b5..60b7b064be 100644 --- a/var/spack/repos/builtin/packages/r-foreach/package.py +++ b/var/spack/repos/builtin/packages/r-foreach/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RForeach(RPackage): diff --git a/var/spack/repos/builtin/packages/r-forecast/package.py b/var/spack/repos/builtin/packages/r-forecast/package.py index 77fdd9cc8d..28a1cfb0ce 100644 --- a/var/spack/repos/builtin/packages/r-forecast/package.py +++ b/var/spack/repos/builtin/packages/r-forecast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RForecast(RPackage): diff --git a/var/spack/repos/builtin/packages/r-foreign/package.py b/var/spack/repos/builtin/packages/r-foreign/package.py index 49bc58802a..769ee0d3e9 100644 --- a/var/spack/repos/builtin/packages/r-foreign/package.py +++ b/var/spack/repos/builtin/packages/r-foreign/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RForeign(RPackage): diff --git a/var/spack/repos/builtin/packages/r-formatr/package.py b/var/spack/repos/builtin/packages/r-formatr/package.py index c503293619..3d70213129 100644 --- a/var/spack/repos/builtin/packages/r-formatr/package.py +++ b/var/spack/repos/builtin/packages/r-formatr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFormatr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-formula/package.py b/var/spack/repos/builtin/packages/r-formula/package.py index 413cd61380..686b900aa8 100644 --- a/var/spack/repos/builtin/packages/r-formula/package.py +++ b/var/spack/repos/builtin/packages/r-formula/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFormula(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fpc/package.py b/var/spack/repos/builtin/packages/r-fpc/package.py index d5d626c31b..b23db8a720 100644 --- a/var/spack/repos/builtin/packages/r-fpc/package.py +++ b/var/spack/repos/builtin/packages/r-fpc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFpc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fpcompare/package.py b/var/spack/repos/builtin/packages/r-fpcompare/package.py index c1fe27160e..1140f1d0a3 100644 --- a/var/spack/repos/builtin/packages/r-fpcompare/package.py +++ b/var/spack/repos/builtin/packages/r-fpcompare/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFpcompare(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fracdiff/package.py b/var/spack/repos/builtin/packages/r-fracdiff/package.py index b87bad6255..4cc973dc3c 100644 --- a/var/spack/repos/builtin/packages/r-fracdiff/package.py +++ b/var/spack/repos/builtin/packages/r-fracdiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFracdiff(RPackage): diff --git a/var/spack/repos/builtin/packages/r-fs/package.py b/var/spack/repos/builtin/packages/r-fs/package.py index 1d90807c3c..73e4f925ef 100644 --- a/var/spack/repos/builtin/packages/r-fs/package.py +++ b/var/spack/repos/builtin/packages/r-fs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-futile-logger/package.py b/var/spack/repos/builtin/packages/r-futile-logger/package.py index ff9f032de1..28dca4714a 100644 --- a/var/spack/repos/builtin/packages/r-futile-logger/package.py +++ b/var/spack/repos/builtin/packages/r-futile-logger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFutileLogger(RPackage): diff --git a/var/spack/repos/builtin/packages/r-futile-options/package.py b/var/spack/repos/builtin/packages/r-futile-options/package.py index 4ee3ad1597..32d2587dbf 100644 --- a/var/spack/repos/builtin/packages/r-futile-options/package.py +++ b/var/spack/repos/builtin/packages/r-futile-options/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFutileOptions(RPackage): diff --git a/var/spack/repos/builtin/packages/r-future-apply/package.py b/var/spack/repos/builtin/packages/r-future-apply/package.py index 4ffc0d3c56..1ce9b47e6e 100644 --- a/var/spack/repos/builtin/packages/r-future-apply/package.py +++ b/var/spack/repos/builtin/packages/r-future-apply/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFutureApply(RPackage): diff --git a/var/spack/repos/builtin/packages/r-future/package.py b/var/spack/repos/builtin/packages/r-future/package.py index ad5d3d86fd..020cadeb8b 100644 --- a/var/spack/repos/builtin/packages/r-future/package.py +++ b/var/spack/repos/builtin/packages/r-future/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RFuture(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gamlss-data/package.py b/var/spack/repos/builtin/packages/r-gamlss-data/package.py index 7e97a46452..1c1d730db2 100644 --- a/var/spack/repos/builtin/packages/r-gamlss-data/package.py +++ b/var/spack/repos/builtin/packages/r-gamlss-data/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGamlssData(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gamlss-dist/package.py b/var/spack/repos/builtin/packages/r-gamlss-dist/package.py index 0cb7a58c6f..ae71c083e5 100644 --- a/var/spack/repos/builtin/packages/r-gamlss-dist/package.py +++ b/var/spack/repos/builtin/packages/r-gamlss-dist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGamlssDist(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gamlss/package.py b/var/spack/repos/builtin/packages/r-gamlss/package.py index c57b195ce4..b1291ddfaa 100644 --- a/var/spack/repos/builtin/packages/r-gamlss/package.py +++ b/var/spack/repos/builtin/packages/r-gamlss/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGamlss(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gamm4/package.py b/var/spack/repos/builtin/packages/r-gamm4/package.py index b8d76204f8..c9a6d205b0 100644 --- a/var/spack/repos/builtin/packages/r-gamm4/package.py +++ b/var/spack/repos/builtin/packages/r-gamm4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGamm4(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gargle/package.py b/var/spack/repos/builtin/packages/r-gargle/package.py index ac2afcc418..274b787ef2 100644 --- a/var/spack/repos/builtin/packages/r-gargle/package.py +++ b/var/spack/repos/builtin/packages/r-gargle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGargle(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gbm/package.py b/var/spack/repos/builtin/packages/r-gbm/package.py index 516971bcc5..b8bab0b528 100644 --- a/var/spack/repos/builtin/packages/r-gbm/package.py +++ b/var/spack/repos/builtin/packages/r-gbm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGbm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gbrd/package.py b/var/spack/repos/builtin/packages/r-gbrd/package.py index e2bd9a42c4..8f1ce0d672 100644 --- a/var/spack/repos/builtin/packages/r-gbrd/package.py +++ b/var/spack/repos/builtin/packages/r-gbrd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGbrd(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gcrma/package.py b/var/spack/repos/builtin/packages/r-gcrma/package.py index 7540ffa53c..edc10e7b84 100644 --- a/var/spack/repos/builtin/packages/r-gcrma/package.py +++ b/var/spack/repos/builtin/packages/r-gcrma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGcrma(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gdalutilities/package.py b/var/spack/repos/builtin/packages/r-gdalutilities/package.py index 154299fce1..249942e869 100644 --- a/var/spack/repos/builtin/packages/r-gdalutilities/package.py +++ b/var/spack/repos/builtin/packages/r-gdalutilities/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGdalutilities(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gdalutils/package.py b/var/spack/repos/builtin/packages/r-gdalutils/package.py index f6d30c4360..e0c4ee775f 100644 --- a/var/spack/repos/builtin/packages/r-gdalutils/package.py +++ b/var/spack/repos/builtin/packages/r-gdalutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGdalutils(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gdata/package.py b/var/spack/repos/builtin/packages/r-gdata/package.py index b336dbb3cf..018561f277 100644 --- a/var/spack/repos/builtin/packages/r-gdata/package.py +++ b/var/spack/repos/builtin/packages/r-gdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGdata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gdsfmt/package.py b/var/spack/repos/builtin/packages/r-gdsfmt/package.py index bc852366f4..1bfe72c824 100644 --- a/var/spack/repos/builtin/packages/r-gdsfmt/package.py +++ b/var/spack/repos/builtin/packages/r-gdsfmt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGdsfmt(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geiger/package.py b/var/spack/repos/builtin/packages/r-geiger/package.py index 4d1e5822b8..49cefe3d81 100644 --- a/var/spack/repos/builtin/packages/r-geiger/package.py +++ b/var/spack/repos/builtin/packages/r-geiger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeiger(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genefilter/package.py b/var/spack/repos/builtin/packages/r-genefilter/package.py index 8b0a7b3175..306752ba8a 100644 --- a/var/spack/repos/builtin/packages/r-genefilter/package.py +++ b/var/spack/repos/builtin/packages/r-genefilter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenefilter(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genelendatabase/package.py b/var/spack/repos/builtin/packages/r-genelendatabase/package.py index 84402eeece..330fa300e4 100644 --- a/var/spack/repos/builtin/packages/r-genelendatabase/package.py +++ b/var/spack/repos/builtin/packages/r-genelendatabase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenelendatabase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genemeta/package.py b/var/spack/repos/builtin/packages/r-genemeta/package.py index a0f8b4f9b8..25b8b7a24d 100644 --- a/var/spack/repos/builtin/packages/r-genemeta/package.py +++ b/var/spack/repos/builtin/packages/r-genemeta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenemeta(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geneplotter/package.py b/var/spack/repos/builtin/packages/r-geneplotter/package.py index 34cbc67874..e1266658f3 100644 --- a/var/spack/repos/builtin/packages/r-geneplotter/package.py +++ b/var/spack/repos/builtin/packages/r-geneplotter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeneplotter(RPackage): diff --git a/var/spack/repos/builtin/packages/r-generics/package.py b/var/spack/repos/builtin/packages/r-generics/package.py index 2130bd8af0..ba568bce60 100644 --- a/var/spack/repos/builtin/packages/r-generics/package.py +++ b/var/spack/repos/builtin/packages/r-generics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenerics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genetics/package.py b/var/spack/repos/builtin/packages/r-genetics/package.py index 9b91dd90f7..fde4f986a5 100644 --- a/var/spack/repos/builtin/packages/r-genetics/package.py +++ b/var/spack/repos/builtin/packages/r-genetics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenetics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genie3/package.py b/var/spack/repos/builtin/packages/r-genie3/package.py index 86cb2613f5..002fddc333 100644 --- a/var/spack/repos/builtin/packages/r-genie3/package.py +++ b/var/spack/repos/builtin/packages/r-genie3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenie3(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py index 99dc82df12..85a1218690 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenomeinfodb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py index 4c682a4a56..8b3d2d86b9 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenomeinfodbdata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genomicalignments/package.py b/var/spack/repos/builtin/packages/r-genomicalignments/package.py index a0afca41d7..a186f8308a 100644 --- a/var/spack/repos/builtin/packages/r-genomicalignments/package.py +++ b/var/spack/repos/builtin/packages/r-genomicalignments/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenomicalignments(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py index 96e310a1a2..344645024f 100644 --- a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py +++ b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenomicfeatures(RPackage): diff --git a/var/spack/repos/builtin/packages/r-genomicranges/package.py b/var/spack/repos/builtin/packages/r-genomicranges/package.py index 1a8549fafe..e40d4257d6 100644 --- a/var/spack/repos/builtin/packages/r-genomicranges/package.py +++ b/var/spack/repos/builtin/packages/r-genomicranges/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGenomicranges(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gensa/package.py b/var/spack/repos/builtin/packages/r-gensa/package.py index ab768cb489..e865bf4166 100644 --- a/var/spack/repos/builtin/packages/r-gensa/package.py +++ b/var/spack/repos/builtin/packages/r-gensa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGensa(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geojsonsf/package.py b/var/spack/repos/builtin/packages/r-geojsonsf/package.py index 5b56a4697a..69b34e9e85 100644 --- a/var/spack/repos/builtin/packages/r-geojsonsf/package.py +++ b/var/spack/repos/builtin/packages/r-geojsonsf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeojsonsf(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geometries/package.py b/var/spack/repos/builtin/packages/r-geometries/package.py index cbb4c2a31e..b838e0bb7c 100644 --- a/var/spack/repos/builtin/packages/r-geometries/package.py +++ b/var/spack/repos/builtin/packages/r-geometries/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeometries(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geomorph/package.py b/var/spack/repos/builtin/packages/r-geomorph/package.py index b2ef1d385d..4913b525b4 100644 --- a/var/spack/repos/builtin/packages/r-geomorph/package.py +++ b/var/spack/repos/builtin/packages/r-geomorph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeomorph(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geonames/package.py b/var/spack/repos/builtin/packages/r-geonames/package.py index 3d122c640d..dfb580daed 100644 --- a/var/spack/repos/builtin/packages/r-geonames/package.py +++ b/var/spack/repos/builtin/packages/r-geonames/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeonames(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geoquery/package.py b/var/spack/repos/builtin/packages/r-geoquery/package.py index efbde50ef9..46a034475c 100644 --- a/var/spack/repos/builtin/packages/r-geoquery/package.py +++ b/var/spack/repos/builtin/packages/r-geoquery/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeoquery(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geor/package.py b/var/spack/repos/builtin/packages/r-geor/package.py index 57a7d1f44a..c4a8c85e26 100644 --- a/var/spack/repos/builtin/packages/r-geor/package.py +++ b/var/spack/repos/builtin/packages/r-geor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeor(RPackage): diff --git a/var/spack/repos/builtin/packages/r-geosphere/package.py b/var/spack/repos/builtin/packages/r-geosphere/package.py index 4f4382dd29..56eed556b8 100644 --- a/var/spack/repos/builtin/packages/r-geosphere/package.py +++ b/var/spack/repos/builtin/packages/r-geosphere/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGeosphere(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gert/package.py b/var/spack/repos/builtin/packages/r-gert/package.py index 13fe131864..a44201a411 100644 --- a/var/spack/repos/builtin/packages/r-gert/package.py +++ b/var/spack/repos/builtin/packages/r-gert/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGert(RPackage): diff --git a/var/spack/repos/builtin/packages/r-getopt/package.py b/var/spack/repos/builtin/packages/r-getopt/package.py index 8d178c7a7b..f48eee3871 100644 --- a/var/spack/repos/builtin/packages/r-getopt/package.py +++ b/var/spack/repos/builtin/packages/r-getopt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGetopt(RPackage): diff --git a/var/spack/repos/builtin/packages/r-getoptlong/package.py b/var/spack/repos/builtin/packages/r-getoptlong/package.py index 4d9d3f8310..fa8d809dc1 100644 --- a/var/spack/repos/builtin/packages/r-getoptlong/package.py +++ b/var/spack/repos/builtin/packages/r-getoptlong/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGetoptlong(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggally/package.py b/var/spack/repos/builtin/packages/r-ggally/package.py index c16b38b3f6..3e1ecb558c 100644 --- a/var/spack/repos/builtin/packages/r-ggally/package.py +++ b/var/spack/repos/builtin/packages/r-ggally/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgally(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggbeeswarm/package.py b/var/spack/repos/builtin/packages/r-ggbeeswarm/package.py index ffb21ca52f..0324bba975 100644 --- a/var/spack/repos/builtin/packages/r-ggbeeswarm/package.py +++ b/var/spack/repos/builtin/packages/r-ggbeeswarm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgbeeswarm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggbio/package.py b/var/spack/repos/builtin/packages/r-ggbio/package.py index 67d6f04a1b..8352efdc57 100644 --- a/var/spack/repos/builtin/packages/r-ggbio/package.py +++ b/var/spack/repos/builtin/packages/r-ggbio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgbio(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggdendro/package.py b/var/spack/repos/builtin/packages/r-ggdendro/package.py index 4a665b4eac..25221cce64 100644 --- a/var/spack/repos/builtin/packages/r-ggdendro/package.py +++ b/var/spack/repos/builtin/packages/r-ggdendro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgdendro(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggforce/package.py b/var/spack/repos/builtin/packages/r-ggforce/package.py index 76c0cc2adc..980de6e4a1 100644 --- a/var/spack/repos/builtin/packages/r-ggforce/package.py +++ b/var/spack/repos/builtin/packages/r-ggforce/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgforce(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggfun/package.py b/var/spack/repos/builtin/packages/r-ggfun/package.py index fc002e7ec3..6218356f5b 100644 --- a/var/spack/repos/builtin/packages/r-ggfun/package.py +++ b/var/spack/repos/builtin/packages/r-ggfun/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgfun(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggjoy/package.py b/var/spack/repos/builtin/packages/r-ggjoy/package.py index 766ba7f584..299557d3a5 100644 --- a/var/spack/repos/builtin/packages/r-ggjoy/package.py +++ b/var/spack/repos/builtin/packages/r-ggjoy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgjoy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggmap/package.py b/var/spack/repos/builtin/packages/r-ggmap/package.py index 24a41a45b4..a6763abf19 100644 --- a/var/spack/repos/builtin/packages/r-ggmap/package.py +++ b/var/spack/repos/builtin/packages/r-ggmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggplot2/package.py b/var/spack/repos/builtin/packages/r-ggplot2/package.py index 69d917ce94..6bfa9085a8 100644 --- a/var/spack/repos/builtin/packages/r-ggplot2/package.py +++ b/var/spack/repos/builtin/packages/r-ggplot2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgplot2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggplotify/package.py b/var/spack/repos/builtin/packages/r-ggplotify/package.py index 612588f420..302b000724 100644 --- a/var/spack/repos/builtin/packages/r-ggplotify/package.py +++ b/var/spack/repos/builtin/packages/r-ggplotify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgplotify(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggpubr/package.py b/var/spack/repos/builtin/packages/r-ggpubr/package.py index e725f3e584..143d4fcc0a 100644 --- a/var/spack/repos/builtin/packages/r-ggpubr/package.py +++ b/var/spack/repos/builtin/packages/r-ggpubr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgpubr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggraph/package.py b/var/spack/repos/builtin/packages/r-ggraph/package.py index 04c1287360..ac5832ba71 100644 --- a/var/spack/repos/builtin/packages/r-ggraph/package.py +++ b/var/spack/repos/builtin/packages/r-ggraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgraph(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggrepel/package.py b/var/spack/repos/builtin/packages/r-ggrepel/package.py index 37d1952876..b82c10ae19 100644 --- a/var/spack/repos/builtin/packages/r-ggrepel/package.py +++ b/var/spack/repos/builtin/packages/r-ggrepel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgrepel(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggridges/package.py b/var/spack/repos/builtin/packages/r-ggridges/package.py index 09f90c428b..8bbcf6d1be 100644 --- a/var/spack/repos/builtin/packages/r-ggridges/package.py +++ b/var/spack/repos/builtin/packages/r-ggridges/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgridges(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggsci/package.py b/var/spack/repos/builtin/packages/r-ggsci/package.py index 31c0f00763..ffcafc5dfb 100644 --- a/var/spack/repos/builtin/packages/r-ggsci/package.py +++ b/var/spack/repos/builtin/packages/r-ggsci/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgsci(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggsignif/package.py b/var/spack/repos/builtin/packages/r-ggsignif/package.py index 9f31938551..79ac9180c6 100644 --- a/var/spack/repos/builtin/packages/r-ggsignif/package.py +++ b/var/spack/repos/builtin/packages/r-ggsignif/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgsignif(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggthemes/package.py b/var/spack/repos/builtin/packages/r-ggthemes/package.py index 2e6b9b712b..0078878287 100644 --- a/var/spack/repos/builtin/packages/r-ggthemes/package.py +++ b/var/spack/repos/builtin/packages/r-ggthemes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgthemes(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggtree/package.py b/var/spack/repos/builtin/packages/r-ggtree/package.py index b3836e724f..244d49bf1a 100644 --- a/var/spack/repos/builtin/packages/r-ggtree/package.py +++ b/var/spack/repos/builtin/packages/r-ggtree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgtree(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py index d5afc7de50..c220a207bb 100644 --- a/var/spack/repos/builtin/packages/r-ggvis/package.py +++ b/var/spack/repos/builtin/packages/r-ggvis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGgvis(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gh/package.py b/var/spack/repos/builtin/packages/r-gh/package.py index 9064fca9d4..097f2e46f5 100644 --- a/var/spack/repos/builtin/packages/r-gh/package.py +++ b/var/spack/repos/builtin/packages/r-gh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGh(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gistr/package.py b/var/spack/repos/builtin/packages/r-gistr/package.py index e159d596b0..3b38fa3ce4 100644 --- a/var/spack/repos/builtin/packages/r-gistr/package.py +++ b/var/spack/repos/builtin/packages/r-gistr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGistr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-git2r/package.py b/var/spack/repos/builtin/packages/r-git2r/package.py index 65f0bf3854..fd1d28e84d 100644 --- a/var/spack/repos/builtin/packages/r-git2r/package.py +++ b/var/spack/repos/builtin/packages/r-git2r/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGit2r(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gitcreds/package.py b/var/spack/repos/builtin/packages/r-gitcreds/package.py index dbb7c6de4e..b3248bc2c0 100644 --- a/var/spack/repos/builtin/packages/r-gitcreds/package.py +++ b/var/spack/repos/builtin/packages/r-gitcreds/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGitcreds(RPackage): diff --git a/var/spack/repos/builtin/packages/r-glimma/package.py b/var/spack/repos/builtin/packages/r-glimma/package.py index ac5fa1b5e3..e631d220a6 100644 --- a/var/spack/repos/builtin/packages/r-glimma/package.py +++ b/var/spack/repos/builtin/packages/r-glimma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGlimma(RPackage): diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py index 8a3e6fdc87..bab2c30f98 100644 --- a/var/spack/repos/builtin/packages/r-glmnet/package.py +++ b/var/spack/repos/builtin/packages/r-glmnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGlmnet(RPackage): diff --git a/var/spack/repos/builtin/packages/r-globaloptions/package.py b/var/spack/repos/builtin/packages/r-globaloptions/package.py index ddc3cc1852..ae97942be2 100644 --- a/var/spack/repos/builtin/packages/r-globaloptions/package.py +++ b/var/spack/repos/builtin/packages/r-globaloptions/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGlobaloptions(RPackage): diff --git a/var/spack/repos/builtin/packages/r-globals/package.py b/var/spack/repos/builtin/packages/r-globals/package.py index 8e16af438a..73d293bed0 100644 --- a/var/spack/repos/builtin/packages/r-globals/package.py +++ b/var/spack/repos/builtin/packages/r-globals/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGlobals(RPackage): diff --git a/var/spack/repos/builtin/packages/r-globaltest/package.py b/var/spack/repos/builtin/packages/r-globaltest/package.py index 0288a9a226..ef67d0e2b9 100644 --- a/var/spack/repos/builtin/packages/r-globaltest/package.py +++ b/var/spack/repos/builtin/packages/r-globaltest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGlobaltest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-glue/package.py b/var/spack/repos/builtin/packages/r-glue/package.py index 4015badc7f..4833f3ea2c 100644 --- a/var/spack/repos/builtin/packages/r-glue/package.py +++ b/var/spack/repos/builtin/packages/r-glue/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGlue(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gmodels/package.py b/var/spack/repos/builtin/packages/r-gmodels/package.py index 2b4dd4da56..da2b29ee28 100644 --- a/var/spack/repos/builtin/packages/r-gmodels/package.py +++ b/var/spack/repos/builtin/packages/r-gmodels/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGmodels(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gmp/package.py b/var/spack/repos/builtin/packages/r-gmp/package.py index 3327d05867..0cd3a3b3aa 100644 --- a/var/spack/repos/builtin/packages/r-gmp/package.py +++ b/var/spack/repos/builtin/packages/r-gmp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGmp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-go-db/package.py b/var/spack/repos/builtin/packages/r-go-db/package.py index 27143c2433..bdc61b8e4c 100644 --- a/var/spack/repos/builtin/packages/r-go-db/package.py +++ b/var/spack/repos/builtin/packages/r-go-db/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGoDb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-goftest/package.py b/var/spack/repos/builtin/packages/r-goftest/package.py index 8fbd25d402..55064e923c 100644 --- a/var/spack/repos/builtin/packages/r-goftest/package.py +++ b/var/spack/repos/builtin/packages/r-goftest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGoftest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gofuncr/package.py b/var/spack/repos/builtin/packages/r-gofuncr/package.py index 77351853e7..62921ac64d 100644 --- a/var/spack/repos/builtin/packages/r-gofuncr/package.py +++ b/var/spack/repos/builtin/packages/r-gofuncr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGofuncr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-googledrive/package.py b/var/spack/repos/builtin/packages/r-googledrive/package.py index fae27c478a..cd4459881c 100644 --- a/var/spack/repos/builtin/packages/r-googledrive/package.py +++ b/var/spack/repos/builtin/packages/r-googledrive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGoogledrive(RPackage): diff --git a/var/spack/repos/builtin/packages/r-googlesheets4/package.py b/var/spack/repos/builtin/packages/r-googlesheets4/package.py index b845405acb..fe6c49a23d 100644 --- a/var/spack/repos/builtin/packages/r-googlesheets4/package.py +++ b/var/spack/repos/builtin/packages/r-googlesheets4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGooglesheets4(RPackage): diff --git a/var/spack/repos/builtin/packages/r-googlevis/package.py b/var/spack/repos/builtin/packages/r-googlevis/package.py index 260e99de9a..62491925c3 100644 --- a/var/spack/repos/builtin/packages/r-googlevis/package.py +++ b/var/spack/repos/builtin/packages/r-googlevis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGooglevis(RPackage): diff --git a/var/spack/repos/builtin/packages/r-goplot/package.py b/var/spack/repos/builtin/packages/r-goplot/package.py index b7c26a62fe..2f52d31067 100644 --- a/var/spack/repos/builtin/packages/r-goplot/package.py +++ b/var/spack/repos/builtin/packages/r-goplot/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGoplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gosemsim/package.py b/var/spack/repos/builtin/packages/r-gosemsim/package.py index 66ea0ad631..394fc244aa 100644 --- a/var/spack/repos/builtin/packages/r-gosemsim/package.py +++ b/var/spack/repos/builtin/packages/r-gosemsim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGosemsim(RPackage): diff --git a/var/spack/repos/builtin/packages/r-goseq/package.py b/var/spack/repos/builtin/packages/r-goseq/package.py index b34c5c38cc..87eaa1bcdf 100644 --- a/var/spack/repos/builtin/packages/r-goseq/package.py +++ b/var/spack/repos/builtin/packages/r-goseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGoseq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gostats/package.py b/var/spack/repos/builtin/packages/r-gostats/package.py index e54f0669aa..b3fd2e9e64 100644 --- a/var/spack/repos/builtin/packages/r-gostats/package.py +++ b/var/spack/repos/builtin/packages/r-gostats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGostats(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gower/package.py b/var/spack/repos/builtin/packages/r-gower/package.py index a60ec14cda..5c5acb787e 100644 --- a/var/spack/repos/builtin/packages/r-gower/package.py +++ b/var/spack/repos/builtin/packages/r-gower/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGower(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gparotation/package.py b/var/spack/repos/builtin/packages/r-gparotation/package.py index 15796d1180..1e20f6a0ff 100644 --- a/var/spack/repos/builtin/packages/r-gparotation/package.py +++ b/var/spack/repos/builtin/packages/r-gparotation/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGparotation(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gplots/package.py b/var/spack/repos/builtin/packages/r-gplots/package.py index 39f92d40ad..a40a1fb6c6 100644 --- a/var/spack/repos/builtin/packages/r-gplots/package.py +++ b/var/spack/repos/builtin/packages/r-gplots/package.py @@ -3,9 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -# -from spack import * +from spack.package import * class RGplots(RPackage): diff --git a/var/spack/repos/builtin/packages/r-graph/package.py b/var/spack/repos/builtin/packages/r-graph/package.py index 4a41f2793a..815b00fec1 100644 --- a/var/spack/repos/builtin/packages/r-graph/package.py +++ b/var/spack/repos/builtin/packages/r-graph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGraph(RPackage): diff --git a/var/spack/repos/builtin/packages/r-graphlayouts/package.py b/var/spack/repos/builtin/packages/r-graphlayouts/package.py index 7761281f67..c09cf47729 100644 --- a/var/spack/repos/builtin/packages/r-graphlayouts/package.py +++ b/var/spack/repos/builtin/packages/r-graphlayouts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGraphlayouts(RPackage): diff --git a/var/spack/repos/builtin/packages/r-grbase/package.py b/var/spack/repos/builtin/packages/r-grbase/package.py index 37819c2ddb..c66440c786 100644 --- a/var/spack/repos/builtin/packages/r-grbase/package.py +++ b/var/spack/repos/builtin/packages/r-grbase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGrbase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gridbase/package.py b/var/spack/repos/builtin/packages/r-gridbase/package.py index e0376616a0..4011a00ff9 100644 --- a/var/spack/repos/builtin/packages/r-gridbase/package.py +++ b/var/spack/repos/builtin/packages/r-gridbase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGridbase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gridextra/package.py b/var/spack/repos/builtin/packages/r-gridextra/package.py index be385b749f..312407bd66 100644 --- a/var/spack/repos/builtin/packages/r-gridextra/package.py +++ b/var/spack/repos/builtin/packages/r-gridextra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGridextra(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gridgraphics/package.py b/var/spack/repos/builtin/packages/r-gridgraphics/package.py index 031b56cb14..acaff9a9d7 100644 --- a/var/spack/repos/builtin/packages/r-gridgraphics/package.py +++ b/var/spack/repos/builtin/packages/r-gridgraphics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGridgraphics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gsa/package.py b/var/spack/repos/builtin/packages/r-gsa/package.py index 9fb4b2d227..367545eef3 100644 --- a/var/spack/repos/builtin/packages/r-gsa/package.py +++ b/var/spack/repos/builtin/packages/r-gsa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGsa(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gsalib/package.py b/var/spack/repos/builtin/packages/r-gsalib/package.py index c57d076725..bd15f2d159 100644 --- a/var/spack/repos/builtin/packages/r-gsalib/package.py +++ b/var/spack/repos/builtin/packages/r-gsalib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGsalib(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gseabase/package.py b/var/spack/repos/builtin/packages/r-gseabase/package.py index 829f317cb5..9d7e00c56e 100644 --- a/var/spack/repos/builtin/packages/r-gseabase/package.py +++ b/var/spack/repos/builtin/packages/r-gseabase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGseabase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gsl/package.py b/var/spack/repos/builtin/packages/r-gsl/package.py index c09dcfc540..58700f51cd 100644 --- a/var/spack/repos/builtin/packages/r-gsl/package.py +++ b/var/spack/repos/builtin/packages/r-gsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGsl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gsodr/package.py b/var/spack/repos/builtin/packages/r-gsodr/package.py index bba48d68a0..1da51f9c88 100644 --- a/var/spack/repos/builtin/packages/r-gsodr/package.py +++ b/var/spack/repos/builtin/packages/r-gsodr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGsodr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gss/package.py b/var/spack/repos/builtin/packages/r-gss/package.py index f364b68e0f..6f0b860f8c 100644 --- a/var/spack/repos/builtin/packages/r-gss/package.py +++ b/var/spack/repos/builtin/packages/r-gss/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGss(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gstat/package.py b/var/spack/repos/builtin/packages/r-gstat/package.py index c0ae8081c1..ca118369c3 100644 --- a/var/spack/repos/builtin/packages/r-gstat/package.py +++ b/var/spack/repos/builtin/packages/r-gstat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGstat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gsubfn/package.py b/var/spack/repos/builtin/packages/r-gsubfn/package.py index 2458ec9d92..260108f947 100644 --- a/var/spack/repos/builtin/packages/r-gsubfn/package.py +++ b/var/spack/repos/builtin/packages/r-gsubfn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGsubfn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gtable/package.py b/var/spack/repos/builtin/packages/r-gtable/package.py index a16e506225..0c37b74746 100644 --- a/var/spack/repos/builtin/packages/r-gtable/package.py +++ b/var/spack/repos/builtin/packages/r-gtable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGtable(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gtools/package.py b/var/spack/repos/builtin/packages/r-gtools/package.py index 50fb0b2936..b36f37b4ac 100644 --- a/var/spack/repos/builtin/packages/r-gtools/package.py +++ b/var/spack/repos/builtin/packages/r-gtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGtools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gtrellis/package.py b/var/spack/repos/builtin/packages/r-gtrellis/package.py index b9c06d4b04..044027e4cc 100644 --- a/var/spack/repos/builtin/packages/r-gtrellis/package.py +++ b/var/spack/repos/builtin/packages/r-gtrellis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGtrellis(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gviz/package.py b/var/spack/repos/builtin/packages/r-gviz/package.py index 98d8c1e096..0678ee0391 100644 --- a/var/spack/repos/builtin/packages/r-gviz/package.py +++ b/var/spack/repos/builtin/packages/r-gviz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGviz(RPackage): diff --git a/var/spack/repos/builtin/packages/r-gwmodel/package.py b/var/spack/repos/builtin/packages/r-gwmodel/package.py index 73bca88d0d..6651397014 100644 --- a/var/spack/repos/builtin/packages/r-gwmodel/package.py +++ b/var/spack/repos/builtin/packages/r-gwmodel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RGwmodel(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hardhat/package.py b/var/spack/repos/builtin/packages/r-hardhat/package.py index 73e52e3742..4c2fed79a9 100644 --- a/var/spack/repos/builtin/packages/r-hardhat/package.py +++ b/var/spack/repos/builtin/packages/r-hardhat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHardhat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-haven/package.py b/var/spack/repos/builtin/packages/r-haven/package.py index 81ced48957..483f92ead2 100644 --- a/var/spack/repos/builtin/packages/r-haven/package.py +++ b/var/spack/repos/builtin/packages/r-haven/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHaven(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hdf5array/package.py b/var/spack/repos/builtin/packages/r-hdf5array/package.py index 99837921f9..4d671c682a 100644 --- a/var/spack/repos/builtin/packages/r-hdf5array/package.py +++ b/var/spack/repos/builtin/packages/r-hdf5array/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHdf5array(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hdf5r/package.py b/var/spack/repos/builtin/packages/r-hdf5r/package.py index 4c1b462876..a9ce59416b 100644 --- a/var/spack/repos/builtin/packages/r-hdf5r/package.py +++ b/var/spack/repos/builtin/packages/r-hdf5r/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHdf5r(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hdrcde/package.py b/var/spack/repos/builtin/packages/r-hdrcde/package.py index d59ba51b0e..d8e3e3d7df 100644 --- a/var/spack/repos/builtin/packages/r-hdrcde/package.py +++ b/var/spack/repos/builtin/packages/r-hdrcde/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RHdrcde(RPackage): """Highest Density Regions and Conditional Density Estimation. diff --git a/var/spack/repos/builtin/packages/r-here/package.py b/var/spack/repos/builtin/packages/r-here/package.py index 4b11f3e46e..5789d4d6b3 100644 --- a/var/spack/repos/builtin/packages/r-here/package.py +++ b/var/spack/repos/builtin/packages/r-here/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHere(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hexbin/package.py b/var/spack/repos/builtin/packages/r-hexbin/package.py index b5460e8190..0a8f292fea 100644 --- a/var/spack/repos/builtin/packages/r-hexbin/package.py +++ b/var/spack/repos/builtin/packages/r-hexbin/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHexbin(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hh/package.py b/var/spack/repos/builtin/packages/r-hh/package.py index afd75fed91..9cf03898b0 100644 --- a/var/spack/repos/builtin/packages/r-hh/package.py +++ b/var/spack/repos/builtin/packages/r-hh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHh(RPackage): diff --git a/var/spack/repos/builtin/packages/r-highr/package.py b/var/spack/repos/builtin/packages/r-highr/package.py index 29f86d32be..1113cb7d58 100644 --- a/var/spack/repos/builtin/packages/r-highr/package.py +++ b/var/spack/repos/builtin/packages/r-highr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHighr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hmisc/package.py b/var/spack/repos/builtin/packages/r-hmisc/package.py index f022ca8a1f..5943ac6f67 100644 --- a/var/spack/repos/builtin/packages/r-hmisc/package.py +++ b/var/spack/repos/builtin/packages/r-hmisc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHmisc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hms/package.py b/var/spack/repos/builtin/packages/r-hms/package.py index 5940b3765a..9fd5762c6a 100644 --- a/var/spack/repos/builtin/packages/r-hms/package.py +++ b/var/spack/repos/builtin/packages/r-hms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHms(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hoardr/package.py b/var/spack/repos/builtin/packages/r-hoardr/package.py index a1d0dec1ed..ad16ad99b8 100644 --- a/var/spack/repos/builtin/packages/r-hoardr/package.py +++ b/var/spack/repos/builtin/packages/r-hoardr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHoardr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-htmltable/package.py b/var/spack/repos/builtin/packages/r-htmltable/package.py index 97efa3f16f..a342937256 100644 --- a/var/spack/repos/builtin/packages/r-htmltable/package.py +++ b/var/spack/repos/builtin/packages/r-htmltable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHtmltable(RPackage): diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py index 9de35fe41a..30b42cb798 100644 --- a/var/spack/repos/builtin/packages/r-htmltools/package.py +++ b/var/spack/repos/builtin/packages/r-htmltools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHtmltools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py index ac41281345..44461ed5e1 100644 --- a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py +++ b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHtmlwidgets(RPackage): diff --git a/var/spack/repos/builtin/packages/r-httpcode/package.py b/var/spack/repos/builtin/packages/r-httpcode/package.py index 7077b9d115..ed5764c2be 100644 --- a/var/spack/repos/builtin/packages/r-httpcode/package.py +++ b/var/spack/repos/builtin/packages/r-httpcode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHttpcode(RPackage): diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py index ee7fdf1618..8d6a66efae 100644 --- a/var/spack/repos/builtin/packages/r-httpuv/package.py +++ b/var/spack/repos/builtin/packages/r-httpuv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHttpuv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-httr/package.py b/var/spack/repos/builtin/packages/r-httr/package.py index 0c92579ffe..c5af44a4de 100644 --- a/var/spack/repos/builtin/packages/r-httr/package.py +++ b/var/spack/repos/builtin/packages/r-httr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHttr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hwriter/package.py b/var/spack/repos/builtin/packages/r-hwriter/package.py index 1905015dff..ba4eb1e1bf 100644 --- a/var/spack/repos/builtin/packages/r-hwriter/package.py +++ b/var/spack/repos/builtin/packages/r-hwriter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHwriter(RPackage): diff --git a/var/spack/repos/builtin/packages/r-hypergraph/package.py b/var/spack/repos/builtin/packages/r-hypergraph/package.py index f412aa949d..e924415f7e 100644 --- a/var/spack/repos/builtin/packages/r-hypergraph/package.py +++ b/var/spack/repos/builtin/packages/r-hypergraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RHypergraph(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ica/package.py b/var/spack/repos/builtin/packages/r-ica/package.py index d8194dc1e9..ab293a949c 100644 --- a/var/spack/repos/builtin/packages/r-ica/package.py +++ b/var/spack/repos/builtin/packages/r-ica/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIca(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ids/package.py b/var/spack/repos/builtin/packages/r-ids/package.py index 2e6f6cd88f..6387aed845 100644 --- a/var/spack/repos/builtin/packages/r-ids/package.py +++ b/var/spack/repos/builtin/packages/r-ids/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIds(RPackage): diff --git a/var/spack/repos/builtin/packages/r-igraph/package.py b/var/spack/repos/builtin/packages/r-igraph/package.py index a74b7c06f3..4dbbec06b9 100644 --- a/var/spack/repos/builtin/packages/r-igraph/package.py +++ b/var/spack/repos/builtin/packages/r-igraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIgraph(RPackage): diff --git a/var/spack/repos/builtin/packages/r-illumina450probevariants-db/package.py b/var/spack/repos/builtin/packages/r-illumina450probevariants-db/package.py index 2d5c3f8a86..417bb29cbf 100644 --- a/var/spack/repos/builtin/packages/r-illumina450probevariants-db/package.py +++ b/var/spack/repos/builtin/packages/r-illumina450probevariants-db/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIllumina450probevariantsDb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kanno-ilmn12-hg19/package.py b/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kanno-ilmn12-hg19/package.py index 971bb47e79..f0be63afc3 100644 --- a/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kanno-ilmn12-hg19/package.py +++ b/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kanno-ilmn12-hg19/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIlluminahumanmethylation450kannoIlmn12Hg19(RPackage): diff --git a/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kmanifest/package.py b/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kmanifest/package.py index cc217f85d1..e22df9eb74 100644 --- a/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kmanifest/package.py +++ b/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kmanifest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIlluminahumanmethylation450kmanifest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicanno-ilm10b4-hg19/package.py b/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicanno-ilm10b4-hg19/package.py index f2bc5755d4..20c439cd94 100644 --- a/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicanno-ilm10b4-hg19/package.py +++ b/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicanno-ilm10b4-hg19/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIlluminahumanmethylationepicannoIlm10b4Hg19(RPackage): diff --git a/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicmanifest/package.py b/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicmanifest/package.py index 8e40918a1e..d7888ed60c 100644 --- a/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicmanifest/package.py +++ b/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicmanifest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIlluminahumanmethylationepicmanifest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-illuminaio/package.py b/var/spack/repos/builtin/packages/r-illuminaio/package.py index a654d24be7..97a036f4d8 100644 --- a/var/spack/repos/builtin/packages/r-illuminaio/package.py +++ b/var/spack/repos/builtin/packages/r-illuminaio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIlluminaio(RPackage): diff --git a/var/spack/repos/builtin/packages/r-imager/package.py b/var/spack/repos/builtin/packages/r-imager/package.py index be813c0b15..26e24290af 100644 --- a/var/spack/repos/builtin/packages/r-imager/package.py +++ b/var/spack/repos/builtin/packages/r-imager/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RImager(RPackage): diff --git a/var/spack/repos/builtin/packages/r-impute/package.py b/var/spack/repos/builtin/packages/r-impute/package.py index 79f872f5a4..3b99037c58 100644 --- a/var/spack/repos/builtin/packages/r-impute/package.py +++ b/var/spack/repos/builtin/packages/r-impute/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RImpute(RPackage): diff --git a/var/spack/repos/builtin/packages/r-influencer/package.py b/var/spack/repos/builtin/packages/r-influencer/package.py index 18f38da1c6..c362a04d35 100644 --- a/var/spack/repos/builtin/packages/r-influencer/package.py +++ b/var/spack/repos/builtin/packages/r-influencer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RInfluencer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ini/package.py b/var/spack/repos/builtin/packages/r-ini/package.py index 731ad9f4fc..eb570c5d63 100644 --- a/var/spack/repos/builtin/packages/r-ini/package.py +++ b/var/spack/repos/builtin/packages/r-ini/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIni(RPackage): diff --git a/var/spack/repos/builtin/packages/r-inline/package.py b/var/spack/repos/builtin/packages/r-inline/package.py index 99bc0b002e..d3286b5968 100644 --- a/var/spack/repos/builtin/packages/r-inline/package.py +++ b/var/spack/repos/builtin/packages/r-inline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RInline(RPackage): diff --git a/var/spack/repos/builtin/packages/r-insight/package.py b/var/spack/repos/builtin/packages/r-insight/package.py index 069bab9ad6..49ef46827c 100644 --- a/var/spack/repos/builtin/packages/r-insight/package.py +++ b/var/spack/repos/builtin/packages/r-insight/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RInsight(RPackage): diff --git a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py index 503947b1cc..7a34e88252 100644 --- a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py +++ b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RInteractivedisplaybase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-intervals/package.py b/var/spack/repos/builtin/packages/r-intervals/package.py index 9d8f317b01..1cbe03b5c0 100644 --- a/var/spack/repos/builtin/packages/r-intervals/package.py +++ b/var/spack/repos/builtin/packages/r-intervals/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIntervals(RPackage): diff --git a/var/spack/repos/builtin/packages/r-inum/package.py b/var/spack/repos/builtin/packages/r-inum/package.py index 1196779b4a..bd26faacb5 100644 --- a/var/spack/repos/builtin/packages/r-inum/package.py +++ b/var/spack/repos/builtin/packages/r-inum/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RInum(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ipred/package.py b/var/spack/repos/builtin/packages/r-ipred/package.py index 7a58fb8a0d..b874776715 100644 --- a/var/spack/repos/builtin/packages/r-ipred/package.py +++ b/var/spack/repos/builtin/packages/r-ipred/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIpred(RPackage): diff --git a/var/spack/repos/builtin/packages/r-iranges/package.py b/var/spack/repos/builtin/packages/r-iranges/package.py index 7648efc3a4..d9d9e25d77 100644 --- a/var/spack/repos/builtin/packages/r-iranges/package.py +++ b/var/spack/repos/builtin/packages/r-iranges/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIranges(RPackage): diff --git a/var/spack/repos/builtin/packages/r-irdisplay/package.py b/var/spack/repos/builtin/packages/r-irdisplay/package.py index b9b72af97b..af3fc112fc 100644 --- a/var/spack/repos/builtin/packages/r-irdisplay/package.py +++ b/var/spack/repos/builtin/packages/r-irdisplay/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIrdisplay(RPackage): diff --git a/var/spack/repos/builtin/packages/r-irkernel/package.py b/var/spack/repos/builtin/packages/r-irkernel/package.py index 32d80184af..560a85e004 100644 --- a/var/spack/repos/builtin/packages/r-irkernel/package.py +++ b/var/spack/repos/builtin/packages/r-irkernel/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIrkernel(RPackage): diff --git a/var/spack/repos/builtin/packages/r-irlba/package.py b/var/spack/repos/builtin/packages/r-irlba/package.py index d1116f9dec..82602087ca 100644 --- a/var/spack/repos/builtin/packages/r-irlba/package.py +++ b/var/spack/repos/builtin/packages/r-irlba/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIrlba(RPackage): diff --git a/var/spack/repos/builtin/packages/r-isdparser/package.py b/var/spack/repos/builtin/packages/r-isdparser/package.py index 35a6076343..2fdd3ae31e 100644 --- a/var/spack/repos/builtin/packages/r-isdparser/package.py +++ b/var/spack/repos/builtin/packages/r-isdparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIsdparser(RPackage): diff --git a/var/spack/repos/builtin/packages/r-islr/package.py b/var/spack/repos/builtin/packages/r-islr/package.py index 61da4752d7..88a34675ce 100644 --- a/var/spack/repos/builtin/packages/r-islr/package.py +++ b/var/spack/repos/builtin/packages/r-islr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIslr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-iso/package.py b/var/spack/repos/builtin/packages/r-iso/package.py index d83523812f..283cff30a5 100644 --- a/var/spack/repos/builtin/packages/r-iso/package.py +++ b/var/spack/repos/builtin/packages/r-iso/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIso(RPackage): diff --git a/var/spack/repos/builtin/packages/r-isoband/package.py b/var/spack/repos/builtin/packages/r-isoband/package.py index 3632a3a230..9304b909e3 100644 --- a/var/spack/repos/builtin/packages/r-isoband/package.py +++ b/var/spack/repos/builtin/packages/r-isoband/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIsoband(RPackage): diff --git a/var/spack/repos/builtin/packages/r-isva/package.py b/var/spack/repos/builtin/packages/r-isva/package.py index f51408ac16..5114891e93 100644 --- a/var/spack/repos/builtin/packages/r-isva/package.py +++ b/var/spack/repos/builtin/packages/r-isva/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIsva(RPackage): diff --git a/var/spack/repos/builtin/packages/r-iterators/package.py b/var/spack/repos/builtin/packages/r-iterators/package.py index b26e7624be..ccb5a071b4 100644 --- a/var/spack/repos/builtin/packages/r-iterators/package.py +++ b/var/spack/repos/builtin/packages/r-iterators/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RIterators(RPackage): diff --git a/var/spack/repos/builtin/packages/r-jade/package.py b/var/spack/repos/builtin/packages/r-jade/package.py index c60b7797dd..5c5c5db9d8 100644 --- a/var/spack/repos/builtin/packages/r-jade/package.py +++ b/var/spack/repos/builtin/packages/r-jade/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RJade(RPackage): diff --git a/var/spack/repos/builtin/packages/r-janitor/package.py b/var/spack/repos/builtin/packages/r-janitor/package.py index 27e75ad903..6ca19dc0fd 100644 --- a/var/spack/repos/builtin/packages/r-janitor/package.py +++ b/var/spack/repos/builtin/packages/r-janitor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RJanitor(RPackage): diff --git a/var/spack/repos/builtin/packages/r-jaspar2018/package.py b/var/spack/repos/builtin/packages/r-jaspar2018/package.py index 91051bef81..ea4da1c381 100644 --- a/var/spack/repos/builtin/packages/r-jaspar2018/package.py +++ b/var/spack/repos/builtin/packages/r-jaspar2018/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RJaspar2018(RPackage): diff --git a/var/spack/repos/builtin/packages/r-jomo/package.py b/var/spack/repos/builtin/packages/r-jomo/package.py index ac1ddfe6c3..f951c7d119 100644 --- a/var/spack/repos/builtin/packages/r-jomo/package.py +++ b/var/spack/repos/builtin/packages/r-jomo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RJomo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-jpeg/package.py b/var/spack/repos/builtin/packages/r-jpeg/package.py index 16c1ba6463..92906cfac0 100644 --- a/var/spack/repos/builtin/packages/r-jpeg/package.py +++ b/var/spack/repos/builtin/packages/r-jpeg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RJpeg(RPackage): diff --git a/var/spack/repos/builtin/packages/r-jquerylib/package.py b/var/spack/repos/builtin/packages/r-jquerylib/package.py index 69d14a2dad..0edd6709b6 100644 --- a/var/spack/repos/builtin/packages/r-jquerylib/package.py +++ b/var/spack/repos/builtin/packages/r-jquerylib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RJquerylib(RPackage): diff --git a/var/spack/repos/builtin/packages/r-jsonify/package.py b/var/spack/repos/builtin/packages/r-jsonify/package.py index 721d7a1f01..31a380be19 100644 --- a/var/spack/repos/builtin/packages/r-jsonify/package.py +++ b/var/spack/repos/builtin/packages/r-jsonify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RJsonify(RPackage): diff --git a/var/spack/repos/builtin/packages/r-jsonlite/package.py b/var/spack/repos/builtin/packages/r-jsonlite/package.py index 1f775bf3e5..e7b25b1385 100644 --- a/var/spack/repos/builtin/packages/r-jsonlite/package.py +++ b/var/spack/repos/builtin/packages/r-jsonlite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RJsonlite(RPackage): diff --git a/var/spack/repos/builtin/packages/r-kegg-db/package.py b/var/spack/repos/builtin/packages/r-kegg-db/package.py index 761d5fde9c..40310b6cdf 100644 --- a/var/spack/repos/builtin/packages/r-kegg-db/package.py +++ b/var/spack/repos/builtin/packages/r-kegg-db/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKeggDb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-kegggraph/package.py b/var/spack/repos/builtin/packages/r-kegggraph/package.py index edb3f9dc63..0ce55ae88e 100644 --- a/var/spack/repos/builtin/packages/r-kegggraph/package.py +++ b/var/spack/repos/builtin/packages/r-kegggraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKegggraph(RPackage): diff --git a/var/spack/repos/builtin/packages/r-keggrest/package.py b/var/spack/repos/builtin/packages/r-keggrest/package.py index dfe235b0ab..3967797795 100644 --- a/var/spack/repos/builtin/packages/r-keggrest/package.py +++ b/var/spack/repos/builtin/packages/r-keggrest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKeggrest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-kernlab/package.py b/var/spack/repos/builtin/packages/r-kernlab/package.py index 98939d645a..9b8845a63f 100644 --- a/var/spack/repos/builtin/packages/r-kernlab/package.py +++ b/var/spack/repos/builtin/packages/r-kernlab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKernlab(RPackage): diff --git a/var/spack/repos/builtin/packages/r-kernsmooth/package.py b/var/spack/repos/builtin/packages/r-kernsmooth/package.py index c11382cbcd..2509d69888 100644 --- a/var/spack/repos/builtin/packages/r-kernsmooth/package.py +++ b/var/spack/repos/builtin/packages/r-kernsmooth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKernsmooth(RPackage): diff --git a/var/spack/repos/builtin/packages/r-kknn/package.py b/var/spack/repos/builtin/packages/r-kknn/package.py index 2e4535acf0..c659d51161 100644 --- a/var/spack/repos/builtin/packages/r-kknn/package.py +++ b/var/spack/repos/builtin/packages/r-kknn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKknn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-klar/package.py b/var/spack/repos/builtin/packages/r-klar/package.py index 93712468de..af65cdf5bd 100644 --- a/var/spack/repos/builtin/packages/r-klar/package.py +++ b/var/spack/repos/builtin/packages/r-klar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKlar(RPackage): diff --git a/var/spack/repos/builtin/packages/r-knitr/package.py b/var/spack/repos/builtin/packages/r-knitr/package.py index 2785669885..f1ee5e7654 100644 --- a/var/spack/repos/builtin/packages/r-knitr/package.py +++ b/var/spack/repos/builtin/packages/r-knitr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKnitr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-kpmt/package.py b/var/spack/repos/builtin/packages/r-kpmt/package.py index 6b0e6abcbc..5c2185e3ee 100644 --- a/var/spack/repos/builtin/packages/r-kpmt/package.py +++ b/var/spack/repos/builtin/packages/r-kpmt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKpmt(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ks/package.py b/var/spack/repos/builtin/packages/r-ks/package.py index 5b4592aaab..4fc91ddf30 100644 --- a/var/spack/repos/builtin/packages/r-ks/package.py +++ b/var/spack/repos/builtin/packages/r-ks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ksamples/package.py b/var/spack/repos/builtin/packages/r-ksamples/package.py index a5b9f0bd0e..c956f15853 100644 --- a/var/spack/repos/builtin/packages/r-ksamples/package.py +++ b/var/spack/repos/builtin/packages/r-ksamples/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RKsamples(RPackage): diff --git a/var/spack/repos/builtin/packages/r-labeling/package.py b/var/spack/repos/builtin/packages/r-labeling/package.py index 54d46ead1a..c66c161a53 100644 --- a/var/spack/repos/builtin/packages/r-labeling/package.py +++ b/var/spack/repos/builtin/packages/r-labeling/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLabeling(RPackage): diff --git a/var/spack/repos/builtin/packages/r-labelled/package.py b/var/spack/repos/builtin/packages/r-labelled/package.py index 477c10392f..9843dee958 100644 --- a/var/spack/repos/builtin/packages/r-labelled/package.py +++ b/var/spack/repos/builtin/packages/r-labelled/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLabelled(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lambda-r/package.py b/var/spack/repos/builtin/packages/r-lambda-r/package.py index a3285add11..2c969c02f5 100644 --- a/var/spack/repos/builtin/packages/r-lambda-r/package.py +++ b/var/spack/repos/builtin/packages/r-lambda-r/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLambdaR(RPackage): diff --git a/var/spack/repos/builtin/packages/r-laplacesdemon/package.py b/var/spack/repos/builtin/packages/r-laplacesdemon/package.py index 45217fb7ef..f5980ca98f 100644 --- a/var/spack/repos/builtin/packages/r-laplacesdemon/package.py +++ b/var/spack/repos/builtin/packages/r-laplacesdemon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLaplacesdemon(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lars/package.py b/var/spack/repos/builtin/packages/r-lars/package.py index 2aa08c1340..585be7f7b6 100644 --- a/var/spack/repos/builtin/packages/r-lars/package.py +++ b/var/spack/repos/builtin/packages/r-lars/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLars(RPackage): diff --git a/var/spack/repos/builtin/packages/r-later/package.py b/var/spack/repos/builtin/packages/r-later/package.py index c3bf76bc11..95b68d97a0 100644 --- a/var/spack/repos/builtin/packages/r-later/package.py +++ b/var/spack/repos/builtin/packages/r-later/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLater(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lattice/package.py b/var/spack/repos/builtin/packages/r-lattice/package.py index 9958bc3979..cfb68eec3d 100644 --- a/var/spack/repos/builtin/packages/r-lattice/package.py +++ b/var/spack/repos/builtin/packages/r-lattice/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLattice(RPackage): diff --git a/var/spack/repos/builtin/packages/r-latticeextra/package.py b/var/spack/repos/builtin/packages/r-latticeextra/package.py index e2a50535a0..5e416c1266 100644 --- a/var/spack/repos/builtin/packages/r-latticeextra/package.py +++ b/var/spack/repos/builtin/packages/r-latticeextra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLatticeextra(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lava/package.py b/var/spack/repos/builtin/packages/r-lava/package.py index 43e499e381..e67339ba41 100644 --- a/var/spack/repos/builtin/packages/r-lava/package.py +++ b/var/spack/repos/builtin/packages/r-lava/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLava(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lavaan/package.py b/var/spack/repos/builtin/packages/r-lavaan/package.py index 163a824dce..1aac757a02 100644 --- a/var/spack/repos/builtin/packages/r-lavaan/package.py +++ b/var/spack/repos/builtin/packages/r-lavaan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLavaan(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lazyeval/package.py b/var/spack/repos/builtin/packages/r-lazyeval/package.py index ecb8f0fbaf..29e9e599ca 100644 --- a/var/spack/repos/builtin/packages/r-lazyeval/package.py +++ b/var/spack/repos/builtin/packages/r-lazyeval/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLazyeval(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ldheatmap/package.py b/var/spack/repos/builtin/packages/r-ldheatmap/package.py index b3010c6984..7c8f2cc981 100644 --- a/var/spack/repos/builtin/packages/r-ldheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-ldheatmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLdheatmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-leafem/package.py b/var/spack/repos/builtin/packages/r-leafem/package.py index 83abd933af..5c28ea77de 100644 --- a/var/spack/repos/builtin/packages/r-leafem/package.py +++ b/var/spack/repos/builtin/packages/r-leafem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLeafem(RPackage): diff --git a/var/spack/repos/builtin/packages/r-leaflet-providers/package.py b/var/spack/repos/builtin/packages/r-leaflet-providers/package.py index dd2c61124b..1ffeaf21f6 100644 --- a/var/spack/repos/builtin/packages/r-leaflet-providers/package.py +++ b/var/spack/repos/builtin/packages/r-leaflet-providers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLeafletProviders(RPackage): diff --git a/var/spack/repos/builtin/packages/r-leaflet/package.py b/var/spack/repos/builtin/packages/r-leaflet/package.py index da95da91c5..57113ccff9 100644 --- a/var/spack/repos/builtin/packages/r-leaflet/package.py +++ b/var/spack/repos/builtin/packages/r-leaflet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLeaflet(RPackage): diff --git a/var/spack/repos/builtin/packages/r-leafpop/package.py b/var/spack/repos/builtin/packages/r-leafpop/package.py index 912dc2c744..c145590aaf 100644 --- a/var/spack/repos/builtin/packages/r-leafpop/package.py +++ b/var/spack/repos/builtin/packages/r-leafpop/package.py @@ -3,9 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# ---------------------------------------------------------------------------- +from spack.package import * -from spack import * +# ---------------------------------------------------------------------------- class RLeafpop(RPackage): diff --git a/var/spack/repos/builtin/packages/r-leaps/package.py b/var/spack/repos/builtin/packages/r-leaps/package.py index d3d89260de..d90b4e15ac 100644 --- a/var/spack/repos/builtin/packages/r-leaps/package.py +++ b/var/spack/repos/builtin/packages/r-leaps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLeaps(RPackage): diff --git a/var/spack/repos/builtin/packages/r-learnbayes/package.py b/var/spack/repos/builtin/packages/r-learnbayes/package.py index 7481f3cf8d..2d4a1bd953 100644 --- a/var/spack/repos/builtin/packages/r-learnbayes/package.py +++ b/var/spack/repos/builtin/packages/r-learnbayes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLearnbayes(RPackage): diff --git a/var/spack/repos/builtin/packages/r-leiden/package.py b/var/spack/repos/builtin/packages/r-leiden/package.py index df4242ec64..0d37871235 100644 --- a/var/spack/repos/builtin/packages/r-leiden/package.py +++ b/var/spack/repos/builtin/packages/r-leiden/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLeiden(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lfe/package.py b/var/spack/repos/builtin/packages/r-lfe/package.py index 50c811b112..a178b07e06 100644 --- a/var/spack/repos/builtin/packages/r-lfe/package.py +++ b/var/spack/repos/builtin/packages/r-lfe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLfe(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lhs/package.py b/var/spack/repos/builtin/packages/r-lhs/package.py index ab36fc55d7..43062dab92 100644 --- a/var/spack/repos/builtin/packages/r-lhs/package.py +++ b/var/spack/repos/builtin/packages/r-lhs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLhs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-libcoin/package.py b/var/spack/repos/builtin/packages/r-libcoin/package.py index 5064ea0e5b..c9c889f7e8 100644 --- a/var/spack/repos/builtin/packages/r-libcoin/package.py +++ b/var/spack/repos/builtin/packages/r-libcoin/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLibcoin(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lifecycle/package.py b/var/spack/repos/builtin/packages/r-lifecycle/package.py index 8c2b80404b..a69414fad7 100644 --- a/var/spack/repos/builtin/packages/r-lifecycle/package.py +++ b/var/spack/repos/builtin/packages/r-lifecycle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLifecycle(RPackage): diff --git a/var/spack/repos/builtin/packages/r-limma/package.py b/var/spack/repos/builtin/packages/r-limma/package.py index f850822f2d..82e25741da 100644 --- a/var/spack/repos/builtin/packages/r-limma/package.py +++ b/var/spack/repos/builtin/packages/r-limma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLimma(RPackage): diff --git a/var/spack/repos/builtin/packages/r-limsolve/package.py b/var/spack/repos/builtin/packages/r-limsolve/package.py index df1fa5c3cf..7025bbef55 100644 --- a/var/spack/repos/builtin/packages/r-limsolve/package.py +++ b/var/spack/repos/builtin/packages/r-limsolve/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLimsolve(RPackage): diff --git a/var/spack/repos/builtin/packages/r-listenv/package.py b/var/spack/repos/builtin/packages/r-listenv/package.py index 3dc3f4e71a..5d91dea7da 100644 --- a/var/spack/repos/builtin/packages/r-listenv/package.py +++ b/var/spack/repos/builtin/packages/r-listenv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RListenv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lme4/package.py b/var/spack/repos/builtin/packages/r-lme4/package.py index a8d1d9871a..bde027c408 100644 --- a/var/spack/repos/builtin/packages/r-lme4/package.py +++ b/var/spack/repos/builtin/packages/r-lme4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLme4(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lmertest/package.py b/var/spack/repos/builtin/packages/r-lmertest/package.py index fd5efb40d6..8639cd63e5 100644 --- a/var/spack/repos/builtin/packages/r-lmertest/package.py +++ b/var/spack/repos/builtin/packages/r-lmertest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLmertest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lmtest/package.py b/var/spack/repos/builtin/packages/r-lmtest/package.py index 99fe7a449e..7ec9ec1d66 100644 --- a/var/spack/repos/builtin/packages/r-lmtest/package.py +++ b/var/spack/repos/builtin/packages/r-lmtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLmtest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lobstr/package.py b/var/spack/repos/builtin/packages/r-lobstr/package.py index 9150c412df..1c7afbf8d7 100644 --- a/var/spack/repos/builtin/packages/r-lobstr/package.py +++ b/var/spack/repos/builtin/packages/r-lobstr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLobstr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-locfit/package.py b/var/spack/repos/builtin/packages/r-locfit/package.py index c351f46448..fb79019ef4 100644 --- a/var/spack/repos/builtin/packages/r-locfit/package.py +++ b/var/spack/repos/builtin/packages/r-locfit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLocfit(RPackage): diff --git a/var/spack/repos/builtin/packages/r-log4r/package.py b/var/spack/repos/builtin/packages/r-log4r/package.py index cba4266c50..6f37485b6a 100644 --- a/var/spack/repos/builtin/packages/r-log4r/package.py +++ b/var/spack/repos/builtin/packages/r-log4r/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLog4r(RPackage): diff --git a/var/spack/repos/builtin/packages/r-loo/package.py b/var/spack/repos/builtin/packages/r-loo/package.py index dca16abbd4..449e403614 100644 --- a/var/spack/repos/builtin/packages/r-loo/package.py +++ b/var/spack/repos/builtin/packages/r-loo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLoo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lpsolve/package.py b/var/spack/repos/builtin/packages/r-lpsolve/package.py index cc422159b9..f51bfe81a8 100644 --- a/var/spack/repos/builtin/packages/r-lpsolve/package.py +++ b/var/spack/repos/builtin/packages/r-lpsolve/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLpsolve(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lpsolveapi/package.py b/var/spack/repos/builtin/packages/r-lpsolveapi/package.py index a67d8f6a17..6f654b4162 100644 --- a/var/spack/repos/builtin/packages/r-lpsolveapi/package.py +++ b/var/spack/repos/builtin/packages/r-lpsolveapi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLpsolveapi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lsei/package.py b/var/spack/repos/builtin/packages/r-lsei/package.py index 37bc88bd5c..7c4b94b4fa 100644 --- a/var/spack/repos/builtin/packages/r-lsei/package.py +++ b/var/spack/repos/builtin/packages/r-lsei/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLsei(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py index 2357879892..1873b8dfa9 100644 --- a/var/spack/repos/builtin/packages/r-lubridate/package.py +++ b/var/spack/repos/builtin/packages/r-lubridate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLubridate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lumi/package.py b/var/spack/repos/builtin/packages/r-lumi/package.py index 5f8cc57d84..c557ec0364 100644 --- a/var/spack/repos/builtin/packages/r-lumi/package.py +++ b/var/spack/repos/builtin/packages/r-lumi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLumi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-lwgeom/package.py b/var/spack/repos/builtin/packages/r-lwgeom/package.py index efab98b877..874815681a 100644 --- a/var/spack/repos/builtin/packages/r-lwgeom/package.py +++ b/var/spack/repos/builtin/packages/r-lwgeom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RLwgeom(RPackage): diff --git a/var/spack/repos/builtin/packages/r-magic/package.py b/var/spack/repos/builtin/packages/r-magic/package.py index fe2c4a9f25..6aa56cf4f4 100644 --- a/var/spack/repos/builtin/packages/r-magic/package.py +++ b/var/spack/repos/builtin/packages/r-magic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMagic(RPackage): diff --git a/var/spack/repos/builtin/packages/r-magick/package.py b/var/spack/repos/builtin/packages/r-magick/package.py index 075d771eb7..6945801377 100644 --- a/var/spack/repos/builtin/packages/r-magick/package.py +++ b/var/spack/repos/builtin/packages/r-magick/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMagick(RPackage): diff --git a/var/spack/repos/builtin/packages/r-magrittr/package.py b/var/spack/repos/builtin/packages/r-magrittr/package.py index 399b2963bb..a0c8311580 100644 --- a/var/spack/repos/builtin/packages/r-magrittr/package.py +++ b/var/spack/repos/builtin/packages/r-magrittr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMagrittr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-makecdfenv/package.py b/var/spack/repos/builtin/packages/r-makecdfenv/package.py index 4c316e6c3a..9756aea25d 100644 --- a/var/spack/repos/builtin/packages/r-makecdfenv/package.py +++ b/var/spack/repos/builtin/packages/r-makecdfenv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMakecdfenv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-maldiquant/package.py b/var/spack/repos/builtin/packages/r-maldiquant/package.py index 1bf2e9eaa7..ea4481799f 100644 --- a/var/spack/repos/builtin/packages/r-maldiquant/package.py +++ b/var/spack/repos/builtin/packages/r-maldiquant/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMaldiquant(RPackage): diff --git a/var/spack/repos/builtin/packages/r-manipulatewidget/package.py b/var/spack/repos/builtin/packages/r-manipulatewidget/package.py index 51d3e5ebcd..41def139fb 100644 --- a/var/spack/repos/builtin/packages/r-manipulatewidget/package.py +++ b/var/spack/repos/builtin/packages/r-manipulatewidget/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RManipulatewidget(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mapplots/package.py b/var/spack/repos/builtin/packages/r-mapplots/package.py index 089713d062..6dedf551f9 100644 --- a/var/spack/repos/builtin/packages/r-mapplots/package.py +++ b/var/spack/repos/builtin/packages/r-mapplots/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMapplots(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mapproj/package.py b/var/spack/repos/builtin/packages/r-mapproj/package.py index f7e0d06b6c..b69df8aee4 100644 --- a/var/spack/repos/builtin/packages/r-mapproj/package.py +++ b/var/spack/repos/builtin/packages/r-mapproj/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMapproj(RPackage): diff --git a/var/spack/repos/builtin/packages/r-maps/package.py b/var/spack/repos/builtin/packages/r-maps/package.py index 94032ce49b..da8b9a2cf1 100644 --- a/var/spack/repos/builtin/packages/r-maps/package.py +++ b/var/spack/repos/builtin/packages/r-maps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMaps(RPackage): diff --git a/var/spack/repos/builtin/packages/r-maptools/package.py b/var/spack/repos/builtin/packages/r-maptools/package.py index 89c67e6ad9..c406d9718f 100644 --- a/var/spack/repos/builtin/packages/r-maptools/package.py +++ b/var/spack/repos/builtin/packages/r-maptools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMaptools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mapview/package.py b/var/spack/repos/builtin/packages/r-mapview/package.py index 1200410162..be7448066c 100644 --- a/var/spack/repos/builtin/packages/r-mapview/package.py +++ b/var/spack/repos/builtin/packages/r-mapview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMapview(RPackage): diff --git a/var/spack/repos/builtin/packages/r-markdown/package.py b/var/spack/repos/builtin/packages/r-markdown/package.py index 9a8611505f..f513ac3348 100644 --- a/var/spack/repos/builtin/packages/r-markdown/package.py +++ b/var/spack/repos/builtin/packages/r-markdown/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMarkdown(RPackage): diff --git a/var/spack/repos/builtin/packages/r-marray/package.py b/var/spack/repos/builtin/packages/r-marray/package.py index 55095efa3a..6b911753a2 100644 --- a/var/spack/repos/builtin/packages/r-marray/package.py +++ b/var/spack/repos/builtin/packages/r-marray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMarray(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mass/package.py b/var/spack/repos/builtin/packages/r-mass/package.py index caea2ea9b7..c370c452c7 100644 --- a/var/spack/repos/builtin/packages/r-mass/package.py +++ b/var/spack/repos/builtin/packages/r-mass/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMass(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mathjaxr/package.py b/var/spack/repos/builtin/packages/r-mathjaxr/package.py index 4ca4c069ef..e66bbf093f 100644 --- a/var/spack/repos/builtin/packages/r-mathjaxr/package.py +++ b/var/spack/repos/builtin/packages/r-mathjaxr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMathjaxr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-matlab/package.py b/var/spack/repos/builtin/packages/r-matlab/package.py index f75482c96c..1311124129 100644 --- a/var/spack/repos/builtin/packages/r-matlab/package.py +++ b/var/spack/repos/builtin/packages/r-matlab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMatlab(RPackage): diff --git a/var/spack/repos/builtin/packages/r-matr/package.py b/var/spack/repos/builtin/packages/r-matr/package.py index 6c11f8571d..a5bc78df37 100644 --- a/var/spack/repos/builtin/packages/r-matr/package.py +++ b/var/spack/repos/builtin/packages/r-matr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMatr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index 6a8d0d5e09..01608c2bc7 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMatrix(RPackage): diff --git a/var/spack/repos/builtin/packages/r-matrixgenerics/package.py b/var/spack/repos/builtin/packages/r-matrixgenerics/package.py index 5d31908371..845f5b4187 100644 --- a/var/spack/repos/builtin/packages/r-matrixgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-matrixgenerics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMatrixgenerics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-matrixmodels/package.py b/var/spack/repos/builtin/packages/r-matrixmodels/package.py index 7a776f8a56..f569c4da8d 100644 --- a/var/spack/repos/builtin/packages/r-matrixmodels/package.py +++ b/var/spack/repos/builtin/packages/r-matrixmodels/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMatrixmodels(RPackage): diff --git a/var/spack/repos/builtin/packages/r-matrixstats/package.py b/var/spack/repos/builtin/packages/r-matrixstats/package.py index 92e56e2e5e..b596a62621 100644 --- a/var/spack/repos/builtin/packages/r-matrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-matrixstats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMatrixstats(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mclust/package.py b/var/spack/repos/builtin/packages/r-mclust/package.py index c3da03324b..37277685c9 100644 --- a/var/spack/repos/builtin/packages/r-mclust/package.py +++ b/var/spack/repos/builtin/packages/r-mclust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMclust(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mcmc/package.py b/var/spack/repos/builtin/packages/r-mcmc/package.py index 30068988cd..0f70af9fb4 100644 --- a/var/spack/repos/builtin/packages/r-mcmc/package.py +++ b/var/spack/repos/builtin/packages/r-mcmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMcmc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mcmcglmm/package.py b/var/spack/repos/builtin/packages/r-mcmcglmm/package.py index 960b213407..80d9d9c350 100644 --- a/var/spack/repos/builtin/packages/r-mcmcglmm/package.py +++ b/var/spack/repos/builtin/packages/r-mcmcglmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMcmcglmm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mcmcpack/package.py b/var/spack/repos/builtin/packages/r-mcmcpack/package.py index 1442458553..497d0c600e 100644 --- a/var/spack/repos/builtin/packages/r-mcmcpack/package.py +++ b/var/spack/repos/builtin/packages/r-mcmcpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMcmcpack(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mco/package.py b/var/spack/repos/builtin/packages/r-mco/package.py index 53282a5aa0..84da3975e6 100644 --- a/var/spack/repos/builtin/packages/r-mco/package.py +++ b/var/spack/repos/builtin/packages/r-mco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMco(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mda/package.py b/var/spack/repos/builtin/packages/r-mda/package.py index da4b38f635..4c37a9bc70 100644 --- a/var/spack/repos/builtin/packages/r-mda/package.py +++ b/var/spack/repos/builtin/packages/r-mda/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMda(RPackage): diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py index 84ee838dce..dae5fc8ec8 100644 --- a/var/spack/repos/builtin/packages/r-memoise/package.py +++ b/var/spack/repos/builtin/packages/r-memoise/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMemoise(RPackage): diff --git a/var/spack/repos/builtin/packages/r-memuse/package.py b/var/spack/repos/builtin/packages/r-memuse/package.py index 0d1bbdda8c..9dd3e6dd9f 100644 --- a/var/spack/repos/builtin/packages/r-memuse/package.py +++ b/var/spack/repos/builtin/packages/r-memuse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMemuse(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mergemaid/package.py b/var/spack/repos/builtin/packages/r-mergemaid/package.py index 6c44fe1925..632101d504 100644 --- a/var/spack/repos/builtin/packages/r-mergemaid/package.py +++ b/var/spack/repos/builtin/packages/r-mergemaid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMergemaid(RPackage): diff --git a/var/spack/repos/builtin/packages/r-metap/package.py b/var/spack/repos/builtin/packages/r-metap/package.py index c7e1e68177..44de67d288 100644 --- a/var/spack/repos/builtin/packages/r-metap/package.py +++ b/var/spack/repos/builtin/packages/r-metap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMetap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-methylumi/package.py b/var/spack/repos/builtin/packages/r-methylumi/package.py index c16967e00e..c69aa2df5b 100644 --- a/var/spack/repos/builtin/packages/r-methylumi/package.py +++ b/var/spack/repos/builtin/packages/r-methylumi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMethylumi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mgcv/package.py b/var/spack/repos/builtin/packages/r-mgcv/package.py index ddaf2cea00..cc6cde5375 100644 --- a/var/spack/repos/builtin/packages/r-mgcv/package.py +++ b/var/spack/repos/builtin/packages/r-mgcv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMgcv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mgraster/package.py b/var/spack/repos/builtin/packages/r-mgraster/package.py index b5cbdeb516..82e936840a 100644 --- a/var/spack/repos/builtin/packages/r-mgraster/package.py +++ b/var/spack/repos/builtin/packages/r-mgraster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMgraster(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mice/package.py b/var/spack/repos/builtin/packages/r-mice/package.py index 2048b02682..9865ca990c 100644 --- a/var/spack/repos/builtin/packages/r-mice/package.py +++ b/var/spack/repos/builtin/packages/r-mice/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMice(RPackage): diff --git a/var/spack/repos/builtin/packages/r-microbenchmark/package.py b/var/spack/repos/builtin/packages/r-microbenchmark/package.py index f12720e077..ea8e3db077 100644 --- a/var/spack/repos/builtin/packages/r-microbenchmark/package.py +++ b/var/spack/repos/builtin/packages/r-microbenchmark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMicrobenchmark(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mime/package.py b/var/spack/repos/builtin/packages/r-mime/package.py index cf470f38c8..ac5949db17 100644 --- a/var/spack/repos/builtin/packages/r-mime/package.py +++ b/var/spack/repos/builtin/packages/r-mime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMime(RPackage): diff --git a/var/spack/repos/builtin/packages/r-minfi/package.py b/var/spack/repos/builtin/packages/r-minfi/package.py index 99ff0c72c0..cf361e76b3 100644 --- a/var/spack/repos/builtin/packages/r-minfi/package.py +++ b/var/spack/repos/builtin/packages/r-minfi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMinfi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-miniui/package.py b/var/spack/repos/builtin/packages/r-miniui/package.py index 6553385170..fcca7bb369 100644 --- a/var/spack/repos/builtin/packages/r-miniui/package.py +++ b/var/spack/repos/builtin/packages/r-miniui/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMiniui(RPackage): diff --git a/var/spack/repos/builtin/packages/r-minqa/package.py b/var/spack/repos/builtin/packages/r-minqa/package.py index 02482d5f06..5683943b65 100644 --- a/var/spack/repos/builtin/packages/r-minqa/package.py +++ b/var/spack/repos/builtin/packages/r-minqa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMinqa(RPackage): diff --git a/var/spack/repos/builtin/packages/r-misc3d/package.py b/var/spack/repos/builtin/packages/r-misc3d/package.py index 543cfc9105..e64c5be933 100644 --- a/var/spack/repos/builtin/packages/r-misc3d/package.py +++ b/var/spack/repos/builtin/packages/r-misc3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMisc3d(RPackage): diff --git a/var/spack/repos/builtin/packages/r-missmethyl/package.py b/var/spack/repos/builtin/packages/r-missmethyl/package.py index 51f2245e3a..848c6c2519 100644 --- a/var/spack/repos/builtin/packages/r-missmethyl/package.py +++ b/var/spack/repos/builtin/packages/r-missmethyl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMissmethyl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mitml/package.py b/var/spack/repos/builtin/packages/r-mitml/package.py index e3451b4dd7..61585aa9d7 100644 --- a/var/spack/repos/builtin/packages/r-mitml/package.py +++ b/var/spack/repos/builtin/packages/r-mitml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMitml(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mitools/package.py b/var/spack/repos/builtin/packages/r-mitools/package.py index b5d7e243a7..51c5e7e1a6 100644 --- a/var/spack/repos/builtin/packages/r-mitools/package.py +++ b/var/spack/repos/builtin/packages/r-mitools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMitools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mixtools/package.py b/var/spack/repos/builtin/packages/r-mixtools/package.py index b2e583f020..90ca087b00 100644 --- a/var/spack/repos/builtin/packages/r-mixtools/package.py +++ b/var/spack/repos/builtin/packages/r-mixtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMixtools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mlbench/package.py b/var/spack/repos/builtin/packages/r-mlbench/package.py index 00ceddf31b..84480a917c 100644 --- a/var/spack/repos/builtin/packages/r-mlbench/package.py +++ b/var/spack/repos/builtin/packages/r-mlbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMlbench(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py index ce1d932f75..30c2f02c5a 100644 --- a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py +++ b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMlinterfaces(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mlr/package.py b/var/spack/repos/builtin/packages/r-mlr/package.py index b96990bbeb..8a30518026 100644 --- a/var/spack/repos/builtin/packages/r-mlr/package.py +++ b/var/spack/repos/builtin/packages/r-mlr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMlr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mlrmbo/package.py b/var/spack/repos/builtin/packages/r-mlrmbo/package.py index ecdca83cf7..24d3a39fdc 100644 --- a/var/spack/repos/builtin/packages/r-mlrmbo/package.py +++ b/var/spack/repos/builtin/packages/r-mlrmbo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMlrmbo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mmwrweek/package.py b/var/spack/repos/builtin/packages/r-mmwrweek/package.py index 00d459fe0f..3db657df15 100644 --- a/var/spack/repos/builtin/packages/r-mmwrweek/package.py +++ b/var/spack/repos/builtin/packages/r-mmwrweek/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMmwrweek(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mnormt/package.py b/var/spack/repos/builtin/packages/r-mnormt/package.py index 41647ff47b..ec4a41b43d 100644 --- a/var/spack/repos/builtin/packages/r-mnormt/package.py +++ b/var/spack/repos/builtin/packages/r-mnormt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMnormt(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mockery/package.py b/var/spack/repos/builtin/packages/r-mockery/package.py index b08d3327db..3165838ce5 100644 --- a/var/spack/repos/builtin/packages/r-mockery/package.py +++ b/var/spack/repos/builtin/packages/r-mockery/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMockery(RPackage): diff --git a/var/spack/repos/builtin/packages/r-modelmetrics/package.py b/var/spack/repos/builtin/packages/r-modelmetrics/package.py index c09f9e8798..e58d273d14 100644 --- a/var/spack/repos/builtin/packages/r-modelmetrics/package.py +++ b/var/spack/repos/builtin/packages/r-modelmetrics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RModelmetrics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-modelr/package.py b/var/spack/repos/builtin/packages/r-modelr/package.py index 115afc3a46..fe96e2cd7d 100644 --- a/var/spack/repos/builtin/packages/r-modelr/package.py +++ b/var/spack/repos/builtin/packages/r-modelr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RModelr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-modeltools/package.py b/var/spack/repos/builtin/packages/r-modeltools/package.py index 0ddfe0c986..569a6a9e55 100644 --- a/var/spack/repos/builtin/packages/r-modeltools/package.py +++ b/var/spack/repos/builtin/packages/r-modeltools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RModeltools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mpm/package.py b/var/spack/repos/builtin/packages/r-mpm/package.py index bc45ed08c8..0c076354e9 100644 --- a/var/spack/repos/builtin/packages/r-mpm/package.py +++ b/var/spack/repos/builtin/packages/r-mpm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMpm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mscoreutils/package.py b/var/spack/repos/builtin/packages/r-mscoreutils/package.py index 9d1e4f7dd8..7138fc5f21 100644 --- a/var/spack/repos/builtin/packages/r-mscoreutils/package.py +++ b/var/spack/repos/builtin/packages/r-mscoreutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMscoreutils(RPackage): diff --git a/var/spack/repos/builtin/packages/r-msnbase/package.py b/var/spack/repos/builtin/packages/r-msnbase/package.py index 09cd1eec72..72c90f7603 100644 --- a/var/spack/repos/builtin/packages/r-msnbase/package.py +++ b/var/spack/repos/builtin/packages/r-msnbase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMsnbase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-multcomp/package.py b/var/spack/repos/builtin/packages/r-multcomp/package.py index 0a3b440cf8..f86a41109f 100644 --- a/var/spack/repos/builtin/packages/r-multcomp/package.py +++ b/var/spack/repos/builtin/packages/r-multcomp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMultcomp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-multcompview/package.py b/var/spack/repos/builtin/packages/r-multcompview/package.py index e79a509a66..41a738f0a2 100644 --- a/var/spack/repos/builtin/packages/r-multcompview/package.py +++ b/var/spack/repos/builtin/packages/r-multcompview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMultcompview(RPackage): diff --git a/var/spack/repos/builtin/packages/r-multicool/package.py b/var/spack/repos/builtin/packages/r-multicool/package.py index b62a29b522..b232592c83 100644 --- a/var/spack/repos/builtin/packages/r-multicool/package.py +++ b/var/spack/repos/builtin/packages/r-multicool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMulticool(RPackage): diff --git a/var/spack/repos/builtin/packages/r-multitaper/package.py b/var/spack/repos/builtin/packages/r-multitaper/package.py index 8654bc8f48..048e7fd190 100644 --- a/var/spack/repos/builtin/packages/r-multitaper/package.py +++ b/var/spack/repos/builtin/packages/r-multitaper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMultitaper(RPackage): diff --git a/var/spack/repos/builtin/packages/r-multtest/package.py b/var/spack/repos/builtin/packages/r-multtest/package.py index 793f2cc756..97ab070efe 100644 --- a/var/spack/repos/builtin/packages/r-multtest/package.py +++ b/var/spack/repos/builtin/packages/r-multtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMulttest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-munsell/package.py b/var/spack/repos/builtin/packages/r-munsell/package.py index 67cf7a43ee..c4d9b1a636 100644 --- a/var/spack/repos/builtin/packages/r-munsell/package.py +++ b/var/spack/repos/builtin/packages/r-munsell/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMunsell(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mutoss/package.py b/var/spack/repos/builtin/packages/r-mutoss/package.py index b086b39355..ccb31c4035 100644 --- a/var/spack/repos/builtin/packages/r-mutoss/package.py +++ b/var/spack/repos/builtin/packages/r-mutoss/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMutoss(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mvtnorm/package.py b/var/spack/repos/builtin/packages/r-mvtnorm/package.py index f465912865..1611089c96 100644 --- a/var/spack/repos/builtin/packages/r-mvtnorm/package.py +++ b/var/spack/repos/builtin/packages/r-mvtnorm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMvtnorm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mzid/package.py b/var/spack/repos/builtin/packages/r-mzid/package.py index 0ea0a9c30b..85973c0101 100644 --- a/var/spack/repos/builtin/packages/r-mzid/package.py +++ b/var/spack/repos/builtin/packages/r-mzid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMzid(RPackage): diff --git a/var/spack/repos/builtin/packages/r-mzr/package.py b/var/spack/repos/builtin/packages/r-mzr/package.py index 3f091378a1..d7a1c9cb65 100644 --- a/var/spack/repos/builtin/packages/r-mzr/package.py +++ b/var/spack/repos/builtin/packages/r-mzr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RMzr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nada/package.py b/var/spack/repos/builtin/packages/r-nada/package.py index b3d45a0075..d8f9f229ce 100644 --- a/var/spack/repos/builtin/packages/r-nada/package.py +++ b/var/spack/repos/builtin/packages/r-nada/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNada(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nanotime/package.py b/var/spack/repos/builtin/packages/r-nanotime/package.py index 17542c7ca4..684343bc0a 100644 --- a/var/spack/repos/builtin/packages/r-nanotime/package.py +++ b/var/spack/repos/builtin/packages/r-nanotime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNanotime(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ncbit/package.py b/var/spack/repos/builtin/packages/r-ncbit/package.py index 20c08dfbda..70a2b43e3d 100644 --- a/var/spack/repos/builtin/packages/r-ncbit/package.py +++ b/var/spack/repos/builtin/packages/r-ncbit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNcbit(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ncdf4/package.py b/var/spack/repos/builtin/packages/r-ncdf4/package.py index 9878c5a83a..8e169b24ee 100644 --- a/var/spack/repos/builtin/packages/r-ncdf4/package.py +++ b/var/spack/repos/builtin/packages/r-ncdf4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNcdf4(RPackage): diff --git a/var/spack/repos/builtin/packages/r-network/package.py b/var/spack/repos/builtin/packages/r-network/package.py index 26fe6a4610..25c3c20d26 100644 --- a/var/spack/repos/builtin/packages/r-network/package.py +++ b/var/spack/repos/builtin/packages/r-network/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNetwork(RPackage): diff --git a/var/spack/repos/builtin/packages/r-networkd3/package.py b/var/spack/repos/builtin/packages/r-networkd3/package.py index 84bf6bac8b..1f7d13e6d1 100644 --- a/var/spack/repos/builtin/packages/r-networkd3/package.py +++ b/var/spack/repos/builtin/packages/r-networkd3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNetworkd3(RPackage): diff --git a/var/spack/repos/builtin/packages/r-neuralnet/package.py b/var/spack/repos/builtin/packages/r-neuralnet/package.py index bf641106ef..4d16ad6524 100644 --- a/var/spack/repos/builtin/packages/r-neuralnet/package.py +++ b/var/spack/repos/builtin/packages/r-neuralnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNeuralnet(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nfactors/package.py b/var/spack/repos/builtin/packages/r-nfactors/package.py index 70822c1a95..e0ed98aac7 100644 --- a/var/spack/repos/builtin/packages/r-nfactors/package.py +++ b/var/spack/repos/builtin/packages/r-nfactors/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNfactors(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nimble/package.py b/var/spack/repos/builtin/packages/r-nimble/package.py index 0b39896db2..da609dcaf0 100644 --- a/var/spack/repos/builtin/packages/r-nimble/package.py +++ b/var/spack/repos/builtin/packages/r-nimble/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNimble(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nleqslv/package.py b/var/spack/repos/builtin/packages/r-nleqslv/package.py index 84ab38c6e4..38d67b5e1e 100644 --- a/var/spack/repos/builtin/packages/r-nleqslv/package.py +++ b/var/spack/repos/builtin/packages/r-nleqslv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNleqslv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nlme/package.py b/var/spack/repos/builtin/packages/r-nlme/package.py index decd172005..8a861052b4 100644 --- a/var/spack/repos/builtin/packages/r-nlme/package.py +++ b/var/spack/repos/builtin/packages/r-nlme/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNlme(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nloptr/package.py b/var/spack/repos/builtin/packages/r-nloptr/package.py index 4ee5d7484b..2127d0e34d 100644 --- a/var/spack/repos/builtin/packages/r-nloptr/package.py +++ b/var/spack/repos/builtin/packages/r-nloptr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNloptr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nmf/package.py b/var/spack/repos/builtin/packages/r-nmf/package.py index d7c974d79b..690113f092 100644 --- a/var/spack/repos/builtin/packages/r-nmf/package.py +++ b/var/spack/repos/builtin/packages/r-nmf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNmf(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nmof/package.py b/var/spack/repos/builtin/packages/r-nmof/package.py index 2440ea5d6d..4281319ac9 100644 --- a/var/spack/repos/builtin/packages/r-nmof/package.py +++ b/var/spack/repos/builtin/packages/r-nmof/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNmof(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nnet/package.py b/var/spack/repos/builtin/packages/r-nnet/package.py index 2a9474abbd..ab2be150e3 100644 --- a/var/spack/repos/builtin/packages/r-nnet/package.py +++ b/var/spack/repos/builtin/packages/r-nnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNnet(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nnls/package.py b/var/spack/repos/builtin/packages/r-nnls/package.py index dcb5ec5724..1be27eca53 100644 --- a/var/spack/repos/builtin/packages/r-nnls/package.py +++ b/var/spack/repos/builtin/packages/r-nnls/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNnls(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nonnest2/package.py b/var/spack/repos/builtin/packages/r-nonnest2/package.py index cb00e3b05d..968f94525b 100644 --- a/var/spack/repos/builtin/packages/r-nonnest2/package.py +++ b/var/spack/repos/builtin/packages/r-nonnest2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNonnest2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nor1mix/package.py b/var/spack/repos/builtin/packages/r-nor1mix/package.py index 9c1c660ce2..2588defb86 100644 --- a/var/spack/repos/builtin/packages/r-nor1mix/package.py +++ b/var/spack/repos/builtin/packages/r-nor1mix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNor1mix(RPackage): diff --git a/var/spack/repos/builtin/packages/r-nortest/package.py b/var/spack/repos/builtin/packages/r-nortest/package.py index 17e4f241d6..e521383179 100644 --- a/var/spack/repos/builtin/packages/r-nortest/package.py +++ b/var/spack/repos/builtin/packages/r-nortest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNortest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-np/package.py b/var/spack/repos/builtin/packages/r-np/package.py index 7fe571d526..0efc94d67c 100644 --- a/var/spack/repos/builtin/packages/r-np/package.py +++ b/var/spack/repos/builtin/packages/r-np/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-npsurv/package.py b/var/spack/repos/builtin/packages/r-npsurv/package.py index 8d9d60e7c1..579029fa15 100644 --- a/var/spack/repos/builtin/packages/r-npsurv/package.py +++ b/var/spack/repos/builtin/packages/r-npsurv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNpsurv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-numderiv/package.py b/var/spack/repos/builtin/packages/r-numderiv/package.py index 844969e018..6d67605095 100644 --- a/var/spack/repos/builtin/packages/r-numderiv/package.py +++ b/var/spack/repos/builtin/packages/r-numderiv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RNumderiv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-oligoclasses/package.py b/var/spack/repos/builtin/packages/r-oligoclasses/package.py index 2f6e9e18c5..6d5f532881 100644 --- a/var/spack/repos/builtin/packages/r-oligoclasses/package.py +++ b/var/spack/repos/builtin/packages/r-oligoclasses/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ROligoclasses(RPackage): diff --git a/var/spack/repos/builtin/packages/r-openssl/package.py b/var/spack/repos/builtin/packages/r-openssl/package.py index 2c2e9abcc6..b2c8f69434 100644 --- a/var/spack/repos/builtin/packages/r-openssl/package.py +++ b/var/spack/repos/builtin/packages/r-openssl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ROpenssl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-openxlsx/package.py b/var/spack/repos/builtin/packages/r-openxlsx/package.py index 30fb8dd701..c394938bc3 100644 --- a/var/spack/repos/builtin/packages/r-openxlsx/package.py +++ b/var/spack/repos/builtin/packages/r-openxlsx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ROpenxlsx(RPackage): diff --git a/var/spack/repos/builtin/packages/r-optimx/package.py b/var/spack/repos/builtin/packages/r-optimx/package.py index f020b19fd0..b6fb27d387 100644 --- a/var/spack/repos/builtin/packages/r-optimx/package.py +++ b/var/spack/repos/builtin/packages/r-optimx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ROptimx(RPackage): diff --git a/var/spack/repos/builtin/packages/r-optparse/package.py b/var/spack/repos/builtin/packages/r-optparse/package.py index 2ecc532a3d..1465d7c29c 100644 --- a/var/spack/repos/builtin/packages/r-optparse/package.py +++ b/var/spack/repos/builtin/packages/r-optparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ROptparse(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ordinal/package.py b/var/spack/repos/builtin/packages/r-ordinal/package.py index d083c234c7..b679f50232 100644 --- a/var/spack/repos/builtin/packages/r-ordinal/package.py +++ b/var/spack/repos/builtin/packages/r-ordinal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ROrdinal(RPackage): diff --git a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py index 178bb144dc..0fd0e5a130 100644 --- a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py +++ b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ROrgHsEgDb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-organismdbi/package.py b/var/spack/repos/builtin/packages/r-organismdbi/package.py index 017b9ea5e3..a853cda294 100644 --- a/var/spack/repos/builtin/packages/r-organismdbi/package.py +++ b/var/spack/repos/builtin/packages/r-organismdbi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ROrganismdbi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-packrat/package.py b/var/spack/repos/builtin/packages/r-packrat/package.py index 14341f182a..5ad2550bb9 100644 --- a/var/spack/repos/builtin/packages/r-packrat/package.py +++ b/var/spack/repos/builtin/packages/r-packrat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPackrat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pacman/package.py b/var/spack/repos/builtin/packages/r-pacman/package.py index 4b35b19433..45b66f0697 100644 --- a/var/spack/repos/builtin/packages/r-pacman/package.py +++ b/var/spack/repos/builtin/packages/r-pacman/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPacman(RPackage): diff --git a/var/spack/repos/builtin/packages/r-paleotree/package.py b/var/spack/repos/builtin/packages/r-paleotree/package.py index 54e61b5fbc..c4ac697b08 100644 --- a/var/spack/repos/builtin/packages/r-paleotree/package.py +++ b/var/spack/repos/builtin/packages/r-paleotree/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPaleotree(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pamr/package.py b/var/spack/repos/builtin/packages/r-pamr/package.py index 530f024966..061f8cf02e 100644 --- a/var/spack/repos/builtin/packages/r-pamr/package.py +++ b/var/spack/repos/builtin/packages/r-pamr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPamr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pan/package.py b/var/spack/repos/builtin/packages/r-pan/package.py index 15f3a58b5f..edab1f4c4c 100644 --- a/var/spack/repos/builtin/packages/r-pan/package.py +++ b/var/spack/repos/builtin/packages/r-pan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPan(RPackage): diff --git a/var/spack/repos/builtin/packages/r-parallelly/package.py b/var/spack/repos/builtin/packages/r-parallelly/package.py index 68bf7eef7e..3d8aa3ad82 100644 --- a/var/spack/repos/builtin/packages/r-parallelly/package.py +++ b/var/spack/repos/builtin/packages/r-parallelly/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RParallelly(RPackage): diff --git a/var/spack/repos/builtin/packages/r-parallelmap/package.py b/var/spack/repos/builtin/packages/r-parallelmap/package.py index ae08766914..ab03375e7e 100644 --- a/var/spack/repos/builtin/packages/r-parallelmap/package.py +++ b/var/spack/repos/builtin/packages/r-parallelmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RParallelmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-paramhelpers/package.py b/var/spack/repos/builtin/packages/r-paramhelpers/package.py index 4f329fb305..88c1e3425a 100644 --- a/var/spack/repos/builtin/packages/r-paramhelpers/package.py +++ b/var/spack/repos/builtin/packages/r-paramhelpers/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RParamhelpers(RPackage): diff --git a/var/spack/repos/builtin/packages/r-party/package.py b/var/spack/repos/builtin/packages/r-party/package.py index 3b09830939..b6e6231390 100644 --- a/var/spack/repos/builtin/packages/r-party/package.py +++ b/var/spack/repos/builtin/packages/r-party/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RParty(RPackage): diff --git a/var/spack/repos/builtin/packages/r-partykit/package.py b/var/spack/repos/builtin/packages/r-partykit/package.py index 3d9c8d0e8c..c8419a3094 100644 --- a/var/spack/repos/builtin/packages/r-partykit/package.py +++ b/var/spack/repos/builtin/packages/r-partykit/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPartykit(RPackage): diff --git a/var/spack/repos/builtin/packages/r-patchwork/package.py b/var/spack/repos/builtin/packages/r-patchwork/package.py index 8f70d94ed6..87c6ac10f6 100644 --- a/var/spack/repos/builtin/packages/r-patchwork/package.py +++ b/var/spack/repos/builtin/packages/r-patchwork/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPatchwork(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pathview/package.py b/var/spack/repos/builtin/packages/r-pathview/package.py index 91903fb433..95d647a073 100644 --- a/var/spack/repos/builtin/packages/r-pathview/package.py +++ b/var/spack/repos/builtin/packages/r-pathview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPathview(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pbapply/package.py b/var/spack/repos/builtin/packages/r-pbapply/package.py index 0d36943f6a..ec17f078b3 100644 --- a/var/spack/repos/builtin/packages/r-pbapply/package.py +++ b/var/spack/repos/builtin/packages/r-pbapply/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPbapply(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pbdzmq/package.py b/var/spack/repos/builtin/packages/r-pbdzmq/package.py index c1e31ced80..a0c6d019b3 100644 --- a/var/spack/repos/builtin/packages/r-pbdzmq/package.py +++ b/var/spack/repos/builtin/packages/r-pbdzmq/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPbdzmq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pbivnorm/package.py b/var/spack/repos/builtin/packages/r-pbivnorm/package.py index 68f10e7a3c..503c3815f2 100644 --- a/var/spack/repos/builtin/packages/r-pbivnorm/package.py +++ b/var/spack/repos/builtin/packages/r-pbivnorm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPbivnorm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pbkrtest/package.py b/var/spack/repos/builtin/packages/r-pbkrtest/package.py index e367ef099f..b61371004c 100644 --- a/var/spack/repos/builtin/packages/r-pbkrtest/package.py +++ b/var/spack/repos/builtin/packages/r-pbkrtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPbkrtest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pcamethods/package.py b/var/spack/repos/builtin/packages/r-pcamethods/package.py index 4c9f0dc079..e130a9fcf3 100644 --- a/var/spack/repos/builtin/packages/r-pcamethods/package.py +++ b/var/spack/repos/builtin/packages/r-pcamethods/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPcamethods(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pcapp/package.py b/var/spack/repos/builtin/packages/r-pcapp/package.py index 4a5808f0eb..2f3a8de0e7 100644 --- a/var/spack/repos/builtin/packages/r-pcapp/package.py +++ b/var/spack/repos/builtin/packages/r-pcapp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPcapp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pegas/package.py b/var/spack/repos/builtin/packages/r-pegas/package.py index 300d517161..45d4215e5d 100644 --- a/var/spack/repos/builtin/packages/r-pegas/package.py +++ b/var/spack/repos/builtin/packages/r-pegas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPegas(RPackage): diff --git a/var/spack/repos/builtin/packages/r-permute/package.py b/var/spack/repos/builtin/packages/r-permute/package.py index de581bd0e0..f1ccf3c68a 100644 --- a/var/spack/repos/builtin/packages/r-permute/package.py +++ b/var/spack/repos/builtin/packages/r-permute/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPermute(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pfam-db/package.py b/var/spack/repos/builtin/packages/r-pfam-db/package.py index 77383836c2..623956c46f 100644 --- a/var/spack/repos/builtin/packages/r-pfam-db/package.py +++ b/var/spack/repos/builtin/packages/r-pfam-db/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPfamDb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-phangorn/package.py b/var/spack/repos/builtin/packages/r-phangorn/package.py index f87ac2dcc8..1caffaf9fe 100644 --- a/var/spack/repos/builtin/packages/r-phangorn/package.py +++ b/var/spack/repos/builtin/packages/r-phangorn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPhangorn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py index 5a2e56ce69..6d3003ef20 100644 --- a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py +++ b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/r-pheatmap/package.py b/var/spack/repos/builtin/packages/r-pheatmap/package.py index 0a07af4629..c9f4854c53 100644 --- a/var/spack/repos/builtin/packages/r-pheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-pheatmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPheatmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-philentropy/package.py b/var/spack/repos/builtin/packages/r-philentropy/package.py index 0acee8f19e..e186d29501 100644 --- a/var/spack/repos/builtin/packages/r-philentropy/package.py +++ b/var/spack/repos/builtin/packages/r-philentropy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPhilentropy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-phylobase/package.py b/var/spack/repos/builtin/packages/r-phylobase/package.py index 9279cac7a6..74f1fa6d35 100644 --- a/var/spack/repos/builtin/packages/r-phylobase/package.py +++ b/var/spack/repos/builtin/packages/r-phylobase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPhylobase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-phyloseq/package.py b/var/spack/repos/builtin/packages/r-phyloseq/package.py index 339db4c4fa..5be8fd3421 100644 --- a/var/spack/repos/builtin/packages/r-phyloseq/package.py +++ b/var/spack/repos/builtin/packages/r-phyloseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPhyloseq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-phylostratr/package.py b/var/spack/repos/builtin/packages/r-phylostratr/package.py index ad1248e5a4..bd56923347 100644 --- a/var/spack/repos/builtin/packages/r-phylostratr/package.py +++ b/var/spack/repos/builtin/packages/r-phylostratr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPhylostratr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-phytools/package.py b/var/spack/repos/builtin/packages/r-phytools/package.py index a9c6f95ba8..57d9cffdcf 100644 --- a/var/spack/repos/builtin/packages/r-phytools/package.py +++ b/var/spack/repos/builtin/packages/r-phytools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPhytools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-picante/package.py b/var/spack/repos/builtin/packages/r-picante/package.py index 8b59aa9b0d..b58a1becbd 100644 --- a/var/spack/repos/builtin/packages/r-picante/package.py +++ b/var/spack/repos/builtin/packages/r-picante/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPicante(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pillar/package.py b/var/spack/repos/builtin/packages/r-pillar/package.py index 3dc9c7b8a8..add5d39094 100644 --- a/var/spack/repos/builtin/packages/r-pillar/package.py +++ b/var/spack/repos/builtin/packages/r-pillar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPillar(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pinfsc50/package.py b/var/spack/repos/builtin/packages/r-pinfsc50/package.py index 1862162073..3b99da8067 100644 --- a/var/spack/repos/builtin/packages/r-pinfsc50/package.py +++ b/var/spack/repos/builtin/packages/r-pinfsc50/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPinfsc50(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pixmap/package.py b/var/spack/repos/builtin/packages/r-pixmap/package.py index dfbe6aacaf..c63589e265 100644 --- a/var/spack/repos/builtin/packages/r-pixmap/package.py +++ b/var/spack/repos/builtin/packages/r-pixmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPixmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pkgbuild/package.py b/var/spack/repos/builtin/packages/r-pkgbuild/package.py index 7869f0d6a0..26ca48ece6 100644 --- a/var/spack/repos/builtin/packages/r-pkgbuild/package.py +++ b/var/spack/repos/builtin/packages/r-pkgbuild/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPkgbuild(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pkgcache/package.py b/var/spack/repos/builtin/packages/r-pkgcache/package.py index bedd98d3d1..5d8ef95309 100644 --- a/var/spack/repos/builtin/packages/r-pkgcache/package.py +++ b/var/spack/repos/builtin/packages/r-pkgcache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPkgcache(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pkgconfig/package.py b/var/spack/repos/builtin/packages/r-pkgconfig/package.py index 09967bed00..ecfcaa599c 100644 --- a/var/spack/repos/builtin/packages/r-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/r-pkgconfig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPkgconfig(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pkgdepends/package.py b/var/spack/repos/builtin/packages/r-pkgdepends/package.py index bb4c27a029..63469914ac 100644 --- a/var/spack/repos/builtin/packages/r-pkgdepends/package.py +++ b/var/spack/repos/builtin/packages/r-pkgdepends/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPkgdepends(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pkgload/package.py b/var/spack/repos/builtin/packages/r-pkgload/package.py index 5f31c309fd..a18bdd0ed2 100644 --- a/var/spack/repos/builtin/packages/r-pkgload/package.py +++ b/var/spack/repos/builtin/packages/r-pkgload/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPkgload(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pkgmaker/package.py b/var/spack/repos/builtin/packages/r-pkgmaker/package.py index fbcc879341..aa2b71a30b 100644 --- a/var/spack/repos/builtin/packages/r-pkgmaker/package.py +++ b/var/spack/repos/builtin/packages/r-pkgmaker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPkgmaker(RPackage): diff --git a/var/spack/repos/builtin/packages/r-plogr/package.py b/var/spack/repos/builtin/packages/r-plogr/package.py index 5464c7c169..2170b33778 100644 --- a/var/spack/repos/builtin/packages/r-plogr/package.py +++ b/var/spack/repos/builtin/packages/r-plogr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPlogr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-plot3d/package.py b/var/spack/repos/builtin/packages/r-plot3d/package.py index c3a75f4499..140403b1b0 100644 --- a/var/spack/repos/builtin/packages/r-plot3d/package.py +++ b/var/spack/repos/builtin/packages/r-plot3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPlot3d(RPackage): diff --git a/var/spack/repos/builtin/packages/r-plotly/package.py b/var/spack/repos/builtin/packages/r-plotly/package.py index 3e5698e2b8..e619a32710 100644 --- a/var/spack/repos/builtin/packages/r-plotly/package.py +++ b/var/spack/repos/builtin/packages/r-plotly/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPlotly(RPackage): diff --git a/var/spack/repos/builtin/packages/r-plotmo/package.py b/var/spack/repos/builtin/packages/r-plotmo/package.py index d00c376382..80dcc8746e 100644 --- a/var/spack/repos/builtin/packages/r-plotmo/package.py +++ b/var/spack/repos/builtin/packages/r-plotmo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPlotmo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-plotrix/package.py b/var/spack/repos/builtin/packages/r-plotrix/package.py index 67f155cee2..461da098fc 100644 --- a/var/spack/repos/builtin/packages/r-plotrix/package.py +++ b/var/spack/repos/builtin/packages/r-plotrix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPlotrix(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pls/package.py b/var/spack/repos/builtin/packages/r-pls/package.py index 13dd0d1f49..2b8ffca72a 100644 --- a/var/spack/repos/builtin/packages/r-pls/package.py +++ b/var/spack/repos/builtin/packages/r-pls/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPls(RPackage): diff --git a/var/spack/repos/builtin/packages/r-plyr/package.py b/var/spack/repos/builtin/packages/r-plyr/package.py index 197005cbbc..ffeefefac9 100644 --- a/var/spack/repos/builtin/packages/r-plyr/package.py +++ b/var/spack/repos/builtin/packages/r-plyr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPlyr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pmcmr/package.py b/var/spack/repos/builtin/packages/r-pmcmr/package.py index 147c4f059f..fbbab8ecbd 100644 --- a/var/spack/repos/builtin/packages/r-pmcmr/package.py +++ b/var/spack/repos/builtin/packages/r-pmcmr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPmcmr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pmcmrplus/package.py b/var/spack/repos/builtin/packages/r-pmcmrplus/package.py index f726daae43..1e002d4a0d 100644 --- a/var/spack/repos/builtin/packages/r-pmcmrplus/package.py +++ b/var/spack/repos/builtin/packages/r-pmcmrplus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPmcmrplus(RPackage): diff --git a/var/spack/repos/builtin/packages/r-png/package.py b/var/spack/repos/builtin/packages/r-png/package.py index 5d4f03e5d7..4f9a140def 100644 --- a/var/spack/repos/builtin/packages/r-png/package.py +++ b/var/spack/repos/builtin/packages/r-png/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPng(RPackage): diff --git a/var/spack/repos/builtin/packages/r-polspline/package.py b/var/spack/repos/builtin/packages/r-polspline/package.py index 6d036dc33f..5bcb850e19 100644 --- a/var/spack/repos/builtin/packages/r-polspline/package.py +++ b/var/spack/repos/builtin/packages/r-polspline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPolspline(RPackage): diff --git a/var/spack/repos/builtin/packages/r-polyclip/package.py b/var/spack/repos/builtin/packages/r-polyclip/package.py index e201f632ec..022467d569 100644 --- a/var/spack/repos/builtin/packages/r-polyclip/package.py +++ b/var/spack/repos/builtin/packages/r-polyclip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPolyclip(RPackage): diff --git a/var/spack/repos/builtin/packages/r-polynom/package.py b/var/spack/repos/builtin/packages/r-polynom/package.py index ef20f15b9f..1473f9b216 100644 --- a/var/spack/repos/builtin/packages/r-polynom/package.py +++ b/var/spack/repos/builtin/packages/r-polynom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPolynom(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pool/package.py b/var/spack/repos/builtin/packages/r-pool/package.py index 97aa33a1a4..b4668175a3 100644 --- a/var/spack/repos/builtin/packages/r-pool/package.py +++ b/var/spack/repos/builtin/packages/r-pool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPool(RPackage): diff --git a/var/spack/repos/builtin/packages/r-poorman/package.py b/var/spack/repos/builtin/packages/r-poorman/package.py index 7eb3dbb846..b7be3ca92b 100644 --- a/var/spack/repos/builtin/packages/r-poorman/package.py +++ b/var/spack/repos/builtin/packages/r-poorman/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPoorman(RPackage): diff --git a/var/spack/repos/builtin/packages/r-popgenome/package.py b/var/spack/repos/builtin/packages/r-popgenome/package.py index 2d03c4536a..27a69c9f46 100644 --- a/var/spack/repos/builtin/packages/r-popgenome/package.py +++ b/var/spack/repos/builtin/packages/r-popgenome/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPopgenome(RPackage): diff --git a/var/spack/repos/builtin/packages/r-popvar/package.py b/var/spack/repos/builtin/packages/r-popvar/package.py index 7234c19ad7..9f13868188 100644 --- a/var/spack/repos/builtin/packages/r-popvar/package.py +++ b/var/spack/repos/builtin/packages/r-popvar/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPopvar(RPackage): diff --git a/var/spack/repos/builtin/packages/r-posterior/package.py b/var/spack/repos/builtin/packages/r-posterior/package.py index e64678ff2c..22cfebc642 100644 --- a/var/spack/repos/builtin/packages/r-posterior/package.py +++ b/var/spack/repos/builtin/packages/r-posterior/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPosterior(RPackage): diff --git a/var/spack/repos/builtin/packages/r-powerlaw/package.py b/var/spack/repos/builtin/packages/r-powerlaw/package.py index 594a5da50c..68dcedf202 100644 --- a/var/spack/repos/builtin/packages/r-powerlaw/package.py +++ b/var/spack/repos/builtin/packages/r-powerlaw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPowerlaw(RPackage): diff --git a/var/spack/repos/builtin/packages/r-prabclus/package.py b/var/spack/repos/builtin/packages/r-prabclus/package.py index 7ffc7cb535..8f765d89d2 100644 --- a/var/spack/repos/builtin/packages/r-prabclus/package.py +++ b/var/spack/repos/builtin/packages/r-prabclus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPrabclus(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pracma/package.py b/var/spack/repos/builtin/packages/r-pracma/package.py index c2439bed99..d687257091 100644 --- a/var/spack/repos/builtin/packages/r-pracma/package.py +++ b/var/spack/repos/builtin/packages/r-pracma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPracma(RPackage): diff --git a/var/spack/repos/builtin/packages/r-praise/package.py b/var/spack/repos/builtin/packages/r-praise/package.py index eb452fc575..c94e8cc164 100644 --- a/var/spack/repos/builtin/packages/r-praise/package.py +++ b/var/spack/repos/builtin/packages/r-praise/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPraise(RPackage): diff --git a/var/spack/repos/builtin/packages/r-preprocesscore/package.py b/var/spack/repos/builtin/packages/r-preprocesscore/package.py index d635e04b26..f7a4619b7e 100644 --- a/var/spack/repos/builtin/packages/r-preprocesscore/package.py +++ b/var/spack/repos/builtin/packages/r-preprocesscore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPreprocesscore(RPackage): diff --git a/var/spack/repos/builtin/packages/r-prettydoc/package.py b/var/spack/repos/builtin/packages/r-prettydoc/package.py index 0a1dd61a4f..1c14d0f9e8 100644 --- a/var/spack/repos/builtin/packages/r-prettydoc/package.py +++ b/var/spack/repos/builtin/packages/r-prettydoc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPrettydoc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-prettyunits/package.py b/var/spack/repos/builtin/packages/r-prettyunits/package.py index 414c6041ab..e866eb07bf 100644 --- a/var/spack/repos/builtin/packages/r-prettyunits/package.py +++ b/var/spack/repos/builtin/packages/r-prettyunits/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPrettyunits(RPackage): diff --git a/var/spack/repos/builtin/packages/r-proc/package.py b/var/spack/repos/builtin/packages/r-proc/package.py index a66ba3e94f..da637cf1ae 100644 --- a/var/spack/repos/builtin/packages/r-proc/package.py +++ b/var/spack/repos/builtin/packages/r-proc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-processx/package.py b/var/spack/repos/builtin/packages/r-processx/package.py index 6022618084..2d1b18ab38 100644 --- a/var/spack/repos/builtin/packages/r-processx/package.py +++ b/var/spack/repos/builtin/packages/r-processx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProcessx(RPackage): diff --git a/var/spack/repos/builtin/packages/r-prodlim/package.py b/var/spack/repos/builtin/packages/r-prodlim/package.py index f6da27db74..9555be191b 100644 --- a/var/spack/repos/builtin/packages/r-prodlim/package.py +++ b/var/spack/repos/builtin/packages/r-prodlim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProdlim(RPackage): diff --git a/var/spack/repos/builtin/packages/r-progress/package.py b/var/spack/repos/builtin/packages/r-progress/package.py index 97e5a0e352..6a8cba0371 100644 --- a/var/spack/repos/builtin/packages/r-progress/package.py +++ b/var/spack/repos/builtin/packages/r-progress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProgress(RPackage): diff --git a/var/spack/repos/builtin/packages/r-progressr/package.py b/var/spack/repos/builtin/packages/r-progressr/package.py index b395c73a89..0e7b3f000a 100644 --- a/var/spack/repos/builtin/packages/r-progressr/package.py +++ b/var/spack/repos/builtin/packages/r-progressr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProgressr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-proj/package.py b/var/spack/repos/builtin/packages/r-proj/package.py index 120de9680f..ceb9e6d822 100644 --- a/var/spack/repos/builtin/packages/r-proj/package.py +++ b/var/spack/repos/builtin/packages/r-proj/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProj(RPackage): diff --git a/var/spack/repos/builtin/packages/r-proj4/package.py b/var/spack/repos/builtin/packages/r-proj4/package.py index 71ddd17051..93e54c9eb8 100644 --- a/var/spack/repos/builtin/packages/r-proj4/package.py +++ b/var/spack/repos/builtin/packages/r-proj4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProj4(RPackage): diff --git a/var/spack/repos/builtin/packages/r-projpred/package.py b/var/spack/repos/builtin/packages/r-projpred/package.py index bde772b6ec..13722be2a3 100644 --- a/var/spack/repos/builtin/packages/r-projpred/package.py +++ b/var/spack/repos/builtin/packages/r-projpred/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProjpred(RPackage): diff --git a/var/spack/repos/builtin/packages/r-promises/package.py b/var/spack/repos/builtin/packages/r-promises/package.py index dca9d202b0..9de02004f3 100644 --- a/var/spack/repos/builtin/packages/r-promises/package.py +++ b/var/spack/repos/builtin/packages/r-promises/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPromises(RPackage): diff --git a/var/spack/repos/builtin/packages/r-protgenerics/package.py b/var/spack/repos/builtin/packages/r-protgenerics/package.py index 3084e927a4..29d96a0617 100644 --- a/var/spack/repos/builtin/packages/r-protgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-protgenerics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProtgenerics(RPackage): diff --git a/var/spack/repos/builtin/packages/r-proto/package.py b/var/spack/repos/builtin/packages/r-proto/package.py index 406df2ae0e..6b303e8fa8 100644 --- a/var/spack/repos/builtin/packages/r-proto/package.py +++ b/var/spack/repos/builtin/packages/r-proto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProto(RPackage): diff --git a/var/spack/repos/builtin/packages/r-proxy/package.py b/var/spack/repos/builtin/packages/r-proxy/package.py index e992e3522e..29fad66432 100644 --- a/var/spack/repos/builtin/packages/r-proxy/package.py +++ b/var/spack/repos/builtin/packages/r-proxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RProxy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pryr/package.py b/var/spack/repos/builtin/packages/r-pryr/package.py index 575716a986..e8de01a2f9 100644 --- a/var/spack/repos/builtin/packages/r-pryr/package.py +++ b/var/spack/repos/builtin/packages/r-pryr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPryr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ps/package.py b/var/spack/repos/builtin/packages/r-ps/package.py index 1d58d5f8f3..d1868c346c 100644 --- a/var/spack/repos/builtin/packages/r-ps/package.py +++ b/var/spack/repos/builtin/packages/r-ps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pscbs/package.py b/var/spack/repos/builtin/packages/r-pscbs/package.py index 5b7fbcc7e5..2fc7160cd3 100644 --- a/var/spack/repos/builtin/packages/r-pscbs/package.py +++ b/var/spack/repos/builtin/packages/r-pscbs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPscbs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pspline/package.py b/var/spack/repos/builtin/packages/r-pspline/package.py index 0fa9be5598..ffcffe920a 100644 --- a/var/spack/repos/builtin/packages/r-pspline/package.py +++ b/var/spack/repos/builtin/packages/r-pspline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPspline(RPackage): diff --git a/var/spack/repos/builtin/packages/r-psych/package.py b/var/spack/repos/builtin/packages/r-psych/package.py index 7d2c7d102e..327f75c3c5 100644 --- a/var/spack/repos/builtin/packages/r-psych/package.py +++ b/var/spack/repos/builtin/packages/r-psych/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPsych(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ptw/package.py b/var/spack/repos/builtin/packages/r-ptw/package.py index c58fbdeb71..d983e715ad 100644 --- a/var/spack/repos/builtin/packages/r-ptw/package.py +++ b/var/spack/repos/builtin/packages/r-ptw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPtw(RPackage): diff --git a/var/spack/repos/builtin/packages/r-purrr/package.py b/var/spack/repos/builtin/packages/r-purrr/package.py index aaee25474b..d29689d406 100644 --- a/var/spack/repos/builtin/packages/r-purrr/package.py +++ b/var/spack/repos/builtin/packages/r-purrr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPurrr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-pvclust/package.py b/var/spack/repos/builtin/packages/r-pvclust/package.py index aad55c22bb..cca3e9601c 100644 --- a/var/spack/repos/builtin/packages/r-pvclust/package.py +++ b/var/spack/repos/builtin/packages/r-pvclust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RPvclust(RPackage): diff --git a/var/spack/repos/builtin/packages/r-qs/package.py b/var/spack/repos/builtin/packages/r-qs/package.py index 78141b337d..ecf48b888c 100644 --- a/var/spack/repos/builtin/packages/r-qs/package.py +++ b/var/spack/repos/builtin/packages/r-qs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-qtl/package.py b/var/spack/repos/builtin/packages/r-qtl/package.py index 94ccccd7f6..8be4e949e9 100644 --- a/var/spack/repos/builtin/packages/r-qtl/package.py +++ b/var/spack/repos/builtin/packages/r-qtl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQtl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-quadprog/package.py b/var/spack/repos/builtin/packages/r-quadprog/package.py index 0a0e46a7c2..fd67058851 100644 --- a/var/spack/repos/builtin/packages/r-quadprog/package.py +++ b/var/spack/repos/builtin/packages/r-quadprog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQuadprog(RPackage): diff --git a/var/spack/repos/builtin/packages/r-quantmod/package.py b/var/spack/repos/builtin/packages/r-quantmod/package.py index 2c5b12290d..b0fbae1970 100644 --- a/var/spack/repos/builtin/packages/r-quantmod/package.py +++ b/var/spack/repos/builtin/packages/r-quantmod/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQuantmod(RPackage): diff --git a/var/spack/repos/builtin/packages/r-quantreg/package.py b/var/spack/repos/builtin/packages/r-quantreg/package.py index 475684aac4..b832d28766 100644 --- a/var/spack/repos/builtin/packages/r-quantreg/package.py +++ b/var/spack/repos/builtin/packages/r-quantreg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQuantreg(RPackage): diff --git a/var/spack/repos/builtin/packages/r-quantro/package.py b/var/spack/repos/builtin/packages/r-quantro/package.py index 9b152a8dda..713e129f4b 100644 --- a/var/spack/repos/builtin/packages/r-quantro/package.py +++ b/var/spack/repos/builtin/packages/r-quantro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQuantro(RPackage): diff --git a/var/spack/repos/builtin/packages/r-questionr/package.py b/var/spack/repos/builtin/packages/r-questionr/package.py index 9485cae149..5f4b87096b 100644 --- a/var/spack/repos/builtin/packages/r-questionr/package.py +++ b/var/spack/repos/builtin/packages/r-questionr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQuestionr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-quickplot/package.py b/var/spack/repos/builtin/packages/r-quickplot/package.py index c3d2c41df7..39ff181858 100644 --- a/var/spack/repos/builtin/packages/r-quickplot/package.py +++ b/var/spack/repos/builtin/packages/r-quickplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQuickplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-qvalue/package.py b/var/spack/repos/builtin/packages/r-qvalue/package.py index 040b9eefda..a8f63c3e3c 100644 --- a/var/spack/repos/builtin/packages/r-qvalue/package.py +++ b/var/spack/repos/builtin/packages/r-qvalue/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RQvalue(RPackage): diff --git a/var/spack/repos/builtin/packages/r-r-cache/package.py b/var/spack/repos/builtin/packages/r-r-cache/package.py index 45d6c31ac1..5cb110d608 100644 --- a/var/spack/repos/builtin/packages/r-r-cache/package.py +++ b/var/spack/repos/builtin/packages/r-r-cache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRCache(RPackage): diff --git a/var/spack/repos/builtin/packages/r-r-methodss3/package.py b/var/spack/repos/builtin/packages/r-r-methodss3/package.py index 3c2db2cfa7..6c11c2bd97 100644 --- a/var/spack/repos/builtin/packages/r-r-methodss3/package.py +++ b/var/spack/repos/builtin/packages/r-r-methodss3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRMethodss3(RPackage): diff --git a/var/spack/repos/builtin/packages/r-r-oo/package.py b/var/spack/repos/builtin/packages/r-r-oo/package.py index 990c5b11cd..f8e7a9555c 100644 --- a/var/spack/repos/builtin/packages/r-r-oo/package.py +++ b/var/spack/repos/builtin/packages/r-r-oo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RROo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-r-utils/package.py b/var/spack/repos/builtin/packages/r-r-utils/package.py index d176f3698c..7508ef2d5a 100644 --- a/var/spack/repos/builtin/packages/r-r-utils/package.py +++ b/var/spack/repos/builtin/packages/r-r-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRUtils(RPackage): diff --git a/var/spack/repos/builtin/packages/r-r6/package.py b/var/spack/repos/builtin/packages/r-r6/package.py index 104c2fc447..6d5e7a329d 100644 --- a/var/spack/repos/builtin/packages/r-r6/package.py +++ b/var/spack/repos/builtin/packages/r-r6/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RR6(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rainbow/package.py b/var/spack/repos/builtin/packages/r-rainbow/package.py index e1edd5b498..7514bcd785 100644 --- a/var/spack/repos/builtin/packages/r-rainbow/package.py +++ b/var/spack/repos/builtin/packages/r-rainbow/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RRainbow(RPackage): """Bagplots, Boxplots and Rainbow Plots for Functional Data. diff --git a/var/spack/repos/builtin/packages/r-randomfields/package.py b/var/spack/repos/builtin/packages/r-randomfields/package.py index 316bb241ea..80be62ad1b 100644 --- a/var/spack/repos/builtin/packages/r-randomfields/package.py +++ b/var/spack/repos/builtin/packages/r-randomfields/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRandomfields(RPackage): diff --git a/var/spack/repos/builtin/packages/r-randomfieldsutils/package.py b/var/spack/repos/builtin/packages/r-randomfieldsutils/package.py index adb16cfc08..88cc2230be 100644 --- a/var/spack/repos/builtin/packages/r-randomfieldsutils/package.py +++ b/var/spack/repos/builtin/packages/r-randomfieldsutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRandomfieldsutils(RPackage): diff --git a/var/spack/repos/builtin/packages/r-randomforest/package.py b/var/spack/repos/builtin/packages/r-randomforest/package.py index 9d781f19bd..b0028abdbe 100644 --- a/var/spack/repos/builtin/packages/r-randomforest/package.py +++ b/var/spack/repos/builtin/packages/r-randomforest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRandomforest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-randomglm/package.py b/var/spack/repos/builtin/packages/r-randomglm/package.py index b1e71b8a10..faba5ad7ef 100644 --- a/var/spack/repos/builtin/packages/r-randomglm/package.py +++ b/var/spack/repos/builtin/packages/r-randomglm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRandomglm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ranger/package.py b/var/spack/repos/builtin/packages/r-ranger/package.py index dd79e0774a..e6e1f4d659 100644 --- a/var/spack/repos/builtin/packages/r-ranger/package.py +++ b/var/spack/repos/builtin/packages/r-ranger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRanger(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rann/package.py b/var/spack/repos/builtin/packages/r-rann/package.py index 76482217de..705f7ab771 100644 --- a/var/spack/repos/builtin/packages/r-rann/package.py +++ b/var/spack/repos/builtin/packages/r-rann/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRann(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rapidjsonr/package.py b/var/spack/repos/builtin/packages/r-rapidjsonr/package.py index e639095a96..2bd0ba6f48 100644 --- a/var/spack/repos/builtin/packages/r-rapidjsonr/package.py +++ b/var/spack/repos/builtin/packages/r-rapidjsonr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRapidjsonr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rapiserialize/package.py b/var/spack/repos/builtin/packages/r-rapiserialize/package.py index 545e80ec90..00125392cb 100644 --- a/var/spack/repos/builtin/packages/r-rapiserialize/package.py +++ b/var/spack/repos/builtin/packages/r-rapiserialize/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRapiserialize(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rappdirs/package.py b/var/spack/repos/builtin/packages/r-rappdirs/package.py index 84566e6a60..c68e0aac9b 100644 --- a/var/spack/repos/builtin/packages/r-rappdirs/package.py +++ b/var/spack/repos/builtin/packages/r-rappdirs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRappdirs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-raster/package.py b/var/spack/repos/builtin/packages/r-raster/package.py index 20d72d54c1..2f50b9ff55 100644 --- a/var/spack/repos/builtin/packages/r-raster/package.py +++ b/var/spack/repos/builtin/packages/r-raster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRaster(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rbgl/package.py b/var/spack/repos/builtin/packages/r-rbgl/package.py index 5b1e4fb16e..0a55c3d7a4 100644 --- a/var/spack/repos/builtin/packages/r-rbgl/package.py +++ b/var/spack/repos/builtin/packages/r-rbgl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRbgl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rbibutils/package.py b/var/spack/repos/builtin/packages/r-rbibutils/package.py index 8351ab50ab..327ab1017a 100644 --- a/var/spack/repos/builtin/packages/r-rbibutils/package.py +++ b/var/spack/repos/builtin/packages/r-rbibutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRbibutils(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rbokeh/package.py b/var/spack/repos/builtin/packages/r-rbokeh/package.py index 1f3d49576a..c34efae6e3 100644 --- a/var/spack/repos/builtin/packages/r-rbokeh/package.py +++ b/var/spack/repos/builtin/packages/r-rbokeh/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRbokeh(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcmdcheck/package.py b/var/spack/repos/builtin/packages/r-rcmdcheck/package.py index 9c05ff7535..9182329ae0 100644 --- a/var/spack/repos/builtin/packages/r-rcmdcheck/package.py +++ b/var/spack/repos/builtin/packages/r-rcmdcheck/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcmdcheck(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py index b57da787f7..3c560e1db9 100644 --- a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py +++ b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcolorbrewer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index 22493cd9e2..de29e7dfa0 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcpp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppannoy/package.py b/var/spack/repos/builtin/packages/r-rcppannoy/package.py index 4d42070520..54d77b78ad 100644 --- a/var/spack/repos/builtin/packages/r-rcppannoy/package.py +++ b/var/spack/repos/builtin/packages/r-rcppannoy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppannoy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py b/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py index 79e6b364d6..0c2ffe0b40 100644 --- a/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py +++ b/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcpparmadillo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppblaze/package.py b/var/spack/repos/builtin/packages/r-rcppblaze/package.py index b990b3653b..1e6df31948 100644 --- a/var/spack/repos/builtin/packages/r-rcppblaze/package.py +++ b/var/spack/repos/builtin/packages/r-rcppblaze/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppblaze(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppcctz/package.py b/var/spack/repos/builtin/packages/r-rcppcctz/package.py index bc343f32a3..f6e43536f4 100644 --- a/var/spack/repos/builtin/packages/r-rcppcctz/package.py +++ b/var/spack/repos/builtin/packages/r-rcppcctz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppcctz(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py index 4266a58645..eed211776f 100644 --- a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py +++ b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppcnpy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppdate/package.py b/var/spack/repos/builtin/packages/r-rcppdate/package.py index 48f39fb548..021fb6e6e2 100644 --- a/var/spack/repos/builtin/packages/r-rcppdate/package.py +++ b/var/spack/repos/builtin/packages/r-rcppdate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppdate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppde/package.py b/var/spack/repos/builtin/packages/r-rcppde/package.py index c093147c56..e73c38ec53 100644 --- a/var/spack/repos/builtin/packages/r-rcppde/package.py +++ b/var/spack/repos/builtin/packages/r-rcppde/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppde(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppeigen/package.py b/var/spack/repos/builtin/packages/r-rcppeigen/package.py index adbda4c47a..10c169240f 100644 --- a/var/spack/repos/builtin/packages/r-rcppeigen/package.py +++ b/var/spack/repos/builtin/packages/r-rcppeigen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppeigen(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppgsl/package.py b/var/spack/repos/builtin/packages/r-rcppgsl/package.py index 7eb9983371..b02a08120a 100644 --- a/var/spack/repos/builtin/packages/r-rcppgsl/package.py +++ b/var/spack/repos/builtin/packages/r-rcppgsl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppgsl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcpphnsw/package.py b/var/spack/repos/builtin/packages/r-rcpphnsw/package.py index 18e353349e..b504a4fdfb 100644 --- a/var/spack/repos/builtin/packages/r-rcpphnsw/package.py +++ b/var/spack/repos/builtin/packages/r-rcpphnsw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcpphnsw(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppparallel/package.py b/var/spack/repos/builtin/packages/r-rcppparallel/package.py index 52241335dc..001be16eeb 100644 --- a/var/spack/repos/builtin/packages/r-rcppparallel/package.py +++ b/var/spack/repos/builtin/packages/r-rcppparallel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppparallel(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppprogress/package.py b/var/spack/repos/builtin/packages/r-rcppprogress/package.py index b5ca017f40..9e5f8e27a4 100644 --- a/var/spack/repos/builtin/packages/r-rcppprogress/package.py +++ b/var/spack/repos/builtin/packages/r-rcppprogress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppprogress(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcpptoml/package.py b/var/spack/repos/builtin/packages/r-rcpptoml/package.py index 05fee75b56..87e8a8ed8f 100644 --- a/var/spack/repos/builtin/packages/r-rcpptoml/package.py +++ b/var/spack/repos/builtin/packages/r-rcpptoml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcpptoml(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcppziggurat/package.py b/var/spack/repos/builtin/packages/r-rcppziggurat/package.py index d043ec20a7..72ef408450 100644 --- a/var/spack/repos/builtin/packages/r-rcppziggurat/package.py +++ b/var/spack/repos/builtin/packages/r-rcppziggurat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcppziggurat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rcurl/package.py b/var/spack/repos/builtin/packages/r-rcurl/package.py index 0fb3912aae..13af9cd37e 100644 --- a/var/spack/repos/builtin/packages/r-rcurl/package.py +++ b/var/spack/repos/builtin/packages/r-rcurl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRcurl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rda/package.py b/var/spack/repos/builtin/packages/r-rda/package.py index 03580dbf96..e5ca242940 100644 --- a/var/spack/repos/builtin/packages/r-rda/package.py +++ b/var/spack/repos/builtin/packages/r-rda/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRda(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rdpack/package.py b/var/spack/repos/builtin/packages/r-rdpack/package.py index 89ec7e0e34..e802086b4b 100644 --- a/var/spack/repos/builtin/packages/r-rdpack/package.py +++ b/var/spack/repos/builtin/packages/r-rdpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRdpack(RPackage): diff --git a/var/spack/repos/builtin/packages/r-readbitmap/package.py b/var/spack/repos/builtin/packages/r-readbitmap/package.py index b28986d58d..1453a070ae 100644 --- a/var/spack/repos/builtin/packages/r-readbitmap/package.py +++ b/var/spack/repos/builtin/packages/r-readbitmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReadbitmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-readr/package.py b/var/spack/repos/builtin/packages/r-readr/package.py index 96a80ec3c1..98fbe24265 100644 --- a/var/spack/repos/builtin/packages/r-readr/package.py +++ b/var/spack/repos/builtin/packages/r-readr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReadr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-readxl/package.py b/var/spack/repos/builtin/packages/r-readxl/package.py index 01e2543563..0dbdb1dbfc 100644 --- a/var/spack/repos/builtin/packages/r-readxl/package.py +++ b/var/spack/repos/builtin/packages/r-readxl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReadxl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-reams/package.py b/var/spack/repos/builtin/packages/r-reams/package.py index 2179d290a8..85250657b9 100644 --- a/var/spack/repos/builtin/packages/r-reams/package.py +++ b/var/spack/repos/builtin/packages/r-reams/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReams(RPackage): diff --git a/var/spack/repos/builtin/packages/r-recipes/package.py b/var/spack/repos/builtin/packages/r-recipes/package.py index 5e3c0570da..606a87c282 100644 --- a/var/spack/repos/builtin/packages/r-recipes/package.py +++ b/var/spack/repos/builtin/packages/r-recipes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRecipes(RPackage): diff --git a/var/spack/repos/builtin/packages/r-registry/package.py b/var/spack/repos/builtin/packages/r-registry/package.py index ac90b09ae7..97fbe69788 100644 --- a/var/spack/repos/builtin/packages/r-registry/package.py +++ b/var/spack/repos/builtin/packages/r-registry/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRegistry(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rematch/package.py b/var/spack/repos/builtin/packages/r-rematch/package.py index 89fabf91ed..430ea5e8c5 100644 --- a/var/spack/repos/builtin/packages/r-rematch/package.py +++ b/var/spack/repos/builtin/packages/r-rematch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRematch(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rematch2/package.py b/var/spack/repos/builtin/packages/r-rematch2/package.py index 42e67d721d..26411a48e1 100644 --- a/var/spack/repos/builtin/packages/r-rematch2/package.py +++ b/var/spack/repos/builtin/packages/r-rematch2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRematch2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-remotes/package.py b/var/spack/repos/builtin/packages/r-remotes/package.py index 2c354ea3c1..ebe1cf6a3e 100644 --- a/var/spack/repos/builtin/packages/r-remotes/package.py +++ b/var/spack/repos/builtin/packages/r-remotes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRemotes(RPackage): diff --git a/var/spack/repos/builtin/packages/r-renv/package.py b/var/spack/repos/builtin/packages/r-renv/package.py index a0f22846af..1b4e57b2ef 100644 --- a/var/spack/repos/builtin/packages/r-renv/package.py +++ b/var/spack/repos/builtin/packages/r-renv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRenv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-reordercluster/package.py b/var/spack/repos/builtin/packages/r-reordercluster/package.py index c75d6bd9d6..4091543bfc 100644 --- a/var/spack/repos/builtin/packages/r-reordercluster/package.py +++ b/var/spack/repos/builtin/packages/r-reordercluster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReordercluster(RPackage): diff --git a/var/spack/repos/builtin/packages/r-reportingtools/package.py b/var/spack/repos/builtin/packages/r-reportingtools/package.py index 850ac4dd7f..6b0b22f023 100644 --- a/var/spack/repos/builtin/packages/r-reportingtools/package.py +++ b/var/spack/repos/builtin/packages/r-reportingtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReportingtools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-repr/package.py b/var/spack/repos/builtin/packages/r-repr/package.py index 18a63bdc73..6450774df9 100644 --- a/var/spack/repos/builtin/packages/r-repr/package.py +++ b/var/spack/repos/builtin/packages/r-repr/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRepr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-reprex/package.py b/var/spack/repos/builtin/packages/r-reprex/package.py index c1d1b26d31..38eac0a967 100644 --- a/var/spack/repos/builtin/packages/r-reprex/package.py +++ b/var/spack/repos/builtin/packages/r-reprex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReprex(RPackage): diff --git a/var/spack/repos/builtin/packages/r-reproducible/package.py b/var/spack/repos/builtin/packages/r-reproducible/package.py index 8029ed28b6..f23a927947 100644 --- a/var/spack/repos/builtin/packages/r-reproducible/package.py +++ b/var/spack/repos/builtin/packages/r-reproducible/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReproducible(RPackage): diff --git a/var/spack/repos/builtin/packages/r-require/package.py b/var/spack/repos/builtin/packages/r-require/package.py index d802b5ecfb..69e7b1993b 100644 --- a/var/spack/repos/builtin/packages/r-require/package.py +++ b/var/spack/repos/builtin/packages/r-require/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRequire(RPackage): diff --git a/var/spack/repos/builtin/packages/r-reshape/package.py b/var/spack/repos/builtin/packages/r-reshape/package.py index f035125a97..9169b838dc 100644 --- a/var/spack/repos/builtin/packages/r-reshape/package.py +++ b/var/spack/repos/builtin/packages/r-reshape/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReshape(RPackage): diff --git a/var/spack/repos/builtin/packages/r-reshape2/package.py b/var/spack/repos/builtin/packages/r-reshape2/package.py index b1287e17a7..5283b3a62b 100644 --- a/var/spack/repos/builtin/packages/r-reshape2/package.py +++ b/var/spack/repos/builtin/packages/r-reshape2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReshape2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-restfulr/package.py b/var/spack/repos/builtin/packages/r-restfulr/package.py index 015588fd0d..f8f099488a 100644 --- a/var/spack/repos/builtin/packages/r-restfulr/package.py +++ b/var/spack/repos/builtin/packages/r-restfulr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRestfulr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-reticulate/package.py b/var/spack/repos/builtin/packages/r-reticulate/package.py index 3367073a83..94aaca0360 100644 --- a/var/spack/repos/builtin/packages/r-reticulate/package.py +++ b/var/spack/repos/builtin/packages/r-reticulate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RReticulate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rex/package.py b/var/spack/repos/builtin/packages/r-rex/package.py index 94f1ec56c4..936128b280 100644 --- a/var/spack/repos/builtin/packages/r-rex/package.py +++ b/var/spack/repos/builtin/packages/r-rex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRex(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rfast/package.py b/var/spack/repos/builtin/packages/r-rfast/package.py index 195d45db1d..9888bdb2ff 100644 --- a/var/spack/repos/builtin/packages/r-rfast/package.py +++ b/var/spack/repos/builtin/packages/r-rfast/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRfast(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rferns/package.py b/var/spack/repos/builtin/packages/r-rferns/package.py index 535231dfc5..387f828364 100644 --- a/var/spack/repos/builtin/packages/r-rferns/package.py +++ b/var/spack/repos/builtin/packages/r-rferns/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRferns(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rgdal/package.py b/var/spack/repos/builtin/packages/r-rgdal/package.py index 6e45bea3b6..72988b7423 100644 --- a/var/spack/repos/builtin/packages/r-rgdal/package.py +++ b/var/spack/repos/builtin/packages/r-rgdal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRgdal(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rgenoud/package.py b/var/spack/repos/builtin/packages/r-rgenoud/package.py index 032299d76f..5c74e6255c 100644 --- a/var/spack/repos/builtin/packages/r-rgenoud/package.py +++ b/var/spack/repos/builtin/packages/r-rgenoud/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRgenoud(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rgeos/package.py b/var/spack/repos/builtin/packages/r-rgeos/package.py index c83777e470..f393b52006 100644 --- a/var/spack/repos/builtin/packages/r-rgeos/package.py +++ b/var/spack/repos/builtin/packages/r-rgeos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRgeos(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rgexf/package.py b/var/spack/repos/builtin/packages/r-rgexf/package.py index b2d68391fa..0bcb98db28 100644 --- a/var/spack/repos/builtin/packages/r-rgexf/package.py +++ b/var/spack/repos/builtin/packages/r-rgexf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRgexf(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rgl/package.py b/var/spack/repos/builtin/packages/r-rgl/package.py index e6f1694cf5..b4ec4539b1 100644 --- a/var/spack/repos/builtin/packages/r-rgl/package.py +++ b/var/spack/repos/builtin/packages/r-rgl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRgl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py index b0118c2dcf..159fc82d28 100644 --- a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py +++ b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRgooglemaps(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rgraphviz/package.py b/var/spack/repos/builtin/packages/r-rgraphviz/package.py index 0ba51737d7..c5c9732b08 100644 --- a/var/spack/repos/builtin/packages/r-rgraphviz/package.py +++ b/var/spack/repos/builtin/packages/r-rgraphviz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRgraphviz(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rhdf5/package.py b/var/spack/repos/builtin/packages/r-rhdf5/package.py index 84dcbb1758..f144ec4dc6 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRhdf5(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rhdf5filters/package.py b/var/spack/repos/builtin/packages/r-rhdf5filters/package.py index 2ed7ccaab6..e1651aed73 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5filters/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5filters/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRhdf5filters(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rhdf5lib/package.py b/var/spack/repos/builtin/packages/r-rhdf5lib/package.py index d47e579ec3..b91b98deae 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5lib/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRhdf5lib(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rhmmer/package.py b/var/spack/repos/builtin/packages/r-rhmmer/package.py index 7580726475..bc10326151 100644 --- a/var/spack/repos/builtin/packages/r-rhmmer/package.py +++ b/var/spack/repos/builtin/packages/r-rhmmer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRhmmer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rhtslib/package.py b/var/spack/repos/builtin/packages/r-rhtslib/package.py index 6f86945770..8ce11d6277 100644 --- a/var/spack/repos/builtin/packages/r-rhtslib/package.py +++ b/var/spack/repos/builtin/packages/r-rhtslib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRhtslib(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rinside/package.py b/var/spack/repos/builtin/packages/r-rinside/package.py index dbd780af7c..259b3aa560 100644 --- a/var/spack/repos/builtin/packages/r-rinside/package.py +++ b/var/spack/repos/builtin/packages/r-rinside/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRinside(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rio/package.py b/var/spack/repos/builtin/packages/r-rio/package.py index 851aa29cb4..87e50f2209 100644 --- a/var/spack/repos/builtin/packages/r-rio/package.py +++ b/var/spack/repos/builtin/packages/r-rio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRio(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rjags/package.py b/var/spack/repos/builtin/packages/r-rjags/package.py index 927ba100d6..5b1438644e 100644 --- a/var/spack/repos/builtin/packages/r-rjags/package.py +++ b/var/spack/repos/builtin/packages/r-rjags/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRjags(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rjava/package.py b/var/spack/repos/builtin/packages/r-rjava/package.py index 7d2d095117..33bf697038 100644 --- a/var/spack/repos/builtin/packages/r-rjava/package.py +++ b/var/spack/repos/builtin/packages/r-rjava/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRjava(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rjson/package.py b/var/spack/repos/builtin/packages/r-rjson/package.py index 6573287b09..0c73608700 100644 --- a/var/spack/repos/builtin/packages/r-rjson/package.py +++ b/var/spack/repos/builtin/packages/r-rjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRjson(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rjsonio/package.py b/var/spack/repos/builtin/packages/r-rjsonio/package.py index 3d73444cd7..593391591d 100644 --- a/var/spack/repos/builtin/packages/r-rjsonio/package.py +++ b/var/spack/repos/builtin/packages/r-rjsonio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRjsonio(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rlang/package.py b/var/spack/repos/builtin/packages/r-rlang/package.py index ef1ba71bb9..0d7a88efa4 100644 --- a/var/spack/repos/builtin/packages/r-rlang/package.py +++ b/var/spack/repos/builtin/packages/r-rlang/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRlang(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rle/package.py b/var/spack/repos/builtin/packages/r-rle/package.py index dbcc32319c..6609843cf9 100644 --- a/var/spack/repos/builtin/packages/r-rle/package.py +++ b/var/spack/repos/builtin/packages/r-rle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRle(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rmariadb/package.py b/var/spack/repos/builtin/packages/r-rmariadb/package.py index cbc29161f2..56d46fe913 100644 --- a/var/spack/repos/builtin/packages/r-rmariadb/package.py +++ b/var/spack/repos/builtin/packages/r-rmariadb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRmariadb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index 8cfa1b1a06..0e657310f6 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRmarkdown(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rminer/package.py b/var/spack/repos/builtin/packages/r-rminer/package.py index da511c44a9..8873ef299d 100644 --- a/var/spack/repos/builtin/packages/r-rminer/package.py +++ b/var/spack/repos/builtin/packages/r-rminer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRminer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rmpfr/package.py b/var/spack/repos/builtin/packages/r-rmpfr/package.py index 215a42cffe..131da9ff42 100644 --- a/var/spack/repos/builtin/packages/r-rmpfr/package.py +++ b/var/spack/repos/builtin/packages/r-rmpfr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRmpfr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rmpi/package.py b/var/spack/repos/builtin/packages/r-rmpi/package.py index baeb12d66d..23b3d87769 100644 --- a/var/spack/repos/builtin/packages/r-rmpi/package.py +++ b/var/spack/repos/builtin/packages/r-rmpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRmpi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rms/package.py b/var/spack/repos/builtin/packages/r-rms/package.py index 961080be9d..b973a83cf8 100644 --- a/var/spack/repos/builtin/packages/r-rms/package.py +++ b/var/spack/repos/builtin/packages/r-rms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRms(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rmutil/package.py b/var/spack/repos/builtin/packages/r-rmutil/package.py index ada5f5b391..620031d2ec 100644 --- a/var/spack/repos/builtin/packages/r-rmutil/package.py +++ b/var/spack/repos/builtin/packages/r-rmutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRmutil(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rmysql/package.py b/var/spack/repos/builtin/packages/r-rmysql/package.py index d020170d06..0639c87e71 100644 --- a/var/spack/repos/builtin/packages/r-rmysql/package.py +++ b/var/spack/repos/builtin/packages/r-rmysql/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRmysql(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rnaseqmap/package.py b/var/spack/repos/builtin/packages/r-rnaseqmap/package.py index 0378e1f653..631f064d78 100644 --- a/var/spack/repos/builtin/packages/r-rnaseqmap/package.py +++ b/var/spack/repos/builtin/packages/r-rnaseqmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRnaseqmap(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rncl/package.py b/var/spack/repos/builtin/packages/r-rncl/package.py index 2f19835d08..4e1cfd9e40 100644 --- a/var/spack/repos/builtin/packages/r-rncl/package.py +++ b/var/spack/repos/builtin/packages/r-rncl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRncl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rnexml/package.py b/var/spack/repos/builtin/packages/r-rnexml/package.py index e617b6d193..72a709321c 100644 --- a/var/spack/repos/builtin/packages/r-rnexml/package.py +++ b/var/spack/repos/builtin/packages/r-rnexml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRnexml(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rngtools/package.py b/var/spack/repos/builtin/packages/r-rngtools/package.py index 7af3db7edf..800e971b51 100644 --- a/var/spack/repos/builtin/packages/r-rngtools/package.py +++ b/var/spack/repos/builtin/packages/r-rngtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRngtools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rnoaa/package.py b/var/spack/repos/builtin/packages/r-rnoaa/package.py index df40001dda..0f8c517f49 100644 --- a/var/spack/repos/builtin/packages/r-rnoaa/package.py +++ b/var/spack/repos/builtin/packages/r-rnoaa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRnoaa(RPackage): diff --git a/var/spack/repos/builtin/packages/r-robust/package.py b/var/spack/repos/builtin/packages/r-robust/package.py index 491dbe7aca..e721f25366 100644 --- a/var/spack/repos/builtin/packages/r-robust/package.py +++ b/var/spack/repos/builtin/packages/r-robust/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) # See the Spack documentation for more information on packaging. -from spack import * +from spack.package import * class RRobust(RPackage): diff --git a/var/spack/repos/builtin/packages/r-robustbase/package.py b/var/spack/repos/builtin/packages/r-robustbase/package.py index 3c253dff58..4afd48c013 100644 --- a/var/spack/repos/builtin/packages/r-robustbase/package.py +++ b/var/spack/repos/builtin/packages/r-robustbase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRobustbase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-roc/package.py b/var/spack/repos/builtin/packages/r-roc/package.py index 6da81d310b..b0ccd2b7b3 100644 --- a/var/spack/repos/builtin/packages/r-roc/package.py +++ b/var/spack/repos/builtin/packages/r-roc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRoc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rocr/package.py b/var/spack/repos/builtin/packages/r-rocr/package.py index 2521443206..391fd6bcd4 100644 --- a/var/spack/repos/builtin/packages/r-rocr/package.py +++ b/var/spack/repos/builtin/packages/r-rocr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRocr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rodbc/package.py b/var/spack/repos/builtin/packages/r-rodbc/package.py index 54054d2dad..131b697a47 100644 --- a/var/spack/repos/builtin/packages/r-rodbc/package.py +++ b/var/spack/repos/builtin/packages/r-rodbc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRodbc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rook/package.py b/var/spack/repos/builtin/packages/r-rook/package.py index d4d782b3ff..0aa935e787 100644 --- a/var/spack/repos/builtin/packages/r-rook/package.py +++ b/var/spack/repos/builtin/packages/r-rook/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRook(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rots/package.py b/var/spack/repos/builtin/packages/r-rots/package.py index 329aa6f138..f3ba1ebfee 100644 --- a/var/spack/repos/builtin/packages/r-rots/package.py +++ b/var/spack/repos/builtin/packages/r-rots/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRots(RPackage): diff --git a/var/spack/repos/builtin/packages/r-roxygen2/package.py b/var/spack/repos/builtin/packages/r-roxygen2/package.py index 468611453d..52d6adbf1a 100644 --- a/var/spack/repos/builtin/packages/r-roxygen2/package.py +++ b/var/spack/repos/builtin/packages/r-roxygen2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRoxygen2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rpart-plot/package.py b/var/spack/repos/builtin/packages/r-rpart-plot/package.py index 37519fcd59..d32f53295c 100644 --- a/var/spack/repos/builtin/packages/r-rpart-plot/package.py +++ b/var/spack/repos/builtin/packages/r-rpart-plot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRpartPlot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rpart/package.py b/var/spack/repos/builtin/packages/r-rpart/package.py index 2a207ee2be..c9622200c1 100644 --- a/var/spack/repos/builtin/packages/r-rpart/package.py +++ b/var/spack/repos/builtin/packages/r-rpart/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRpart(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rpmm/package.py b/var/spack/repos/builtin/packages/r-rpmm/package.py index 8588840d97..717d3a0039 100644 --- a/var/spack/repos/builtin/packages/r-rpmm/package.py +++ b/var/spack/repos/builtin/packages/r-rpmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRpmm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rpostgres/package.py b/var/spack/repos/builtin/packages/r-rpostgres/package.py index 9da3523be4..13a21556cb 100644 --- a/var/spack/repos/builtin/packages/r-rpostgres/package.py +++ b/var/spack/repos/builtin/packages/r-rpostgres/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRpostgres(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rpostgresql/package.py b/var/spack/repos/builtin/packages/r-rpostgresql/package.py index 88bf94ba7b..a4a013226c 100644 --- a/var/spack/repos/builtin/packages/r-rpostgresql/package.py +++ b/var/spack/repos/builtin/packages/r-rpostgresql/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRpostgresql(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rprojroot/package.py b/var/spack/repos/builtin/packages/r-rprojroot/package.py index 714c713d9b..b7711232c4 100644 --- a/var/spack/repos/builtin/packages/r-rprojroot/package.py +++ b/var/spack/repos/builtin/packages/r-rprojroot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRprojroot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rpsychi/package.py b/var/spack/repos/builtin/packages/r-rpsychi/package.py index dbf9264aaf..19a087d837 100644 --- a/var/spack/repos/builtin/packages/r-rpsychi/package.py +++ b/var/spack/repos/builtin/packages/r-rpsychi/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RRpsychi(RPackage): """Statistics for psychiatric research. diff --git a/var/spack/repos/builtin/packages/r-rrblup/package.py b/var/spack/repos/builtin/packages/r-rrblup/package.py index 790863fed0..41a08c0f5e 100644 --- a/var/spack/repos/builtin/packages/r-rrblup/package.py +++ b/var/spack/repos/builtin/packages/r-rrblup/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRrblup(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rrcov/package.py b/var/spack/repos/builtin/packages/r-rrcov/package.py index f9a8f69c48..ee28602ea5 100644 --- a/var/spack/repos/builtin/packages/r-rrcov/package.py +++ b/var/spack/repos/builtin/packages/r-rrcov/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRrcov(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rrpp/package.py b/var/spack/repos/builtin/packages/r-rrpp/package.py index 273b13ccef..95cea8c2fa 100644 --- a/var/spack/repos/builtin/packages/r-rrpp/package.py +++ b/var/spack/repos/builtin/packages/r-rrpp/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRrpp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rsamtools/package.py b/var/spack/repos/builtin/packages/r-rsamtools/package.py index bfaa8e2c4d..938c29382d 100644 --- a/var/spack/repos/builtin/packages/r-rsamtools/package.py +++ b/var/spack/repos/builtin/packages/r-rsamtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRsamtools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rsconnect/package.py b/var/spack/repos/builtin/packages/r-rsconnect/package.py index 71ba58ad45..82a842d087 100644 --- a/var/spack/repos/builtin/packages/r-rsconnect/package.py +++ b/var/spack/repos/builtin/packages/r-rsconnect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRsconnect(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rsnns/package.py b/var/spack/repos/builtin/packages/r-rsnns/package.py index 235421cdc1..b074323cd2 100644 --- a/var/spack/repos/builtin/packages/r-rsnns/package.py +++ b/var/spack/repos/builtin/packages/r-rsnns/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRsnns(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rsolnp/package.py b/var/spack/repos/builtin/packages/r-rsolnp/package.py index 7ceef0cead..866d2cfbad 100644 --- a/var/spack/repos/builtin/packages/r-rsolnp/package.py +++ b/var/spack/repos/builtin/packages/r-rsolnp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRsolnp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rspectra/package.py b/var/spack/repos/builtin/packages/r-rspectra/package.py index 26d4266612..add9d55e88 100644 --- a/var/spack/repos/builtin/packages/r-rspectra/package.py +++ b/var/spack/repos/builtin/packages/r-rspectra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRspectra(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py index 671c2c3c30..242f2379d3 100644 --- a/var/spack/repos/builtin/packages/r-rsqlite/package.py +++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRsqlite(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rstan/package.py b/var/spack/repos/builtin/packages/r-rstan/package.py index 1844b5cf92..0b728c9132 100644 --- a/var/spack/repos/builtin/packages/r-rstan/package.py +++ b/var/spack/repos/builtin/packages/r-rstan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRstan(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rstantools/package.py b/var/spack/repos/builtin/packages/r-rstantools/package.py index 46c672947b..f42a24a864 100644 --- a/var/spack/repos/builtin/packages/r-rstantools/package.py +++ b/var/spack/repos/builtin/packages/r-rstantools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRstantools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rstatix/package.py b/var/spack/repos/builtin/packages/r-rstatix/package.py index 2e77674be8..3eb2fd60da 100644 --- a/var/spack/repos/builtin/packages/r-rstatix/package.py +++ b/var/spack/repos/builtin/packages/r-rstatix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRstatix(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rstudioapi/package.py b/var/spack/repos/builtin/packages/r-rstudioapi/package.py index 4edb04668c..821aa014a3 100644 --- a/var/spack/repos/builtin/packages/r-rstudioapi/package.py +++ b/var/spack/repos/builtin/packages/r-rstudioapi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRstudioapi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rsvd/package.py b/var/spack/repos/builtin/packages/r-rsvd/package.py index 12f6283d05..852351fb1f 100644 --- a/var/spack/repos/builtin/packages/r-rsvd/package.py +++ b/var/spack/repos/builtin/packages/r-rsvd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRsvd(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rtracklayer/package.py b/var/spack/repos/builtin/packages/r-rtracklayer/package.py index 56280ffc87..aa5892dd04 100644 --- a/var/spack/repos/builtin/packages/r-rtracklayer/package.py +++ b/var/spack/repos/builtin/packages/r-rtracklayer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRtracklayer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rtsne/package.py b/var/spack/repos/builtin/packages/r-rtsne/package.py index 58dc56b5c1..09026705ae 100644 --- a/var/spack/repos/builtin/packages/r-rtsne/package.py +++ b/var/spack/repos/builtin/packages/r-rtsne/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRtsne(RPackage): diff --git a/var/spack/repos/builtin/packages/r-runit/package.py b/var/spack/repos/builtin/packages/r-runit/package.py index 959902fc4b..f6210fde2b 100644 --- a/var/spack/repos/builtin/packages/r-runit/package.py +++ b/var/spack/repos/builtin/packages/r-runit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRunit(RPackage): diff --git a/var/spack/repos/builtin/packages/r-runjags/package.py b/var/spack/repos/builtin/packages/r-runjags/package.py index a74c9f8e5a..ba9a3cb291 100644 --- a/var/spack/repos/builtin/packages/r-runjags/package.py +++ b/var/spack/repos/builtin/packages/r-runjags/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRunjags(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ruv/package.py b/var/spack/repos/builtin/packages/r-ruv/package.py index 997addcd23..dcf881495b 100644 --- a/var/spack/repos/builtin/packages/r-ruv/package.py +++ b/var/spack/repos/builtin/packages/r-ruv/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRuv(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rvcheck/package.py b/var/spack/repos/builtin/packages/r-rvcheck/package.py index 201db39016..83c518bc98 100644 --- a/var/spack/repos/builtin/packages/r-rvcheck/package.py +++ b/var/spack/repos/builtin/packages/r-rvcheck/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRvcheck(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rversions/package.py b/var/spack/repos/builtin/packages/r-rversions/package.py index 255f8741e0..257e8cd02f 100644 --- a/var/spack/repos/builtin/packages/r-rversions/package.py +++ b/var/spack/repos/builtin/packages/r-rversions/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRversions(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rvest/package.py b/var/spack/repos/builtin/packages/r-rvest/package.py index 2e51772980..2f25063091 100644 --- a/var/spack/repos/builtin/packages/r-rvest/package.py +++ b/var/spack/repos/builtin/packages/r-rvest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRvest(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rviennacl/package.py b/var/spack/repos/builtin/packages/r-rviennacl/package.py index 251770efe6..bb30f5964a 100644 --- a/var/spack/repos/builtin/packages/r-rviennacl/package.py +++ b/var/spack/repos/builtin/packages/r-rviennacl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRviennacl(RPackage): diff --git a/var/spack/repos/builtin/packages/r-rzmq/package.py b/var/spack/repos/builtin/packages/r-rzmq/package.py index c50c4c7c03..a17f701236 100644 --- a/var/spack/repos/builtin/packages/r-rzmq/package.py +++ b/var/spack/repos/builtin/packages/r-rzmq/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RRzmq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-s2/package.py b/var/spack/repos/builtin/packages/r-s2/package.py index 893af8437a..0452ed8b84 100644 --- a/var/spack/repos/builtin/packages/r-s2/package.py +++ b/var/spack/repos/builtin/packages/r-s2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RS2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-s4vectors/package.py b/var/spack/repos/builtin/packages/r-s4vectors/package.py index ca6cec34ee..dabf9fdb54 100644 --- a/var/spack/repos/builtin/packages/r-s4vectors/package.py +++ b/var/spack/repos/builtin/packages/r-s4vectors/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RS4vectors(RPackage): diff --git a/var/spack/repos/builtin/packages/r-samr/package.py b/var/spack/repos/builtin/packages/r-samr/package.py index f62c57c78b..287bc0dc59 100644 --- a/var/spack/repos/builtin/packages/r-samr/package.py +++ b/var/spack/repos/builtin/packages/r-samr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSamr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sandwich/package.py b/var/spack/repos/builtin/packages/r-sandwich/package.py index 7dc5437fe3..ab55939ca9 100644 --- a/var/spack/repos/builtin/packages/r-sandwich/package.py +++ b/var/spack/repos/builtin/packages/r-sandwich/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSandwich(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sass/package.py b/var/spack/repos/builtin/packages/r-sass/package.py index 86d6139171..10ce4769a7 100644 --- a/var/spack/repos/builtin/packages/r-sass/package.py +++ b/var/spack/repos/builtin/packages/r-sass/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSass(RPackage): diff --git a/var/spack/repos/builtin/packages/r-satellite/package.py b/var/spack/repos/builtin/packages/r-satellite/package.py index 86345fa6e1..d7966fd130 100644 --- a/var/spack/repos/builtin/packages/r-satellite/package.py +++ b/var/spack/repos/builtin/packages/r-satellite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSatellite(RPackage): diff --git a/var/spack/repos/builtin/packages/r-scaledmatrix/package.py b/var/spack/repos/builtin/packages/r-scaledmatrix/package.py index 0d92fadf2d..389086d890 100644 --- a/var/spack/repos/builtin/packages/r-scaledmatrix/package.py +++ b/var/spack/repos/builtin/packages/r-scaledmatrix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RScaledmatrix(RPackage): diff --git a/var/spack/repos/builtin/packages/r-scales/package.py b/var/spack/repos/builtin/packages/r-scales/package.py index b91b880051..dcfd92b087 100644 --- a/var/spack/repos/builtin/packages/r-scales/package.py +++ b/var/spack/repos/builtin/packages/r-scales/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RScales(RPackage): diff --git a/var/spack/repos/builtin/packages/r-scater/package.py b/var/spack/repos/builtin/packages/r-scater/package.py index ac914eee67..ab6bbf27d2 100644 --- a/var/spack/repos/builtin/packages/r-scater/package.py +++ b/var/spack/repos/builtin/packages/r-scater/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RScater(RPackage): diff --git a/var/spack/repos/builtin/packages/r-scattermore/package.py b/var/spack/repos/builtin/packages/r-scattermore/package.py index 7b7b5078a6..be4afdb4ac 100644 --- a/var/spack/repos/builtin/packages/r-scattermore/package.py +++ b/var/spack/repos/builtin/packages/r-scattermore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RScattermore(RPackage): diff --git a/var/spack/repos/builtin/packages/r-scatterpie/package.py b/var/spack/repos/builtin/packages/r-scatterpie/package.py index 3a7a8e6e28..f7953014ff 100644 --- a/var/spack/repos/builtin/packages/r-scatterpie/package.py +++ b/var/spack/repos/builtin/packages/r-scatterpie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RScatterpie(RPackage): diff --git a/var/spack/repos/builtin/packages/r-scatterplot3d/package.py b/var/spack/repos/builtin/packages/r-scatterplot3d/package.py index dea4ac6261..cfa7c0b641 100644 --- a/var/spack/repos/builtin/packages/r-scatterplot3d/package.py +++ b/var/spack/repos/builtin/packages/r-scatterplot3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RScatterplot3d(RPackage): diff --git a/var/spack/repos/builtin/packages/r-scrime/package.py b/var/spack/repos/builtin/packages/r-scrime/package.py index 1afaff714b..ea019b4e3a 100644 --- a/var/spack/repos/builtin/packages/r-scrime/package.py +++ b/var/spack/repos/builtin/packages/r-scrime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RScrime(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sctransform/package.py b/var/spack/repos/builtin/packages/r-sctransform/package.py index 184eacf740..33b505c691 100644 --- a/var/spack/repos/builtin/packages/r-sctransform/package.py +++ b/var/spack/repos/builtin/packages/r-sctransform/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSctransform(RPackage): diff --git a/var/spack/repos/builtin/packages/r-scuttle/package.py b/var/spack/repos/builtin/packages/r-scuttle/package.py index 9cf8a47490..cf640c841c 100644 --- a/var/spack/repos/builtin/packages/r-scuttle/package.py +++ b/var/spack/repos/builtin/packages/r-scuttle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RScuttle(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sdmtools/package.py b/var/spack/repos/builtin/packages/r-sdmtools/package.py index a61f467c3c..76c60c66df 100644 --- a/var/spack/repos/builtin/packages/r-sdmtools/package.py +++ b/var/spack/repos/builtin/packages/r-sdmtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSdmtools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-segmented/package.py b/var/spack/repos/builtin/packages/r-segmented/package.py index bb62bae35e..a51f783f8e 100644 --- a/var/spack/repos/builtin/packages/r-segmented/package.py +++ b/var/spack/repos/builtin/packages/r-segmented/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSegmented(RPackage): diff --git a/var/spack/repos/builtin/packages/r-selectr/package.py b/var/spack/repos/builtin/packages/r-selectr/package.py index aab2f9311c..4b731e0ee2 100644 --- a/var/spack/repos/builtin/packages/r-selectr/package.py +++ b/var/spack/repos/builtin/packages/r-selectr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSelectr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-seqinr/package.py b/var/spack/repos/builtin/packages/r-seqinr/package.py index 45588c34b1..0da3dcd9a0 100644 --- a/var/spack/repos/builtin/packages/r-seqinr/package.py +++ b/var/spack/repos/builtin/packages/r-seqinr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSeqinr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-seqlogo/package.py b/var/spack/repos/builtin/packages/r-seqlogo/package.py index 4b6e04664f..9984ad18aa 100644 --- a/var/spack/repos/builtin/packages/r-seqlogo/package.py +++ b/var/spack/repos/builtin/packages/r-seqlogo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSeqlogo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-servr/package.py b/var/spack/repos/builtin/packages/r-servr/package.py index b6b088dde3..ff51f09276 100644 --- a/var/spack/repos/builtin/packages/r-servr/package.py +++ b/var/spack/repos/builtin/packages/r-servr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RServr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sessioninfo/package.py b/var/spack/repos/builtin/packages/r-sessioninfo/package.py index 9b599679b9..4fbf98d147 100644 --- a/var/spack/repos/builtin/packages/r-sessioninfo/package.py +++ b/var/spack/repos/builtin/packages/r-sessioninfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSessioninfo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-seurat/package.py b/var/spack/repos/builtin/packages/r-seurat/package.py index fc54baab6a..cb5c43bd15 100644 --- a/var/spack/repos/builtin/packages/r-seurat/package.py +++ b/var/spack/repos/builtin/packages/r-seurat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSeurat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-seuratobject/package.py b/var/spack/repos/builtin/packages/r-seuratobject/package.py index f03c67fbf8..342bc14c88 100644 --- a/var/spack/repos/builtin/packages/r-seuratobject/package.py +++ b/var/spack/repos/builtin/packages/r-seuratobject/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSeuratobject(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sf/package.py b/var/spack/repos/builtin/packages/r-sf/package.py index 3dd6d0b53e..ef5ef7d486 100644 --- a/var/spack/repos/builtin/packages/r-sf/package.py +++ b/var/spack/repos/builtin/packages/r-sf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSf(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sfheaders/package.py b/var/spack/repos/builtin/packages/r-sfheaders/package.py index 9092e191df..464d4c7147 100644 --- a/var/spack/repos/builtin/packages/r-sfheaders/package.py +++ b/var/spack/repos/builtin/packages/r-sfheaders/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSfheaders(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sfsmisc/package.py b/var/spack/repos/builtin/packages/r-sfsmisc/package.py index d88e9de019..619e3a9843 100644 --- a/var/spack/repos/builtin/packages/r-sfsmisc/package.py +++ b/var/spack/repos/builtin/packages/r-sfsmisc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSfsmisc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shadowtext/package.py b/var/spack/repos/builtin/packages/r-shadowtext/package.py index 5bd0438474..29fcf894ed 100644 --- a/var/spack/repos/builtin/packages/r-shadowtext/package.py +++ b/var/spack/repos/builtin/packages/r-shadowtext/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShadowtext(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shape/package.py b/var/spack/repos/builtin/packages/r-shape/package.py index 02ba974545..85acd2ea0f 100644 --- a/var/spack/repos/builtin/packages/r-shape/package.py +++ b/var/spack/repos/builtin/packages/r-shape/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShape(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py index b43c68713b..2922091b7e 100644 --- a/var/spack/repos/builtin/packages/r-shiny/package.py +++ b/var/spack/repos/builtin/packages/r-shiny/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShiny(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shinydashboard/package.py b/var/spack/repos/builtin/packages/r-shinydashboard/package.py index 2ef0b14044..db8f218c87 100644 --- a/var/spack/repos/builtin/packages/r-shinydashboard/package.py +++ b/var/spack/repos/builtin/packages/r-shinydashboard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShinydashboard(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shinyfiles/package.py b/var/spack/repos/builtin/packages/r-shinyfiles/package.py index 5fc37bbbbb..10ca43204d 100644 --- a/var/spack/repos/builtin/packages/r-shinyfiles/package.py +++ b/var/spack/repos/builtin/packages/r-shinyfiles/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShinyfiles(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shinyjs/package.py b/var/spack/repos/builtin/packages/r-shinyjs/package.py index e9bd0fb05d..ed3428a017 100644 --- a/var/spack/repos/builtin/packages/r-shinyjs/package.py +++ b/var/spack/repos/builtin/packages/r-shinyjs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShinyjs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shinystan/package.py b/var/spack/repos/builtin/packages/r-shinystan/package.py index d7acec1f06..bcd5054253 100644 --- a/var/spack/repos/builtin/packages/r-shinystan/package.py +++ b/var/spack/repos/builtin/packages/r-shinystan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShinystan(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shinythemes/package.py b/var/spack/repos/builtin/packages/r-shinythemes/package.py index bc3b7bb3ad..d24db3bd20 100644 --- a/var/spack/repos/builtin/packages/r-shinythemes/package.py +++ b/var/spack/repos/builtin/packages/r-shinythemes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShinythemes(RPackage): diff --git a/var/spack/repos/builtin/packages/r-shortread/package.py b/var/spack/repos/builtin/packages/r-shortread/package.py index 4e53af95b8..1faf2a0018 100644 --- a/var/spack/repos/builtin/packages/r-shortread/package.py +++ b/var/spack/repos/builtin/packages/r-shortread/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RShortread(RPackage): diff --git a/var/spack/repos/builtin/packages/r-siggenes/package.py b/var/spack/repos/builtin/packages/r-siggenes/package.py index 838cb4cc5f..b701acaaef 100644 --- a/var/spack/repos/builtin/packages/r-siggenes/package.py +++ b/var/spack/repos/builtin/packages/r-siggenes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSiggenes(RPackage): diff --git a/var/spack/repos/builtin/packages/r-simpleaffy/package.py b/var/spack/repos/builtin/packages/r-simpleaffy/package.py index 1b1282345b..3ce4608858 100644 --- a/var/spack/repos/builtin/packages/r-simpleaffy/package.py +++ b/var/spack/repos/builtin/packages/r-simpleaffy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSimpleaffy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-singlecellexperiment/package.py b/var/spack/repos/builtin/packages/r-singlecellexperiment/package.py index 24374acbec..2501f8380c 100644 --- a/var/spack/repos/builtin/packages/r-singlecellexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-singlecellexperiment/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSinglecellexperiment(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sitmo/package.py b/var/spack/repos/builtin/packages/r-sitmo/package.py index 79be0fa870..d670ad46ce 100644 --- a/var/spack/repos/builtin/packages/r-sitmo/package.py +++ b/var/spack/repos/builtin/packages/r-sitmo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSitmo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sm/package.py b/var/spack/repos/builtin/packages/r-sm/package.py index cbb01fac8a..37f7902c0c 100644 --- a/var/spack/repos/builtin/packages/r-sm/package.py +++ b/var/spack/repos/builtin/packages/r-sm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-smoof/package.py b/var/spack/repos/builtin/packages/r-smoof/package.py index 5657c7860e..022b9116b8 100644 --- a/var/spack/repos/builtin/packages/r-smoof/package.py +++ b/var/spack/repos/builtin/packages/r-smoof/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSmoof(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sn/package.py b/var/spack/repos/builtin/packages/r-sn/package.py index 7b0a6b8372..0b28fe9faf 100644 --- a/var/spack/repos/builtin/packages/r-sn/package.py +++ b/var/spack/repos/builtin/packages/r-sn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-snakecase/package.py b/var/spack/repos/builtin/packages/r-snakecase/package.py index a7c59f1178..950860802f 100644 --- a/var/spack/repos/builtin/packages/r-snakecase/package.py +++ b/var/spack/repos/builtin/packages/r-snakecase/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSnakecase(RPackage): diff --git a/var/spack/repos/builtin/packages/r-snow/package.py b/var/spack/repos/builtin/packages/r-snow/package.py index 00f52108f0..b8679524d9 100644 --- a/var/spack/repos/builtin/packages/r-snow/package.py +++ b/var/spack/repos/builtin/packages/r-snow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSnow(RPackage): diff --git a/var/spack/repos/builtin/packages/r-snowfall/package.py b/var/spack/repos/builtin/packages/r-snowfall/package.py index 4255cb2b75..c8139e30ec 100644 --- a/var/spack/repos/builtin/packages/r-snowfall/package.py +++ b/var/spack/repos/builtin/packages/r-snowfall/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSnowfall(RPackage): diff --git a/var/spack/repos/builtin/packages/r-snprelate/package.py b/var/spack/repos/builtin/packages/r-snprelate/package.py index 8d8ef691b6..6bd0d5910d 100644 --- a/var/spack/repos/builtin/packages/r-snprelate/package.py +++ b/var/spack/repos/builtin/packages/r-snprelate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSnprelate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-snpstats/package.py b/var/spack/repos/builtin/packages/r-snpstats/package.py index 78d5a47daf..4d2c1085ce 100644 --- a/var/spack/repos/builtin/packages/r-snpstats/package.py +++ b/var/spack/repos/builtin/packages/r-snpstats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSnpstats(RPackage): diff --git a/var/spack/repos/builtin/packages/r-som/package.py b/var/spack/repos/builtin/packages/r-som/package.py index 2b50810821..fedf618f22 100644 --- a/var/spack/repos/builtin/packages/r-som/package.py +++ b/var/spack/repos/builtin/packages/r-som/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSom(RPackage): diff --git a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py index d4f2f781a3..1c1be5becd 100644 --- a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py +++ b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSomaticsignatures(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sourcetools/package.py b/var/spack/repos/builtin/packages/r-sourcetools/package.py index e2e4086c21..720b80d566 100644 --- a/var/spack/repos/builtin/packages/r-sourcetools/package.py +++ b/var/spack/repos/builtin/packages/r-sourcetools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSourcetools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sp/package.py b/var/spack/repos/builtin/packages/r-sp/package.py index 404121017f..9b185c7697 100644 --- a/var/spack/repos/builtin/packages/r-sp/package.py +++ b/var/spack/repos/builtin/packages/r-sp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spacetime/package.py b/var/spack/repos/builtin/packages/r-spacetime/package.py index d3b9f269c4..a1d6cebc11 100644 --- a/var/spack/repos/builtin/packages/r-spacetime/package.py +++ b/var/spack/repos/builtin/packages/r-spacetime/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpacetime(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spades-addins/package.py b/var/spack/repos/builtin/packages/r-spades-addins/package.py index 3a1bb8b03f..923ff7f7ef 100644 --- a/var/spack/repos/builtin/packages/r-spades-addins/package.py +++ b/var/spack/repos/builtin/packages/r-spades-addins/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpadesAddins(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spades-core/package.py b/var/spack/repos/builtin/packages/r-spades-core/package.py index 037c38f54a..15537f6427 100644 --- a/var/spack/repos/builtin/packages/r-spades-core/package.py +++ b/var/spack/repos/builtin/packages/r-spades-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpadesCore(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spades-tools/package.py b/var/spack/repos/builtin/packages/r-spades-tools/package.py index 3b6066be59..0204be1b9a 100644 --- a/var/spack/repos/builtin/packages/r-spades-tools/package.py +++ b/var/spack/repos/builtin/packages/r-spades-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpadesTools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spades/package.py b/var/spack/repos/builtin/packages/r-spades/package.py index 2d67db5d68..772009eb8f 100644 --- a/var/spack/repos/builtin/packages/r-spades/package.py +++ b/var/spack/repos/builtin/packages/r-spades/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpades(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spam/package.py b/var/spack/repos/builtin/packages/r-spam/package.py index 1bad55a1e3..c0237ec84e 100644 --- a/var/spack/repos/builtin/packages/r-spam/package.py +++ b/var/spack/repos/builtin/packages/r-spam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpam(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sparsem/package.py b/var/spack/repos/builtin/packages/r-sparsem/package.py index b9c7010be4..c8fb259423 100644 --- a/var/spack/repos/builtin/packages/r-sparsem/package.py +++ b/var/spack/repos/builtin/packages/r-sparsem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSparsem(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sparsematrixstats/package.py b/var/spack/repos/builtin/packages/r-sparsematrixstats/package.py index ab20069edb..5a65b01d35 100644 --- a/var/spack/repos/builtin/packages/r-sparsematrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-sparsematrixstats/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSparsematrixstats(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatial/package.py b/var/spack/repos/builtin/packages/r-spatial/package.py index 8d60671413..49dcb30865 100644 --- a/var/spack/repos/builtin/packages/r-spatial/package.py +++ b/var/spack/repos/builtin/packages/r-spatial/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatial(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatialeco/package.py b/var/spack/repos/builtin/packages/r-spatialeco/package.py index 89dd67eb61..3c5d730922 100644 --- a/var/spack/repos/builtin/packages/r-spatialeco/package.py +++ b/var/spack/repos/builtin/packages/r-spatialeco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatialeco(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatialpack/package.py b/var/spack/repos/builtin/packages/r-spatialpack/package.py index 1007dcbfa9..7bfc6c67b4 100644 --- a/var/spack/repos/builtin/packages/r-spatialpack/package.py +++ b/var/spack/repos/builtin/packages/r-spatialpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatialpack(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatialreg/package.py b/var/spack/repos/builtin/packages/r-spatialreg/package.py index c4c3009386..48c79a77b7 100644 --- a/var/spack/repos/builtin/packages/r-spatialreg/package.py +++ b/var/spack/repos/builtin/packages/r-spatialreg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatialreg(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatstat-core/package.py b/var/spack/repos/builtin/packages/r-spatstat-core/package.py index e699eab73c..ce093c2704 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-core/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatstatCore(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatstat-data/package.py b/var/spack/repos/builtin/packages/r-spatstat-data/package.py index b9ab00c448..e8a30730ba 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-data/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-data/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatstatData(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatstat-geom/package.py b/var/spack/repos/builtin/packages/r-spatstat-geom/package.py index 5b540b6a16..4b0750b143 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-geom/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-geom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatstatGeom(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatstat-linnet/package.py b/var/spack/repos/builtin/packages/r-spatstat-linnet/package.py index 4a76a1e408..32c088412d 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-linnet/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-linnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatstatLinnet(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatstat-sparse/package.py b/var/spack/repos/builtin/packages/r-spatstat-sparse/package.py index 1fd525ef3a..88f9ecaac0 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-sparse/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-sparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatstatSparse(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatstat-utils/package.py b/var/spack/repos/builtin/packages/r-spatstat-utils/package.py index 3e0ed0e1c7..bc0da61e73 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-utils/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatstatUtils(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spatstat/package.py b/var/spack/repos/builtin/packages/r-spatstat/package.py index eeb31eebf8..90878ea745 100644 --- a/var/spack/repos/builtin/packages/r-spatstat/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpatstat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spdata/package.py b/var/spack/repos/builtin/packages/r-spdata/package.py index cb12570d1e..c3c6325367 100644 --- a/var/spack/repos/builtin/packages/r-spdata/package.py +++ b/var/spack/repos/builtin/packages/r-spdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpdata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spdep/package.py b/var/spack/repos/builtin/packages/r-spdep/package.py index 576e31422d..b465343a5b 100644 --- a/var/spack/repos/builtin/packages/r-spdep/package.py +++ b/var/spack/repos/builtin/packages/r-spdep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpdep(RPackage): diff --git a/var/spack/repos/builtin/packages/r-speedglm/package.py b/var/spack/repos/builtin/packages/r-speedglm/package.py index bc34f898b3..ec796e6a5d 100644 --- a/var/spack/repos/builtin/packages/r-speedglm/package.py +++ b/var/spack/repos/builtin/packages/r-speedglm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpeedglm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-spem/package.py b/var/spack/repos/builtin/packages/r-spem/package.py index f9b490e9f0..09d8ee08d5 100644 --- a/var/spack/repos/builtin/packages/r-spem/package.py +++ b/var/spack/repos/builtin/packages/r-spem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSpem(RPackage): diff --git a/var/spack/repos/builtin/packages/r-splancs/package.py b/var/spack/repos/builtin/packages/r-splancs/package.py index f82da03d8f..0524b842a7 100644 --- a/var/spack/repos/builtin/packages/r-splancs/package.py +++ b/var/spack/repos/builtin/packages/r-splancs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSplancs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-splitstackshape/package.py b/var/spack/repos/builtin/packages/r-splitstackshape/package.py index c2870d283e..eec1be7da4 100644 --- a/var/spack/repos/builtin/packages/r-splitstackshape/package.py +++ b/var/spack/repos/builtin/packages/r-splitstackshape/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSplitstackshape(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sqldf/package.py b/var/spack/repos/builtin/packages/r-sqldf/package.py index ba15a96c86..e0788032df 100644 --- a/var/spack/repos/builtin/packages/r-sqldf/package.py +++ b/var/spack/repos/builtin/packages/r-sqldf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSqldf(RPackage): diff --git a/var/spack/repos/builtin/packages/r-squarem/package.py b/var/spack/repos/builtin/packages/r-squarem/package.py index fac73c2342..fb033fa8e1 100644 --- a/var/spack/repos/builtin/packages/r-squarem/package.py +++ b/var/spack/repos/builtin/packages/r-squarem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSquarem(RPackage): diff --git a/var/spack/repos/builtin/packages/r-squash/package.py b/var/spack/repos/builtin/packages/r-squash/package.py index 311ae25cdf..33bf694b9f 100644 --- a/var/spack/repos/builtin/packages/r-squash/package.py +++ b/var/spack/repos/builtin/packages/r-squash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSquash(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sseq/package.py b/var/spack/repos/builtin/packages/r-sseq/package.py index d6e42020b3..aadcfb95f9 100644 --- a/var/spack/repos/builtin/packages/r-sseq/package.py +++ b/var/spack/repos/builtin/packages/r-sseq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSseq(RPackage): diff --git a/var/spack/repos/builtin/packages/r-stabledist/package.py b/var/spack/repos/builtin/packages/r-stabledist/package.py index 07b03af3e7..42c04b793c 100644 --- a/var/spack/repos/builtin/packages/r-stabledist/package.py +++ b/var/spack/repos/builtin/packages/r-stabledist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStabledist(RPackage): diff --git a/var/spack/repos/builtin/packages/r-stanheaders/package.py b/var/spack/repos/builtin/packages/r-stanheaders/package.py index 9e0f09531b..296225d3c8 100644 --- a/var/spack/repos/builtin/packages/r-stanheaders/package.py +++ b/var/spack/repos/builtin/packages/r-stanheaders/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStanheaders(RPackage): diff --git a/var/spack/repos/builtin/packages/r-stargazer/package.py b/var/spack/repos/builtin/packages/r-stargazer/package.py index 9806d460e2..05aa38bebd 100644 --- a/var/spack/repos/builtin/packages/r-stargazer/package.py +++ b/var/spack/repos/builtin/packages/r-stargazer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStargazer(RPackage): diff --git a/var/spack/repos/builtin/packages/r-statmod/package.py b/var/spack/repos/builtin/packages/r-statmod/package.py index 6f8bbd85c7..f96e3a2312 100644 --- a/var/spack/repos/builtin/packages/r-statmod/package.py +++ b/var/spack/repos/builtin/packages/r-statmod/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStatmod(RPackage): diff --git a/var/spack/repos/builtin/packages/r-statnet-common/package.py b/var/spack/repos/builtin/packages/r-statnet-common/package.py index 108a571c11..998f973482 100644 --- a/var/spack/repos/builtin/packages/r-statnet-common/package.py +++ b/var/spack/repos/builtin/packages/r-statnet-common/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStatnetCommon(RPackage): diff --git a/var/spack/repos/builtin/packages/r-stringfish/package.py b/var/spack/repos/builtin/packages/r-stringfish/package.py index df8f03e61a..6ec7288b13 100644 --- a/var/spack/repos/builtin/packages/r-stringfish/package.py +++ b/var/spack/repos/builtin/packages/r-stringfish/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStringfish(RPackage): diff --git a/var/spack/repos/builtin/packages/r-stringi/package.py b/var/spack/repos/builtin/packages/r-stringi/package.py index f8de74aa61..c1546dd081 100644 --- a/var/spack/repos/builtin/packages/r-stringi/package.py +++ b/var/spack/repos/builtin/packages/r-stringi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStringi(RPackage): diff --git a/var/spack/repos/builtin/packages/r-stringr/package.py b/var/spack/repos/builtin/packages/r-stringr/package.py index 84c116b4f1..bd81423d64 100644 --- a/var/spack/repos/builtin/packages/r-stringr/package.py +++ b/var/spack/repos/builtin/packages/r-stringr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStringr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-strucchange/package.py b/var/spack/repos/builtin/packages/r-strucchange/package.py index cb3962901c..69e6c8b0b8 100644 --- a/var/spack/repos/builtin/packages/r-strucchange/package.py +++ b/var/spack/repos/builtin/packages/r-strucchange/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStrucchange(RPackage): diff --git a/var/spack/repos/builtin/packages/r-strucchangercpp/package.py b/var/spack/repos/builtin/packages/r-strucchangercpp/package.py index b66777a8c0..c4c72e73c0 100644 --- a/var/spack/repos/builtin/packages/r-strucchangercpp/package.py +++ b/var/spack/repos/builtin/packages/r-strucchangercpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStrucchangercpp(RPackage): diff --git a/var/spack/repos/builtin/packages/r-styler/package.py b/var/spack/repos/builtin/packages/r-styler/package.py index 60f6bf58c1..90c00ea131 100644 --- a/var/spack/repos/builtin/packages/r-styler/package.py +++ b/var/spack/repos/builtin/packages/r-styler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RStyler(RPackage): diff --git a/var/spack/repos/builtin/packages/r-subplex/package.py b/var/spack/repos/builtin/packages/r-subplex/package.py index 5954badca0..6d125d022a 100644 --- a/var/spack/repos/builtin/packages/r-subplex/package.py +++ b/var/spack/repos/builtin/packages/r-subplex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSubplex(RPackage): diff --git a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py index 9477845f76..52a14a0709 100644 --- a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSummarizedexperiment(RPackage): diff --git a/var/spack/repos/builtin/packages/r-suppdists/package.py b/var/spack/repos/builtin/packages/r-suppdists/package.py index 7812fb7f2a..612178c76b 100644 --- a/var/spack/repos/builtin/packages/r-suppdists/package.py +++ b/var/spack/repos/builtin/packages/r-suppdists/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSuppdists(RPackage): diff --git a/var/spack/repos/builtin/packages/r-survey/package.py b/var/spack/repos/builtin/packages/r-survey/package.py index 12ddda333e..1d004b1ac3 100644 --- a/var/spack/repos/builtin/packages/r-survey/package.py +++ b/var/spack/repos/builtin/packages/r-survey/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSurvey(RPackage): diff --git a/var/spack/repos/builtin/packages/r-survival/package.py b/var/spack/repos/builtin/packages/r-survival/package.py index 1f567e1281..6108f47e32 100644 --- a/var/spack/repos/builtin/packages/r-survival/package.py +++ b/var/spack/repos/builtin/packages/r-survival/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSurvival(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sva/package.py b/var/spack/repos/builtin/packages/r-sva/package.py index 59ad4aeac5..ab135b7342 100644 --- a/var/spack/repos/builtin/packages/r-sva/package.py +++ b/var/spack/repos/builtin/packages/r-sva/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSva(RPackage): diff --git a/var/spack/repos/builtin/packages/r-svglite/package.py b/var/spack/repos/builtin/packages/r-svglite/package.py index 62bfbd74b6..7546c617f9 100644 --- a/var/spack/repos/builtin/packages/r-svglite/package.py +++ b/var/spack/repos/builtin/packages/r-svglite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSvglite(RPackage): diff --git a/var/spack/repos/builtin/packages/r-sys/package.py b/var/spack/repos/builtin/packages/r-sys/package.py index 7cf5487453..cd1779ccf8 100644 --- a/var/spack/repos/builtin/packages/r-sys/package.py +++ b/var/spack/repos/builtin/packages/r-sys/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSys(RPackage): diff --git a/var/spack/repos/builtin/packages/r-systemfonts/package.py b/var/spack/repos/builtin/packages/r-systemfonts/package.py index fe28f554a5..5a35eeb732 100644 --- a/var/spack/repos/builtin/packages/r-systemfonts/package.py +++ b/var/spack/repos/builtin/packages/r-systemfonts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RSystemfonts(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tarifx/package.py b/var/spack/repos/builtin/packages/r-tarifx/package.py index b00219845b..2b1dab2bd5 100644 --- a/var/spack/repos/builtin/packages/r-tarifx/package.py +++ b/var/spack/repos/builtin/packages/r-tarifx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTarifx(RPackage): diff --git a/var/spack/repos/builtin/packages/r-taxizedb/package.py b/var/spack/repos/builtin/packages/r-taxizedb/package.py index ca40cd557d..d1758c6db5 100644 --- a/var/spack/repos/builtin/packages/r-taxizedb/package.py +++ b/var/spack/repos/builtin/packages/r-taxizedb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTaxizedb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tclust/package.py b/var/spack/repos/builtin/packages/r-tclust/package.py index ec7828d2ea..b1caf31d8e 100644 --- a/var/spack/repos/builtin/packages/r-tclust/package.py +++ b/var/spack/repos/builtin/packages/r-tclust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTclust(RPackage): diff --git a/var/spack/repos/builtin/packages/r-teachingdemos/package.py b/var/spack/repos/builtin/packages/r-teachingdemos/package.py index 8a79786df9..eeecc70eff 100644 --- a/var/spack/repos/builtin/packages/r-teachingdemos/package.py +++ b/var/spack/repos/builtin/packages/r-teachingdemos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTeachingdemos(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tensor/package.py b/var/spack/repos/builtin/packages/r-tensor/package.py index 5523077dce..c0cce979e3 100644 --- a/var/spack/repos/builtin/packages/r-tensor/package.py +++ b/var/spack/repos/builtin/packages/r-tensor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTensor(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tensora/package.py b/var/spack/repos/builtin/packages/r-tensora/package.py index 1fee14b0ce..318e9e5d86 100644 --- a/var/spack/repos/builtin/packages/r-tensora/package.py +++ b/var/spack/repos/builtin/packages/r-tensora/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTensora(RPackage): diff --git a/var/spack/repos/builtin/packages/r-terra/package.py b/var/spack/repos/builtin/packages/r-terra/package.py index bb8908eda8..cb023ac1af 100644 --- a/var/spack/repos/builtin/packages/r-terra/package.py +++ b/var/spack/repos/builtin/packages/r-terra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTerra(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tester/package.py b/var/spack/repos/builtin/packages/r-tester/package.py index 3522bf212f..314d82983f 100644 --- a/var/spack/repos/builtin/packages/r-tester/package.py +++ b/var/spack/repos/builtin/packages/r-tester/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTester(RPackage): diff --git a/var/spack/repos/builtin/packages/r-testit/package.py b/var/spack/repos/builtin/packages/r-testit/package.py index 8f623a6acf..6b0ca05b53 100644 --- a/var/spack/repos/builtin/packages/r-testit/package.py +++ b/var/spack/repos/builtin/packages/r-testit/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTestit(RPackage): diff --git a/var/spack/repos/builtin/packages/r-testthat/package.py b/var/spack/repos/builtin/packages/r-testthat/package.py index 2f43aabf21..a2c8cd4fee 100644 --- a/var/spack/repos/builtin/packages/r-testthat/package.py +++ b/var/spack/repos/builtin/packages/r-testthat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTestthat(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tfbstools/package.py b/var/spack/repos/builtin/packages/r-tfbstools/package.py index 2a59c6cbb8..3d7f8725f2 100644 --- a/var/spack/repos/builtin/packages/r-tfbstools/package.py +++ b/var/spack/repos/builtin/packages/r-tfbstools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTfbstools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tfisher/package.py b/var/spack/repos/builtin/packages/r-tfisher/package.py index 5d9211725c..e2142cfbf5 100644 --- a/var/spack/repos/builtin/packages/r-tfisher/package.py +++ b/var/spack/repos/builtin/packages/r-tfisher/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTfisher(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py index 53b9021c06..f4e1333b60 100644 --- a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py +++ b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTfmpvalue(RPackage): diff --git a/var/spack/repos/builtin/packages/r-th-data/package.py b/var/spack/repos/builtin/packages/r-th-data/package.py index c42ef33359..b3e95c8de3 100644 --- a/var/spack/repos/builtin/packages/r-th-data/package.py +++ b/var/spack/repos/builtin/packages/r-th-data/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RThData(RPackage): diff --git a/var/spack/repos/builtin/packages/r-threejs/package.py b/var/spack/repos/builtin/packages/r-threejs/package.py index 1bcaaf3d4e..0501f6b473 100644 --- a/var/spack/repos/builtin/packages/r-threejs/package.py +++ b/var/spack/repos/builtin/packages/r-threejs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RThreejs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py index 1bc847cf83..c2ba5523a7 100644 --- a/var/spack/repos/builtin/packages/r-tibble/package.py +++ b/var/spack/repos/builtin/packages/r-tibble/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTibble(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tictoc/package.py b/var/spack/repos/builtin/packages/r-tictoc/package.py index 0b34c25f31..4230c60546 100644 --- a/var/spack/repos/builtin/packages/r-tictoc/package.py +++ b/var/spack/repos/builtin/packages/r-tictoc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTictoc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tidycensus/package.py b/var/spack/repos/builtin/packages/r-tidycensus/package.py index 216a50d811..0da25c22cb 100644 --- a/var/spack/repos/builtin/packages/r-tidycensus/package.py +++ b/var/spack/repos/builtin/packages/r-tidycensus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTidycensus(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tidygraph/package.py b/var/spack/repos/builtin/packages/r-tidygraph/package.py index 2d96e015cc..09c22942d7 100644 --- a/var/spack/repos/builtin/packages/r-tidygraph/package.py +++ b/var/spack/repos/builtin/packages/r-tidygraph/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTidygraph(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py index 361059eb2e..9703540d3e 100644 --- a/var/spack/repos/builtin/packages/r-tidyr/package.py +++ b/var/spack/repos/builtin/packages/r-tidyr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTidyr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tidyselect/package.py b/var/spack/repos/builtin/packages/r-tidyselect/package.py index c5ad825fc9..adabdd6d40 100644 --- a/var/spack/repos/builtin/packages/r-tidyselect/package.py +++ b/var/spack/repos/builtin/packages/r-tidyselect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTidyselect(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tidytree/package.py b/var/spack/repos/builtin/packages/r-tidytree/package.py index b714615544..4e7b4b4259 100644 --- a/var/spack/repos/builtin/packages/r-tidytree/package.py +++ b/var/spack/repos/builtin/packages/r-tidytree/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTidytree(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tidyverse/package.py b/var/spack/repos/builtin/packages/r-tidyverse/package.py index 5313a91890..7351bf2e75 100644 --- a/var/spack/repos/builtin/packages/r-tidyverse/package.py +++ b/var/spack/repos/builtin/packages/r-tidyverse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTidyverse(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tiff/package.py b/var/spack/repos/builtin/packages/r-tiff/package.py index 6cf31a9783..a369d4751a 100644 --- a/var/spack/repos/builtin/packages/r-tiff/package.py +++ b/var/spack/repos/builtin/packages/r-tiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTiff(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tigris/package.py b/var/spack/repos/builtin/packages/r-tigris/package.py index c1c17027d7..abb556b4c3 100644 --- a/var/spack/repos/builtin/packages/r-tigris/package.py +++ b/var/spack/repos/builtin/packages/r-tigris/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTigris(RPackage): diff --git a/var/spack/repos/builtin/packages/r-timedate/package.py b/var/spack/repos/builtin/packages/r-timedate/package.py index 4054af3feb..8ce6e308a1 100644 --- a/var/spack/repos/builtin/packages/r-timedate/package.py +++ b/var/spack/repos/builtin/packages/r-timedate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTimedate(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tinytex/package.py b/var/spack/repos/builtin/packages/r-tinytex/package.py index 11f44a5971..54138e5af7 100644 --- a/var/spack/repos/builtin/packages/r-tinytex/package.py +++ b/var/spack/repos/builtin/packages/r-tinytex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTinytex(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tmixclust/package.py b/var/spack/repos/builtin/packages/r-tmixclust/package.py index 865b5cd14b..20ecaf2751 100644 --- a/var/spack/repos/builtin/packages/r-tmixclust/package.py +++ b/var/spack/repos/builtin/packages/r-tmixclust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTmixclust(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tmvnsim/package.py b/var/spack/repos/builtin/packages/r-tmvnsim/package.py index 7dc28e50ff..be47382b25 100644 --- a/var/spack/repos/builtin/packages/r-tmvnsim/package.py +++ b/var/spack/repos/builtin/packages/r-tmvnsim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTmvnsim(RPackage): diff --git a/var/spack/repos/builtin/packages/r-topgo/package.py b/var/spack/repos/builtin/packages/r-topgo/package.py index 3f9a8cc89a..1125de4034 100644 --- a/var/spack/repos/builtin/packages/r-topgo/package.py +++ b/var/spack/repos/builtin/packages/r-topgo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTopgo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-treeio/package.py b/var/spack/repos/builtin/packages/r-treeio/package.py index 9e792f3cf9..c94f5290dc 100644 --- a/var/spack/repos/builtin/packages/r-treeio/package.py +++ b/var/spack/repos/builtin/packages/r-treeio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTreeio(RPackage): diff --git a/var/spack/repos/builtin/packages/r-triebeard/package.py b/var/spack/repos/builtin/packages/r-triebeard/package.py index 9d60082a39..4424b1aac4 100644 --- a/var/spack/repos/builtin/packages/r-triebeard/package.py +++ b/var/spack/repos/builtin/packages/r-triebeard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTriebeard(RPackage): diff --git a/var/spack/repos/builtin/packages/r-trimcluster/package.py b/var/spack/repos/builtin/packages/r-trimcluster/package.py index 87bf0a4373..43a6e1f27c 100644 --- a/var/spack/repos/builtin/packages/r-trimcluster/package.py +++ b/var/spack/repos/builtin/packages/r-trimcluster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTrimcluster(RPackage): diff --git a/var/spack/repos/builtin/packages/r-truncdist/package.py b/var/spack/repos/builtin/packages/r-truncdist/package.py index 09db765886..e775a4cea8 100644 --- a/var/spack/repos/builtin/packages/r-truncdist/package.py +++ b/var/spack/repos/builtin/packages/r-truncdist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTruncdist(RPackage): diff --git a/var/spack/repos/builtin/packages/r-truncnorm/package.py b/var/spack/repos/builtin/packages/r-truncnorm/package.py index e4010cf532..8509e1b787 100644 --- a/var/spack/repos/builtin/packages/r-truncnorm/package.py +++ b/var/spack/repos/builtin/packages/r-truncnorm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTruncnorm(RPackage): diff --git a/var/spack/repos/builtin/packages/r-trust/package.py b/var/spack/repos/builtin/packages/r-trust/package.py index 8a4e72faed..acab05da66 100644 --- a/var/spack/repos/builtin/packages/r-trust/package.py +++ b/var/spack/repos/builtin/packages/r-trust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTrust(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tseries/package.py b/var/spack/repos/builtin/packages/r-tseries/package.py index 4ff59ca012..28019efbc9 100644 --- a/var/spack/repos/builtin/packages/r-tseries/package.py +++ b/var/spack/repos/builtin/packages/r-tseries/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTseries(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tsne/package.py b/var/spack/repos/builtin/packages/r-tsne/package.py index bb65555bf5..fbbc2d6d36 100644 --- a/var/spack/repos/builtin/packages/r-tsne/package.py +++ b/var/spack/repos/builtin/packages/r-tsne/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTsne(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ttr/package.py b/var/spack/repos/builtin/packages/r-ttr/package.py index 60271d22ce..1347a8a64b 100644 --- a/var/spack/repos/builtin/packages/r-ttr/package.py +++ b/var/spack/repos/builtin/packages/r-ttr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTtr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tweenr/package.py b/var/spack/repos/builtin/packages/r-tweenr/package.py index 04ceec1cb0..a268d88835 100644 --- a/var/spack/repos/builtin/packages/r-tweenr/package.py +++ b/var/spack/repos/builtin/packages/r-tweenr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTweenr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg18-knowngene/package.py b/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg18-knowngene/package.py index dab13e7888..e0c83d19d7 100644 --- a/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg18-knowngene/package.py +++ b/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg18-knowngene/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTxdbHsapiensUcscHg18Knowngene(RPackage): diff --git a/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg19-knowngene/package.py b/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg19-knowngene/package.py index 0e47f7a35a..c2911850fa 100644 --- a/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg19-knowngene/package.py +++ b/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg19-knowngene/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTxdbHsapiensUcscHg19Knowngene(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tximport/package.py b/var/spack/repos/builtin/packages/r-tximport/package.py index b3cf968d7a..9e68fd31f3 100644 --- a/var/spack/repos/builtin/packages/r-tximport/package.py +++ b/var/spack/repos/builtin/packages/r-tximport/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTximport(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tximportdata/package.py b/var/spack/repos/builtin/packages/r-tximportdata/package.py index 34e92e2b30..02cf762fb7 100644 --- a/var/spack/repos/builtin/packages/r-tximportdata/package.py +++ b/var/spack/repos/builtin/packages/r-tximportdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTximportdata(RPackage): diff --git a/var/spack/repos/builtin/packages/r-tzdb/package.py b/var/spack/repos/builtin/packages/r-tzdb/package.py index ea2b2509cc..f55262b19e 100644 --- a/var/spack/repos/builtin/packages/r-tzdb/package.py +++ b/var/spack/repos/builtin/packages/r-tzdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RTzdb(RPackage): diff --git a/var/spack/repos/builtin/packages/r-ucminf/package.py b/var/spack/repos/builtin/packages/r-ucminf/package.py index e3e7764934..bc7958e367 100644 --- a/var/spack/repos/builtin/packages/r-ucminf/package.py +++ b/var/spack/repos/builtin/packages/r-ucminf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUcminf(RPackage): diff --git a/var/spack/repos/builtin/packages/r-udunits2/package.py b/var/spack/repos/builtin/packages/r-udunits2/package.py index 448dc9acb7..897f6228e5 100644 --- a/var/spack/repos/builtin/packages/r-udunits2/package.py +++ b/var/spack/repos/builtin/packages/r-udunits2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUdunits2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-units/package.py b/var/spack/repos/builtin/packages/r-units/package.py index b424903aa9..22b3944594 100644 --- a/var/spack/repos/builtin/packages/r-units/package.py +++ b/var/spack/repos/builtin/packages/r-units/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUnits(RPackage): diff --git a/var/spack/repos/builtin/packages/r-upsetr/package.py b/var/spack/repos/builtin/packages/r-upsetr/package.py index eccbdcb0c2..bd0cf49e4a 100644 --- a/var/spack/repos/builtin/packages/r-upsetr/package.py +++ b/var/spack/repos/builtin/packages/r-upsetr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUpsetr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-urca/package.py b/var/spack/repos/builtin/packages/r-urca/package.py index 5f773d8b7e..da125f82e6 100644 --- a/var/spack/repos/builtin/packages/r-urca/package.py +++ b/var/spack/repos/builtin/packages/r-urca/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUrca(RPackage): diff --git a/var/spack/repos/builtin/packages/r-urltools/package.py b/var/spack/repos/builtin/packages/r-urltools/package.py index eb6355eb98..b65e5c879c 100644 --- a/var/spack/repos/builtin/packages/r-urltools/package.py +++ b/var/spack/repos/builtin/packages/r-urltools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUrltools(RPackage): diff --git a/var/spack/repos/builtin/packages/r-usethis/package.py b/var/spack/repos/builtin/packages/r-usethis/package.py index cda4f1c143..0dc724aa82 100644 --- a/var/spack/repos/builtin/packages/r-usethis/package.py +++ b/var/spack/repos/builtin/packages/r-usethis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUsethis(RPackage): diff --git a/var/spack/repos/builtin/packages/r-utf8/package.py b/var/spack/repos/builtin/packages/r-utf8/package.py index 8441eaaeeb..9667ea6e8f 100644 --- a/var/spack/repos/builtin/packages/r-utf8/package.py +++ b/var/spack/repos/builtin/packages/r-utf8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUtf8(RPackage): diff --git a/var/spack/repos/builtin/packages/r-uuid/package.py b/var/spack/repos/builtin/packages/r-uuid/package.py index 875f199d32..766515018f 100644 --- a/var/spack/repos/builtin/packages/r-uuid/package.py +++ b/var/spack/repos/builtin/packages/r-uuid/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUuid(RPackage): diff --git a/var/spack/repos/builtin/packages/r-uwot/package.py b/var/spack/repos/builtin/packages/r-uwot/package.py index e7bb652c07..cf83566119 100644 --- a/var/spack/repos/builtin/packages/r-uwot/package.py +++ b/var/spack/repos/builtin/packages/r-uwot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RUwot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-v8/package.py b/var/spack/repos/builtin/packages/r-v8/package.py index a054b9a04c..996325cfc3 100644 --- a/var/spack/repos/builtin/packages/r-v8/package.py +++ b/var/spack/repos/builtin/packages/r-v8/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RV8(RPackage): diff --git a/var/spack/repos/builtin/packages/r-variantannotation/package.py b/var/spack/repos/builtin/packages/r-variantannotation/package.py index 6dec776a64..f283881775 100644 --- a/var/spack/repos/builtin/packages/r-variantannotation/package.py +++ b/var/spack/repos/builtin/packages/r-variantannotation/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVariantannotation(RPackage): diff --git a/var/spack/repos/builtin/packages/r-varselrf/package.py b/var/spack/repos/builtin/packages/r-varselrf/package.py index 030ec89edf..e9fd35be4b 100644 --- a/var/spack/repos/builtin/packages/r-varselrf/package.py +++ b/var/spack/repos/builtin/packages/r-varselrf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVarselrf(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vcd/package.py b/var/spack/repos/builtin/packages/r-vcd/package.py index aa2d4d3104..305f71345b 100644 --- a/var/spack/repos/builtin/packages/r-vcd/package.py +++ b/var/spack/repos/builtin/packages/r-vcd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVcd(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vcfr/package.py b/var/spack/repos/builtin/packages/r-vcfr/package.py index 3622914b1d..81482b8e90 100644 --- a/var/spack/repos/builtin/packages/r-vcfr/package.py +++ b/var/spack/repos/builtin/packages/r-vcfr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVcfr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vctrs/package.py b/var/spack/repos/builtin/packages/r-vctrs/package.py index 2a65475e9b..4447091e91 100644 --- a/var/spack/repos/builtin/packages/r-vctrs/package.py +++ b/var/spack/repos/builtin/packages/r-vctrs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVctrs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vegan/package.py b/var/spack/repos/builtin/packages/r-vegan/package.py index 688db4af04..8d642329ac 100644 --- a/var/spack/repos/builtin/packages/r-vegan/package.py +++ b/var/spack/repos/builtin/packages/r-vegan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVegan(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vfs/package.py b/var/spack/repos/builtin/packages/r-vfs/package.py index ef72634d0a..d2dd310be3 100644 --- a/var/spack/repos/builtin/packages/r-vfs/package.py +++ b/var/spack/repos/builtin/packages/r-vfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVfs(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vgam/package.py b/var/spack/repos/builtin/packages/r-vgam/package.py index 26644803a6..c69b2eb7d1 100644 --- a/var/spack/repos/builtin/packages/r-vgam/package.py +++ b/var/spack/repos/builtin/packages/r-vgam/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVgam(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vioplot/package.py b/var/spack/repos/builtin/packages/r-vioplot/package.py index bf5a43851a..1c4c27166b 100644 --- a/var/spack/repos/builtin/packages/r-vioplot/package.py +++ b/var/spack/repos/builtin/packages/r-vioplot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVioplot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vipor/package.py b/var/spack/repos/builtin/packages/r-vipor/package.py index 401ae6adde..324097cd2f 100644 --- a/var/spack/repos/builtin/packages/r-vipor/package.py +++ b/var/spack/repos/builtin/packages/r-vipor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVipor(RPackage): diff --git a/var/spack/repos/builtin/packages/r-viridis/package.py b/var/spack/repos/builtin/packages/r-viridis/package.py index 36bf29e579..f62cd473f0 100644 --- a/var/spack/repos/builtin/packages/r-viridis/package.py +++ b/var/spack/repos/builtin/packages/r-viridis/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RViridis(RPackage): diff --git a/var/spack/repos/builtin/packages/r-viridislite/package.py b/var/spack/repos/builtin/packages/r-viridislite/package.py index 50eda98d39..91b6f7d55d 100644 --- a/var/spack/repos/builtin/packages/r-viridislite/package.py +++ b/var/spack/repos/builtin/packages/r-viridislite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RViridislite(RPackage): diff --git a/var/spack/repos/builtin/packages/r-visnetwork/package.py b/var/spack/repos/builtin/packages/r-visnetwork/package.py index 12c8264a2f..13bc45e9d4 100644 --- a/var/spack/repos/builtin/packages/r-visnetwork/package.py +++ b/var/spack/repos/builtin/packages/r-visnetwork/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVisnetwork(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vroom/package.py b/var/spack/repos/builtin/packages/r-vroom/package.py index 2697380da2..a06426e478 100644 --- a/var/spack/repos/builtin/packages/r-vroom/package.py +++ b/var/spack/repos/builtin/packages/r-vroom/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVroom(RPackage): diff --git a/var/spack/repos/builtin/packages/r-vsn/package.py b/var/spack/repos/builtin/packages/r-vsn/package.py index e37198624f..a5b87eb059 100644 --- a/var/spack/repos/builtin/packages/r-vsn/package.py +++ b/var/spack/repos/builtin/packages/r-vsn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RVsn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-waldo/package.py b/var/spack/repos/builtin/packages/r-waldo/package.py index 9c99dfb46d..ee25addfc2 100644 --- a/var/spack/repos/builtin/packages/r-waldo/package.py +++ b/var/spack/repos/builtin/packages/r-waldo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RWaldo(RPackage): diff --git a/var/spack/repos/builtin/packages/r-watermelon/package.py b/var/spack/repos/builtin/packages/r-watermelon/package.py index a4edcffb89..f85fdf6c6e 100644 --- a/var/spack/repos/builtin/packages/r-watermelon/package.py +++ b/var/spack/repos/builtin/packages/r-watermelon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RWatermelon(RPackage): diff --git a/var/spack/repos/builtin/packages/r-webshot/package.py b/var/spack/repos/builtin/packages/r-webshot/package.py index f9d7793409..9c3699298c 100644 --- a/var/spack/repos/builtin/packages/r-webshot/package.py +++ b/var/spack/repos/builtin/packages/r-webshot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RWebshot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-wgcna/package.py b/var/spack/repos/builtin/packages/r-wgcna/package.py index e7fad2b3c9..3cbf5b7f85 100644 --- a/var/spack/repos/builtin/packages/r-wgcna/package.py +++ b/var/spack/repos/builtin/packages/r-wgcna/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RWgcna(RPackage): diff --git a/var/spack/repos/builtin/packages/r-whisker/package.py b/var/spack/repos/builtin/packages/r-whisker/package.py index 7cc5fee459..fa8d62fa0b 100644 --- a/var/spack/repos/builtin/packages/r-whisker/package.py +++ b/var/spack/repos/builtin/packages/r-whisker/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RWhisker(RPackage): diff --git a/var/spack/repos/builtin/packages/r-withr/package.py b/var/spack/repos/builtin/packages/r-withr/package.py index 63ea6b745b..77481ad1e7 100644 --- a/var/spack/repos/builtin/packages/r-withr/package.py +++ b/var/spack/repos/builtin/packages/r-withr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RWithr(RPackage): diff --git a/var/spack/repos/builtin/packages/r-wk/package.py b/var/spack/repos/builtin/packages/r-wk/package.py index 92e38c61d9..66ec144229 100644 --- a/var/spack/repos/builtin/packages/r-wk/package.py +++ b/var/spack/repos/builtin/packages/r-wk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RWk(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xde/package.py b/var/spack/repos/builtin/packages/r-xde/package.py index 6e24162c00..d056bdf300 100644 --- a/var/spack/repos/builtin/packages/r-xde/package.py +++ b/var/spack/repos/builtin/packages/r-xde/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXde(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xfun/package.py b/var/spack/repos/builtin/packages/r-xfun/package.py index b43e0c8f1b..d5f96cb3e8 100644 --- a/var/spack/repos/builtin/packages/r-xfun/package.py +++ b/var/spack/repos/builtin/packages/r-xfun/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXfun(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xgboost/package.py b/var/spack/repos/builtin/packages/r-xgboost/package.py index 44c7849c10..6a2c94d113 100644 --- a/var/spack/repos/builtin/packages/r-xgboost/package.py +++ b/var/spack/repos/builtin/packages/r-xgboost/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXgboost(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py index 87fe53a430..0af477b54a 100644 --- a/var/spack/repos/builtin/packages/r-xlconnect/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXlconnect(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py index 30c7205b7f..17dc4fa3d0 100644 --- a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXlconnectjars(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xlsx/package.py b/var/spack/repos/builtin/packages/r-xlsx/package.py index 7ae42cc9fe..e1e0a0e95a 100644 --- a/var/spack/repos/builtin/packages/r-xlsx/package.py +++ b/var/spack/repos/builtin/packages/r-xlsx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXlsx(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xlsxjars/package.py b/var/spack/repos/builtin/packages/r-xlsxjars/package.py index a685f257ad..11a9b3658e 100644 --- a/var/spack/repos/builtin/packages/r-xlsxjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlsxjars/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXlsxjars(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xmapbridge/package.py b/var/spack/repos/builtin/packages/r-xmapbridge/package.py index 94c2117eff..da927d94df 100644 --- a/var/spack/repos/builtin/packages/r-xmapbridge/package.py +++ b/var/spack/repos/builtin/packages/r-xmapbridge/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXmapbridge(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xml/package.py b/var/spack/repos/builtin/packages/r-xml/package.py index 5fd7c108f9..5b06679e46 100644 --- a/var/spack/repos/builtin/packages/r-xml/package.py +++ b/var/spack/repos/builtin/packages/r-xml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXml(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xml2/package.py b/var/spack/repos/builtin/packages/r-xml2/package.py index 4db0d342ea..abaf146a52 100644 --- a/var/spack/repos/builtin/packages/r-xml2/package.py +++ b/var/spack/repos/builtin/packages/r-xml2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXml2(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xnomial/package.py b/var/spack/repos/builtin/packages/r-xnomial/package.py index fa5fbc75c5..d1a0ca61ed 100644 --- a/var/spack/repos/builtin/packages/r-xnomial/package.py +++ b/var/spack/repos/builtin/packages/r-xnomial/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) # See the Spack documentation for more information on packaging. -from spack import * +from spack.package import * class RXnomial(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xopen/package.py b/var/spack/repos/builtin/packages/r-xopen/package.py index 59ca045407..a8df017ec8 100644 --- a/var/spack/repos/builtin/packages/r-xopen/package.py +++ b/var/spack/repos/builtin/packages/r-xopen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXopen(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xtable/package.py b/var/spack/repos/builtin/packages/r-xtable/package.py index 6ab845bbf6..847922b1bc 100644 --- a/var/spack/repos/builtin/packages/r-xtable/package.py +++ b/var/spack/repos/builtin/packages/r-xtable/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXtable(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xts/package.py b/var/spack/repos/builtin/packages/r-xts/package.py index b600bce1ce..027bc61a91 100644 --- a/var/spack/repos/builtin/packages/r-xts/package.py +++ b/var/spack/repos/builtin/packages/r-xts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXts(RPackage): diff --git a/var/spack/repos/builtin/packages/r-xvector/package.py b/var/spack/repos/builtin/packages/r-xvector/package.py index 390d527b4b..2bab94440d 100644 --- a/var/spack/repos/builtin/packages/r-xvector/package.py +++ b/var/spack/repos/builtin/packages/r-xvector/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RXvector(RPackage): diff --git a/var/spack/repos/builtin/packages/r-yaimpute/package.py b/var/spack/repos/builtin/packages/r-yaimpute/package.py index d5dd494e4d..114fdc1f91 100644 --- a/var/spack/repos/builtin/packages/r-yaimpute/package.py +++ b/var/spack/repos/builtin/packages/r-yaimpute/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RYaimpute(RPackage): diff --git a/var/spack/repos/builtin/packages/r-yaml/package.py b/var/spack/repos/builtin/packages/r-yaml/package.py index 3dc0061501..832c2581eb 100644 --- a/var/spack/repos/builtin/packages/r-yaml/package.py +++ b/var/spack/repos/builtin/packages/r-yaml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RYaml(RPackage): diff --git a/var/spack/repos/builtin/packages/r-yapsa/package.py b/var/spack/repos/builtin/packages/r-yapsa/package.py index 1ee33769fd..f6bee15e74 100644 --- a/var/spack/repos/builtin/packages/r-yapsa/package.py +++ b/var/spack/repos/builtin/packages/r-yapsa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RYapsa(RPackage): diff --git a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py index cdaef69fb8..99bef85d5c 100644 --- a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py +++ b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RYaqcaffy(RPackage): diff --git a/var/spack/repos/builtin/packages/r-yarn/package.py b/var/spack/repos/builtin/packages/r-yarn/package.py index ef790997e6..ab3fa587a4 100644 --- a/var/spack/repos/builtin/packages/r-yarn/package.py +++ b/var/spack/repos/builtin/packages/r-yarn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RYarn(RPackage): diff --git a/var/spack/repos/builtin/packages/r-yulab-utils/package.py b/var/spack/repos/builtin/packages/r-yulab-utils/package.py index 27b5cff90a..4053b549f3 100644 --- a/var/spack/repos/builtin/packages/r-yulab-utils/package.py +++ b/var/spack/repos/builtin/packages/r-yulab-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RYulabUtils(RPackage): diff --git a/var/spack/repos/builtin/packages/r-zcompositions/package.py b/var/spack/repos/builtin/packages/r-zcompositions/package.py index de6929d0d6..79a6cb4b5c 100644 --- a/var/spack/repos/builtin/packages/r-zcompositions/package.py +++ b/var/spack/repos/builtin/packages/r-zcompositions/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RZcompositions(RPackage): diff --git a/var/spack/repos/builtin/packages/r-zeallot/package.py b/var/spack/repos/builtin/packages/r-zeallot/package.py index 48108c08d7..b712a74892 100644 --- a/var/spack/repos/builtin/packages/r-zeallot/package.py +++ b/var/spack/repos/builtin/packages/r-zeallot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RZeallot(RPackage): diff --git a/var/spack/repos/builtin/packages/r-zip/package.py b/var/spack/repos/builtin/packages/r-zip/package.py index 7f4074f6a9..10a469a040 100644 --- a/var/spack/repos/builtin/packages/r-zip/package.py +++ b/var/spack/repos/builtin/packages/r-zip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RZip(RPackage): diff --git a/var/spack/repos/builtin/packages/r-zlibbioc/package.py b/var/spack/repos/builtin/packages/r-zlibbioc/package.py index 9714100b5e..10eaf33ac5 100644 --- a/var/spack/repos/builtin/packages/r-zlibbioc/package.py +++ b/var/spack/repos/builtin/packages/r-zlibbioc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RZlibbioc(RPackage): diff --git a/var/spack/repos/builtin/packages/r-zoo/package.py b/var/spack/repos/builtin/packages/r-zoo/package.py index 2b14511cf0..1a484db62a 100644 --- a/var/spack/repos/builtin/packages/r-zoo/package.py +++ b/var/spack/repos/builtin/packages/r-zoo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RZoo(RPackage): diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index e3f4530316..837b140bbc 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class R(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/r3d/package.py b/var/spack/repos/builtin/packages/r3d/package.py index 31a263cf81..fddf52e69a 100644 --- a/var/spack/repos/builtin/packages/r3d/package.py +++ b/var/spack/repos/builtin/packages/r3d/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class R3d(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rabbitmq/package.py b/var/spack/repos/builtin/packages/rabbitmq/package.py index e6c3c4ddb0..015f966a91 100644 --- a/var/spack/repos/builtin/packages/rabbitmq/package.py +++ b/var/spack/repos/builtin/packages/rabbitmq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rabbitmq(Package): diff --git a/var/spack/repos/builtin/packages/racket/package.py b/var/spack/repos/builtin/packages/racket/package.py index c06483bf31..335bd341e3 100644 --- a/var/spack/repos/builtin/packages/racket/package.py +++ b/var/spack/repos/builtin/packages/racket/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Racket(Package): diff --git a/var/spack/repos/builtin/packages/racon/package.py b/var/spack/repos/builtin/packages/racon/package.py index 19fa656037..549f04a31e 100644 --- a/var/spack/repos/builtin/packages/racon/package.py +++ b/var/spack/repos/builtin/packages/racon/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Racon(CMakePackage): diff --git a/var/spack/repos/builtin/packages/raft/package.py b/var/spack/repos/builtin/packages/raft/package.py index 4c4ec744df..fe8aa4923f 100644 --- a/var/spack/repos/builtin/packages/raft/package.py +++ b/var/spack/repos/builtin/packages/raft/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Raft(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ragel/package.py b/var/spack/repos/builtin/packages/ragel/package.py index fc101f808c..37c9631206 100644 --- a/var/spack/repos/builtin/packages/ragel/package.py +++ b/var/spack/repos/builtin/packages/ragel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ragel(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index 5a96d0fa1f..f33cc84822 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -5,7 +5,7 @@ import socket -from spack import * +from spack.package import * class Raja(CachedCMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/ramulator/package.py b/var/spack/repos/builtin/packages/ramulator/package.py index 9da551c861..aabcba0592 100644 --- a/var/spack/repos/builtin/packages/ramulator/package.py +++ b/var/spack/repos/builtin/packages/ramulator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ramulator(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/randfold/package.py b/var/spack/repos/builtin/packages/randfold/package.py index 875aa7e4dc..02bb74d19e 100644 --- a/var/spack/repos/builtin/packages/randfold/package.py +++ b/var/spack/repos/builtin/packages/randfold/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Randfold(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/random123/package.py b/var/spack/repos/builtin/packages/random123/package.py index d856dc5052..72b0d83545 100644 --- a/var/spack/repos/builtin/packages/random123/package.py +++ b/var/spack/repos/builtin/packages/random123/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Random123(Package): diff --git a/var/spack/repos/builtin/packages/randrproto/package.py b/var/spack/repos/builtin/packages/randrproto/package.py index ea9a387c8c..3b615816c3 100644 --- a/var/spack/repos/builtin/packages/randrproto/package.py +++ b/var/spack/repos/builtin/packages/randrproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Randrproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/range-v3/package.py b/var/spack/repos/builtin/packages/range-v3/package.py index 99021a1d97..73ac2f623b 100644 --- a/var/spack/repos/builtin/packages/range-v3/package.py +++ b/var/spack/repos/builtin/packages/range-v3/package.py @@ -6,7 +6,7 @@ import os import shutil -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/rankstr/package.py b/var/spack/repos/builtin/packages/rankstr/package.py index bd3b07f407..cd67fb3312 100644 --- a/var/spack/repos/builtin/packages/rankstr/package.py +++ b/var/spack/repos/builtin/packages/rankstr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rankstr(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rapidjson/package.py b/var/spack/repos/builtin/packages/rapidjson/package.py index 74099513b2..7bf86cb056 100644 --- a/var/spack/repos/builtin/packages/rapidjson/package.py +++ b/var/spack/repos/builtin/packages/rapidjson/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rapidjson(CMakePackage): diff --git a/var/spack/repos/builtin/packages/raptor2/package.py b/var/spack/repos/builtin/packages/raptor2/package.py index b95a044e59..edfd5f99ef 100644 --- a/var/spack/repos/builtin/packages/raptor2/package.py +++ b/var/spack/repos/builtin/packages/raptor2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Raptor2(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rasdaemon/package.py b/var/spack/repos/builtin/packages/rasdaemon/package.py index 401230591f..acf7e8cc5c 100644 --- a/var/spack/repos/builtin/packages/rasdaemon/package.py +++ b/var/spack/repos/builtin/packages/rasdaemon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rasdaemon(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rasqal/package.py b/var/spack/repos/builtin/packages/rasqal/package.py index 0406974aaf..48ece03494 100644 --- a/var/spack/repos/builtin/packages/rasqal/package.py +++ b/var/spack/repos/builtin/packages/rasqal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rasqal(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ratel/package.py b/var/spack/repos/builtin/packages/ratel/package.py index b2569e4ec0..e27afad346 100644 --- a/var/spack/repos/builtin/packages/ratel/package.py +++ b/var/spack/repos/builtin/packages/ratel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ratel(MakefilePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/ravel/package.py b/var/spack/repos/builtin/packages/ravel/package.py index 2f22220fd4..3e42220303 100644 --- a/var/spack/repos/builtin/packages/ravel/package.py +++ b/var/spack/repos/builtin/packages/ravel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ravel(CMakePackage): diff --git a/var/spack/repos/builtin/packages/raxml-ng/package.py b/var/spack/repos/builtin/packages/raxml-ng/package.py index 7919e03631..a2f625595f 100644 --- a/var/spack/repos/builtin/packages/raxml-ng/package.py +++ b/var/spack/repos/builtin/packages/raxml-ng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RaxmlNg(CMakePackage): diff --git a/var/spack/repos/builtin/packages/raxml/package.py b/var/spack/repos/builtin/packages/raxml/package.py index e0a969afbc..1df2c28366 100644 --- a/var/spack/repos/builtin/packages/raxml/package.py +++ b/var/spack/repos/builtin/packages/raxml/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import glob +from spack.package import * + class Raxml(Package): """RAxML (Randomized Axelerated Maximum Likelihood) is a program for diff --git a/var/spack/repos/builtin/packages/ray/package.py b/var/spack/repos/builtin/packages/ray/package.py index 2c927e2333..55a1fcef59 100644 --- a/var/spack/repos/builtin/packages/ray/package.py +++ b/var/spack/repos/builtin/packages/ray/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ray(CMakePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index 5660ccc07d..c00a5f3ca8 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Rccl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rclone/package.py b/var/spack/repos/builtin/packages/rclone/package.py index 9626676eab..4065900ed7 100644 --- a/var/spack/repos/builtin/packages/rclone/package.py +++ b/var/spack/repos/builtin/packages/rclone/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rclone(Package): diff --git a/var/spack/repos/builtin/packages/rdc/package.py b/var/spack/repos/builtin/packages/rdc/package.py index d28c62fe40..2ee0de7245 100644 --- a/var/spack/repos/builtin/packages/rdc/package.py +++ b/var/spack/repos/builtin/packages/rdc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rdc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rdkit/package.py b/var/spack/repos/builtin/packages/rdkit/package.py index 6bc316c2a7..3ad1ac7aff 100644 --- a/var/spack/repos/builtin/packages/rdkit/package.py +++ b/var/spack/repos/builtin/packages/rdkit/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rdkit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py index e99c815aaa..fa23d828dd 100644 --- a/var/spack/repos/builtin/packages/rdma-core/package.py +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class RdmaCore(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rdp-classifier/package.py b/var/spack/repos/builtin/packages/rdp-classifier/package.py index 157af657f3..fb5ef25b29 100644 --- a/var/spack/repos/builtin/packages/rdp-classifier/package.py +++ b/var/spack/repos/builtin/packages/rdp-classifier/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RdpClassifier(Package, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/rdptools/package.py b/var/spack/repos/builtin/packages/rdptools/package.py index a7a7042ebc..e5f5c458ca 100644 --- a/var/spack/repos/builtin/packages/rdptools/package.py +++ b/var/spack/repos/builtin/packages/rdptools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rdptools(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/re2/package.py b/var/spack/repos/builtin/packages/re2/package.py index 08bdc195bf..2a3d81d4d1 100644 --- a/var/spack/repos/builtin/packages/re2/package.py +++ b/var/spack/repos/builtin/packages/re2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Re2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/re2c/package.py b/var/spack/repos/builtin/packages/re2c/package.py index e31a791298..f72e62b8e6 100644 --- a/var/spack/repos/builtin/packages/re2c/package.py +++ b/var/spack/repos/builtin/packages/re2c/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class Re2c(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/readfq/package.py b/var/spack/repos/builtin/packages/readfq/package.py index f1a985cf1e..f3573e2cf7 100644 --- a/var/spack/repos/builtin/packages/readfq/package.py +++ b/var/spack/repos/builtin/packages/readfq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Readfq(Package): diff --git a/var/spack/repos/builtin/packages/readline/package.py b/var/spack/repos/builtin/packages/readline/package.py index 8bc8e8207e..e105ae29dc 100644 --- a/var/spack/repos/builtin/packages/readline/package.py +++ b/var/spack/repos/builtin/packages/readline/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Readline(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/recola-sm/package.py b/var/spack/repos/builtin/packages/recola-sm/package.py index c05f1d0030..d912302850 100644 --- a/var/spack/repos/builtin/packages/recola-sm/package.py +++ b/var/spack/repos/builtin/packages/recola-sm/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RecolaSm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/recola/package.py b/var/spack/repos/builtin/packages/recola/package.py index 9b4768e2c3..38c69b7387 100644 --- a/var/spack/repos/builtin/packages/recola/package.py +++ b/var/spack/repos/builtin/packages/recola/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Recola(CMakePackage): diff --git a/var/spack/repos/builtin/packages/recon/package.py b/var/spack/repos/builtin/packages/recon/package.py index 8c116e041c..88ae35a007 100644 --- a/var/spack/repos/builtin/packages/recon/package.py +++ b/var/spack/repos/builtin/packages/recon/package.py @@ -5,7 +5,7 @@ from os import symlink -from spack import * +from spack.package import * class Recon(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/recorder/package.py b/var/spack/repos/builtin/packages/recorder/package.py index bd03fb51df..32f777eb70 100644 --- a/var/spack/repos/builtin/packages/recorder/package.py +++ b/var/spack/repos/builtin/packages/recorder/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Recorder(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/recordproto/package.py b/var/spack/repos/builtin/packages/recordproto/package.py index befdf5912a..b186c92110 100644 --- a/var/spack/repos/builtin/packages/recordproto/package.py +++ b/var/spack/repos/builtin/packages/recordproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Recordproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/redis/package.py b/var/spack/repos/builtin/packages/redis/package.py index 49ec9b9f80..70d0961e45 100644 --- a/var/spack/repos/builtin/packages/redis/package.py +++ b/var/spack/repos/builtin/packages/redis/package.py @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Redis(MakefilePackage): """Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. diff --git a/var/spack/repos/builtin/packages/reditools/package.py b/var/spack/repos/builtin/packages/reditools/package.py index f6171c37b4..45c2fb82ae 100644 --- a/var/spack/repos/builtin/packages/reditools/package.py +++ b/var/spack/repos/builtin/packages/reditools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Reditools(PythonPackage): diff --git a/var/spack/repos/builtin/packages/redland-bindings/package.py b/var/spack/repos/builtin/packages/redland-bindings/package.py index 020aeb3221..2282d1e288 100644 --- a/var/spack/repos/builtin/packages/redland-bindings/package.py +++ b/var/spack/repos/builtin/packages/redland-bindings/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class RedlandBindings(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/redland/package.py b/var/spack/repos/builtin/packages/redland/package.py index 16006f0c55..e6cbdcdcc1 100644 --- a/var/spack/repos/builtin/packages/redland/package.py +++ b/var/spack/repos/builtin/packages/redland/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Redland(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py index 7653cb7659..beb0ddefcc 100644 --- a/var/spack/repos/builtin/packages/redset/package.py +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Redset(CMakePackage): diff --git a/var/spack/repos/builtin/packages/redundans/package.py b/var/spack/repos/builtin/packages/redundans/package.py index b694591dc5..5a1c5ec4b5 100644 --- a/var/spack/repos/builtin/packages/redundans/package.py +++ b/var/spack/repos/builtin/packages/redundans/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Redundans(Package): """Redundans pipeline assists an assembly of heterozygous genomes.""" diff --git a/var/spack/repos/builtin/packages/reframe/package.py b/var/spack/repos/builtin/packages/reframe/package.py index 49582cf667..111046655e 100644 --- a/var/spack/repos/builtin/packages/reframe/package.py +++ b/var/spack/repos/builtin/packages/reframe/package.py @@ -5,7 +5,7 @@ import shutil -from spack import * +from spack.package import * class Reframe(Package): diff --git a/var/spack/repos/builtin/packages/regcm/package.py b/var/spack/repos/builtin/packages/regcm/package.py index 34e751681a..8bd91b1300 100644 --- a/var/spack/repos/builtin/packages/regcm/package.py +++ b/var/spack/repos/builtin/packages/regcm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Regcm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/relax/package.py b/var/spack/repos/builtin/packages/relax/package.py index f727017762..2462a4843a 100644 --- a/var/spack/repos/builtin/packages/relax/package.py +++ b/var/spack/repos/builtin/packages/relax/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Relax(CMakePackage): diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index 7f912fbe7e..68b67b695a 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Relion(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/remhos/package.py b/var/spack/repos/builtin/packages/remhos/package.py index 0e9411a06c..bfc659afed 100644 --- a/var/spack/repos/builtin/packages/remhos/package.py +++ b/var/spack/repos/builtin/packages/remhos/package.py @@ -2,8 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from typing import List -from spack import * +from spack.package import * class Remhos(MakefilePackage): @@ -51,4 +52,4 @@ class Remhos(MakefilePackage): mkdirp(prefix.bin) install('remhos', prefix.bin) - install_time_test_callbacks = [] + install_time_test_callbacks = [] # type: List[str] diff --git a/var/spack/repos/builtin/packages/rempi/package.py b/var/spack/repos/builtin/packages/rempi/package.py index 564a0a89eb..07a39f18e9 100644 --- a/var/spack/repos/builtin/packages/rempi/package.py +++ b/var/spack/repos/builtin/packages/rempi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rempi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rename/package.py b/var/spack/repos/builtin/packages/rename/package.py index ee650c901f..8a610409ab 100644 --- a/var/spack/repos/builtin/packages/rename/package.py +++ b/var/spack/repos/builtin/packages/rename/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rename(Package): diff --git a/var/spack/repos/builtin/packages/rendercheck/package.py b/var/spack/repos/builtin/packages/rendercheck/package.py index 79f96ebe3b..ed3c6f7972 100644 --- a/var/spack/repos/builtin/packages/rendercheck/package.py +++ b/var/spack/repos/builtin/packages/rendercheck/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rendercheck(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/renderproto/package.py b/var/spack/repos/builtin/packages/renderproto/package.py index 1034e84868..0481d4218c 100644 --- a/var/spack/repos/builtin/packages/renderproto/package.py +++ b/var/spack/repos/builtin/packages/renderproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Renderproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/repeatmasker/package.py b/var/spack/repos/builtin/packages/repeatmasker/package.py index 3d0c31a6f7..47d267967f 100644 --- a/var/spack/repos/builtin/packages/repeatmasker/package.py +++ b/var/spack/repos/builtin/packages/repeatmasker/package.py @@ -5,7 +5,7 @@ import glob -from spack import * +from spack.package import * class Repeatmasker(Package): diff --git a/var/spack/repos/builtin/packages/repeatmodeler/package.py b/var/spack/repos/builtin/packages/repeatmodeler/package.py index 3e0fc006a2..744007d0ae 100644 --- a/var/spack/repos/builtin/packages/repeatmodeler/package.py +++ b/var/spack/repos/builtin/packages/repeatmodeler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Repeatmodeler(Package): diff --git a/var/spack/repos/builtin/packages/repeatscout/package.py b/var/spack/repos/builtin/packages/repeatscout/package.py index 2b8c72faf6..62899a6044 100644 --- a/var/spack/repos/builtin/packages/repeatscout/package.py +++ b/var/spack/repos/builtin/packages/repeatscout/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) # See the Spack documentation for more information on packaging. -from spack import * +from spack.package import * class Repeatscout(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/reprimand/package.py b/var/spack/repos/builtin/packages/reprimand/package.py index f9d67067be..605fe4114d 100644 --- a/var/spack/repos/builtin/packages/reprimand/package.py +++ b/var/spack/repos/builtin/packages/reprimand/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Reprimand(MesonPackage): diff --git a/var/spack/repos/builtin/packages/resourceproto/package.py b/var/spack/repos/builtin/packages/resourceproto/package.py index 2591afbaeb..9fffd8a80c 100644 --- a/var/spack/repos/builtin/packages/resourceproto/package.py +++ b/var/spack/repos/builtin/packages/resourceproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Resourceproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/restic/package.py b/var/spack/repos/builtin/packages/restic/package.py index 63c6cb04ae..abcf63e5e8 100644 --- a/var/spack/repos/builtin/packages/restic/package.py +++ b/var/spack/repos/builtin/packages/restic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Restic(Package): diff --git a/var/spack/repos/builtin/packages/revbayes/package.py b/var/spack/repos/builtin/packages/revbayes/package.py index 77fe158e64..74534f0ab2 100644 --- a/var/spack/repos/builtin/packages/revbayes/package.py +++ b/var/spack/repos/builtin/packages/revbayes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/revocap-coupler/package.py b/var/spack/repos/builtin/packages/revocap-coupler/package.py index 09bf74d535..49f3fac3cc 100644 --- a/var/spack/repos/builtin/packages/revocap-coupler/package.py +++ b/var/spack/repos/builtin/packages/revocap-coupler/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class RevocapCoupler(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/revocap-refiner/package.py b/var/spack/repos/builtin/packages/revocap-refiner/package.py index 33ac360c40..50fa7a6158 100644 --- a/var/spack/repos/builtin/packages/revocap-refiner/package.py +++ b/var/spack/repos/builtin/packages/revocap-refiner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RevocapRefiner(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rgb/package.py b/var/spack/repos/builtin/packages/rgb/package.py index c5c2766e4b..c7c48a39a6 100644 --- a/var/spack/repos/builtin/packages/rgb/package.py +++ b/var/spack/repos/builtin/packages/rgb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rgb(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/rhash/package.py b/var/spack/repos/builtin/packages/rhash/package.py index 6567454e45..a8c5d62041 100644 --- a/var/spack/repos/builtin/packages/rhash/package.py +++ b/var/spack/repos/builtin/packages/rhash/package.py @@ -5,6 +5,8 @@ import os +from spack.package import * + class Rhash(MakefilePackage): """RHash is a console utility for computing and verifying hash sums of diff --git a/var/spack/repos/builtin/packages/rinetd/package.py b/var/spack/repos/builtin/packages/rinetd/package.py index c3be9bc772..e44d26a6c0 100644 --- a/var/spack/repos/builtin/packages/rinetd/package.py +++ b/var/spack/repos/builtin/packages/rinetd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rinetd(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ripgrep/package.py b/var/spack/repos/builtin/packages/ripgrep/package.py index db8f39d4c1..009cfe078e 100644 --- a/var/spack/repos/builtin/packages/ripgrep/package.py +++ b/var/spack/repos/builtin/packages/ripgrep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ripgrep(Package): diff --git a/var/spack/repos/builtin/packages/rivet/package.py b/var/spack/repos/builtin/packages/rivet/package.py index d67626e29a..795ca835fd 100644 --- a/var/spack/repos/builtin/packages/rivet/package.py +++ b/var/spack/repos/builtin/packages/rivet/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/rkt-base/package.py b/var/spack/repos/builtin/packages/rkt-base/package.py index 36d7987a97..623cf8f1aa 100644 --- a/var/spack/repos/builtin/packages/rkt-base/package.py +++ b/var/spack/repos/builtin/packages/rkt-base/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RktBase(RacketPackage): diff --git a/var/spack/repos/builtin/packages/rkt-cext-lib/package.py b/var/spack/repos/builtin/packages/rkt-cext-lib/package.py index ed49ab3406..b38a495061 100644 --- a/var/spack/repos/builtin/packages/rkt-cext-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-cext-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RktCextLib(RacketPackage): diff --git a/var/spack/repos/builtin/packages/rkt-compiler-lib/package.py b/var/spack/repos/builtin/packages/rkt-compiler-lib/package.py index c7c333e4cd..1a553dfdd3 100644 --- a/var/spack/repos/builtin/packages/rkt-compiler-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-compiler-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RktCompilerLib(RacketPackage): diff --git a/var/spack/repos/builtin/packages/rkt-dynext-lib/package.py b/var/spack/repos/builtin/packages/rkt-dynext-lib/package.py index cc57851776..ce00cdc7e9 100644 --- a/var/spack/repos/builtin/packages/rkt-dynext-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-dynext-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RktDynextLib(RacketPackage): diff --git a/var/spack/repos/builtin/packages/rkt-rackunit-lib/package.py b/var/spack/repos/builtin/packages/rkt-rackunit-lib/package.py index c1d7aa7444..fe3c6e10ec 100644 --- a/var/spack/repos/builtin/packages/rkt-rackunit-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-rackunit-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT)- -from spack import * +from spack.package import * class RktRackunitLib(RacketPackage): diff --git a/var/spack/repos/builtin/packages/rkt-scheme-lib/package.py b/var/spack/repos/builtin/packages/rkt-scheme-lib/package.py index e98c6d33f7..8884c65690 100644 --- a/var/spack/repos/builtin/packages/rkt-scheme-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-scheme-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RktSchemeLib(RacketPackage): diff --git a/var/spack/repos/builtin/packages/rkt-testing-util-lib/package.py b/var/spack/repos/builtin/packages/rkt-testing-util-lib/package.py index a9d6e973ff..be035a68fa 100644 --- a/var/spack/repos/builtin/packages/rkt-testing-util-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-testing-util-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RktTestingUtilLib(RacketPackage): diff --git a/var/spack/repos/builtin/packages/rkt-zo-lib/package.py b/var/spack/repos/builtin/packages/rkt-zo-lib/package.py index 10042fc6bd..b4384a357b 100644 --- a/var/spack/repos/builtin/packages/rkt-zo-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-zo-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RktZoLib(RacketPackage): diff --git a/var/spack/repos/builtin/packages/rlwrap/package.py b/var/spack/repos/builtin/packages/rlwrap/package.py index 5d420c1407..f9bc4c4cae 100644 --- a/var/spack/repos/builtin/packages/rlwrap/package.py +++ b/var/spack/repos/builtin/packages/rlwrap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rlwrap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rmats/package.py b/var/spack/repos/builtin/packages/rmats/package.py index 4529285f11..81e879023a 100644 --- a/var/spack/repos/builtin/packages/rmats/package.py +++ b/var/spack/repos/builtin/packages/rmats/package.py @@ -6,7 +6,7 @@ from os import symlink -from spack import * +from spack.package import * class Rmats(Package): diff --git a/var/spack/repos/builtin/packages/rmgdft/package.py b/var/spack/repos/builtin/packages/rmgdft/package.py index 6e46c19848..8a6833c518 100644 --- a/var/spack/repos/builtin/packages/rmgdft/package.py +++ b/var/spack/repos/builtin/packages/rmgdft/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rmgdft(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rmlab/package.py b/var/spack/repos/builtin/packages/rmlab/package.py index fdf98645d8..23cbd98645 100644 --- a/var/spack/repos/builtin/packages/rmlab/package.py +++ b/var/spack/repos/builtin/packages/rmlab/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rmlab(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rna-seqc/package.py b/var/spack/repos/builtin/packages/rna-seqc/package.py index 0fe64296ab..feb50d4b93 100644 --- a/var/spack/repos/builtin/packages/rna-seqc/package.py +++ b/var/spack/repos/builtin/packages/rna-seqc/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class RnaSeqc(Package): diff --git a/var/spack/repos/builtin/packages/rnaquast/package.py b/var/spack/repos/builtin/packages/rnaquast/package.py index 69d1d21396..3c1029bed6 100644 --- a/var/spack/repos/builtin/packages/rnaquast/package.py +++ b/var/spack/repos/builtin/packages/rnaquast/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Rnaquast(Package): diff --git a/var/spack/repos/builtin/packages/rnaz/package.py b/var/spack/repos/builtin/packages/rnaz/package.py index b829600207..d9fd8a30e8 100644 --- a/var/spack/repos/builtin/packages/rnaz/package.py +++ b/var/spack/repos/builtin/packages/rnaz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rnaz(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rng-tools/package.py b/var/spack/repos/builtin/packages/rng-tools/package.py index 46913a9833..290a6f5428 100644 --- a/var/spack/repos/builtin/packages/rng-tools/package.py +++ b/var/spack/repos/builtin/packages/rng-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RngTools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rngstreams/package.py b/var/spack/repos/builtin/packages/rngstreams/package.py index b97591fc1d..e56d6d188a 100644 --- a/var/spack/repos/builtin/packages/rngstreams/package.py +++ b/var/spack/repos/builtin/packages/rngstreams/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rngstreams(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rnpletal/package.py b/var/spack/repos/builtin/packages/rnpletal/package.py index 1eaab6cc29..958775b83e 100644 --- a/var/spack/repos/builtin/packages/rnpletal/package.py +++ b/var/spack/repos/builtin/packages/rnpletal/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Rnpletal(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index 625d04371b..10f175ad05 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -5,7 +5,7 @@ import itertools -from spack import * +from spack.package import * class Rocalution(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index eb8060ce82..4fc51853a3 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rocblas(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index d41e8ce4b0..c740df8795 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rocfft(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocketmq/package.py b/var/spack/repos/builtin/packages/rocketmq/package.py index c5c12c37b1..ef2b426048 100644 --- a/var/spack/repos/builtin/packages/rocketmq/package.py +++ b/var/spack/repos/builtin/packages/rocketmq/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rocketmq(Package): diff --git a/var/spack/repos/builtin/packages/rocksdb/package.py b/var/spack/repos/builtin/packages/rocksdb/package.py index 46186fa098..74d3633d41 100644 --- a/var/spack/repos/builtin/packages/rocksdb/package.py +++ b/var/spack/repos/builtin/packages/rocksdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rocksdb(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rockstar/package.py b/var/spack/repos/builtin/packages/rockstar/package.py index df7c60081e..525c281e6e 100644 --- a/var/spack/repos/builtin/packages/rockstar/package.py +++ b/var/spack/repos/builtin/packages/rockstar/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Rockstar(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py index 2c1d64b9ac..0679032e1e 100644 --- a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py +++ b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocmBandwidthTest(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py index 4b71d73931..e1409082a4 100644 --- a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py +++ b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocmClangOcl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index ae56126bfe..2de1f9da04 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocmCmake(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index 2f2761867b..4590284a97 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocmDbgapi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py index 210362a722..7f2fc114f0 100644 --- a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py +++ b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocmDebugAgent(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocm-device-libs/package.py b/var/spack/repos/builtin/packages/rocm-device-libs/package.py index a847fd6a2b..1aa79c9e62 100644 --- a/var/spack/repos/builtin/packages/rocm-device-libs/package.py +++ b/var/spack/repos/builtin/packages/rocm-device-libs/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocmDeviceLibs(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocm-gdb/package.py b/var/spack/repos/builtin/packages/rocm-gdb/package.py index 037ccc6708..db8dc2d7b0 100644 --- a/var/spack/repos/builtin/packages/rocm-gdb/package.py +++ b/var/spack/repos/builtin/packages/rocm-gdb/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocmGdb(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index 164b3cc1dd..a078d2f60c 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocmOpencl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py index 1e9fed530b..1d6e9bfb81 100644 --- a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py +++ b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py @@ -5,8 +5,9 @@ import os import re +from typing import Dict -from spack import * +from spack.package import * tools_url = 'https://github.com/ROCm-Developer-Tools' compute_url = 'https://github.com/RadeonOpenCompute' @@ -91,7 +92,7 @@ extras = [ versions = ['3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', '5.1.0'] -versions_dict = dict() +versions_dict = dict() # type: Dict[str,Dict[str,str]] components = ['aomp', 'devlib', 'llvm', 'flang', 'extras'] component_hashes = [aomp, devlib, llvm, flang, extras] diff --git a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py index cc0dd52d43..f2e23287a0 100644 --- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py @@ -7,7 +7,7 @@ import os import shutil -from spack import * +from spack.package import * class RocmSmiLib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocm-smi/package.py b/var/spack/repos/builtin/packages/rocm-smi/package.py index fba7cff021..4915cf041e 100644 --- a/var/spack/repos/builtin/packages/rocm-smi/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class RocmSmi(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rocm-tensile/package.py b/var/spack/repos/builtin/packages/rocm-tensile/package.py index 0a3ee2695e..c00b8c08ba 100644 --- a/var/spack/repos/builtin/packages/rocm-tensile/package.py +++ b/var/spack/repos/builtin/packages/rocm-tensile/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py index 86b9768c7c..4792efb31f 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class RocmValidationSuite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocminfo/package.py b/var/spack/repos/builtin/packages/rocminfo/package.py index 9ed7a49a99..354af8ad71 100644 --- a/var/spack/repos/builtin/packages/rocminfo/package.py +++ b/var/spack/repos/builtin/packages/rocminfo/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rocminfo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index 2a65c80b50..bd17931fc7 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rocprim(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py index c6ae894e24..2e572285d4 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RocprofilerDev(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index 051e4045bf..cd218b3b2f 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Rocrand(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index 4171b7ef45..9057b36d00 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -5,7 +5,7 @@ import itertools -from spack import * +from spack.package import * class Rocsolver(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index 379c2f34ec..41f7ebd5c7 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -5,7 +5,7 @@ import itertools -from spack import * +from spack.package import * class Rocsparse(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index 69950716f9..fea4eb6110 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rocthrust(CMakePackage): diff --git a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py index 56aeb91d01..e402eba851 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RoctracerDevApi(Package): diff --git a/var/spack/repos/builtin/packages/roctracer-dev/package.py b/var/spack/repos/builtin/packages/roctracer-dev/package.py index 20ba27aaaf..f18190d585 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RoctracerDev(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rodinia/package.py b/var/spack/repos/builtin/packages/rodinia/package.py index 6437cf984e..44d73bd1c0 100644 --- a/var/spack/repos/builtin/packages/rodinia/package.py +++ b/var/spack/repos/builtin/packages/rodinia/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rodinia(MakefilePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/roms/package.py b/var/spack/repos/builtin/packages/roms/package.py index edf9205bfd..12d601ca5a 100644 --- a/var/spack/repos/builtin/packages/roms/package.py +++ b/var/spack/repos/builtin/packages/roms/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Roms(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 36ec273d3c..82f2792058 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -6,7 +6,7 @@ import sys -from spack import * +from spack.package import * from spack.util.environment import is_system_path diff --git a/var/spack/repos/builtin/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py index ec44654524..cac4f3eb81 100644 --- a/var/spack/repos/builtin/packages/rose/package.py +++ b/var/spack/repos/builtin/packages/rose/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/ross/package.py b/var/spack/repos/builtin/packages/ross/package.py index 6956776bbc..6848fd4805 100644 --- a/var/spack/repos/builtin/packages/ross/package.py +++ b/var/spack/repos/builtin/packages/ross/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ross(CMakePackage): diff --git a/var/spack/repos/builtin/packages/routino/package.py b/var/spack/repos/builtin/packages/routino/package.py index d9f8ebbd8b..d523a874b9 100644 --- a/var/spack/repos/builtin/packages/routino/package.py +++ b/var/spack/repos/builtin/packages/routino/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Routino(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rpcsvc-proto/package.py b/var/spack/repos/builtin/packages/rpcsvc-proto/package.py index c58bb12c29..a0cb3d307b 100644 --- a/var/spack/repos/builtin/packages/rpcsvc-proto/package.py +++ b/var/spack/repos/builtin/packages/rpcsvc-proto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RpcsvcProto(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rpm/package.py b/var/spack/repos/builtin/packages/rpm/package.py index 321c506f23..d407e9534a 100644 --- a/var/spack/repos/builtin/packages/rpm/package.py +++ b/var/spack/repos/builtin/packages/rpm/package.py @@ -5,7 +5,7 @@ import llnl.util.tty as tty -from spack import * +from spack.package import * class Rpm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rr/package.py b/var/spack/repos/builtin/packages/rr/package.py index 2a93229dad..92c52352c3 100644 --- a/var/spack/repos/builtin/packages/rr/package.py +++ b/var/spack/repos/builtin/packages/rr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rr(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rrdtool/package.py b/var/spack/repos/builtin/packages/rrdtool/package.py index d33629a124..5849c02b90 100644 --- a/var/spack/repos/builtin/packages/rrdtool/package.py +++ b/var/spack/repos/builtin/packages/rrdtool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rrdtool(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rsbench/package.py b/var/spack/repos/builtin/packages/rsbench/package.py index 0b0d7a1d25..219d782954 100644 --- a/var/spack/repos/builtin/packages/rsbench/package.py +++ b/var/spack/repos/builtin/packages/rsbench/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rsbench(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rsem/package.py b/var/spack/repos/builtin/packages/rsem/package.py index 03b5266592..610843c5cf 100644 --- a/var/spack/repos/builtin/packages/rsem/package.py +++ b/var/spack/repos/builtin/packages/rsem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rsem(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rstart/package.py b/var/spack/repos/builtin/packages/rstart/package.py index 0cd777fdf3..91ecec0422 100644 --- a/var/spack/repos/builtin/packages/rstart/package.py +++ b/var/spack/repos/builtin/packages/rstart/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rstart(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/rstudio/package.py b/var/spack/repos/builtin/packages/rstudio/package.py index a3a0a9e4b7..2f61f21483 100644 --- a/var/spack/repos/builtin/packages/rstudio/package.py +++ b/var/spack/repos/builtin/packages/rstudio/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Rstudio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rsync/package.py b/var/spack/repos/builtin/packages/rsync/package.py index 29d469c3c8..e8b31f11c9 100644 --- a/var/spack/repos/builtin/packages/rsync/package.py +++ b/var/spack/repos/builtin/packages/rsync/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Rsync(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rsyslog/package.py b/var/spack/repos/builtin/packages/rsyslog/package.py index 54d9ce8733..7f39bdcb48 100644 --- a/var/spack/repos/builtin/packages/rsyslog/package.py +++ b/var/spack/repos/builtin/packages/rsyslog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rsyslog(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/rt-tests/package.py b/var/spack/repos/builtin/packages/rt-tests/package.py index dd569b6c25..5ef17fe801 100644 --- a/var/spack/repos/builtin/packages/rt-tests/package.py +++ b/var/spack/repos/builtin/packages/rt-tests/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class RtTests(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rtags/package.py b/var/spack/repos/builtin/packages/rtags/package.py index 33c3ec91b8..0508a3860e 100644 --- a/var/spack/repos/builtin/packages/rtags/package.py +++ b/var/spack/repos/builtin/packages/rtags/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rtags(CMakePackage): diff --git a/var/spack/repos/builtin/packages/rtax/package.py b/var/spack/repos/builtin/packages/rtax/package.py index bbb62aff85..09643a2173 100644 --- a/var/spack/repos/builtin/packages/rtax/package.py +++ b/var/spack/repos/builtin/packages/rtax/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Rtax(Package): diff --git a/var/spack/repos/builtin/packages/ruby-asciidoctor/package.py b/var/spack/repos/builtin/packages/ruby-asciidoctor/package.py index 6216e6bd97..abef7f8db3 100644 --- a/var/spack/repos/builtin/packages/ruby-asciidoctor/package.py +++ b/var/spack/repos/builtin/packages/ruby-asciidoctor/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyAsciidoctor(RubyPackage): """A fast, open source text processor and publishing toolchain for converting AsciiDoc content to HTML 5, DocBook 5, and other formats.""" diff --git a/var/spack/repos/builtin/packages/ruby-erubis/package.py b/var/spack/repos/builtin/packages/ruby-erubis/package.py index 1007144a7c..66289ba6f6 100644 --- a/var/spack/repos/builtin/packages/ruby-erubis/package.py +++ b/var/spack/repos/builtin/packages/ruby-erubis/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyErubis(RubyPackage): """Erubis is a fast, secure, and very extensible implementation of eRuby. """ diff --git a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py index 4258d85bfd..f023fb06e2 100644 --- a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py +++ b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyGnuplot(RubyPackage): """Utility library to aid in interacting with gnuplot from ruby""" diff --git a/var/spack/repos/builtin/packages/ruby-hpricot/package.py b/var/spack/repos/builtin/packages/ruby-hpricot/package.py index 7c663f7f81..b4fdc8be49 100644 --- a/var/spack/repos/builtin/packages/ruby-hpricot/package.py +++ b/var/spack/repos/builtin/packages/ruby-hpricot/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyHpricot(RubyPackage): """A swift, liberal HTML parser with a fantastic library. diff --git a/var/spack/repos/builtin/packages/ruby-mustache/package.py b/var/spack/repos/builtin/packages/ruby-mustache/package.py index e1a549332e..8efca93910 100644 --- a/var/spack/repos/builtin/packages/ruby-mustache/package.py +++ b/var/spack/repos/builtin/packages/ruby-mustache/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyMustache(RubyPackage): """Inspired by ctemplate and et, Mustache is a framework-agnostic way to render logic-free views.""" diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py index f8a4ebf2f1..57d9131197 100644 --- a/var/spack/repos/builtin/packages/ruby-narray/package.py +++ b/var/spack/repos/builtin/packages/ruby-narray/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyNarray(RubyPackage): """Numo::NArray is an Numerical N-dimensional Array class for fast processing and easy manipulation of multi-dimensional numerical data, diff --git a/var/spack/repos/builtin/packages/ruby-rake/package.py b/var/spack/repos/builtin/packages/ruby-rake/package.py index 42eb1d8b5d..c742170e4e 100644 --- a/var/spack/repos/builtin/packages/ruby-rake/package.py +++ b/var/spack/repos/builtin/packages/ruby-rake/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyRake(RubyPackage): """Rake is a Make-like program implemented in Ruby.""" diff --git a/var/spack/repos/builtin/packages/ruby-rdiscount/package.py b/var/spack/repos/builtin/packages/ruby-rdiscount/package.py index 7a124fab5d..3759115490 100644 --- a/var/spack/repos/builtin/packages/ruby-rdiscount/package.py +++ b/var/spack/repos/builtin/packages/ruby-rdiscount/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyRdiscount(RubyPackage): """Fast Implementation of Gruber's Markdown in C.""" diff --git a/var/spack/repos/builtin/packages/ruby-ronn/package.py b/var/spack/repos/builtin/packages/ruby-ronn/package.py index b4367672da..0af65fe30f 100644 --- a/var/spack/repos/builtin/packages/ruby-ronn/package.py +++ b/var/spack/repos/builtin/packages/ruby-ronn/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyRonn(RubyPackage): """Ronn builds manuals. It converts simple, human readable textfiles to roff for terminal display, and also to HTML for the web.""" diff --git a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py index 154bc5e698..1362e8584e 100644 --- a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py +++ b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyRubyinline(RubyPackage): """Inline allows you to write foreign code within your ruby code.""" diff --git a/var/spack/repos/builtin/packages/ruby-svn2git/package.py b/var/spack/repos/builtin/packages/ruby-svn2git/package.py index 96c13269eb..adf5bb28ec 100644 --- a/var/spack/repos/builtin/packages/ruby-svn2git/package.py +++ b/var/spack/repos/builtin/packages/ruby-svn2git/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubySvn2git(RubyPackage): """svn2git is a tiny utility for migrating projects from Subversion to Git while keeping the trunk, branches and tags where they should be. It uses diff --git a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py index 864fd7740f..7254472a8c 100644 --- a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py +++ b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyTerminalTable(RubyPackage): """Simple, feature rich ascii table generation library""" diff --git a/var/spack/repos/builtin/packages/ruby-thor/package.py b/var/spack/repos/builtin/packages/ruby-thor/package.py index 92b67624f1..45aeab176d 100644 --- a/var/spack/repos/builtin/packages/ruby-thor/package.py +++ b/var/spack/repos/builtin/packages/ruby-thor/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyThor(RubyPackage): """Thor is a toolkit for building powerful command-line interfaces.""" diff --git a/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py b/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py index 16f9360e45..d96ffd42e1 100644 --- a/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py +++ b/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyTmuxinator(RubyPackage): """Create and manage complex tmux sessions easily.""" diff --git a/var/spack/repos/builtin/packages/ruby-unicode-display-width/package.py b/var/spack/repos/builtin/packages/ruby-unicode-display-width/package.py index 6202fe7bd9..e9d6a2243d 100644 --- a/var/spack/repos/builtin/packages/ruby-unicode-display-width/package.py +++ b/var/spack/repos/builtin/packages/ruby-unicode-display-width/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyUnicodeDisplayWidth(RubyPackage): """Determines the monospace display width of a string in Ruby.""" diff --git a/var/spack/repos/builtin/packages/ruby-xdg/package.py b/var/spack/repos/builtin/packages/ruby-xdg/package.py index a0d248b2c8..9d0517593d 100644 --- a/var/spack/repos/builtin/packages/ruby-xdg/package.py +++ b/var/spack/repos/builtin/packages/ruby-xdg/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyXdg(RubyPackage): """Provides a Ruby implementation of the XDG Base Directory Specification. """ diff --git a/var/spack/repos/builtin/packages/ruby-zentest/package.py b/var/spack/repos/builtin/packages/ruby-zentest/package.py index a522614db1..9de7f0d68d 100644 --- a/var/spack/repos/builtin/packages/ruby-zentest/package.py +++ b/var/spack/repos/builtin/packages/ruby-zentest/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class RubyZentest(RubyPackage): """ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby.""" diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index 4db2feb1ad..526e14c962 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -5,8 +5,9 @@ import re import sys +from typing import List -from spack import * +from spack.package import * is_windows = sys.platform == 'win32' @@ -48,7 +49,7 @@ class Ruby(Package): extendable = True phases = ['configure', 'build', 'install'] - build_targets = [] + build_targets = [] # type: List[str] install_targets = ['install'] # Known build issues when Avira antivirus software is running: # https://github.com/rvm/rvm/issues/4313#issuecomment-374020379 diff --git a/var/spack/repos/builtin/packages/runc/package.py b/var/spack/repos/builtin/packages/runc/package.py index 8ad360804a..31646a1636 100644 --- a/var/spack/repos/builtin/packages/runc/package.py +++ b/var/spack/repos/builtin/packages/runc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Runc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/rust-bindgen/package.py b/var/spack/repos/builtin/packages/rust-bindgen/package.py index 92711ca1b2..f11885f8c2 100644 --- a/var/spack/repos/builtin/packages/rust-bindgen/package.py +++ b/var/spack/repos/builtin/packages/rust-bindgen/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class RustBindgen(Package): diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index 5450908c06..7a68d020ff 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -7,6 +7,8 @@ import re from six import iteritems +from spack.package import * + class Rust(Package): """The Rust programming language toolchain diff --git a/var/spack/repos/builtin/packages/sabre/package.py b/var/spack/repos/builtin/packages/sabre/package.py index e560303d40..8cdd944b3f 100644 --- a/var/spack/repos/builtin/packages/sabre/package.py +++ b/var/spack/repos/builtin/packages/sabre/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sabre(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/saga-gis/package.py b/var/spack/repos/builtin/packages/saga-gis/package.py index b08fefa2c8..c5718d94f6 100644 --- a/var/spack/repos/builtin/packages/saga-gis/package.py +++ b/var/spack/repos/builtin/packages/saga-gis/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SagaGis(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/sailfish/package.py b/var/spack/repos/builtin/packages/sailfish/package.py index 9da23e0551..5a43d72e74 100644 --- a/var/spack/repos/builtin/packages/sailfish/package.py +++ b/var/spack/repos/builtin/packages/sailfish/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/salmon-tddft/package.py b/var/spack/repos/builtin/packages/salmon-tddft/package.py index a29454aa17..4d79957583 100644 --- a/var/spack/repos/builtin/packages/salmon-tddft/package.py +++ b/var/spack/repos/builtin/packages/salmon-tddft/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SalmonTddft(CMakePackage): diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index 63aac9d5f6..3a5507bbfb 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -2,6 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * class Salmon(CMakePackage): diff --git a/var/spack/repos/builtin/packages/salome-configuration/package.py b/var/spack/repos/builtin/packages/salome-configuration/package.py index 3ec00f4a71..a8bbb7d672 100644 --- a/var/spack/repos/builtin/packages/salome-configuration/package.py +++ b/var/spack/repos/builtin/packages/salome-configuration/package.py @@ -6,7 +6,7 @@ # Important feature: a set of salome-xxx packages must have all the same version # - except salome-med that is also fixed but by another number version -from spack import * +from spack.package import * class SalomeConfiguration(Package): diff --git a/var/spack/repos/builtin/packages/salome-med/package.py b/var/spack/repos/builtin/packages/salome-med/package.py index 3fe76de34c..9006f2d2ef 100644 --- a/var/spack/repos/builtin/packages/salome-med/package.py +++ b/var/spack/repos/builtin/packages/salome-med/package.py @@ -6,7 +6,7 @@ # Important feature: to interoperate goodly MED files, it is imperative to fix # the HDF5 version for a salome-med version -from spack import * +from spack.package import * class SalomeMed(CMakePackage): diff --git a/var/spack/repos/builtin/packages/salome-medcoupling/package.py b/var/spack/repos/builtin/packages/salome-medcoupling/package.py index b32085c935..966465852a 100644 --- a/var/spack/repos/builtin/packages/salome-medcoupling/package.py +++ b/var/spack/repos/builtin/packages/salome-medcoupling/package.py @@ -6,7 +6,7 @@ # Important feature: a version of salome-medcoupling depand on # a specific version of salome-med package -from spack import * +from spack.package import * class SalomeMedcoupling(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sambamba/package.py b/var/spack/repos/builtin/packages/sambamba/package.py index 6955c39068..a6f659b166 100644 --- a/var/spack/repos/builtin/packages/sambamba/package.py +++ b/var/spack/repos/builtin/packages/sambamba/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sambamba(Package): diff --git a/var/spack/repos/builtin/packages/samblaster/package.py b/var/spack/repos/builtin/packages/samblaster/package.py index 623dd92dbc..83b1d64aa0 100644 --- a/var/spack/repos/builtin/packages/samblaster/package.py +++ b/var/spack/repos/builtin/packages/samblaster/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Samblaster(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index 2b6394ab35..3a413ec451 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index e9bb9da586..c589e42da8 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Samtools(Package): diff --git a/var/spack/repos/builtin/packages/sandbox/package.py b/var/spack/repos/builtin/packages/sandbox/package.py index 76e93695d0..122e4183e2 100644 --- a/var/spack/repos/builtin/packages/sandbox/package.py +++ b/var/spack/repos/builtin/packages/sandbox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sandbox(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sarus/package.py b/var/spack/repos/builtin/packages/sarus/package.py index ec7ad7b3f6..1e9b53bd85 100644 --- a/var/spack/repos/builtin/packages/sarus/package.py +++ b/var/spack/repos/builtin/packages/sarus/package.py @@ -5,7 +5,7 @@ import llnl.util.tty as tty -from spack import * +from spack.package import * class Sarus(CMakePackage): diff --git a/var/spack/repos/builtin/packages/satsuma2/package.py b/var/spack/repos/builtin/packages/satsuma2/package.py index 38e067df79..41ab18359e 100644 --- a/var/spack/repos/builtin/packages/satsuma2/package.py +++ b/var/spack/repos/builtin/packages/satsuma2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Satsuma2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/savanna/package.py b/var/spack/repos/builtin/packages/savanna/package.py index 3b965ee076..db2bdee8cf 100644 --- a/var/spack/repos/builtin/packages/savanna/package.py +++ b/var/spack/repos/builtin/packages/savanna/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Savanna(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/saws/package.py b/var/spack/repos/builtin/packages/saws/package.py index b7e3706c55..3ec1253413 100644 --- a/var/spack/repos/builtin/packages/saws/package.py +++ b/var/spack/repos/builtin/packages/saws/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Saws(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sblim-sfcc/package.py b/var/spack/repos/builtin/packages/sblim-sfcc/package.py index 3f88a9d841..981dfb726f 100644 --- a/var/spack/repos/builtin/packages/sblim-sfcc/package.py +++ b/var/spack/repos/builtin/packages/sblim-sfcc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SblimSfcc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sbml/package.py b/var/spack/repos/builtin/packages/sbml/package.py index 4ece4581ed..7061c3fc71 100644 --- a/var/spack/repos/builtin/packages/sbml/package.py +++ b/var/spack/repos/builtin/packages/sbml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sbml(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sbp/package.py b/var/spack/repos/builtin/packages/sbp/package.py index 3a43ee3070..0580cf1ad7 100644 --- a/var/spack/repos/builtin/packages/sbp/package.py +++ b/var/spack/repos/builtin/packages/sbp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sbp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sbt/package.py b/var/spack/repos/builtin/packages/sbt/package.py index 3d07eb4a85..85f1ee3b70 100644 --- a/var/spack/repos/builtin/packages/sbt/package.py +++ b/var/spack/repos/builtin/packages/sbt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sbt(Package): diff --git a/var/spack/repos/builtin/packages/scala/package.py b/var/spack/repos/builtin/packages/scala/package.py index 849af18545..271fcecd57 100644 --- a/var/spack/repos/builtin/packages/scala/package.py +++ b/var/spack/repos/builtin/packages/scala/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scala(Package): diff --git a/var/spack/repos/builtin/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py index db7eb1a9e0..4148a57b1f 100644 --- a/var/spack/repos/builtin/packages/scalasca/package.py +++ b/var/spack/repos/builtin/packages/scalasca/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scalasca(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/scale/package.py b/var/spack/repos/builtin/packages/scale/package.py index 8c6cb061d3..3bfe200dea 100644 --- a/var/spack/repos/builtin/packages/scale/package.py +++ b/var/spack/repos/builtin/packages/scale/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Scale(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/scallop/package.py b/var/spack/repos/builtin/packages/scallop/package.py index 31588a88b7..e5b0ea5607 100644 --- a/var/spack/repos/builtin/packages/scallop/package.py +++ b/var/spack/repos/builtin/packages/scallop/package.py @@ -2,8 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack import * +from spack.package import * class Scallop(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/scalpel/package.py b/var/spack/repos/builtin/packages/scalpel/package.py index fe83efd27f..31b91f0249 100644 --- a/var/spack/repos/builtin/packages/scalpel/package.py +++ b/var/spack/repos/builtin/packages/scalpel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scalpel(MakefilePackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/scan-for-matches/package.py b/var/spack/repos/builtin/packages/scan-for-matches/package.py index f2a7cc2d83..ac5585aafd 100644 --- a/var/spack/repos/builtin/packages/scan-for-matches/package.py +++ b/var/spack/repos/builtin/packages/scan-for-matches/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ScanForMatches(Package): diff --git a/var/spack/repos/builtin/packages/scantailor/package.py b/var/spack/repos/builtin/packages/scantailor/package.py index b56891a28a..9b9efaa3c9 100644 --- a/var/spack/repos/builtin/packages/scantailor/package.py +++ b/var/spack/repos/builtin/packages/scantailor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/scipoptsuite/package.py b/var/spack/repos/builtin/packages/scipoptsuite/package.py index 267bd144f8..47ddb80f69 100644 --- a/var/spack/repos/builtin/packages/scipoptsuite/package.py +++ b/var/spack/repos/builtin/packages/scipoptsuite/package.py @@ -6,6 +6,8 @@ import os +from spack.package import * + class Scipoptsuite(CMakePackage): """The SCIP Optimization Suite is a toolbox for generating and diff --git a/var/spack/repos/builtin/packages/scitokens-cpp/package.py b/var/spack/repos/builtin/packages/scitokens-cpp/package.py index 8057cbf562..958eaff1ef 100644 --- a/var/spack/repos/builtin/packages/scitokens-cpp/package.py +++ b/var/spack/repos/builtin/packages/scitokens-cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ScitokensCpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/scons/package.py b/var/spack/repos/builtin/packages/scons/package.py index 738f05abd8..09fe43d72d 100644 --- a/var/spack/repos/builtin/packages/scons/package.py +++ b/var/spack/repos/builtin/packages/scons/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scons(PythonPackage): diff --git a/var/spack/repos/builtin/packages/scorec-core/package.py b/var/spack/repos/builtin/packages/scorec-core/package.py index 1c0e57d2db..7bc9d77749 100644 --- a/var/spack/repos/builtin/packages/scorec-core/package.py +++ b/var/spack/repos/builtin/packages/scorec-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ScorecCore(CMakePackage): diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index e92cfeeb4c..dbaa1c7462 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scorep(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/scorpio/package.py b/var/spack/repos/builtin/packages/scorpio/package.py index e1186f4627..c39932f699 100644 --- a/var/spack/repos/builtin/packages/scorpio/package.py +++ b/var/spack/repos/builtin/packages/scorpio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scorpio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 3fbec80966..644eff32eb 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scotch(CMakePackage): diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 28bf5f7f8c..93095bf993 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * def detect_scheduler(): diff --git a/var/spack/repos/builtin/packages/screen/package.py b/var/spack/repos/builtin/packages/screen/package.py index f8c34188da..b31026791e 100644 --- a/var/spack/repos/builtin/packages/screen/package.py +++ b/var/spack/repos/builtin/packages/screen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Screen(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/scripts/package.py b/var/spack/repos/builtin/packages/scripts/package.py index 1fce2aba9f..bafdde9532 100644 --- a/var/spack/repos/builtin/packages/scripts/package.py +++ b/var/spack/repos/builtin/packages/scripts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scripts(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/scrnsaverproto/package.py b/var/spack/repos/builtin/packages/scrnsaverproto/package.py index 96fb16f730..1193731417 100644 --- a/var/spack/repos/builtin/packages/scrnsaverproto/package.py +++ b/var/spack/repos/builtin/packages/scrnsaverproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scrnsaverproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/scrot/package.py b/var/spack/repos/builtin/packages/scrot/package.py index 6aadb1f06f..73deae863e 100644 --- a/var/spack/repos/builtin/packages/scrot/package.py +++ b/var/spack/repos/builtin/packages/scrot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scrot(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/scs/package.py b/var/spack/repos/builtin/packages/scs/package.py index dc23053f43..9d860920f2 100644 --- a/var/spack/repos/builtin/packages/scs/package.py +++ b/var/spack/repos/builtin/packages/scs/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Scs(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sctk/package.py b/var/spack/repos/builtin/packages/sctk/package.py index b4939e5308..5bcf0d01e2 100644 --- a/var/spack/repos/builtin/packages/sctk/package.py +++ b/var/spack/repos/builtin/packages/sctk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sctk(Package): diff --git a/var/spack/repos/builtin/packages/sdl2-image/package.py b/var/spack/repos/builtin/packages/sdl2-image/package.py index b94470a325..4d2508c834 100644 --- a/var/spack/repos/builtin/packages/sdl2-image/package.py +++ b/var/spack/repos/builtin/packages/sdl2-image/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sdl2Image(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sdl2/package.py b/var/spack/repos/builtin/packages/sdl2/package.py index 2fcdb91490..553377aa9a 100644 --- a/var/spack/repos/builtin/packages/sdl2/package.py +++ b/var/spack/repos/builtin/packages/sdl2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sdl2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sdsl-lite/package.py b/var/spack/repos/builtin/packages/sdsl-lite/package.py index 926411809c..4bb03f6c7a 100644 --- a/var/spack/repos/builtin/packages/sdsl-lite/package.py +++ b/var/spack/repos/builtin/packages/sdsl-lite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SdslLite(Package): diff --git a/var/spack/repos/builtin/packages/seacas/package.py b/var/spack/repos/builtin/packages/seacas/package.py index 4438a3e1dd..c3bb5e3beb 100644 --- a/var/spack/repos/builtin/packages/seacas/package.py +++ b/var/spack/repos/builtin/packages/seacas/package.py @@ -5,8 +5,8 @@ import sys -from spack import * from spack.operating_systems.mac_os import macos_version +from spack.package import * # # Need to add: diff --git a/var/spack/repos/builtin/packages/seal/package.py b/var/spack/repos/builtin/packages/seal/package.py index 80ae0d030e..7f9b1822ff 100644 --- a/var/spack/repos/builtin/packages/seal/package.py +++ b/var/spack/repos/builtin/packages/seal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Seal(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sed/package.py b/var/spack/repos/builtin/packages/sed/package.py index cd57901c74..6ba0f85cf1 100644 --- a/var/spack/repos/builtin/packages/sed/package.py +++ b/var/spack/repos/builtin/packages/sed/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Sed(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/sensei/package.py b/var/spack/repos/builtin/packages/sensei/package.py index 3382c4a0a9..7087d241f5 100644 --- a/var/spack/repos/builtin/packages/sensei/package.py +++ b/var/spack/repos/builtin/packages/sensei/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sensei(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sentencepiece/package.py b/var/spack/repos/builtin/packages/sentencepiece/package.py index a9e89f3c1a..0d7ad74f8d 100644 --- a/var/spack/repos/builtin/packages/sentencepiece/package.py +++ b/var/spack/repos/builtin/packages/sentencepiece/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sentencepiece(CMakePackage): """Unsupervised text tokenizer for Neural Network-based text generation. diff --git a/var/spack/repos/builtin/packages/sentieon-genomics/package.py b/var/spack/repos/builtin/packages/sentieon-genomics/package.py index 4c21466a18..f78bf16d0c 100644 --- a/var/spack/repos/builtin/packages/sentieon-genomics/package.py +++ b/var/spack/repos/builtin/packages/sentieon-genomics/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SentieonGenomics(Package): diff --git a/var/spack/repos/builtin/packages/seqan/package.py b/var/spack/repos/builtin/packages/seqan/package.py index ec4f617a7c..0677bfa9a7 100644 --- a/var/spack/repos/builtin/packages/seqan/package.py +++ b/var/spack/repos/builtin/packages/seqan/package.py @@ -2,9 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack import * +from spack.package import * class Seqan(CMakePackage): diff --git a/var/spack/repos/builtin/packages/seqkit/package.py b/var/spack/repos/builtin/packages/seqkit/package.py index de1f827649..5759e9b5e5 100644 --- a/var/spack/repos/builtin/packages/seqkit/package.py +++ b/var/spack/repos/builtin/packages/seqkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Seqkit(Package): diff --git a/var/spack/repos/builtin/packages/seqprep/package.py b/var/spack/repos/builtin/packages/seqprep/package.py index 6ac1cd21ac..33d3ed2d42 100644 --- a/var/spack/repos/builtin/packages/seqprep/package.py +++ b/var/spack/repos/builtin/packages/seqprep/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Seqprep(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/seqtk/package.py b/var/spack/repos/builtin/packages/seqtk/package.py index 90192ea180..bc5ad62d79 100644 --- a/var/spack/repos/builtin/packages/seqtk/package.py +++ b/var/spack/repos/builtin/packages/seqtk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Seqtk(Package): diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index 8453b2a3b5..aa3fb55302 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Serf(SConsPackage): diff --git a/var/spack/repos/builtin/packages/serialbox/package.py b/var/spack/repos/builtin/packages/serialbox/package.py index cf04ca2b71..5c7ab58e7f 100644 --- a/var/spack/repos/builtin/packages/serialbox/package.py +++ b/var/spack/repos/builtin/packages/serialbox/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Serialbox(CMakePackage): """Serialbox is a serialization library and tools for C/C++, Python3 and Fortran. Serialbox is used in several projects for building validation diff --git a/var/spack/repos/builtin/packages/sessreg/package.py b/var/spack/repos/builtin/packages/sessreg/package.py index d55c3f58d3..9cf249061f 100644 --- a/var/spack/repos/builtin/packages/sessreg/package.py +++ b/var/spack/repos/builtin/packages/sessreg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sessreg(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/setserial/package.py b/var/spack/repos/builtin/packages/setserial/package.py index ab563b7096..8cc555ce7f 100644 --- a/var/spack/repos/builtin/packages/setserial/package.py +++ b/var/spack/repos/builtin/packages/setserial/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Setserial(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/setxkbmap/package.py b/var/spack/repos/builtin/packages/setxkbmap/package.py index 57b5de531c..00f61580f4 100644 --- a/var/spack/repos/builtin/packages/setxkbmap/package.py +++ b/var/spack/repos/builtin/packages/setxkbmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Setxkbmap(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/sfcgal/package.py b/var/spack/repos/builtin/packages/sfcgal/package.py index 852fd8a180..e134c83c9f 100644 --- a/var/spack/repos/builtin/packages/sfcgal/package.py +++ b/var/spack/repos/builtin/packages/sfcgal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/sfcio/package.py b/var/spack/repos/builtin/packages/sfcio/package.py index 30ab34259b..6257db451e 100644 --- a/var/spack/repos/builtin/packages/sfcio/package.py +++ b/var/spack/repos/builtin/packages/sfcio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sfcio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sga/package.py b/var/spack/repos/builtin/packages/sga/package.py index 7c5171306b..423ce76dd0 100644 --- a/var/spack/repos/builtin/packages/sga/package.py +++ b/var/spack/repos/builtin/packages/sga/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sga(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sgpp/package.py b/var/spack/repos/builtin/packages/sgpp/package.py index 69a9df5842..64ae4bd3c2 100644 --- a/var/spack/repos/builtin/packages/sgpp/package.py +++ b/var/spack/repos/builtin/packages/sgpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/shadow/package.py b/var/spack/repos/builtin/packages/shadow/package.py index 87dbb58dbd..bdc577c024 100644 --- a/var/spack/repos/builtin/packages/shadow/package.py +++ b/var/spack/repos/builtin/packages/shadow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shadow(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/shapeit/package.py b/var/spack/repos/builtin/packages/shapeit/package.py index 98e4fa250e..ae2ee02e62 100644 --- a/var/spack/repos/builtin/packages/shapeit/package.py +++ b/var/spack/repos/builtin/packages/shapeit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shapeit(Package): diff --git a/var/spack/repos/builtin/packages/shapeit4/package.py b/var/spack/repos/builtin/packages/shapeit4/package.py index f4fde917ff..c02f212110 100644 --- a/var/spack/repos/builtin/packages/shapeit4/package.py +++ b/var/spack/repos/builtin/packages/shapeit4/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shapeit4(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/shapelib/package.py b/var/spack/repos/builtin/packages/shapelib/package.py index f725461411..28ced3955d 100644 --- a/var/spack/repos/builtin/packages/shapelib/package.py +++ b/var/spack/repos/builtin/packages/shapelib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shapelib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/shared-mime-info/package.py b/var/spack/repos/builtin/packages/shared-mime-info/package.py index 0d01bec0d5..7c429bd639 100644 --- a/var/spack/repos/builtin/packages/shared-mime-info/package.py +++ b/var/spack/repos/builtin/packages/shared-mime-info/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class SharedMimeInfo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/shark/package.py b/var/spack/repos/builtin/packages/shark/package.py index 112358e120..da50499ca3 100644 --- a/var/spack/repos/builtin/packages/shark/package.py +++ b/var/spack/repos/builtin/packages/shark/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/shc/package.py b/var/spack/repos/builtin/packages/shc/package.py index e4d592bc36..538047f145 100644 --- a/var/spack/repos/builtin/packages/shc/package.py +++ b/var/spack/repos/builtin/packages/shc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/shengbte/package.py b/var/spack/repos/builtin/packages/shengbte/package.py index 5f99351a98..092038443c 100644 --- a/var/spack/repos/builtin/packages/shengbte/package.py +++ b/var/spack/repos/builtin/packages/shengbte/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shengbte(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sherpa/package.py b/var/spack/repos/builtin/packages/sherpa/package.py index 85c0d58568..d7bb762d26 100644 --- a/var/spack/repos/builtin/packages/sherpa/package.py +++ b/var/spack/repos/builtin/packages/sherpa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sherpa(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/shiny-server/package.py b/var/spack/repos/builtin/packages/shiny-server/package.py index d730f65c96..d627469da1 100644 --- a/var/spack/repos/builtin/packages/shiny-server/package.py +++ b/var/spack/repos/builtin/packages/shiny-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ShinyServer(CMakePackage): diff --git a/var/spack/repos/builtin/packages/shiro/package.py b/var/spack/repos/builtin/packages/shiro/package.py index 63c447b7e2..8534d0e773 100644 --- a/var/spack/repos/builtin/packages/shiro/package.py +++ b/var/spack/repos/builtin/packages/shiro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shiro(MavenPackage): diff --git a/var/spack/repos/builtin/packages/shocklibs/package.py b/var/spack/repos/builtin/packages/shocklibs/package.py index fda7790174..f1a823fa1b 100644 --- a/var/spack/repos/builtin/packages/shocklibs/package.py +++ b/var/spack/repos/builtin/packages/shocklibs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shocklibs(Package): diff --git a/var/spack/repos/builtin/packages/shoremap/package.py b/var/spack/repos/builtin/packages/shoremap/package.py index b56e9c72df..84305f14e4 100644 --- a/var/spack/repos/builtin/packages/shoremap/package.py +++ b/var/spack/repos/builtin/packages/shoremap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shoremap(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/shortbred/package.py b/var/spack/repos/builtin/packages/shortbred/package.py index 4f2c9e381d..5617734502 100644 --- a/var/spack/repos/builtin/packages/shortbred/package.py +++ b/var/spack/repos/builtin/packages/shortbred/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shortbred(Package): diff --git a/var/spack/repos/builtin/packages/shortstack/package.py b/var/spack/repos/builtin/packages/shortstack/package.py index 23d81b06b0..f938fa0f05 100644 --- a/var/spack/repos/builtin/packages/shortstack/package.py +++ b/var/spack/repos/builtin/packages/shortstack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shortstack(Package): diff --git a/var/spack/repos/builtin/packages/showfont/package.py b/var/spack/repos/builtin/packages/showfont/package.py index 58319c2fbf..fa00ae3af4 100644 --- a/var/spack/repos/builtin/packages/showfont/package.py +++ b/var/spack/repos/builtin/packages/showfont/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Showfont(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/shtools/package.py b/var/spack/repos/builtin/packages/shtools/package.py index 0a1472751a..dbdcce706d 100644 --- a/var/spack/repos/builtin/packages/shtools/package.py +++ b/var/spack/repos/builtin/packages/shtools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shtools(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py index f6d191a172..73e5ea2668 100644 --- a/var/spack/repos/builtin/packages/shuffile/package.py +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Shuffile(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sickle/package.py b/var/spack/repos/builtin/packages/sickle/package.py index 82ac06261a..b457440243 100644 --- a/var/spack/repos/builtin/packages/sickle/package.py +++ b/var/spack/repos/builtin/packages/sickle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sickle(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sicm/package.py b/var/spack/repos/builtin/packages/sicm/package.py index f743191f49..27f5157342 100644 --- a/var/spack/repos/builtin/packages/sicm/package.py +++ b/var/spack/repos/builtin/packages/sicm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sicm(CMakePackage): @@ -12,8 +12,6 @@ class Sicm(CMakePackage): homepage = "https://github.com/lanl/SICM/" git = "https://github.com/lanl/SICM.git" - maintainers = [] - version('master') depends_on('jemalloc jemalloc_prefix=je_') diff --git a/var/spack/repos/builtin/packages/siesta/package.py b/var/spack/repos/builtin/packages/siesta/package.py index b230748b1b..b1ada7df3c 100644 --- a/var/spack/repos/builtin/packages/siesta/package.py +++ b/var/spack/repos/builtin/packages/siesta/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class Siesta(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sigcpp/package.py b/var/spack/repos/builtin/packages/sigcpp/package.py index e840d594c8..895cae8b70 100644 --- a/var/spack/repos/builtin/packages/sigcpp/package.py +++ b/var/spack/repos/builtin/packages/sigcpp/package.py @@ -6,7 +6,7 @@ import os import shutil -from spack import * +from spack.package import * class Sigcpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sigio/package.py b/var/spack/repos/builtin/packages/sigio/package.py index 90b39a3fe9..b21ed3c451 100644 --- a/var/spack/repos/builtin/packages/sigio/package.py +++ b/var/spack/repos/builtin/packages/sigio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sigio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/signalp/package.py b/var/spack/repos/builtin/packages/signalp/package.py index fce80c3426..10f986788f 100644 --- a/var/spack/repos/builtin/packages/signalp/package.py +++ b/var/spack/repos/builtin/packages/signalp/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Signalp(Package): diff --git a/var/spack/repos/builtin/packages/signify/package.py b/var/spack/repos/builtin/packages/signify/package.py index af9642abff..0d5097cecd 100644 --- a/var/spack/repos/builtin/packages/signify/package.py +++ b/var/spack/repos/builtin/packages/signify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Signify(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 7bfbc1a96a..4b61a4f832 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.util.environment import is_system_path diff --git a/var/spack/repos/builtin/packages/simde/package.py b/var/spack/repos/builtin/packages/simde/package.py index 2c1fd08b2f..af194cbe3c 100644 --- a/var/spack/repos/builtin/packages/simde/package.py +++ b/var/spack/repos/builtin/packages/simde/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Simde(MesonPackage): diff --git a/var/spack/repos/builtin/packages/simgrid/package.py b/var/spack/repos/builtin/packages/simgrid/package.py index 5b3b44b534..983e5d91b5 100644 --- a/var/spack/repos/builtin/packages/simgrid/package.py +++ b/var/spack/repos/builtin/packages/simgrid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Simgrid(CMakePackage): diff --git a/var/spack/repos/builtin/packages/simmetrix-simmodsuite/package.py b/var/spack/repos/builtin/packages/simmetrix-simmodsuite/package.py index 3756ff4c8e..22a1d06b15 100644 --- a/var/spack/repos/builtin/packages/simmetrix-simmodsuite/package.py +++ b/var/spack/repos/builtin/packages/simmetrix-simmodsuite/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * def simmodsuite_releases(): diff --git a/var/spack/repos/builtin/packages/simplemoc/package.py b/var/spack/repos/builtin/packages/simplemoc/package.py index bd04bce987..5b2aa23858 100644 --- a/var/spack/repos/builtin/packages/simplemoc/package.py +++ b/var/spack/repos/builtin/packages/simplemoc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Simplemoc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/simsipm/package.py b/var/spack/repos/builtin/packages/simsipm/package.py index f1742720e0..b82c1f6b9b 100644 --- a/var/spack/repos/builtin/packages/simsipm/package.py +++ b/var/spack/repos/builtin/packages/simsipm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Simsipm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/simul/package.py b/var/spack/repos/builtin/packages/simul/package.py index 96a2d6e93d..b30f93a2ce 100644 --- a/var/spack/repos/builtin/packages/simul/package.py +++ b/var/spack/repos/builtin/packages/simul/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Simul(Package): diff --git a/var/spack/repos/builtin/packages/simulationio/package.py b/var/spack/repos/builtin/packages/simulationio/package.py index 67a806ae7f..ab3d6572e6 100644 --- a/var/spack/repos/builtin/packages/simulationio/package.py +++ b/var/spack/repos/builtin/packages/simulationio/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Simulationio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sina/package.py b/var/spack/repos/builtin/packages/sina/package.py index 6f215a869b..b28cbb6a65 100644 --- a/var/spack/repos/builtin/packages/sina/package.py +++ b/var/spack/repos/builtin/packages/sina/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Sina(CachedCMakePackage): diff --git a/var/spack/repos/builtin/packages/singularity-legacy/package.py b/var/spack/repos/builtin/packages/singularity-legacy/package.py index 1ae8ce5d2e..2515aff47b 100644 --- a/var/spack/repos/builtin/packages/singularity-legacy/package.py +++ b/var/spack/repos/builtin/packages/singularity-legacy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SingularityLegacy(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index 9a25ca9770..321c08716d 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.singularityce import SingularityBase diff --git a/var/spack/repos/builtin/packages/singularityce/package.py b/var/spack/repos/builtin/packages/singularityce/package.py index f59142f9f4..a87dfa7a95 100644 --- a/var/spack/repos/builtin/packages/singularityce/package.py +++ b/var/spack/repos/builtin/packages/singularityce/package.py @@ -8,7 +8,7 @@ import shutil import llnl.util.tty as tty -from spack import * +from spack.package import * class SingularityBase(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sio/package.py b/var/spack/repos/builtin/packages/sio/package.py index f9790be5dc..6a5e4e3caa 100644 --- a/var/spack/repos/builtin/packages/sio/package.py +++ b/var/spack/repos/builtin/packages/sio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sionlib/package.py b/var/spack/repos/builtin/packages/sionlib/package.py index 71c4254847..8a0025a039 100644 --- a/var/spack/repos/builtin/packages/sionlib/package.py +++ b/var/spack/repos/builtin/packages/sionlib/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sionlib(AutotoolsPackage): """Scalable I/O library for parallel access to task-local files""" diff --git a/var/spack/repos/builtin/packages/sirius/package.py b/var/spack/repos/builtin/packages/sirius/package.py index 5097e3f096..c181175b2c 100644 --- a/var/spack/repos/builtin/packages/sirius/package.py +++ b/var/spack/repos/builtin/packages/sirius/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Sirius(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/skilion-onedrive/package.py b/var/spack/repos/builtin/packages/skilion-onedrive/package.py index 7e2955666f..dafa72c903 100644 --- a/var/spack/repos/builtin/packages/skilion-onedrive/package.py +++ b/var/spack/repos/builtin/packages/skilion-onedrive/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SkilionOnedrive(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/skopeo/package.py b/var/spack/repos/builtin/packages/skopeo/package.py index 5ef46f4084..86214efa12 100644 --- a/var/spack/repos/builtin/packages/skopeo/package.py +++ b/var/spack/repos/builtin/packages/skopeo/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Skopeo(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sl/package.py b/var/spack/repos/builtin/packages/sl/package.py index cb633a6437..3c15ecefda 100644 --- a/var/spack/repos/builtin/packages/sl/package.py +++ b/var/spack/repos/builtin/packages/sl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sl(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/slang/package.py b/var/spack/repos/builtin/packages/slang/package.py index e58440bd70..3903f48228 100644 --- a/var/spack/repos/builtin/packages/slang/package.py +++ b/var/spack/repos/builtin/packages/slang/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Slang(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/slate/package.py b/var/spack/repos/builtin/packages/slate/package.py index a385ff0e78..05b6b94ed9 100644 --- a/var/spack/repos/builtin/packages/slate/package.py +++ b/var/spack/repos/builtin/packages/slate/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Slate(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/sleef/package.py b/var/spack/repos/builtin/packages/sleef/package.py index c87c49bc3b..b1b38f609c 100644 --- a/var/spack/repos/builtin/packages/sleef/package.py +++ b/var/spack/repos/builtin/packages/sleef/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sleef(CMakePackage): diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 71a9f4c1ff..f893ccee20 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -6,7 +6,7 @@ import os import sys -from spack import * +from spack.package import * class Slepc(Package, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/slf4j/package.py b/var/spack/repos/builtin/packages/slf4j/package.py index e4055ad036..ae0645bbf6 100644 --- a/var/spack/repos/builtin/packages/slf4j/package.py +++ b/var/spack/repos/builtin/packages/slf4j/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Slf4j(MavenPackage): """The Simple Logging Facade for Java (SLF4J) serves as a simple facade or abstraction for various logging frameworks (e.g. java.util.logging, diff --git a/var/spack/repos/builtin/packages/slider/package.py b/var/spack/repos/builtin/packages/slider/package.py index 4266f778bc..b0d7c2178b 100644 --- a/var/spack/repos/builtin/packages/slider/package.py +++ b/var/spack/repos/builtin/packages/slider/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Slider(MavenPackage): """Slider is a framework for deployment and management of these long-running data access applications in Hadoop.""" diff --git a/var/spack/repos/builtin/packages/slirp4netns/package.py b/var/spack/repos/builtin/packages/slirp4netns/package.py index 5bcbcdad21..3aa8dc6393 100644 --- a/var/spack/repos/builtin/packages/slirp4netns/package.py +++ b/var/spack/repos/builtin/packages/slirp4netns/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Slirp4netns(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sloccount/package.py b/var/spack/repos/builtin/packages/sloccount/package.py index 11c8891197..773d40acb9 100644 --- a/var/spack/repos/builtin/packages/sloccount/package.py +++ b/var/spack/repos/builtin/packages/sloccount/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sloccount(MakefilePackage): """SLOCCount is a set of tools for counting physical Source Lines of Code (SLOC) in a large number of languages of a potentially large set of diff --git a/var/spack/repos/builtin/packages/slurm-drmaa/package.py b/var/spack/repos/builtin/packages/slurm-drmaa/package.py index 69059fb138..f5581a0cfc 100644 --- a/var/spack/repos/builtin/packages/slurm-drmaa/package.py +++ b/var/spack/repos/builtin/packages/slurm-drmaa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SlurmDrmaa(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index 4b9f16cdea..4270ba30fa 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -6,6 +6,8 @@ import re +from spack.package import * + class Slurm(AutotoolsPackage): """Slurm is an open source, fault-tolerant, and highly scalable cluster diff --git a/var/spack/repos/builtin/packages/smalt/package.py b/var/spack/repos/builtin/packages/smalt/package.py index 116103e35b..3260e3589b 100644 --- a/var/spack/repos/builtin/packages/smalt/package.py +++ b/var/spack/repos/builtin/packages/smalt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Smalt(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/smartdenovo/package.py b/var/spack/repos/builtin/packages/smartdenovo/package.py index 30c39f6297..31e81e3153 100644 --- a/var/spack/repos/builtin/packages/smartdenovo/package.py +++ b/var/spack/repos/builtin/packages/smartdenovo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Smartdenovo(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/smartmontools/package.py b/var/spack/repos/builtin/packages/smartmontools/package.py index 21b8763736..f715614c9c 100644 --- a/var/spack/repos/builtin/packages/smartmontools/package.py +++ b/var/spack/repos/builtin/packages/smartmontools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Smartmontools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/smof/package.py b/var/spack/repos/builtin/packages/smof/package.py index 10ae2b55fd..eb5a6f5f23 100644 --- a/var/spack/repos/builtin/packages/smof/package.py +++ b/var/spack/repos/builtin/packages/smof/package.py @@ -6,7 +6,7 @@ from os import symlink -from spack import * +from spack.package import * class Smof(Package): diff --git a/var/spack/repos/builtin/packages/smproxy/package.py b/var/spack/repos/builtin/packages/smproxy/package.py index ba38e8ab23..221a2b42e6 100644 --- a/var/spack/repos/builtin/packages/smproxy/package.py +++ b/var/spack/repos/builtin/packages/smproxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Smproxy(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/snakemake/package.py b/var/spack/repos/builtin/packages/snakemake/package.py index ec6eb5eebe..a24928881d 100644 --- a/var/spack/repos/builtin/packages/snakemake/package.py +++ b/var/spack/repos/builtin/packages/snakemake/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Snakemake(PythonPackage): diff --git a/var/spack/repos/builtin/packages/snap-berkeley/package.py b/var/spack/repos/builtin/packages/snap-berkeley/package.py index b22efee0d8..57089d85cb 100644 --- a/var/spack/repos/builtin/packages/snap-berkeley/package.py +++ b/var/spack/repos/builtin/packages/snap-berkeley/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SnapBerkeley(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/snap-korf/package.py b/var/spack/repos/builtin/packages/snap-korf/package.py index 95b024d84a..b3f0dc2b07 100644 --- a/var/spack/repos/builtin/packages/snap-korf/package.py +++ b/var/spack/repos/builtin/packages/snap-korf/package.py @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class SnapKorf(MakefilePackage): """SNAP is a general purpose gene finding program suitable for both eukaryotic and prokaryotic genomes.""" diff --git a/var/spack/repos/builtin/packages/snap/package.py b/var/spack/repos/builtin/packages/snap/package.py index c00a68f75e..70196a835b 100644 --- a/var/spack/repos/builtin/packages/snap/package.py +++ b/var/spack/repos/builtin/packages/snap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Snap(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/snappy/package.py b/var/spack/repos/builtin/packages/snappy/package.py index 315ab2fece..b347ffb5f0 100644 --- a/var/spack/repos/builtin/packages/snappy/package.py +++ b/var/spack/repos/builtin/packages/snappy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Snappy(CMakePackage): diff --git a/var/spack/repos/builtin/packages/snbone/package.py b/var/spack/repos/builtin/packages/snbone/package.py index e8098feb1a..91dff530c6 100644 --- a/var/spack/repos/builtin/packages/snbone/package.py +++ b/var/spack/repos/builtin/packages/snbone/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Snbone(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sniffles/package.py b/var/spack/repos/builtin/packages/sniffles/package.py index d496bbbb47..7d685bdb49 100644 --- a/var/spack/repos/builtin/packages/sniffles/package.py +++ b/var/spack/repos/builtin/packages/sniffles/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sniffles(CMakePackage): diff --git a/var/spack/repos/builtin/packages/snpeff/package.py b/var/spack/repos/builtin/packages/snpeff/package.py index b91845112a..9d4a890c9d 100644 --- a/var/spack/repos/builtin/packages/snpeff/package.py +++ b/var/spack/repos/builtin/packages/snpeff/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Snpeff(Package, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/snphylo/package.py b/var/spack/repos/builtin/packages/snphylo/package.py index e4a4c8bfdb..445cdfdd55 100644 --- a/var/spack/repos/builtin/packages/snphylo/package.py +++ b/var/spack/repos/builtin/packages/snphylo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Snphylo(Package): diff --git a/var/spack/repos/builtin/packages/snptest/package.py b/var/spack/repos/builtin/packages/snptest/package.py index 54ef12d922..b6d3cc6647 100644 --- a/var/spack/repos/builtin/packages/snptest/package.py +++ b/var/spack/repos/builtin/packages/snptest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Snptest(Package): diff --git a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py index 776fdc4b59..7530a638a4 100644 --- a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py +++ b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SoapdenovoTrans(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/soapdenovo2/package.py b/var/spack/repos/builtin/packages/soapdenovo2/package.py index 2c99c9d5e4..988765147c 100644 --- a/var/spack/repos/builtin/packages/soapdenovo2/package.py +++ b/var/spack/repos/builtin/packages/soapdenovo2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Soapdenovo2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/soci/package.py b/var/spack/repos/builtin/packages/soci/package.py index 4c109f6888..523c41881d 100644 --- a/var/spack/repos/builtin/packages/soci/package.py +++ b/var/spack/repos/builtin/packages/soci/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Soci(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sofa-c/package.py b/var/spack/repos/builtin/packages/sofa-c/package.py index 305c766e4e..02b62b0e18 100644 --- a/var/spack/repos/builtin/packages/sofa-c/package.py +++ b/var/spack/repos/builtin/packages/sofa-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SofaC(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sollve/package.py b/var/spack/repos/builtin/packages/sollve/package.py index 3d16e86e13..ff9f06091f 100644 --- a/var/spack/repos/builtin/packages/sollve/package.py +++ b/var/spack/repos/builtin/packages/sollve/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sollve(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sollya/package.py b/var/spack/repos/builtin/packages/sollya/package.py index 9b744b9966..6bb7dc3b09 100644 --- a/var/spack/repos/builtin/packages/sollya/package.py +++ b/var/spack/repos/builtin/packages/sollya/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sollya(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/solr/package.py b/var/spack/repos/builtin/packages/solr/package.py index bb059de406..659d0769ab 100644 --- a/var/spack/repos/builtin/packages/solr/package.py +++ b/var/spack/repos/builtin/packages/solr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Solr(Package): diff --git a/var/spack/repos/builtin/packages/somatic-sniper/package.py b/var/spack/repos/builtin/packages/somatic-sniper/package.py index 5f080811c7..efe5327f23 100644 --- a/var/spack/repos/builtin/packages/somatic-sniper/package.py +++ b/var/spack/repos/builtin/packages/somatic-sniper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SomaticSniper(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sombrero/package.py b/var/spack/repos/builtin/packages/sombrero/package.py index 7529d3c400..0fd32fbc86 100644 --- a/var/spack/repos/builtin/packages/sombrero/package.py +++ b/var/spack/repos/builtin/packages/sombrero/package.py @@ -5,9 +5,7 @@ from os import symlink -from llnl.util.filesystem import join_path - -from spack import * +from spack.package import * class Sombrero(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sonlib/package.py b/var/spack/repos/builtin/packages/sonlib/package.py index a986eead4d..a027b5e8a0 100644 --- a/var/spack/repos/builtin/packages/sonlib/package.py +++ b/var/spack/repos/builtin/packages/sonlib/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Sonlib(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sortmerna/package.py b/var/spack/repos/builtin/packages/sortmerna/package.py index 3e48cf9ef6..2a86121121 100644 --- a/var/spack/repos/builtin/packages/sortmerna/package.py +++ b/var/spack/repos/builtin/packages/sortmerna/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sortmerna(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sos/package.py b/var/spack/repos/builtin/packages/sos/package.py index f11df84164..ee37278268 100644 --- a/var/spack/repos/builtin/packages/sos/package.py +++ b/var/spack/repos/builtin/packages/sos/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sos(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sosflow/package.py b/var/spack/repos/builtin/packages/sosflow/package.py index dd221fb71d..21926d74dc 100644 --- a/var/spack/repos/builtin/packages/sosflow/package.py +++ b/var/spack/repos/builtin/packages/sosflow/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sosflow(CMakePackage): diff --git a/var/spack/repos/builtin/packages/source-highlight/package.py b/var/spack/repos/builtin/packages/source-highlight/package.py index 774f6f35af..1f7f28a8fb 100644 --- a/var/spack/repos/builtin/packages/source-highlight/package.py +++ b/var/spack/repos/builtin/packages/source-highlight/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SourceHighlight(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/sowing/package.py b/var/spack/repos/builtin/packages/sowing/package.py index 40aa42b3af..6f5cacffe5 100644 --- a/var/spack/repos/builtin/packages/sowing/package.py +++ b/var/spack/repos/builtin/packages/sowing/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sowing(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sox/package.py b/var/spack/repos/builtin/packages/sox/package.py index 864b1d8e19..3de5388a2d 100644 --- a/var/spack/repos/builtin/packages/sox/package.py +++ b/var/spack/repos/builtin/packages/sox/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sox(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sp/package.py b/var/spack/repos/builtin/packages/sp/package.py index 392e5509b1..37eb948f8d 100644 --- a/var/spack/repos/builtin/packages/sp/package.py +++ b/var/spack/repos/builtin/packages/sp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/spack/package.py b/var/spack/repos/builtin/packages/spack/package.py index f3ea76a186..571382fb59 100644 --- a/var/spack/repos/builtin/packages/spack/package.py +++ b/var/spack/repos/builtin/packages/spack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spack(Package): diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index 53cde8d026..e24ac04d12 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spades(CMakePackage): diff --git a/var/spack/repos/builtin/packages/span-lite/package.py b/var/spack/repos/builtin/packages/span-lite/package.py index 2b8e18e159..3366027b01 100644 --- a/var/spack/repos/builtin/packages/span-lite/package.py +++ b/var/spack/repos/builtin/packages/span-lite/package.py @@ -5,7 +5,7 @@ from shutil import copytree -from spack import * +from spack.package import * class SpanLite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index 808ddf8dcc..a4877f03a3 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Spark(Package): diff --git a/var/spack/repos/builtin/packages/sparrow/package.py b/var/spack/repos/builtin/packages/sparrow/package.py index 4171f5ee27..3da23056a5 100644 --- a/var/spack/repos/builtin/packages/sparrow/package.py +++ b/var/spack/repos/builtin/packages/sparrow/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Sparrow(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sparse/package.py b/var/spack/repos/builtin/packages/sparse/package.py index 03537b197b..8cfbc61380 100644 --- a/var/spack/repos/builtin/packages/sparse/package.py +++ b/var/spack/repos/builtin/packages/sparse/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sparse(MakefilePackage): """An open source sparse linear equation solver.""" diff --git a/var/spack/repos/builtin/packages/sparsehash/package.py b/var/spack/repos/builtin/packages/sparsehash/package.py index 78036301d9..b6ab3e531a 100644 --- a/var/spack/repos/builtin/packages/sparsehash/package.py +++ b/var/spack/repos/builtin/packages/sparsehash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sparsehash(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sparskit/package.py b/var/spack/repos/builtin/packages/sparskit/package.py index f70a097f52..9852f7332a 100644 --- a/var/spack/repos/builtin/packages/sparskit/package.py +++ b/var/spack/repos/builtin/packages/sparskit/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Sparskit(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sparta/package.py b/var/spack/repos/builtin/packages/sparta/package.py index a3560085b9..b021dc57f1 100644 --- a/var/spack/repos/builtin/packages/sparta/package.py +++ b/var/spack/repos/builtin/packages/sparta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sparta(Package): diff --git a/var/spack/repos/builtin/packages/spath/package.py b/var/spack/repos/builtin/packages/spath/package.py index a1b27911a5..df4f015689 100644 --- a/var/spack/repos/builtin/packages/spath/package.py +++ b/var/spack/repos/builtin/packages/spath/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spath(CMakePackage): diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index bce3c766a4..910dcef498 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spdlog(CMakePackage): diff --git a/var/spack/repos/builtin/packages/specfem3d-globe/package.py b/var/spack/repos/builtin/packages/specfem3d-globe/package.py index 01014666f4..229bf46d3d 100644 --- a/var/spack/repos/builtin/packages/specfem3d-globe/package.py +++ b/var/spack/repos/builtin/packages/specfem3d-globe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Specfem3dGlobe(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/spectra/package.py b/var/spack/repos/builtin/packages/spectra/package.py index 14a3e8ba6b..2c6bdd9f53 100644 --- a/var/spack/repos/builtin/packages/spectra/package.py +++ b/var/spack/repos/builtin/packages/spectra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spectra(CMakePackage): diff --git a/var/spack/repos/builtin/packages/spectre/package.py b/var/spack/repos/builtin/packages/spectre/package.py index 017b7d07c9..1ece27ff10 100644 --- a/var/spack/repos/builtin/packages/spectre/package.py +++ b/var/spack/repos/builtin/packages/spectre/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spectre(CMakePackage): diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index 02be409adc..651f87a262 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -5,6 +5,8 @@ import os import re +from spack.package import * + class SpectrumMpi(BundlePackage): """IBM MPI implementation from Spectrum MPI.""" diff --git a/var/spack/repos/builtin/packages/speex/package.py b/var/spack/repos/builtin/packages/speex/package.py index 33d0eb5700..b0d97069c7 100644 --- a/var/spack/repos/builtin/packages/speex/package.py +++ b/var/spack/repos/builtin/packages/speex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Speex(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/speexdsp/package.py b/var/spack/repos/builtin/packages/speexdsp/package.py index 55b3fb3dc9..614eb75f2b 100644 --- a/var/spack/repos/builtin/packages/speexdsp/package.py +++ b/var/spack/repos/builtin/packages/speexdsp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Speexdsp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/spfft/package.py b/var/spack/repos/builtin/packages/spfft/package.py index 00381428ed..87eeef2068 100644 --- a/var/spack/repos/builtin/packages/spfft/package.py +++ b/var/spack/repos/builtin/packages/spfft/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spfft(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/spglib/package.py b/var/spack/repos/builtin/packages/spglib/package.py index 6cfa4805a6..5b30948d7e 100644 --- a/var/spack/repos/builtin/packages/spglib/package.py +++ b/var/spack/repos/builtin/packages/spglib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spglib(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sph2pipe/package.py b/var/spack/repos/builtin/packages/sph2pipe/package.py index 23bfdedd9f..115363e15b 100644 --- a/var/spack/repos/builtin/packages/sph2pipe/package.py +++ b/var/spack/repos/builtin/packages/sph2pipe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sph2pipe(CMakePackage): diff --git a/var/spack/repos/builtin/packages/spherepack/package.py b/var/spack/repos/builtin/packages/spherepack/package.py index 5304dd4f71..bc32b77825 100644 --- a/var/spack/repos/builtin/packages/spherepack/package.py +++ b/var/spack/repos/builtin/packages/spherepack/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spherepack(Package): diff --git a/var/spack/repos/builtin/packages/spindle/package.py b/var/spack/repos/builtin/packages/spindle/package.py index 6d145abc4d..877359f349 100644 --- a/var/spack/repos/builtin/packages/spindle/package.py +++ b/var/spack/repos/builtin/packages/spindle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spindle(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/spiner/package.py b/var/spack/repos/builtin/packages/spiner/package.py index bc1d1d7572..5fbec3c869 100644 --- a/var/spack/repos/builtin/packages/spiner/package.py +++ b/var/spack/repos/builtin/packages/spiner/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spiner(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/spiral-package-fftx/package.py b/var/spack/repos/builtin/packages/spiral-package-fftx/package.py index d7dd6603ce..c3bae59d6b 100644 --- a/var/spack/repos/builtin/packages/spiral-package-fftx/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-fftx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpiralPackageFftx(Package): diff --git a/var/spack/repos/builtin/packages/spiral-package-hcol/package.py b/var/spack/repos/builtin/packages/spiral-package-hcol/package.py index 1dbd0385c3..1f38190e3b 100644 --- a/var/spack/repos/builtin/packages/spiral-package-hcol/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-hcol/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpiralPackageHcol(Package): diff --git a/var/spack/repos/builtin/packages/spiral-package-mpi/package.py b/var/spack/repos/builtin/packages/spiral-package-mpi/package.py index 8ee226ceb7..15bb9a5642 100644 --- a/var/spack/repos/builtin/packages/spiral-package-mpi/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-mpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpiralPackageMpi(Package): diff --git a/var/spack/repos/builtin/packages/spiral-package-simt/package.py b/var/spack/repos/builtin/packages/spiral-package-simt/package.py index 1e8c1eb472..b4257e8bc0 100644 --- a/var/spack/repos/builtin/packages/spiral-package-simt/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-simt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpiralPackageSimt(Package): diff --git a/var/spack/repos/builtin/packages/spiral-software/package.py b/var/spack/repos/builtin/packages/spiral-software/package.py index e44cb35e03..428a05d26f 100644 --- a/var/spack/repos/builtin/packages/spiral-software/package.py +++ b/var/spack/repos/builtin/packages/spiral-software/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SpiralSoftware(CMakePackage): diff --git a/var/spack/repos/builtin/packages/spla/package.py b/var/spack/repos/builtin/packages/spla/package.py index a3467f8d91..5c6ffc1163 100644 --- a/var/spack/repos/builtin/packages/spla/package.py +++ b/var/spack/repos/builtin/packages/spla/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spla(CMakePackage): diff --git a/var/spack/repos/builtin/packages/spm/package.py b/var/spack/repos/builtin/packages/spm/package.py index 462ba3a0eb..f538b52f0e 100644 --- a/var/spack/repos/builtin/packages/spm/package.py +++ b/var/spack/repos/builtin/packages/spm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Spm(Package): diff --git a/var/spack/repos/builtin/packages/spot/package.py b/var/spack/repos/builtin/packages/spot/package.py index 4cabcb0570..83e4de422f 100644 --- a/var/spack/repos/builtin/packages/spot/package.py +++ b/var/spack/repos/builtin/packages/spot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/sprng/package.py b/var/spack/repos/builtin/packages/sprng/package.py index bcee17d87c..3b10b638cc 100644 --- a/var/spack/repos/builtin/packages/sprng/package.py +++ b/var/spack/repos/builtin/packages/sprng/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sprng(AutotoolsPackage): """SPRNG: A Scalable Library For Pseudorandom Number Generation Sprng is a distributed process-aware random number generator that diff --git a/var/spack/repos/builtin/packages/sqlcipher/package.py b/var/spack/repos/builtin/packages/sqlcipher/package.py index 26c493fef9..084b299be2 100644 --- a/var/spack/repos/builtin/packages/sqlcipher/package.py +++ b/var/spack/repos/builtin/packages/sqlcipher/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sqlcipher(AutotoolsPackage): """SQLCipher is an SQLite extension that provides 256 bit AES encryption of database files. diff --git a/var/spack/repos/builtin/packages/sqlite-jdbc/package.py b/var/spack/repos/builtin/packages/sqlite-jdbc/package.py index b26eab1563..b99cc0635b 100644 --- a/var/spack/repos/builtin/packages/sqlite-jdbc/package.py +++ b/var/spack/repos/builtin/packages/sqlite-jdbc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SqliteJdbc(MavenPackage): diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index 7591fdef3b..93c582b28a 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -7,6 +7,7 @@ import re from tempfile import NamedTemporaryFile import spack.platforms +from spack.package import * class Sqlite(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sqlitebrowser/package.py b/var/spack/repos/builtin/packages/sqlitebrowser/package.py index bbe3d90765..d3afcede9f 100644 --- a/var/spack/repos/builtin/packages/sqlitebrowser/package.py +++ b/var/spack/repos/builtin/packages/sqlitebrowser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sqlitebrowser(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sqoop/package.py b/var/spack/repos/builtin/packages/sqoop/package.py index d5bbfed415..3fe586628c 100644 --- a/var/spack/repos/builtin/packages/sqoop/package.py +++ b/var/spack/repos/builtin/packages/sqoop/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sqoop(MavenPackage): """Apache Sqoop is a tool designed for efficiently transferring bulk data between Apache Hadoop and structured datastores such as relational diff --git a/var/spack/repos/builtin/packages/squashfs/package.py b/var/spack/repos/builtin/packages/squashfs/package.py index b0a0fba798..7561cb175d 100644 --- a/var/spack/repos/builtin/packages/squashfs/package.py +++ b/var/spack/repos/builtin/packages/squashfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Squashfs(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/squashfuse/package.py b/var/spack/repos/builtin/packages/squashfuse/package.py index a6af861658..7ea6222f35 100644 --- a/var/spack/repos/builtin/packages/squashfuse/package.py +++ b/var/spack/repos/builtin/packages/squashfuse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Squashfuse(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/squid/package.py b/var/spack/repos/builtin/packages/squid/package.py index 21e427718b..c215ed9091 100644 --- a/var/spack/repos/builtin/packages/squid/package.py +++ b/var/spack/repos/builtin/packages/squid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Squid(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sratoolkit/package.py b/var/spack/repos/builtin/packages/sratoolkit/package.py index 3d0efb69b9..ea65e524de 100644 --- a/var/spack/repos/builtin/packages/sratoolkit/package.py +++ b/var/spack/repos/builtin/packages/sratoolkit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sratoolkit(Package): diff --git a/var/spack/repos/builtin/packages/srilm/package.py b/var/spack/repos/builtin/packages/srilm/package.py index 574e605fe2..9b80aebfaa 100644 --- a/var/spack/repos/builtin/packages/srilm/package.py +++ b/var/spack/repos/builtin/packages/srilm/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Srilm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sse2neon/package.py b/var/spack/repos/builtin/packages/sse2neon/package.py index 0dabb1dd66..31fba8729e 100644 --- a/var/spack/repos/builtin/packages/sse2neon/package.py +++ b/var/spack/repos/builtin/packages/sse2neon/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sse2neon(Package): """A C/C++ header file that converts Intel SSE intrinsics to Arm/Aarch64 NEON intrinsics.""" diff --git a/var/spack/repos/builtin/packages/sshfs/package.py b/var/spack/repos/builtin/packages/sshfs/package.py index 19d784f833..ca45326c52 100644 --- a/var/spack/repos/builtin/packages/sshfs/package.py +++ b/var/spack/repos/builtin/packages/sshfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sshfs(MesonPackage): diff --git a/var/spack/repos/builtin/packages/sshpass/package.py b/var/spack/repos/builtin/packages/sshpass/package.py index 9fc43bf308..e34fad8c3b 100644 --- a/var/spack/repos/builtin/packages/sshpass/package.py +++ b/var/spack/repos/builtin/packages/sshpass/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sshpass(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ssht/package.py b/var/spack/repos/builtin/packages/ssht/package.py index 1339848ae7..26a506562e 100644 --- a/var/spack/repos/builtin/packages/ssht/package.py +++ b/var/spack/repos/builtin/packages/ssht/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ssht(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ssmtp/package.py b/var/spack/repos/builtin/packages/ssmtp/package.py index 00be34218b..13cef88247 100644 --- a/var/spack/repos/builtin/packages/ssmtp/package.py +++ b/var/spack/repos/builtin/packages/ssmtp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Ssmtp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sspace-longread/package.py b/var/spack/repos/builtin/packages/sspace-longread/package.py index d841c591ad..d3a6dca8fd 100644 --- a/var/spack/repos/builtin/packages/sspace-longread/package.py +++ b/var/spack/repos/builtin/packages/sspace-longread/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class SspaceLongread(Package): diff --git a/var/spack/repos/builtin/packages/sspace-standard/package.py b/var/spack/repos/builtin/packages/sspace-standard/package.py index 4da20ec644..7dd1fd18d3 100644 --- a/var/spack/repos/builtin/packages/sspace-standard/package.py +++ b/var/spack/repos/builtin/packages/sspace-standard/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class SspaceStandard(Package): diff --git a/var/spack/repos/builtin/packages/sst-core/package.py b/var/spack/repos/builtin/packages/sst-core/package.py index 0df437203e..0870aae646 100644 --- a/var/spack/repos/builtin/packages/sst-core/package.py +++ b/var/spack/repos/builtin/packages/sst-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SstCore(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sst-dumpi/package.py b/var/spack/repos/builtin/packages/sst-dumpi/package.py index 90ba9b6845..1dc2d780bd 100644 --- a/var/spack/repos/builtin/packages/sst-dumpi/package.py +++ b/var/spack/repos/builtin/packages/sst-dumpi/package.py @@ -3,11 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -# Author: Samuel Knight <sknigh@sandia.gov> -# Date: Feb 3, 2017 -# -from spack import * +from spack.package import * class SstDumpi(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sst-elements/package.py b/var/spack/repos/builtin/packages/sst-elements/package.py index 73f042f5f1..ec9f9bc460 100644 --- a/var/spack/repos/builtin/packages/sst-elements/package.py +++ b/var/spack/repos/builtin/packages/sst-elements/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SstElements(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index 8a77ed255d..c3604c090b 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SstMacro(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sst-transports/package.py b/var/spack/repos/builtin/packages/sst-transports/package.py index b3c4d0e8da..e5221a4564 100644 --- a/var/spack/repos/builtin/packages/sst-transports/package.py +++ b/var/spack/repos/builtin/packages/sst-transports/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SstTransports(CMakePackage): diff --git a/var/spack/repos/builtin/packages/stacks/package.py b/var/spack/repos/builtin/packages/stacks/package.py index 16f05620b5..5c865e9fd6 100644 --- a/var/spack/repos/builtin/packages/stacks/package.py +++ b/var/spack/repos/builtin/packages/stacks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Stacks(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/staden-io-lib/package.py b/var/spack/repos/builtin/packages/staden-io-lib/package.py index 281b898c9f..dbf54c10c1 100644 --- a/var/spack/repos/builtin/packages/staden-io-lib/package.py +++ b/var/spack/repos/builtin/packages/staden-io-lib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class StadenIoLib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/star-ccm-plus/package.py b/var/spack/repos/builtin/packages/star-ccm-plus/package.py index eafa6d8202..d5d8af215b 100644 --- a/var/spack/repos/builtin/packages/star-ccm-plus/package.py +++ b/var/spack/repos/builtin/packages/star-ccm-plus/package.py @@ -7,7 +7,7 @@ import glob import os import re -from spack import * +from spack.package import * class StarCcmPlus(Package): diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index 635058c0ca..0596e78796 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Star(Package): diff --git a/var/spack/repos/builtin/packages/starlight/package.py b/var/spack/repos/builtin/packages/starlight/package.py index 5530289191..2fdd95b4c9 100644 --- a/var/spack/repos/builtin/packages/starlight/package.py +++ b/var/spack/repos/builtin/packages/starlight/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Starlight(CMakePackage): diff --git a/var/spack/repos/builtin/packages/starpu/package.py b/var/spack/repos/builtin/packages/starpu/package.py index d823d6ae61..73810bb677 100644 --- a/var/spack/repos/builtin/packages/starpu/package.py +++ b/var/spack/repos/builtin/packages/starpu/package.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +from spack.package import * + class Starpu(AutotoolsPackage): """StarPU runtime system diff --git a/var/spack/repos/builtin/packages/startup-notification/package.py b/var/spack/repos/builtin/packages/startup-notification/package.py index e966d41edb..b3c470f8fe 100644 --- a/var/spack/repos/builtin/packages/startup-notification/package.py +++ b/var/spack/repos/builtin/packages/startup-notification/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class StartupNotification(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index 9cda55b703..052ed218e0 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/stata/package.py b/var/spack/repos/builtin/packages/stata/package.py index 1603635b01..c3b0430356 100644 --- a/var/spack/repos/builtin/packages/stata/package.py +++ b/var/spack/repos/builtin/packages/stata/package.py @@ -6,7 +6,7 @@ import os from datetime import datetime -from spack import * +from spack.package import * class Stata(Package): diff --git a/var/spack/repos/builtin/packages/static-analysis-suite/package.py b/var/spack/repos/builtin/packages/static-analysis-suite/package.py index 1ba14e738e..f5ad51eda8 100644 --- a/var/spack/repos/builtin/packages/static-analysis-suite/package.py +++ b/var/spack/repos/builtin/packages/static-analysis-suite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class StaticAnalysisSuite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py index ab294c6f53..65fd7e4cdb 100644 --- a/var/spack/repos/builtin/packages/stc/package.py +++ b/var/spack/repos/builtin/packages/stc/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Stc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/steps/package.py b/var/spack/repos/builtin/packages/steps/package.py index 376343fb1e..f225d02cfd 100644 --- a/var/spack/repos/builtin/packages/steps/package.py +++ b/var/spack/repos/builtin/packages/steps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Steps(CMakePackage): diff --git a/var/spack/repos/builtin/packages/stinger/package.py b/var/spack/repos/builtin/packages/stinger/package.py index db52c33348..abd8ed3e65 100644 --- a/var/spack/repos/builtin/packages/stinger/package.py +++ b/var/spack/repos/builtin/packages/stinger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Stinger(CMakePackage): diff --git a/var/spack/repos/builtin/packages/storm/package.py b/var/spack/repos/builtin/packages/storm/package.py index 4bb4ee4144..712827edbb 100644 --- a/var/spack/repos/builtin/packages/storm/package.py +++ b/var/spack/repos/builtin/packages/storm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Storm(Package): diff --git a/var/spack/repos/builtin/packages/stow/package.py b/var/spack/repos/builtin/packages/stow/package.py index 8c473c15f6..a26f62d1a6 100644 --- a/var/spack/repos/builtin/packages/stow/package.py +++ b/var/spack/repos/builtin/packages/stow/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Stow(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/strace/package.py b/var/spack/repos/builtin/packages/strace/package.py index 0f1d97c858..f0c98f503d 100644 --- a/var/spack/repos/builtin/packages/strace/package.py +++ b/var/spack/repos/builtin/packages/strace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Strace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/stream/package.py b/var/spack/repos/builtin/packages/stream/package.py index 5bfe84be36..3d55ac3878 100644 --- a/var/spack/repos/builtin/packages/stream/package.py +++ b/var/spack/repos/builtin/packages/stream/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Stream(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/strelka/package.py b/var/spack/repos/builtin/packages/strelka/package.py index f3314eb0cc..19ae0e81cb 100644 --- a/var/spack/repos/builtin/packages/strelka/package.py +++ b/var/spack/repos/builtin/packages/strelka/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Strelka(CMakePackage): diff --git a/var/spack/repos/builtin/packages/stress-ng/package.py b/var/spack/repos/builtin/packages/stress-ng/package.py index d048f60f1f..a9bd7b5167 100644 --- a/var/spack/repos/builtin/packages/stress-ng/package.py +++ b/var/spack/repos/builtin/packages/stress-ng/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class StressNg(MakefilePackage): """stress-ng will stress test a computer system in various selectable ways. It was designed to exercise various physical diff --git a/var/spack/repos/builtin/packages/stress/package.py b/var/spack/repos/builtin/packages/stress/package.py index 5f0a6ecb0c..e1053e88bb 100644 --- a/var/spack/repos/builtin/packages/stress/package.py +++ b/var/spack/repos/builtin/packages/stress/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Stress(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/string-view-lite/package.py b/var/spack/repos/builtin/packages/string-view-lite/package.py index 4212109509..e48cb605c0 100644 --- a/var/spack/repos/builtin/packages/string-view-lite/package.py +++ b/var/spack/repos/builtin/packages/string-view-lite/package.py @@ -5,7 +5,7 @@ from shutil import copytree -from spack import * +from spack.package import * class StringViewLite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/stringtie/package.py b/var/spack/repos/builtin/packages/stringtie/package.py index 495ac83f53..10ba057d9e 100644 --- a/var/spack/repos/builtin/packages/stringtie/package.py +++ b/var/spack/repos/builtin/packages/stringtie/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Stringtie(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/stripack/package.py b/var/spack/repos/builtin/packages/stripack/package.py index bc165f4787..8b3b68dda4 100644 --- a/var/spack/repos/builtin/packages/stripack/package.py +++ b/var/spack/repos/builtin/packages/stripack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Stripack(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/structure/package.py b/var/spack/repos/builtin/packages/structure/package.py index 44e454d04e..02b867af81 100644 --- a/var/spack/repos/builtin/packages/structure/package.py +++ b/var/spack/repos/builtin/packages/structure/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Structure(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index 10b8cfa090..bc684a62a4 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -3,9 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.util.environment import set_env -from spack.util.executable import which class Strumpack(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/su2/package.py b/var/spack/repos/builtin/packages/su2/package.py index f0a318d412..e979fe4f67 100644 --- a/var/spack/repos/builtin/packages/su2/package.py +++ b/var/spack/repos/builtin/packages/su2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Su2(MesonPackage): diff --git a/var/spack/repos/builtin/packages/sublime-text/package.py b/var/spack/repos/builtin/packages/sublime-text/package.py index fd88b66d22..5c585b4300 100644 --- a/var/spack/repos/builtin/packages/sublime-text/package.py +++ b/var/spack/repos/builtin/packages/sublime-text/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SublimeText(Package): diff --git a/var/spack/repos/builtin/packages/subread/package.py b/var/spack/repos/builtin/packages/subread/package.py index e1f14d9ead..e58f489080 100644 --- a/var/spack/repos/builtin/packages/subread/package.py +++ b/var/spack/repos/builtin/packages/subread/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Subread(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/subversion/package.py b/var/spack/repos/builtin/packages/subversion/package.py index b1f4df6f33..a69d0f3c5f 100644 --- a/var/spack/repos/builtin/packages/subversion/package.py +++ b/var/spack/repos/builtin/packages/subversion/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Subversion(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 41d101de52..091139db3f 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SuiteSparse(Package): diff --git a/var/spack/repos/builtin/packages/sumaclust/package.py b/var/spack/repos/builtin/packages/sumaclust/package.py index ed6df0858f..3d60fc8c28 100644 --- a/var/spack/repos/builtin/packages/sumaclust/package.py +++ b/var/spack/repos/builtin/packages/sumaclust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sumaclust(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sumo/package.py b/var/spack/repos/builtin/packages/sumo/package.py index 337ed2eaec..def5519273 100644 --- a/var/spack/repos/builtin/packages/sumo/package.py +++ b/var/spack/repos/builtin/packages/sumo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sumo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 3cb4f3323d..75086b1b5f 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -8,7 +8,7 @@ import sys from llnl.util import tty -from spack import * +from spack.package import * class Sundials(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/suntans/package.py b/var/spack/repos/builtin/packages/suntans/package.py index 9678525b37..6a96a13f33 100644 --- a/var/spack/repos/builtin/packages/suntans/package.py +++ b/var/spack/repos/builtin/packages/suntans/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Suntans(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/superchic/package.py b/var/spack/repos/builtin/packages/superchic/package.py index 84ab5860c0..f60959a07f 100644 --- a/var/spack/repos/builtin/packages/superchic/package.py +++ b/var/spack/repos/builtin/packages/superchic/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Superchic(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 565ec5d380..34dbcb1322 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/superlu-mt/package.py b/var/spack/repos/builtin/packages/superlu-mt/package.py index 300a2c5f88..1f9b10f264 100644 --- a/var/spack/repos/builtin/packages/superlu-mt/package.py +++ b/var/spack/repos/builtin/packages/superlu-mt/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class SuperluMt(Package): diff --git a/var/spack/repos/builtin/packages/superlu/package.py b/var/spack/repos/builtin/packages/superlu/package.py index 9527c650b3..1204ec9e28 100644 --- a/var/spack/repos/builtin/packages/superlu/package.py +++ b/var/spack/repos/builtin/packages/superlu/package.py @@ -7,6 +7,8 @@ import os from llnl.util import tty +from spack.package import * + class Superlu(CMakePackage): """SuperLU is a general purpose library for the direct solution of large, diff --git a/var/spack/repos/builtin/packages/supernova/package.py b/var/spack/repos/builtin/packages/supernova/package.py index 02de85715d..f13fcdabbb 100644 --- a/var/spack/repos/builtin/packages/supernova/package.py +++ b/var/spack/repos/builtin/packages/supernova/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Supernova(Package): diff --git a/var/spack/repos/builtin/packages/survey/package.py b/var/spack/repos/builtin/packages/survey/package.py index 64428ec874..234374b2e1 100644 --- a/var/spack/repos/builtin/packages/survey/package.py +++ b/var/spack/repos/builtin/packages/survey/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Survey(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sw4lite/package.py b/var/spack/repos/builtin/packages/sw4lite/package.py index 6b9f43dab1..c536a30f55 100644 --- a/var/spack/repos/builtin/packages/sw4lite/package.py +++ b/var/spack/repos/builtin/packages/sw4lite/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Sw4lite(MakefilePackage, CudaPackage): """Sw4lite is a bare bone version of SW4 intended for testing performance optimizations in a few important numerical kernels of SW4.""" diff --git a/var/spack/repos/builtin/packages/swan/package.py b/var/spack/repos/builtin/packages/swan/package.py index b82d8f7d32..f7c8f7dd21 100644 --- a/var/spack/repos/builtin/packages/swan/package.py +++ b/var/spack/repos/builtin/packages/swan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Swan(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/swap-assembler/package.py b/var/spack/repos/builtin/packages/swap-assembler/package.py index c1530cfba8..17bb8d75f0 100644 --- a/var/spack/repos/builtin/packages/swap-assembler/package.py +++ b/var/spack/repos/builtin/packages/swap-assembler/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SwapAssembler(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/swarm/package.py b/var/spack/repos/builtin/packages/swarm/package.py index dd1c6b219f..d4d405fbc3 100644 --- a/var/spack/repos/builtin/packages/swarm/package.py +++ b/var/spack/repos/builtin/packages/swarm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Swarm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py index 24ebfca390..6a55a5a64f 100644 --- a/var/spack/repos/builtin/packages/swfft/package.py +++ b/var/spack/repos/builtin/packages/swfft/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Swfft(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/swftools/package.py b/var/spack/repos/builtin/packages/swftools/package.py index dcb12e58e3..10eec879cb 100644 --- a/var/spack/repos/builtin/packages/swftools/package.py +++ b/var/spack/repos/builtin/packages/swftools/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Swftools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py index ad31864ea7..2bfaed3552 100644 --- a/var/spack/repos/builtin/packages/swiftsim/package.py +++ b/var/spack/repos/builtin/packages/swiftsim/package.py @@ -5,7 +5,7 @@ import llnl.util.tty as tty -from spack import * +from spack.package import * class Swiftsim(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py index b8605696fb..30c00eb7c0 100644 --- a/var/spack/repos/builtin/packages/swig/package.py +++ b/var/spack/repos/builtin/packages/swig/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Swig(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/swipl/package.py b/var/spack/repos/builtin/packages/swipl/package.py index e31992ae72..2b3be29fd2 100644 --- a/var/spack/repos/builtin/packages/swipl/package.py +++ b/var/spack/repos/builtin/packages/swipl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Swipl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py index 8a2cae617f..28ecc89bce 100644 --- a/var/spack/repos/builtin/packages/symengine/package.py +++ b/var/spack/repos/builtin/packages/symengine/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/symlinks/package.py b/var/spack/repos/builtin/packages/symlinks/package.py index fa220fdb7f..88d0ba511b 100644 --- a/var/spack/repos/builtin/packages/symlinks/package.py +++ b/var/spack/repos/builtin/packages/symlinks/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Symlinks(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sympol/package.py b/var/spack/repos/builtin/packages/sympol/package.py index 4362d3225f..c5df2f2da9 100644 --- a/var/spack/repos/builtin/packages/sympol/package.py +++ b/var/spack/repos/builtin/packages/sympol/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/sys-sage/package.py b/var/spack/repos/builtin/packages/sys-sage/package.py index 9b077520e0..35ee51a060 100644 --- a/var/spack/repos/builtin/packages/sys-sage/package.py +++ b/var/spack/repos/builtin/packages/sys-sage/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class SysSage(CMakePackage): diff --git a/var/spack/repos/builtin/packages/sysbench/package.py b/var/spack/repos/builtin/packages/sysbench/package.py index 518b534fd4..b69af52fac 100644 --- a/var/spack/repos/builtin/packages/sysbench/package.py +++ b/var/spack/repos/builtin/packages/sysbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sysbench(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/syscalc/package.py b/var/spack/repos/builtin/packages/syscalc/package.py index ac8f3bd550..3cf6bd5739 100644 --- a/var/spack/repos/builtin/packages/syscalc/package.py +++ b/var/spack/repos/builtin/packages/syscalc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Syscalc(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sysfsutils/package.py b/var/spack/repos/builtin/packages/sysfsutils/package.py index 05b79d1ce9..8ba56d1d91 100644 --- a/var/spack/repos/builtin/packages/sysfsutils/package.py +++ b/var/spack/repos/builtin/packages/sysfsutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sysfsutils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sysget/package.py b/var/spack/repos/builtin/packages/sysget/package.py index b9820bfd02..4a7e094dec 100644 --- a/var/spack/repos/builtin/packages/sysget/package.py +++ b/var/spack/repos/builtin/packages/sysget/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Sysget(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/sysstat/package.py b/var/spack/repos/builtin/packages/sysstat/package.py index 6888accc66..f5ceca274a 100644 --- a/var/spack/repos/builtin/packages/sysstat/package.py +++ b/var/spack/repos/builtin/packages/sysstat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sysstat(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/systemc/package.py b/var/spack/repos/builtin/packages/systemc/package.py index eeeb6fa24d..1ac2b895f1 100644 --- a/var/spack/repos/builtin/packages/systemc/package.py +++ b/var/spack/repos/builtin/packages/systemc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Systemc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/systemtap/package.py b/var/spack/repos/builtin/packages/systemtap/package.py index dcccd9e202..6af2bef76d 100644 --- a/var/spack/repos/builtin/packages/systemtap/package.py +++ b/var/spack/repos/builtin/packages/systemtap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Systemtap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index 702e0f7d72..12c8c054ac 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Sz(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tabix/package.py b/var/spack/repos/builtin/packages/tabix/package.py index d2de826309..84872b3262 100644 --- a/var/spack/repos/builtin/packages/tabix/package.py +++ b/var/spack/repos/builtin/packages/tabix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tabix(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/tajo/package.py b/var/spack/repos/builtin/packages/tajo/package.py index 9b30bc1ccd..58adaf8605 100644 --- a/var/spack/repos/builtin/packages/tajo/package.py +++ b/var/spack/repos/builtin/packages/tajo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tajo(Package): diff --git a/var/spack/repos/builtin/packages/talass/package.py b/var/spack/repos/builtin/packages/talass/package.py index 426447cf89..7a0f60fb37 100644 --- a/var/spack/repos/builtin/packages/talass/package.py +++ b/var/spack/repos/builtin/packages/talass/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Talass(CMakePackage): diff --git a/var/spack/repos/builtin/packages/talloc/package.py b/var/spack/repos/builtin/packages/talloc/package.py index c1d2a6627e..d5dc862330 100644 --- a/var/spack/repos/builtin/packages/talloc/package.py +++ b/var/spack/repos/builtin/packages/talloc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Talloc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tamaas/package.py b/var/spack/repos/builtin/packages/tamaas/package.py index e4f51d820d..676f39fd5a 100644 --- a/var/spack/repos/builtin/packages/tamaas/package.py +++ b/var/spack/repos/builtin/packages/tamaas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tamaas(SConsPackage): diff --git a/var/spack/repos/builtin/packages/tangram/package.py b/var/spack/repos/builtin/packages/tangram/package.py index 0d0a37b307..1867b7ad26 100644 --- a/var/spack/repos/builtin/packages/tangram/package.py +++ b/var/spack/repos/builtin/packages/tangram/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tangram(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tantan/package.py b/var/spack/repos/builtin/packages/tantan/package.py index ef49372da7..28fd849ac7 100644 --- a/var/spack/repos/builtin/packages/tantan/package.py +++ b/var/spack/repos/builtin/packages/tantan/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tantan(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/tar/package.py b/var/spack/repos/builtin/packages/tar/package.py index 8991be9a51..c1c100707b 100644 --- a/var/spack/repos/builtin/packages/tar/package.py +++ b/var/spack/repos/builtin/packages/tar/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Tar(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/targetp/package.py b/var/spack/repos/builtin/packages/targetp/package.py index f5fd7bbf82..8dd91004a6 100644 --- a/var/spack/repos/builtin/packages/targetp/package.py +++ b/var/spack/repos/builtin/packages/targetp/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Targetp(Package): diff --git a/var/spack/repos/builtin/packages/task/package.py b/var/spack/repos/builtin/packages/task/package.py index ce151aa6b1..44f212b44a 100644 --- a/var/spack/repos/builtin/packages/task/package.py +++ b/var/spack/repos/builtin/packages/task/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Task(CMakePackage): diff --git a/var/spack/repos/builtin/packages/taskd/package.py b/var/spack/repos/builtin/packages/taskd/package.py index 2f907476b8..13d5813029 100644 --- a/var/spack/repos/builtin/packages/taskd/package.py +++ b/var/spack/repos/builtin/packages/taskd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Taskd(CMakePackage): diff --git a/var/spack/repos/builtin/packages/taskflow/package.py b/var/spack/repos/builtin/packages/taskflow/package.py index 8549385819..d108e53383 100644 --- a/var/spack/repos/builtin/packages/taskflow/package.py +++ b/var/spack/repos/builtin/packages/taskflow/package.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * from spack.compiler import UnsupportedCompilerFlag +from spack.package import * class Taskflow(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index a957f749f0..bc685b5df5 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -7,7 +7,7 @@ import os from llnl.util import tty -from spack import * +from spack.package import * class Tasmanian(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/tassel/package.py b/var/spack/repos/builtin/packages/tassel/package.py index a580a343ea..c42e960008 100644 --- a/var/spack/repos/builtin/packages/tassel/package.py +++ b/var/spack/repos/builtin/packages/tassel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tassel(Package): diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 4d3d13d7fe..a1069a1517 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -9,9 +9,7 @@ import os import platform import sys -from llnl.util.filesystem import join_path - -from spack import * +from spack.package import * class Tau(Package): diff --git a/var/spack/repos/builtin/packages/tauola/package.py b/var/spack/repos/builtin/packages/tauola/package.py index eb1bb5cb51..51ccf0c141 100644 --- a/var/spack/repos/builtin/packages/tauola/package.py +++ b/var/spack/repos/builtin/packages/tauola/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tauola(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tbl2asn/package.py b/var/spack/repos/builtin/packages/tbl2asn/package.py index f2f1dbd04d..8a839da901 100644 --- a/var/spack/repos/builtin/packages/tbl2asn/package.py +++ b/var/spack/repos/builtin/packages/tbl2asn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tbl2asn(Package): diff --git a/var/spack/repos/builtin/packages/tcl-itcl/package.py b/var/spack/repos/builtin/packages/tcl-itcl/package.py index 88d49271ec..5c06a1a2c3 100644 --- a/var/spack/repos/builtin/packages/tcl-itcl/package.py +++ b/var/spack/repos/builtin/packages/tcl-itcl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TclItcl(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tcl-tcllib/package.py b/var/spack/repos/builtin/packages/tcl-tcllib/package.py index 97ded9044a..4baf73a9f6 100644 --- a/var/spack/repos/builtin/packages/tcl-tcllib/package.py +++ b/var/spack/repos/builtin/packages/tcl-tcllib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TclTcllib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tcl-tclxml/package.py b/var/spack/repos/builtin/packages/tcl-tclxml/package.py index 97bedcb80a..f520b187f1 100644 --- a/var/spack/repos/builtin/packages/tcl-tclxml/package.py +++ b/var/spack/repos/builtin/packages/tcl-tclxml/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TclTclxml(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index f74ed4c73e..db98075e60 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -5,6 +5,7 @@ import os +from spack.package import * from spack.util.environment import is_system_path diff --git a/var/spack/repos/builtin/packages/tclap/package.py b/var/spack/repos/builtin/packages/tclap/package.py index 36eb62df0f..30837c7872 100644 --- a/var/spack/repos/builtin/packages/tclap/package.py +++ b/var/spack/repos/builtin/packages/tclap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tclap(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/tcoffee/package.py b/var/spack/repos/builtin/packages/tcoffee/package.py index 61a6375c9b..083cc1116b 100644 --- a/var/spack/repos/builtin/packages/tcoffee/package.py +++ b/var/spack/repos/builtin/packages/tcoffee/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tcoffee(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/tcpdump/package.py b/var/spack/repos/builtin/packages/tcpdump/package.py index 853fa1aedc..77433a6fec 100644 --- a/var/spack/repos/builtin/packages/tcpdump/package.py +++ b/var/spack/repos/builtin/packages/tcpdump/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tcpdump(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tcptrace/package.py b/var/spack/repos/builtin/packages/tcptrace/package.py index 233a6083c2..a375fb87ae 100644 --- a/var/spack/repos/builtin/packages/tcptrace/package.py +++ b/var/spack/repos/builtin/packages/tcptrace/package.py @@ -5,7 +5,7 @@ from os.path import join -from spack import * +from spack.package import * class Tcptrace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tcsh/package.py b/var/spack/repos/builtin/packages/tcsh/package.py index 7d42728852..ef5076091a 100644 --- a/var/spack/repos/builtin/packages/tcsh/package.py +++ b/var/spack/repos/builtin/packages/tcsh/package.py @@ -3,7 +3,12 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * + + +def fedora_patch(commit, file, **kwargs): + prefix = 'https://src.fedoraproject.org/rpms/tcsh/raw/{0}/f/'.format(commit) + patch('{0}{1}'.format(prefix, file), **kwargs) class Tcsh(AutotoolsPackage): @@ -23,10 +28,6 @@ class Tcsh(AutotoolsPackage): version('6.21.00', sha256='c438325448371f59b12a4c93bfd3f6982e6f79f8c5aef4bc83aac8f62766e972') version('6.20.00', sha256='b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d') - def fedora_patch(commit, file, **kwargs): # noqa - prefix = 'https://src.fedoraproject.org/rpms/tcsh/raw/{0}/f/'.format(commit) - patch('{0}{1}'.format(prefix, file), **kwargs) - # Upstream patches fedora_patch('96b95844cc685b11ed0cc215137e394da4505d41', 'tcsh-6.22.02-avoid-gcc-to-fail.patch', when='@:6.22.02', sha256='392615011adb7afeb0010152409a37b150f03dbde5b534503e9cd7363b742a19') fedora_patch('8a6066c901fb4fc75013dd488ba958387f00c74d', 'tcsh-6.20.00-000-add-all-flags-for-gethost-build.patch', when='@6.20.00', sha256='f8266916189ebbdfbad5c2c28ac00ed25f07be70f054d9830eb84ba84b3d03ef') diff --git a/var/spack/repos/builtin/packages/tdengine/package.py b/var/spack/repos/builtin/packages/tdengine/package.py index 48fb63f02a..e05274ce26 100644 --- a/var/spack/repos/builtin/packages/tdengine/package.py +++ b/var/spack/repos/builtin/packages/tdengine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tdengine(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tealeaf/package.py b/var/spack/repos/builtin/packages/tealeaf/package.py index 213bd9415e..555f2933f6 100644 --- a/var/spack/repos/builtin/packages/tealeaf/package.py +++ b/var/spack/repos/builtin/packages/tealeaf/package.py @@ -6,7 +6,7 @@ import glob -from spack import * +from spack.package import * class Tealeaf(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/teckit/package.py b/var/spack/repos/builtin/packages/teckit/package.py index 2be3871249..8159a30eec 100644 --- a/var/spack/repos/builtin/packages/teckit/package.py +++ b/var/spack/repos/builtin/packages/teckit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Teckit(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tecplot/package.py b/var/spack/repos/builtin/packages/tecplot/package.py index 21706a967b..f1ac96451c 100644 --- a/var/spack/repos/builtin/packages/tecplot/package.py +++ b/var/spack/repos/builtin/packages/tecplot/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Tecplot(Package): diff --git a/var/spack/repos/builtin/packages/telegraf/package.py b/var/spack/repos/builtin/packages/telegraf/package.py index aebe3d42ad..16c9bf5b15 100644 --- a/var/spack/repos/builtin/packages/telegraf/package.py +++ b/var/spack/repos/builtin/packages/telegraf/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Telegraf(MakefilePackage): """Telegraf is an agent for collecting, processing, aggregating, and writing metrics.""" diff --git a/var/spack/repos/builtin/packages/tempestremap/package.py b/var/spack/repos/builtin/packages/tempestremap/package.py index 4332f07331..8f19759711 100644 --- a/var/spack/repos/builtin/packages/tempestremap/package.py +++ b/var/spack/repos/builtin/packages/tempestremap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tempestremap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/templight-tools/package.py b/var/spack/repos/builtin/packages/templight-tools/package.py index 2d637137f8..9955c6db6d 100644 --- a/var/spack/repos/builtin/packages/templight-tools/package.py +++ b/var/spack/repos/builtin/packages/templight-tools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TemplightTools(CMakePackage): diff --git a/var/spack/repos/builtin/packages/templight/package.py b/var/spack/repos/builtin/packages/templight/package.py index 8bfa3c2e64..74a4d59560 100644 --- a/var/spack/repos/builtin/packages/templight/package.py +++ b/var/spack/repos/builtin/packages/templight/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Templight(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tengine/package.py b/var/spack/repos/builtin/packages/tengine/package.py index 281a129c49..ac32b60090 100644 --- a/var/spack/repos/builtin/packages/tengine/package.py +++ b/var/spack/repos/builtin/packages/tengine/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tengine(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tensorflow-serving-client/package.py b/var/spack/repos/builtin/packages/tensorflow-serving-client/package.py index 7bbdaef4db..c7ca30f5f6 100644 --- a/var/spack/repos/builtin/packages/tensorflow-serving-client/package.py +++ b/var/spack/repos/builtin/packages/tensorflow-serving-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TensorflowServingClient(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tensorpipe/package.py b/var/spack/repos/builtin/packages/tensorpipe/package.py index 32a7eb8965..10ddcd393c 100644 --- a/var/spack/repos/builtin/packages/tensorpipe/package.py +++ b/var/spack/repos/builtin/packages/tensorpipe/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tensorpipe(CMakePackage): diff --git a/var/spack/repos/builtin/packages/termcap/package.py b/var/spack/repos/builtin/packages/termcap/package.py index b89d874f9e..1443b437d4 100644 --- a/var/spack/repos/builtin/packages/termcap/package.py +++ b/var/spack/repos/builtin/packages/termcap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Termcap(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tesseract/package.py b/var/spack/repos/builtin/packages/tesseract/package.py index 245af820fa..bde01dddde 100644 --- a/var/spack/repos/builtin/packages/tesseract/package.py +++ b/var/spack/repos/builtin/packages/tesseract/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tesseract(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/testdfsio/package.py b/var/spack/repos/builtin/packages/testdfsio/package.py index 3ccb86e550..c33ded1555 100644 --- a/var/spack/repos/builtin/packages/testdfsio/package.py +++ b/var/spack/repos/builtin/packages/testdfsio/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Testdfsio(MavenPackage): """A corrected and enhanced version of Apache Hadoop TestDFSIO""" diff --git a/var/spack/repos/builtin/packages/testu01/package.py b/var/spack/repos/builtin/packages/testu01/package.py index da13faef34..4c5a32aa4f 100644 --- a/var/spack/repos/builtin/packages/testu01/package.py +++ b/var/spack/repos/builtin/packages/testu01/package.py @@ -5,7 +5,7 @@ from os import chmod -from spack import * +from spack.package import * class Testu01(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tetgen/package.py b/var/spack/repos/builtin/packages/tetgen/package.py index efce6140d9..fd3f1bf9ae 100644 --- a/var/spack/repos/builtin/packages/tetgen/package.py +++ b/var/spack/repos/builtin/packages/tetgen/package.py @@ -6,7 +6,7 @@ import glob -from spack import * +from spack.package import * class Tetgen(Package): diff --git a/var/spack/repos/builtin/packages/tethex/package.py b/var/spack/repos/builtin/packages/tethex/package.py index 2859be691b..5bc2f1fea6 100644 --- a/var/spack/repos/builtin/packages/tethex/package.py +++ b/var/spack/repos/builtin/packages/tethex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tethex(CMakePackage): diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index 32ad2ef1e7..cd6a1980eb 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -6,7 +6,7 @@ import re -from spack import * +from spack.package import * class Texinfo(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py index 21d9889104..6ed8056d22 100644 --- a/var/spack/repos/builtin/packages/texlive/package.py +++ b/var/spack/repos/builtin/packages/texlive/package.py @@ -8,7 +8,7 @@ import platform import re import tempfile -from spack import * +from spack.package import * class Texlive(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/texstudio/package.py b/var/spack/repos/builtin/packages/texstudio/package.py index 002aa869a1..633bacaefa 100644 --- a/var/spack/repos/builtin/packages/texstudio/package.py +++ b/var/spack/repos/builtin/packages/texstudio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Texstudio(QMakePackage): diff --git a/var/spack/repos/builtin/packages/textparser/package.py b/var/spack/repos/builtin/packages/textparser/package.py index ee8a942f62..6cf874437b 100644 --- a/var/spack/repos/builtin/packages/textparser/package.py +++ b/var/spack/repos/builtin/packages/textparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Textparser(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tfel/package.py b/var/spack/repos/builtin/packages/tfel/package.py index b1ec11edfb..307ea5a988 100644 --- a/var/spack/repos/builtin/packages/tfel/package.py +++ b/var/spack/repos/builtin/packages/tfel/package.py @@ -3,12 +3,11 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# Maintainer comments: -# 18/12/2018: fix python detection - -from spack import * +from spack.package import * +# Maintainer comments: +# 18/12/2018: fix python detection class Tfel(CMakePackage): """ The TFEL project is a collaborative development of CEA diff --git a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py index 8b1f553792..2c14dca223 100644 --- a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ThePlatinumSearcher(Package): diff --git a/var/spack/repos/builtin/packages/the-silver-searcher/package.py b/var/spack/repos/builtin/packages/the-silver-searcher/package.py index 2ad2098f9d..6caf9904d0 100644 --- a/var/spack/repos/builtin/packages/the-silver-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-silver-searcher/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TheSilverSearcher(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/thepeg/package.py b/var/spack/repos/builtin/packages/thepeg/package.py index 1e9339d45d..5e5fa23b17 100644 --- a/var/spack/repos/builtin/packages/thepeg/package.py +++ b/var/spack/repos/builtin/packages/thepeg/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/thornado-mini/package.py b/var/spack/repos/builtin/packages/thornado-mini/package.py index ea08b8b7ff..7155b70091 100644 --- a/var/spack/repos/builtin/packages/thornado-mini/package.py +++ b/var/spack/repos/builtin/packages/thornado-mini/package.py @@ -6,7 +6,7 @@ import os -from spack import * +from spack.package import * class ThornadoMini(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py index 8ad5bb80f4..722f8c0e15 100644 --- a/var/spack/repos/builtin/packages/thrift/package.py +++ b/var/spack/repos/builtin/packages/thrift/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/thrust/package.py b/var/spack/repos/builtin/packages/thrust/package.py index 3793d88378..d2916b298f 100644 --- a/var/spack/repos/builtin/packages/thrust/package.py +++ b/var/spack/repos/builtin/packages/thrust/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Thrust(Package): diff --git a/var/spack/repos/builtin/packages/tidy-html5/package.py b/var/spack/repos/builtin/packages/tidy-html5/package.py index 03bc1d7f85..bc0488d19f 100644 --- a/var/spack/repos/builtin/packages/tidy-html5/package.py +++ b/var/spack/repos/builtin/packages/tidy-html5/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TidyHtml5(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tig/package.py b/var/spack/repos/builtin/packages/tig/package.py index 828f9759df..f0020e4d4a 100644 --- a/var/spack/repos/builtin/packages/tig/package.py +++ b/var/spack/repos/builtin/packages/tig/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tig(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/time/package.py b/var/spack/repos/builtin/packages/time/package.py index 1377ab8995..2792863c5d 100644 --- a/var/spack/repos/builtin/packages/time/package.py +++ b/var/spack/repos/builtin/packages/time/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Time(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/timedatex/package.py b/var/spack/repos/builtin/packages/timedatex/package.py index 13cf4e5a71..ec5c0f81b3 100644 --- a/var/spack/repos/builtin/packages/timedatex/package.py +++ b/var/spack/repos/builtin/packages/timedatex/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Timedatex(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/timemory/package.py b/var/spack/repos/builtin/packages/timemory/package.py index e955f13e66..8b257a163c 100644 --- a/var/spack/repos/builtin/packages/timemory/package.py +++ b/var/spack/repos/builtin/packages/timemory/package.py @@ -5,7 +5,7 @@ # # ---------------------------------------------------------------------------- -from spack import * +from spack.package import * class Timemory(CMakePackage, PythonPackage): diff --git a/var/spack/repos/builtin/packages/tini/package.py b/var/spack/repos/builtin/packages/tini/package.py index 4219938961..d268033959 100644 --- a/var/spack/repos/builtin/packages/tini/package.py +++ b/var/spack/repos/builtin/packages/tini/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tini(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tinker/package.py b/var/spack/repos/builtin/packages/tinker/package.py index 0f49ec59a9..083cd5ae16 100644 --- a/var/spack/repos/builtin/packages/tinker/package.py +++ b/var/spack/repos/builtin/packages/tinker/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tinker(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tinygltf/package.py b/var/spack/repos/builtin/packages/tinygltf/package.py index b92205c860..a2cfba6b68 100644 --- a/var/spack/repos/builtin/packages/tinygltf/package.py +++ b/var/spack/repos/builtin/packages/tinygltf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tinygltf(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tinyobjloader/package.py b/var/spack/repos/builtin/packages/tinyobjloader/package.py index b9976a9c6a..1c4926361d 100644 --- a/var/spack/repos/builtin/packages/tinyobjloader/package.py +++ b/var/spack/repos/builtin/packages/tinyobjloader/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tinyobjloader(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tinyxml/package.py b/var/spack/repos/builtin/packages/tinyxml/package.py index 1dab0c2a3d..c14aea9e05 100644 --- a/var/spack/repos/builtin/packages/tinyxml/package.py +++ b/var/spack/repos/builtin/packages/tinyxml/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Tinyxml(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tinyxml2/package.py b/var/spack/repos/builtin/packages/tinyxml2/package.py index a54fefb060..c0e825778e 100644 --- a/var/spack/repos/builtin/packages/tinyxml2/package.py +++ b/var/spack/repos/builtin/packages/tinyxml2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tinyxml2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py index 7a0bc53e98..0238a82d65 100644 --- a/var/spack/repos/builtin/packages/tioga/package.py +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import sys -from spack import * +from spack.package import * class Tioga(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/tippecanoe/package.py b/var/spack/repos/builtin/packages/tippecanoe/package.py index 30da4bd44d..da466e514f 100644 --- a/var/spack/repos/builtin/packages/tippecanoe/package.py +++ b/var/spack/repos/builtin/packages/tippecanoe/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tippecanoe(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/tiptop/package.py b/var/spack/repos/builtin/packages/tiptop/package.py index 8801b56efc..7ec0c2e9b4 100644 --- a/var/spack/repos/builtin/packages/tiptop/package.py +++ b/var/spack/repos/builtin/packages/tiptop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tiptop(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tix/package.py b/var/spack/repos/builtin/packages/tix/package.py index 4220df70da..40f906661b 100644 --- a/var/spack/repos/builtin/packages/tix/package.py +++ b/var/spack/repos/builtin/packages/tix/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Tix(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tixi/package.py b/var/spack/repos/builtin/packages/tixi/package.py index cdf6d39d4d..6fa4693c2c 100644 --- a/var/spack/repos/builtin/packages/tixi/package.py +++ b/var/spack/repos/builtin/packages/tixi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tixi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py index fe4b09a9a5..29e217bde7 100644 --- a/var/spack/repos/builtin/packages/tk/package.py +++ b/var/spack/repos/builtin/packages/tk/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Tk(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/tkrzw/package.py b/var/spack/repos/builtin/packages/tkrzw/package.py index b1fe2d6407..69438de3cc 100644 --- a/var/spack/repos/builtin/packages/tkrzw/package.py +++ b/var/spack/repos/builtin/packages/tkrzw/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tkrzw(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tldd/package.py b/var/spack/repos/builtin/packages/tldd/package.py index ba1f1a7028..e40c92d443 100644 --- a/var/spack/repos/builtin/packages/tldd/package.py +++ b/var/spack/repos/builtin/packages/tldd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tldd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/tmalign/package.py b/var/spack/repos/builtin/packages/tmalign/package.py index 681eb2c9ab..20b36d39fa 100644 --- a/var/spack/repos/builtin/packages/tmalign/package.py +++ b/var/spack/repos/builtin/packages/tmalign/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tmalign(Package): diff --git a/var/spack/repos/builtin/packages/tmhmm/package.py b/var/spack/repos/builtin/packages/tmhmm/package.py index 14a5c77106..929557ef9f 100644 --- a/var/spack/repos/builtin/packages/tmhmm/package.py +++ b/var/spack/repos/builtin/packages/tmhmm/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Tmhmm(Package): diff --git a/var/spack/repos/builtin/packages/tmux/package.py b/var/spack/repos/builtin/packages/tmux/package.py index f20a3fb18a..1108e2474f 100644 --- a/var/spack/repos/builtin/packages/tmux/package.py +++ b/var/spack/repos/builtin/packages/tmux/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tmux(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tomcat/package.py b/var/spack/repos/builtin/packages/tomcat/package.py index 692f49512e..49ed980293 100644 --- a/var/spack/repos/builtin/packages/tomcat/package.py +++ b/var/spack/repos/builtin/packages/tomcat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tomcat(Package): diff --git a/var/spack/repos/builtin/packages/toml11/package.py b/var/spack/repos/builtin/packages/toml11/package.py index ae55d03e3e..0e9af2751a 100644 --- a/var/spack/repos/builtin/packages/toml11/package.py +++ b/var/spack/repos/builtin/packages/toml11/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Toml11(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tophat/package.py b/var/spack/repos/builtin/packages/tophat/package.py index b36838be61..f1ec46f7f2 100644 --- a/var/spack/repos/builtin/packages/tophat/package.py +++ b/var/spack/repos/builtin/packages/tophat/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tophat(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/torque/package.py b/var/spack/repos/builtin/packages/torque/package.py index 6d7908fbc9..416f4a22ef 100644 --- a/var/spack/repos/builtin/packages/torque/package.py +++ b/var/spack/repos/builtin/packages/torque/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Torque(Package): diff --git a/var/spack/repos/builtin/packages/totalview/package.py b/var/spack/repos/builtin/packages/totalview/package.py index e2eb6c9b33..62d1d94ac0 100644 --- a/var/spack/repos/builtin/packages/totalview/package.py +++ b/var/spack/repos/builtin/packages/totalview/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Totalview(Package): diff --git a/var/spack/repos/builtin/packages/tpm2-tss/package.py b/var/spack/repos/builtin/packages/tpm2-tss/package.py index f0916029f0..508af2506e 100644 --- a/var/spack/repos/builtin/packages/tpm2-tss/package.py +++ b/var/spack/repos/builtin/packages/tpm2-tss/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tpm2Tss(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tppred/package.py b/var/spack/repos/builtin/packages/tppred/package.py index 98115420bd..a8389a8547 100644 --- a/var/spack/repos/builtin/packages/tppred/package.py +++ b/var/spack/repos/builtin/packages/tppred/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tppred(Package): diff --git a/var/spack/repos/builtin/packages/tracer/package.py b/var/spack/repos/builtin/packages/tracer/package.py index 0a6d13616c..0c2b92d6df 100644 --- a/var/spack/repos/builtin/packages/tracer/package.py +++ b/var/spack/repos/builtin/packages/tracer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tracer(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/tracy-client/package.py b/var/spack/repos/builtin/packages/tracy-client/package.py index c8b84f2fff..af8d96a5c4 100644 --- a/var/spack/repos/builtin/packages/tracy-client/package.py +++ b/var/spack/repos/builtin/packages/tracy-client/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TracyClient(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tracy/package.py b/var/spack/repos/builtin/packages/tracy/package.py index 51f39b0e5d..9d86d0026d 100644 --- a/var/spack/repos/builtin/packages/tracy/package.py +++ b/var/spack/repos/builtin/packages/tracy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tracy(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/tramonto/package.py b/var/spack/repos/builtin/packages/tramonto/package.py index fb59a03974..e174e47385 100644 --- a/var/spack/repos/builtin/packages/tramonto/package.py +++ b/var/spack/repos/builtin/packages/tramonto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tramonto(CMakePackage): diff --git a/var/spack/repos/builtin/packages/transabyss/package.py b/var/spack/repos/builtin/packages/transabyss/package.py index dbb8c7edbe..759fb4dfa1 100644 --- a/var/spack/repos/builtin/packages/transabyss/package.py +++ b/var/spack/repos/builtin/packages/transabyss/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Transabyss(Package): diff --git a/var/spack/repos/builtin/packages/transdecoder/package.py b/var/spack/repos/builtin/packages/transdecoder/package.py index b6d1bdb877..3afb995cdd 100644 --- a/var/spack/repos/builtin/packages/transdecoder/package.py +++ b/var/spack/repos/builtin/packages/transdecoder/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Transdecoder(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/transposome/package.py b/var/spack/repos/builtin/packages/transposome/package.py index 0762c9480e..6d30d990aa 100644 --- a/var/spack/repos/builtin/packages/transposome/package.py +++ b/var/spack/repos/builtin/packages/transposome/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Transposome(PerlPackage): diff --git a/var/spack/repos/builtin/packages/transrate/package.py b/var/spack/repos/builtin/packages/transrate/package.py index 3fd2ef674a..57cfb7bf73 100644 --- a/var/spack/repos/builtin/packages/transrate/package.py +++ b/var/spack/repos/builtin/packages/transrate/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Transrate(Package): diff --git a/var/spack/repos/builtin/packages/transset/package.py b/var/spack/repos/builtin/packages/transset/package.py index 75bc22cfa8..96641c8231 100644 --- a/var/spack/repos/builtin/packages/transset/package.py +++ b/var/spack/repos/builtin/packages/transset/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Transset(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/trapproto/package.py b/var/spack/repos/builtin/packages/trapproto/package.py index cdb2731e52..377ff9842d 100644 --- a/var/spack/repos/builtin/packages/trapproto/package.py +++ b/var/spack/repos/builtin/packages/trapproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Trapproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/tree-sitter/package.py b/var/spack/repos/builtin/packages/tree-sitter/package.py index 964a5d63d3..9bdd1efedc 100644 --- a/var/spack/repos/builtin/packages/tree-sitter/package.py +++ b/var/spack/repos/builtin/packages/tree-sitter/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TreeSitter(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/tree/package.py b/var/spack/repos/builtin/packages/tree/package.py index 234cc193ff..b5d4230154 100644 --- a/var/spack/repos/builtin/packages/tree/package.py +++ b/var/spack/repos/builtin/packages/tree/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Tree(Package): diff --git a/var/spack/repos/builtin/packages/treelite/package.py b/var/spack/repos/builtin/packages/treelite/package.py index 9e3f8b167b..9a5c646068 100644 --- a/var/spack/repos/builtin/packages/treelite/package.py +++ b/var/spack/repos/builtin/packages/treelite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Treelite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/treesub/package.py b/var/spack/repos/builtin/packages/treesub/package.py index d26999c08d..cb7a9ad4f8 100644 --- a/var/spack/repos/builtin/packages/treesub/package.py +++ b/var/spack/repos/builtin/packages/treesub/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Treesub(Package): diff --git a/var/spack/repos/builtin/packages/trf/package.py b/var/spack/repos/builtin/packages/trf/package.py index 52b95d9569..8823eb9985 100644 --- a/var/spack/repos/builtin/packages/trf/package.py +++ b/var/spack/repos/builtin/packages/trf/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Trf(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/triangle/package.py b/var/spack/repos/builtin/packages/triangle/package.py index 3d2abb767d..a8a1bbd8d9 100644 --- a/var/spack/repos/builtin/packages/triangle/package.py +++ b/var/spack/repos/builtin/packages/triangle/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Triangle(Package): diff --git a/var/spack/repos/builtin/packages/trident/package.py b/var/spack/repos/builtin/packages/trident/package.py index 565ce3c587..72adfb5007 100644 --- a/var/spack/repos/builtin/packages/trident/package.py +++ b/var/spack/repos/builtin/packages/trident/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Trident(Package): diff --git a/var/spack/repos/builtin/packages/trilinos-catalyst-ioss-adapter/package.py b/var/spack/repos/builtin/packages/trilinos-catalyst-ioss-adapter/package.py index be805ef162..9bdc5e0315 100644 --- a/var/spack/repos/builtin/packages/trilinos-catalyst-ioss-adapter/package.py +++ b/var/spack/repos/builtin/packages/trilinos-catalyst-ioss-adapter/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TrilinosCatalystIossAdapter(CMakePackage): diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 2b3f6a7b4b..19215854f3 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -6,10 +6,10 @@ import os import sys -from spack import * from spack.build_environment import dso_suffix from spack.error import NoHeadersError from spack.operating_systems.mac_os import macos_version +from spack.package import * from spack.pkg.builtin.kokkos import Kokkos # Trilinos is complicated to build, as an inspiration a couple of links to diff --git a/var/spack/repos/builtin/packages/trimal/package.py b/var/spack/repos/builtin/packages/trimal/package.py index 64681491ca..021adfd86d 100644 --- a/var/spack/repos/builtin/packages/trimal/package.py +++ b/var/spack/repos/builtin/packages/trimal/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Trimal(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/trimgalore/package.py b/var/spack/repos/builtin/packages/trimgalore/package.py index ea98bd5d31..58351a3db3 100644 --- a/var/spack/repos/builtin/packages/trimgalore/package.py +++ b/var/spack/repos/builtin/packages/trimgalore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Trimgalore(Package): diff --git a/var/spack/repos/builtin/packages/trimmomatic/package.py b/var/spack/repos/builtin/packages/trimmomatic/package.py index 5c80fdde5c..6d806d9f70 100644 --- a/var/spack/repos/builtin/packages/trimmomatic/package.py +++ b/var/spack/repos/builtin/packages/trimmomatic/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Trimmomatic(Package): diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py index b8954493eb..2a34b9a5a3 100644 --- a/var/spack/repos/builtin/packages/trinity/package.py +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Trinity(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/trinotate/package.py b/var/spack/repos/builtin/packages/trinotate/package.py index 0f6303050e..a399207c8e 100644 --- a/var/spack/repos/builtin/packages/trinotate/package.py +++ b/var/spack/repos/builtin/packages/trinotate/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Trinotate(Package): diff --git a/var/spack/repos/builtin/packages/trnascan-se/package.py b/var/spack/repos/builtin/packages/trnascan-se/package.py index 6c625695c6..a08009be41 100644 --- a/var/spack/repos/builtin/packages/trnascan-se/package.py +++ b/var/spack/repos/builtin/packages/trnascan-se/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class TrnascanSe(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/truchas/package.py b/var/spack/repos/builtin/packages/truchas/package.py index a25db2d292..af25c7c921 100644 --- a/var/spack/repos/builtin/packages/truchas/package.py +++ b/var/spack/repos/builtin/packages/truchas/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Truchas(CMakePackage): diff --git a/var/spack/repos/builtin/packages/tskit/package.py b/var/spack/repos/builtin/packages/tskit/package.py index ff99ca906a..466231e69d 100644 --- a/var/spack/repos/builtin/packages/tskit/package.py +++ b/var/spack/repos/builtin/packages/tskit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tskit(PythonPackage): diff --git a/var/spack/repos/builtin/packages/tulip/package.py b/var/spack/repos/builtin/packages/tulip/package.py index d39ed0e7f8..4364033c29 100644 --- a/var/spack/repos/builtin/packages/tulip/package.py +++ b/var/spack/repos/builtin/packages/tulip/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Tulip(CMakePackage): """ Tulip is an information visualization framework dedicated to the analysis and visualization of relational data. diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py index d04a515a35..43159fc142 100644 --- a/var/spack/repos/builtin/packages/turbine/package.py +++ b/var/spack/repos/builtin/packages/turbine/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack import * +from spack.package import * class Turbine(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/turbomole/package.py b/var/spack/repos/builtin/packages/turbomole/package.py index bc9105f69d..ef9289ced9 100644 --- a/var/spack/repos/builtin/packages/turbomole/package.py +++ b/var/spack/repos/builtin/packages/turbomole/package.py @@ -6,7 +6,7 @@ import os import subprocess -from spack import * +from spack.package import * class Turbomole(Package): diff --git a/var/spack/repos/builtin/packages/turnserver/package.py b/var/spack/repos/builtin/packages/turnserver/package.py index d4527fa6f2..ee44ec6ead 100644 --- a/var/spack/repos/builtin/packages/turnserver/package.py +++ b/var/spack/repos/builtin/packages/turnserver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Turnserver(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/tut/package.py b/var/spack/repos/builtin/packages/tut/package.py index 7ac23c26da..4136d326ae 100644 --- a/var/spack/repos/builtin/packages/tut/package.py +++ b/var/spack/repos/builtin/packages/tut/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tut(WafPackage): diff --git a/var/spack/repos/builtin/packages/twm/package.py b/var/spack/repos/builtin/packages/twm/package.py index 4486ae9aa6..c59d60ab83 100644 --- a/var/spack/repos/builtin/packages/twm/package.py +++ b/var/spack/repos/builtin/packages/twm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Twm(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/tycho2/package.py b/var/spack/repos/builtin/packages/tycho2/package.py index bc2d69e3d8..ecfe04303e 100644 --- a/var/spack/repos/builtin/packages/tycho2/package.py +++ b/var/spack/repos/builtin/packages/tycho2/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Tycho2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py index ec05194466..7253d25e0c 100644 --- a/var/spack/repos/builtin/packages/typhon/package.py +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Typhon(CMakePackage): diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py index 6c3f3b996c..de6897b361 100644 --- a/var/spack/repos/builtin/packages/typhonio/package.py +++ b/var/spack/repos/builtin/packages/typhonio/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Typhonio(CMakePackage): diff --git a/var/spack/repos/builtin/packages/uchardet/package.py b/var/spack/repos/builtin/packages/uchardet/package.py index 054115357a..7cf90ba617 100644 --- a/var/spack/repos/builtin/packages/uchardet/package.py +++ b/var/spack/repos/builtin/packages/uchardet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Uchardet(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index 62d4ca95cc..eb63e9c767 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import shutil -from spack import * +from spack.package import * class Ucx(AutotoolsPackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/udunits/package.py b/var/spack/repos/builtin/packages/udunits/package.py index 18d814a054..0711af1bad 100644 --- a/var/spack/repos/builtin/packages/udunits/package.py +++ b/var/spack/repos/builtin/packages/udunits/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Udunits(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ufo-core/package.py b/var/spack/repos/builtin/packages/ufo-core/package.py index 38bf9b00c8..dc0127aa11 100644 --- a/var/spack/repos/builtin/packages/ufo-core/package.py +++ b/var/spack/repos/builtin/packages/ufo-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UfoCore(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ufo-filters/package.py b/var/spack/repos/builtin/packages/ufo-filters/package.py index 89a1f59b87..d1f2764e82 100644 --- a/var/spack/repos/builtin/packages/ufo-filters/package.py +++ b/var/spack/repos/builtin/packages/ufo-filters/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UfoFilters(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ufs-utils/package.py b/var/spack/repos/builtin/packages/ufs-utils/package.py index b8af86c15b..cbc82d9eeb 100644 --- a/var/spack/repos/builtin/packages/ufs-utils/package.py +++ b/var/spack/repos/builtin/packages/ufs-utils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UfsUtils(CMakePackage): diff --git a/var/spack/repos/builtin/packages/ufs-weather-model/package.py b/var/spack/repos/builtin/packages/ufs-weather-model/package.py index 3fcda6f140..f5e2486a55 100644 --- a/var/spack/repos/builtin/packages/ufs-weather-model/package.py +++ b/var/spack/repos/builtin/packages/ufs-weather-model/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UfsWeatherModel(CMakePackage): diff --git a/var/spack/repos/builtin/packages/uftrace/package.py b/var/spack/repos/builtin/packages/uftrace/package.py index 83402bedb8..7114af3f5e 100644 --- a/var/spack/repos/builtin/packages/uftrace/package.py +++ b/var/spack/repos/builtin/packages/uftrace/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class Uftrace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/umap/package.py b/var/spack/repos/builtin/packages/umap/package.py index a281018857..de1e4e5fdf 100644 --- a/var/spack/repos/builtin/packages/umap/package.py +++ b/var/spack/repos/builtin/packages/umap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Umap(CMakePackage): diff --git a/var/spack/repos/builtin/packages/umesimd/package.py b/var/spack/repos/builtin/packages/umesimd/package.py index 8a71e32d24..37f5909c12 100644 --- a/var/spack/repos/builtin/packages/umesimd/package.py +++ b/var/spack/repos/builtin/packages/umesimd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Umesimd(CMakePackage): diff --git a/var/spack/repos/builtin/packages/umoci/package.py b/var/spack/repos/builtin/packages/umoci/package.py index 52a9097ea0..23295664f3 100644 --- a/var/spack/repos/builtin/packages/umoci/package.py +++ b/var/spack/repos/builtin/packages/umoci/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Umoci(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index 028ba2ee17..4fee70da56 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -8,7 +8,7 @@ import socket import llnl.util.tty as tty -from spack import * +from spack.package import * class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/unblur/package.py b/var/spack/repos/builtin/packages/unblur/package.py index ecb5283810..2cee9db204 100644 --- a/var/spack/repos/builtin/packages/unblur/package.py +++ b/var/spack/repos/builtin/packages/unblur/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unblur(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/uncrustify/package.py b/var/spack/repos/builtin/packages/uncrustify/package.py index f465939ea4..4abeea389d 100644 --- a/var/spack/repos/builtin/packages/uncrustify/package.py +++ b/var/spack/repos/builtin/packages/uncrustify/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Uncrustify(Package): diff --git a/var/spack/repos/builtin/packages/unibilium/package.py b/var/spack/repos/builtin/packages/unibilium/package.py index c722f04e02..b9eb3e8fcc 100644 --- a/var/spack/repos/builtin/packages/unibilium/package.py +++ b/var/spack/repos/builtin/packages/unibilium/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unibilium(Package): diff --git a/var/spack/repos/builtin/packages/unifdef/package.py b/var/spack/repos/builtin/packages/unifdef/package.py index 53a7e3266a..57626ff212 100644 --- a/var/spack/repos/builtin/packages/unifdef/package.py +++ b/var/spack/repos/builtin/packages/unifdef/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unifdef(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/unifyfs/package.py b/var/spack/repos/builtin/packages/unifyfs/package.py index 1df4241001..fcaba77426 100644 --- a/var/spack/repos/builtin/packages/unifyfs/package.py +++ b/var/spack/repos/builtin/packages/unifyfs/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unifyfs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/unigen/package.py b/var/spack/repos/builtin/packages/unigen/package.py index b2329b6401..3c95de651a 100644 --- a/var/spack/repos/builtin/packages/unigen/package.py +++ b/var/spack/repos/builtin/packages/unigen/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unigen(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/unison/package.py b/var/spack/repos/builtin/packages/unison/package.py index 5c85eedc78..9d1fbf9b59 100644 --- a/var/spack/repos/builtin/packages/unison/package.py +++ b/var/spack/repos/builtin/packages/unison/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unison(Package): diff --git a/var/spack/repos/builtin/packages/units/package.py b/var/spack/repos/builtin/packages/units/package.py index 5045f6de1e..e384572ffb 100644 --- a/var/spack/repos/builtin/packages/units/package.py +++ b/var/spack/repos/builtin/packages/units/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Units(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/unittest-cpp/package.py b/var/spack/repos/builtin/packages/unittest-cpp/package.py index 37508e5117..a158b68c23 100644 --- a/var/spack/repos/builtin/packages/unittest-cpp/package.py +++ b/var/spack/repos/builtin/packages/unittest-cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UnittestCpp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/universal-ctags/package.py b/var/spack/repos/builtin/packages/universal-ctags/package.py index dad16fe908..497d5f974d 100644 --- a/var/spack/repos/builtin/packages/universal-ctags/package.py +++ b/var/spack/repos/builtin/packages/universal-ctags/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UniversalCtags(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/unixodbc/package.py b/var/spack/repos/builtin/packages/unixodbc/package.py index 94b6b47b8c..fda3dec2fe 100644 --- a/var/spack/repos/builtin/packages/unixodbc/package.py +++ b/var/spack/repos/builtin/packages/unixodbc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unixodbc(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/unqlite/package.py b/var/spack/repos/builtin/packages/unqlite/package.py index fe932b8e84..f447c6ca0a 100644 --- a/var/spack/repos/builtin/packages/unqlite/package.py +++ b/var/spack/repos/builtin/packages/unqlite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unqlite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/unrar/package.py b/var/spack/repos/builtin/packages/unrar/package.py index aa10e8f31d..36d192a3dd 100644 --- a/var/spack/repos/builtin/packages/unrar/package.py +++ b/var/spack/repos/builtin/packages/unrar/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Unrar(MakefilePackage): """RAR archive extraction utility""" diff --git a/var/spack/repos/builtin/packages/unuran/package.py b/var/spack/repos/builtin/packages/unuran/package.py index 96d0c42b56..6cfd08896c 100644 --- a/var/spack/repos/builtin/packages/unuran/package.py +++ b/var/spack/repos/builtin/packages/unuran/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unuran(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py index f63011ae8d..bc4d769790 100644 --- a/var/spack/repos/builtin/packages/unzip/package.py +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Unzip(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/upcxx/package.py b/var/spack/repos/builtin/packages/upcxx/package.py index cbbc93285d..3217c3f116 100644 --- a/var/spack/repos/builtin/packages/upcxx/package.py +++ b/var/spack/repos/builtin/packages/upcxx/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * def is_CrayXC(): diff --git a/var/spack/repos/builtin/packages/upp/package.py b/var/spack/repos/builtin/packages/upp/package.py index b68dfa1e15..90acfec6dd 100644 --- a/var/spack/repos/builtin/packages/upp/package.py +++ b/var/spack/repos/builtin/packages/upp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Upp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/uqtk/package.py b/var/spack/repos/builtin/packages/uqtk/package.py index 0faacee002..7341993d38 100644 --- a/var/spack/repos/builtin/packages/uqtk/package.py +++ b/var/spack/repos/builtin/packages/uqtk/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Uqtk(CMakePackage): diff --git a/var/spack/repos/builtin/packages/uriparser/package.py b/var/spack/repos/builtin/packages/uriparser/package.py index d9518ccaa2..5c1a50c2c9 100644 --- a/var/spack/repos/builtin/packages/uriparser/package.py +++ b/var/spack/repos/builtin/packages/uriparser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Uriparser(CMakePackage): diff --git a/var/spack/repos/builtin/packages/usbutils/package.py b/var/spack/repos/builtin/packages/usbutils/package.py index b5b44934d9..8eb0647929 100644 --- a/var/spack/repos/builtin/packages/usbutils/package.py +++ b/var/spack/repos/builtin/packages/usbutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Usbutils(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/usearch/package.py b/var/spack/repos/builtin/packages/usearch/package.py index dff22b4326..5269f5c934 100644 --- a/var/spack/repos/builtin/packages/usearch/package.py +++ b/var/spack/repos/builtin/packages/usearch/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Usearch(Package): diff --git a/var/spack/repos/builtin/packages/userspace-rcu/package.py b/var/spack/repos/builtin/packages/userspace-rcu/package.py index dfe55d4a00..b23e110796 100644 --- a/var/spack/repos/builtin/packages/userspace-rcu/package.py +++ b/var/spack/repos/builtin/packages/userspace-rcu/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UserspaceRcu(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/utf8cpp/package.py b/var/spack/repos/builtin/packages/utf8cpp/package.py index d60ff86a99..79bb7ce495 100644 --- a/var/spack/repos/builtin/packages/utf8cpp/package.py +++ b/var/spack/repos/builtin/packages/utf8cpp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Utf8cpp(Package): diff --git a/var/spack/repos/builtin/packages/utf8proc/package.py b/var/spack/repos/builtin/packages/utf8proc/package.py index 174cdec994..a4aa77546b 100644 --- a/var/spack/repos/builtin/packages/utf8proc/package.py +++ b/var/spack/repos/builtin/packages/utf8proc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Utf8proc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/util-linux-uuid/package.py b/var/spack/repos/builtin/packages/util-linux-uuid/package.py index 38b355a30a..fef7347c7f 100644 --- a/var/spack/repos/builtin/packages/util-linux-uuid/package.py +++ b/var/spack/repos/builtin/packages/util-linux-uuid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UtilLinuxUuid(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/util-linux/package.py b/var/spack/repos/builtin/packages/util-linux/package.py index bd08b1f5c7..67b0c85f68 100644 --- a/var/spack/repos/builtin/packages/util-linux/package.py +++ b/var/spack/repos/builtin/packages/util-linux/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class UtilLinux(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/util-macros/package.py b/var/spack/repos/builtin/packages/util-macros/package.py index 81ee9507f0..13d4af8d91 100644 --- a/var/spack/repos/builtin/packages/util-macros/package.py +++ b/var/spack/repos/builtin/packages/util-macros/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class UtilMacros(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/uvw/package.py b/var/spack/repos/builtin/packages/uvw/package.py index 6c8058412b..3103e52d0e 100644 --- a/var/spack/repos/builtin/packages/uvw/package.py +++ b/var/spack/repos/builtin/packages/uvw/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Uvw(CMakePackage): """uvw is a header-only, event based, tiny and easy to use libuv wrapper in modern C++. diff --git a/var/spack/repos/builtin/packages/vacuumms/package.py b/var/spack/repos/builtin/packages/vacuumms/package.py index 4a67ddfdc8..67fe9c6910 100644 --- a/var/spack/repos/builtin/packages/vacuumms/package.py +++ b/var/spack/repos/builtin/packages/vacuumms/package.py @@ -2,7 +2,8 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * + +from spack.package import * class Vacuumms(CMakePackage): diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index 0f28da1867..579894da7c 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -6,7 +6,7 @@ import glob import sys -from spack import * +from spack.package import * class Valgrind(AutotoolsPackage, SourcewarePackage): diff --git a/var/spack/repos/builtin/packages/vampirtrace/package.py b/var/spack/repos/builtin/packages/vampirtrace/package.py index 3eca4beaa2..376be85fd1 100644 --- a/var/spack/repos/builtin/packages/vampirtrace/package.py +++ b/var/spack/repos/builtin/packages/vampirtrace/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vampirtrace(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/vapor/package.py b/var/spack/repos/builtin/packages/vapor/package.py index 8e83541905..cc49ecdf98 100644 --- a/var/spack/repos/builtin/packages/vapor/package.py +++ b/var/spack/repos/builtin/packages/vapor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vapor(CMakePackage): diff --git a/var/spack/repos/builtin/packages/vardictjava/package.py b/var/spack/repos/builtin/packages/vardictjava/package.py index 805656f886..5f99a7e546 100644 --- a/var/spack/repos/builtin/packages/vardictjava/package.py +++ b/var/spack/repos/builtin/packages/vardictjava/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Vardictjava(Package): """VarDictJava is a variant discovery program written in Java. It is a partial Java port of VarDict variant caller.""" diff --git a/var/spack/repos/builtin/packages/variorum/package.py b/var/spack/repos/builtin/packages/variorum/package.py index 8fba46ae4a..f048879c72 100644 --- a/var/spack/repos/builtin/packages/variorum/package.py +++ b/var/spack/repos/builtin/packages/variorum/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Variorum(CMakePackage): diff --git a/var/spack/repos/builtin/packages/varnish-cache/package.py b/var/spack/repos/builtin/packages/varnish-cache/package.py index 87cd3b6338..69b1204fa0 100644 --- a/var/spack/repos/builtin/packages/varnish-cache/package.py +++ b/var/spack/repos/builtin/packages/varnish-cache/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class VarnishCache(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/varscan/package.py b/var/spack/repos/builtin/packages/varscan/package.py index e05e7cc638..4632ebec2f 100644 --- a/var/spack/repos/builtin/packages/varscan/package.py +++ b/var/spack/repos/builtin/packages/varscan/package.py @@ -5,7 +5,7 @@ import os.path -from spack import * +from spack.package import * class Varscan(Package): diff --git a/var/spack/repos/builtin/packages/vasp/package.py b/var/spack/repos/builtin/packages/vasp/package.py index 285cf0cca1..cf670ea9f1 100644 --- a/var/spack/repos/builtin/packages/vasp/package.py +++ b/var/spack/repos/builtin/packages/vasp/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Vasp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/vbfnlo/package.py b/var/spack/repos/builtin/packages/vbfnlo/package.py index 9cdd0a5b48..3c9aee9831 100644 --- a/var/spack/repos/builtin/packages/vbfnlo/package.py +++ b/var/spack/repos/builtin/packages/vbfnlo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vbfnlo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/vc/package.py b/var/spack/repos/builtin/packages/vc/package.py index 9b9c9384fa..12f67f75d8 100644 --- a/var/spack/repos/builtin/packages/vc/package.py +++ b/var/spack/repos/builtin/packages/vc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/vcftools/package.py b/var/spack/repos/builtin/packages/vcftools/package.py index dd64c4e1c8..e2e9543cd8 100644 --- a/var/spack/repos/builtin/packages/vcftools/package.py +++ b/var/spack/repos/builtin/packages/vcftools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vcftools(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/vcsh/package.py b/var/spack/repos/builtin/packages/vcsh/package.py index e0fdc21830..4549a4e40e 100644 --- a/var/spack/repos/builtin/packages/vcsh/package.py +++ b/var/spack/repos/builtin/packages/vcsh/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vcsh(Package): diff --git a/var/spack/repos/builtin/packages/vdt/package.py b/var/spack/repos/builtin/packages/vdt/package.py index d9ee3e8177..b5859fbe6b 100644 --- a/var/spack/repos/builtin/packages/vdt/package.py +++ b/var/spack/repos/builtin/packages/vdt/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Vdt(CMakePackage): """Vectorised math. A collection of fast and inline implementations of mathematical functions. diff --git a/var/spack/repos/builtin/packages/veccore/package.py b/var/spack/repos/builtin/packages/veccore/package.py index ab685cfc0f..17e6d02e88 100644 --- a/var/spack/repos/builtin/packages/veccore/package.py +++ b/var/spack/repos/builtin/packages/veccore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Veccore(CMakePackage): diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index 72025e6c90..5868803192 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vecgeom(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py index 089b908d79..ec9b10f7e0 100644 --- a/var/spack/repos/builtin/packages/veclibfort/package.py +++ b/var/spack/repos/builtin/packages/veclibfort/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Veclibfort(Package): diff --git a/var/spack/repos/builtin/packages/vecmem/package.py b/var/spack/repos/builtin/packages/vecmem/package.py index 0eba370e1f..68664e04ce 100644 --- a/var/spack/repos/builtin/packages/vecmem/package.py +++ b/var/spack/repos/builtin/packages/vecmem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vecmem(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/vectorclass-version2/package.py b/var/spack/repos/builtin/packages/vectorclass-version2/package.py index 00aa8147c9..6570bff3f8 100644 --- a/var/spack/repos/builtin/packages/vectorclass-version2/package.py +++ b/var/spack/repos/builtin/packages/vectorclass-version2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class VectorclassVersion2(Package): diff --git a/var/spack/repos/builtin/packages/vegas2/package.py b/var/spack/repos/builtin/packages/vegas2/package.py index 9774c2cd81..181d6852b3 100644 --- a/var/spack/repos/builtin/packages/vegas2/package.py +++ b/var/spack/repos/builtin/packages/vegas2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vegas2(Package): diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index e4c22deec2..cca9ce3e63 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/velvet/package.py b/var/spack/repos/builtin/packages/velvet/package.py index 300bb04de2..c9d7f1686c 100644 --- a/var/spack/repos/builtin/packages/velvet/package.py +++ b/var/spack/repos/builtin/packages/velvet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Velvet(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/velvetoptimiser/package.py b/var/spack/repos/builtin/packages/velvetoptimiser/package.py index 7054070b1b..d3db3765d1 100644 --- a/var/spack/repos/builtin/packages/velvetoptimiser/package.py +++ b/var/spack/repos/builtin/packages/velvetoptimiser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Velvetoptimiser(Package): diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index 9c0ca25849..e810e93ba4 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Verilator(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py index abe15be5b9..633cbf4495 100644 --- a/var/spack/repos/builtin/packages/verrou/package.py +++ b/var/spack/repos/builtin/packages/verrou/package.py @@ -7,7 +7,7 @@ import glob import os import sys -from spack import * +from spack.package import * class Verrou(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/vesta/package.py b/var/spack/repos/builtin/packages/vesta/package.py index 9be9b607d4..11a4e9fd1b 100644 --- a/var/spack/repos/builtin/packages/vesta/package.py +++ b/var/spack/repos/builtin/packages/vesta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vesta(Package): diff --git a/var/spack/repos/builtin/packages/vgm/package.py b/var/spack/repos/builtin/packages/vgm/package.py index b82ec3769e..3ea4487983 100644 --- a/var/spack/repos/builtin/packages/vgm/package.py +++ b/var/spack/repos/builtin/packages/vgm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vgm(CMakePackage): diff --git a/var/spack/repos/builtin/packages/videoproto/package.py b/var/spack/repos/builtin/packages/videoproto/package.py index c690983ae9..1324d30111 100644 --- a/var/spack/repos/builtin/packages/videoproto/package.py +++ b/var/spack/repos/builtin/packages/videoproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Videoproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/viennarna/package.py b/var/spack/repos/builtin/packages/viennarna/package.py index e969d80663..48e8759466 100644 --- a/var/spack/repos/builtin/packages/viennarna/package.py +++ b/var/spack/repos/builtin/packages/viennarna/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Viennarna(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/viewres/package.py b/var/spack/repos/builtin/packages/viewres/package.py index 7839459d99..5b12d27c63 100644 --- a/var/spack/repos/builtin/packages/viewres/package.py +++ b/var/spack/repos/builtin/packages/viewres/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Viewres(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/vifi/package.py b/var/spack/repos/builtin/packages/vifi/package.py index 68892e6939..fcc070129b 100644 --- a/var/spack/repos/builtin/packages/vifi/package.py +++ b/var/spack/repos/builtin/packages/vifi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vifi(Package): diff --git a/var/spack/repos/builtin/packages/vigra/package.py b/var/spack/repos/builtin/packages/vigra/package.py index f214402622..dfe7a2bdcc 100644 --- a/var/spack/repos/builtin/packages/vigra/package.py +++ b/var/spack/repos/builtin/packages/vigra/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index bdc1858ae9..a4434569f7 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vim(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/virtest/package.py b/var/spack/repos/builtin/packages/virtest/package.py index 8097f92f6e..aea359d914 100644 --- a/var/spack/repos/builtin/packages/virtest/package.py +++ b/var/spack/repos/builtin/packages/virtest/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Virtest(CMakePackage): diff --git a/var/spack/repos/builtin/packages/virtualgl/package.py b/var/spack/repos/builtin/packages/virtualgl/package.py index 03f1f5880e..2fec526109 100644 --- a/var/spack/repos/builtin/packages/virtualgl/package.py +++ b/var/spack/repos/builtin/packages/virtualgl/package.py @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# -from spack import * +from spack.package import * class Virtualgl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/virtuoso/package.py b/var/spack/repos/builtin/packages/virtuoso/package.py index 70db29a33a..f07edafbf8 100644 --- a/var/spack/repos/builtin/packages/virtuoso/package.py +++ b/var/spack/repos/builtin/packages/virtuoso/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Virtuoso(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/visit-cgns/package.py b/var/spack/repos/builtin/packages/visit-cgns/package.py index 5b7800fc85..8fa0235eec 100644 --- a/var/spack/repos/builtin/packages/visit-cgns/package.py +++ b/var/spack/repos/builtin/packages/visit-cgns/package.py @@ -8,7 +8,7 @@ import os # Import re module to use regular expression import re -from spack import * +from spack.package import * class VisitCgns(CMakePackage): diff --git a/var/spack/repos/builtin/packages/visit-ffp/package.py b/var/spack/repos/builtin/packages/visit-ffp/package.py index 4cbe6324b0..11a285b898 100644 --- a/var/spack/repos/builtin/packages/visit-ffp/package.py +++ b/var/spack/repos/builtin/packages/visit-ffp/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class VisitFfp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/visit-mfem/package.py b/var/spack/repos/builtin/packages/visit-mfem/package.py index 5810ddec9e..caa59eb72a 100644 --- a/var/spack/repos/builtin/packages/visit-mfem/package.py +++ b/var/spack/repos/builtin/packages/visit-mfem/package.py @@ -8,7 +8,7 @@ import os # Import re module to use regular expression import re -from spack import * +from spack.package import * class VisitMfem(CMakePackage): diff --git a/var/spack/repos/builtin/packages/visit-silo/package.py b/var/spack/repos/builtin/packages/visit-silo/package.py index 9ff1963f5e..aff31012df 100644 --- a/var/spack/repos/builtin/packages/visit-silo/package.py +++ b/var/spack/repos/builtin/packages/visit-silo/package.py @@ -8,7 +8,7 @@ import os # Import re module to use regular expression import re -from spack import * +from spack.package import * class VisitSilo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/visit-unv/package.py b/var/spack/repos/builtin/packages/visit-unv/package.py index 6568e1849a..8872c6c6dd 100644 --- a/var/spack/repos/builtin/packages/visit-unv/package.py +++ b/var/spack/repos/builtin/packages/visit-unv/package.py @@ -6,7 +6,7 @@ import os import re -from spack import * +from spack.package import * class VisitUnv(CMakePackage): diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index bd20520afc..dbd6188c4d 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Visit(CMakePackage): diff --git a/var/spack/repos/builtin/packages/vite/package.py b/var/spack/repos/builtin/packages/vite/package.py index e551ba8aea..85a450ec08 100644 --- a/var/spack/repos/builtin/packages/vite/package.py +++ b/var/spack/repos/builtin/packages/vite/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vite(CMakePackage): diff --git a/var/spack/repos/builtin/packages/vizglow/package.py b/var/spack/repos/builtin/packages/vizglow/package.py index d86e6ce914..9d7c702050 100644 --- a/var/spack/repos/builtin/packages/vizglow/package.py +++ b/var/spack/repos/builtin/packages/vizglow/package.py @@ -6,7 +6,7 @@ import glob import os -from spack import * +from spack.package import * class Vizglow(Package): diff --git a/var/spack/repos/builtin/packages/vmatch/package.py b/var/spack/repos/builtin/packages/vmatch/package.py index a6648043ed..b0a2417895 100644 --- a/var/spack/repos/builtin/packages/vmatch/package.py +++ b/var/spack/repos/builtin/packages/vmatch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vmatch(Package): diff --git a/var/spack/repos/builtin/packages/vmc/package.py b/var/spack/repos/builtin/packages/vmc/package.py index d1d4aff642..09e4dddc77 100644 --- a/var/spack/repos/builtin/packages/vmc/package.py +++ b/var/spack/repos/builtin/packages/vmc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vmc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/vmd/package.py b/var/spack/repos/builtin/packages/vmd/package.py index 39aefae96f..c859d67a17 100644 --- a/var/spack/repos/builtin/packages/vmd/package.py +++ b/var/spack/repos/builtin/packages/vmd/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Vmd(Package): diff --git a/var/spack/repos/builtin/packages/volk/package.py b/var/spack/repos/builtin/packages/volk/package.py index 7908ad23e6..457952e228 100644 --- a/var/spack/repos/builtin/packages/volk/package.py +++ b/var/spack/repos/builtin/packages/volk/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Volk(CMakePackage): """VOLK is the Vector-Optimized Library of Kernels. It is a library that contains kernels of hand-written SIMD code for diff --git a/var/spack/repos/builtin/packages/voropp/package.py b/var/spack/repos/builtin/packages/voropp/package.py index 9c86424544..4cde3e8fd4 100644 --- a/var/spack/repos/builtin/packages/voropp/package.py +++ b/var/spack/repos/builtin/packages/voropp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Voropp(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py b/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py index 8970e266cb..19eb556ebd 100644 --- a/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py +++ b/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py index 483ef0bf37..a3b7387af2 100644 --- a/var/spack/repos/builtin/packages/votca-csg/package.py +++ b/var/spack/repos/builtin/packages/votca-csg/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class VotcaCsg(CMakePackage): diff --git a/var/spack/repos/builtin/packages/votca-csgapps/package.py b/var/spack/repos/builtin/packages/votca-csgapps/package.py index 605c83c7c0..9f9ec7a036 100644 --- a/var/spack/repos/builtin/packages/votca-csgapps/package.py +++ b/var/spack/repos/builtin/packages/votca-csgapps/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class VotcaCsgapps(CMakePackage): diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py index ba91f967ba..1d090e802c 100644 --- a/var/spack/repos/builtin/packages/votca-ctp/package.py +++ b/var/spack/repos/builtin/packages/votca-ctp/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class VotcaCtp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index 895a2f9215..11a9056d7a 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class VotcaTools(CMakePackage): diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index 155784b7b2..18361a826d 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class VotcaXtp(CMakePackage): diff --git a/var/spack/repos/builtin/packages/votca/package.py b/var/spack/repos/builtin/packages/votca/package.py index 983335774f..489f414c49 100644 --- a/var/spack/repos/builtin/packages/votca/package.py +++ b/var/spack/repos/builtin/packages/votca/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Votca(CMakePackage): diff --git a/var/spack/repos/builtin/packages/vpfft/package.py b/var/spack/repos/builtin/packages/vpfft/package.py index 2221bb0244..7735846402 100644 --- a/var/spack/repos/builtin/packages/vpfft/package.py +++ b/var/spack/repos/builtin/packages/vpfft/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vpfft(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/vpic/package.py b/var/spack/repos/builtin/packages/vpic/package.py index 0cec87b6cb..3aed3c3eb5 100644 --- a/var/spack/repos/builtin/packages/vpic/package.py +++ b/var/spack/repos/builtin/packages/vpic/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vpic(CMakePackage): diff --git a/var/spack/repos/builtin/packages/vsearch/package.py b/var/spack/repos/builtin/packages/vsearch/package.py index ce06c273d9..7a339dc78b 100644 --- a/var/spack/repos/builtin/packages/vsearch/package.py +++ b/var/spack/repos/builtin/packages/vsearch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vsearch(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/vsftpd/package.py b/var/spack/repos/builtin/packages/vsftpd/package.py index 818f1d4308..6d7cf5d680 100644 --- a/var/spack/repos/builtin/packages/vsftpd/package.py +++ b/var/spack/repos/builtin/packages/vsftpd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vsftpd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/vt/package.py b/var/spack/repos/builtin/packages/vt/package.py index da2b0deb2a..24a61f25a8 100644 --- a/var/spack/repos/builtin/packages/vt/package.py +++ b/var/spack/repos/builtin/packages/vt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vt(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/vtable-dumper/package.py b/var/spack/repos/builtin/packages/vtable-dumper/package.py index 1d968f2d27..1965dce2b5 100644 --- a/var/spack/repos/builtin/packages/vtable-dumper/package.py +++ b/var/spack/repos/builtin/packages/vtable-dumper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class VtableDumper(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py index 93dfb965d6..b0371363a2 100644 --- a/var/spack/repos/builtin/packages/vtk-h/package.py +++ b/var/spack/repos/builtin/packages/vtk-h/package.py @@ -11,7 +11,7 @@ from os import environ as env import llnl.util.tty as tty -from spack import * +from spack.package import * def cmake_cache_entry(name, value, vtype=None): diff --git a/var/spack/repos/builtin/packages/vtk-m/package.py b/var/spack/repos/builtin/packages/vtk-m/package.py index ae898a8945..bd817e0319 100644 --- a/var/spack/repos/builtin/packages/vtk-m/package.py +++ b/var/spack/repos/builtin/packages/vtk-m/package.py @@ -8,7 +8,7 @@ import os import shutil import sys -from spack import * +from spack.package import * class VtkM(CMakePackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 0a5fcc0551..4449e344a5 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -7,7 +7,7 @@ import os import sys -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/vvtest/package.py b/var/spack/repos/builtin/packages/vvtest/package.py index 3ec989a354..23abc30751 100644 --- a/var/spack/repos/builtin/packages/vvtest/package.py +++ b/var/spack/repos/builtin/packages/vvtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Vvtest(Package): diff --git a/var/spack/repos/builtin/packages/w3emc/package.py b/var/spack/repos/builtin/packages/w3emc/package.py index 65e8cb99fe..261aabf361 100644 --- a/var/spack/repos/builtin/packages/w3emc/package.py +++ b/var/spack/repos/builtin/packages/w3emc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class W3emc(CMakePackage): diff --git a/var/spack/repos/builtin/packages/w3m/package.py b/var/spack/repos/builtin/packages/w3m/package.py index 07c4898c7d..a563c24d2d 100644 --- a/var/spack/repos/builtin/packages/w3m/package.py +++ b/var/spack/repos/builtin/packages/w3m/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class W3m(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/w3nco/package.py b/var/spack/repos/builtin/packages/w3nco/package.py index 96a683b5e7..1a55ffe095 100644 --- a/var/spack/repos/builtin/packages/w3nco/package.py +++ b/var/spack/repos/builtin/packages/w3nco/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class W3nco(CMakePackage): diff --git a/var/spack/repos/builtin/packages/wannier90/package.py b/var/spack/repos/builtin/packages/wannier90/package.py index 8635227518..f4c3f97c2b 100644 --- a/var/spack/repos/builtin/packages/wannier90/package.py +++ b/var/spack/repos/builtin/packages/wannier90/package.py @@ -6,7 +6,7 @@ import inspect import os.path -from spack import * +from spack.package import * class Wannier90(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/warpx/package.py b/var/spack/repos/builtin/packages/warpx/package.py index 66577c87c6..61853136ce 100644 --- a/var/spack/repos/builtin/packages/warpx/package.py +++ b/var/spack/repos/builtin/packages/warpx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Warpx(CMakePackage): diff --git a/var/spack/repos/builtin/packages/watch/package.py b/var/spack/repos/builtin/packages/watch/package.py index 1cad9618a0..5a70081b04 100644 --- a/var/spack/repos/builtin/packages/watch/package.py +++ b/var/spack/repos/builtin/packages/watch/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Watch(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wayland-protocols/package.py b/var/spack/repos/builtin/packages/wayland-protocols/package.py index 609e22bc2e..6cfdbfc59e 100644 --- a/var/spack/repos/builtin/packages/wayland-protocols/package.py +++ b/var/spack/repos/builtin/packages/wayland-protocols/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class WaylandProtocols(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wayland/package.py b/var/spack/repos/builtin/packages/wayland/package.py index bd15a7013b..b7825cee8d 100644 --- a/var/spack/repos/builtin/packages/wayland/package.py +++ b/var/spack/repos/builtin/packages/wayland/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wayland(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wcs/package.py b/var/spack/repos/builtin/packages/wcs/package.py index d3b79c8043..35a551b7ed 100644 --- a/var/spack/repos/builtin/packages/wcs/package.py +++ b/var/spack/repos/builtin/packages/wcs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/wcslib/package.py b/var/spack/repos/builtin/packages/wcslib/package.py index ef37836078..578e051e61 100644 --- a/var/spack/repos/builtin/packages/wcslib/package.py +++ b/var/spack/repos/builtin/packages/wcslib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wcslib(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/webbench/package.py b/var/spack/repos/builtin/packages/webbench/package.py index 8cf6e58b8b..5d9bb446f5 100644 --- a/var/spack/repos/builtin/packages/webbench/package.py +++ b/var/spack/repos/builtin/packages/webbench/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Webbench(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/weechat/package.py b/var/spack/repos/builtin/packages/weechat/package.py index 63dce84fc5..0477f03b89 100644 --- a/var/spack/repos/builtin/packages/weechat/package.py +++ b/var/spack/repos/builtin/packages/weechat/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Weechat(CMakePackage): """WeeChat is a fast, light and extensible chat client, with a text-based user interface.""" diff --git a/var/spack/repos/builtin/packages/weighttp/package.py b/var/spack/repos/builtin/packages/weighttp/package.py index cd5a4c9b12..caa89b24b8 100644 --- a/var/spack/repos/builtin/packages/weighttp/package.py +++ b/var/spack/repos/builtin/packages/weighttp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Weighttp(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index d031112e0b..cb3f64cf3e 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wget(AutotoolsPackage, GNUMirrorPackage): diff --git a/var/spack/repos/builtin/packages/wgrib2/package.py b/var/spack/repos/builtin/packages/wgrib2/package.py index 127db325fa..30629f4d81 100644 --- a/var/spack/repos/builtin/packages/wgrib2/package.py +++ b/var/spack/repos/builtin/packages/wgrib2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wgrib2(CMakePackage): diff --git a/var/spack/repos/builtin/packages/wgsim/package.py b/var/spack/repos/builtin/packages/wgsim/package.py index aa4ede4aea..29b151fc5e 100644 --- a/var/spack/repos/builtin/packages/wgsim/package.py +++ b/var/spack/repos/builtin/packages/wgsim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wgsim(Package): diff --git a/var/spack/repos/builtin/packages/which/package.py b/var/spack/repos/builtin/packages/which/package.py index 5523a82ff8..f90ad68078 100644 --- a/var/spack/repos/builtin/packages/which/package.py +++ b/var/spack/repos/builtin/packages/which/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import re -from spack import * +from spack.package import * class Which(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/whizard/package.py b/var/spack/repos/builtin/packages/whizard/package.py index cda67a154c..05f0db7b2f 100644 --- a/var/spack/repos/builtin/packages/whizard/package.py +++ b/var/spack/repos/builtin/packages/whizard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Whizard(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wi4mpi/package.py b/var/spack/repos/builtin/packages/wi4mpi/package.py index 3c72612e57..aa573af782 100644 --- a/var/spack/repos/builtin/packages/wi4mpi/package.py +++ b/var/spack/repos/builtin/packages/wi4mpi/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wi4mpi(CMakePackage): diff --git a/var/spack/repos/builtin/packages/windowswmproto/package.py b/var/spack/repos/builtin/packages/windowswmproto/package.py index 4e3d168b83..db3b094ade 100644 --- a/var/spack/repos/builtin/packages/windowswmproto/package.py +++ b/var/spack/repos/builtin/packages/windowswmproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Windowswmproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/wiredtiger/package.py b/var/spack/repos/builtin/packages/wiredtiger/package.py index 6dec93a321..39fcc25d35 100644 --- a/var/spack/repos/builtin/packages/wiredtiger/package.py +++ b/var/spack/repos/builtin/packages/wiredtiger/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wiredtiger(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index 008c12651d..182fa36f56 100644 --- a/var/spack/repos/builtin/packages/wireshark/package.py +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Wireshark(CMakePackage): """Graphical network analyzer and capture tool""" diff --git a/var/spack/repos/builtin/packages/wonton/package.py b/var/spack/repos/builtin/packages/wonton/package.py index a44121eee1..314b4023e3 100644 --- a/var/spack/repos/builtin/packages/wonton/package.py +++ b/var/spack/repos/builtin/packages/wonton/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/wordnet/package.py b/var/spack/repos/builtin/packages/wordnet/package.py index 34584f56af..b693dc31f7 100644 --- a/var/spack/repos/builtin/packages/wordnet/package.py +++ b/var/spack/repos/builtin/packages/wordnet/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wordnet(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/workrave/package.py b/var/spack/repos/builtin/packages/workrave/package.py index 4833d9aa43..a20e736031 100644 --- a/var/spack/repos/builtin/packages/workrave/package.py +++ b/var/spack/repos/builtin/packages/workrave/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Workrave(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wps/package.py b/var/spack/repos/builtin/packages/wps/package.py index 7d8e190919..63f8a5ea54 100644 --- a/var/spack/repos/builtin/packages/wps/package.py +++ b/var/spack/repos/builtin/packages/wps/package.py @@ -6,7 +6,7 @@ import glob import tempfile -from spack import * +from spack.package import * class Wps(Package): diff --git a/var/spack/repos/builtin/packages/wrf-io/package.py b/var/spack/repos/builtin/packages/wrf-io/package.py index 617d11d626..f89877c096 100644 --- a/var/spack/repos/builtin/packages/wrf-io/package.py +++ b/var/spack/repos/builtin/packages/wrf-io/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class WrfIo(CMakePackage): diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index b7d9f03e54..cf051f85bb 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -12,7 +12,7 @@ from sys import platform, stdout from llnl.util import tty -from spack import * +from spack.package import * is_windows = platform == 'win32' diff --git a/var/spack/repos/builtin/packages/wrk/package.py b/var/spack/repos/builtin/packages/wrk/package.py index 766da7695e..8a7a909647 100644 --- a/var/spack/repos/builtin/packages/wrk/package.py +++ b/var/spack/repos/builtin/packages/wrk/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wrk(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/wsmancli/package.py b/var/spack/repos/builtin/packages/wsmancli/package.py index 1652a29745..b2fc047fe5 100644 --- a/var/spack/repos/builtin/packages/wsmancli/package.py +++ b/var/spack/repos/builtin/packages/wsmancli/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wsmancli(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wt/package.py b/var/spack/repos/builtin/packages/wt/package.py index 625a432fc0..9fa39e5e93 100644 --- a/var/spack/repos/builtin/packages/wt/package.py +++ b/var/spack/repos/builtin/packages/wt/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/wtdbg2/package.py b/var/spack/repos/builtin/packages/wtdbg2/package.py index 190c57cb86..586a9c376e 100644 --- a/var/spack/repos/builtin/packages/wtdbg2/package.py +++ b/var/spack/repos/builtin/packages/wtdbg2/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wtdbg2(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/wxparaver/package.py b/var/spack/repos/builtin/packages/wxparaver/package.py index eef2ed174c..bcdefa4406 100644 --- a/var/spack/repos/builtin/packages/wxparaver/package.py +++ b/var/spack/repos/builtin/packages/wxparaver/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wxparaver(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/wxpropgrid/package.py b/var/spack/repos/builtin/packages/wxpropgrid/package.py index 7758862d56..6b82d8048a 100644 --- a/var/spack/repos/builtin/packages/wxpropgrid/package.py +++ b/var/spack/repos/builtin/packages/wxpropgrid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Wxpropgrid(Package, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/wxwidgets/package.py b/var/spack/repos/builtin/packages/wxwidgets/package.py index 9a9a4a3f4d..b1d87fb1f2 100644 --- a/var/spack/repos/builtin/packages/wxwidgets/package.py +++ b/var/spack/repos/builtin/packages/wxwidgets/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class Wxwidgets(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/x11perf/package.py b/var/spack/repos/builtin/packages/x11perf/package.py index 73feff61bf..085a5b25cc 100644 --- a/var/spack/repos/builtin/packages/x11perf/package.py +++ b/var/spack/repos/builtin/packages/x11perf/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class X11perf(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/x264/package.py b/var/spack/repos/builtin/packages/x264/package.py index 0f2be7eae5..413ddff23e 100644 --- a/var/spack/repos/builtin/packages/x264/package.py +++ b/var/spack/repos/builtin/packages/x264/package.py @@ -2,7 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.directives import depends_on, version +from spack.package import * class X264(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xabclib/package.py b/var/spack/repos/builtin/packages/xabclib/package.py index 2141fa3e51..e675c37252 100644 --- a/var/spack/repos/builtin/packages/xabclib/package.py +++ b/var/spack/repos/builtin/packages/xabclib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xabclib(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xapian-core/package.py b/var/spack/repos/builtin/packages/xapian-core/package.py index 3402f28ed6..e113dff4ea 100644 --- a/var/spack/repos/builtin/packages/xapian-core/package.py +++ b/var/spack/repos/builtin/packages/xapian-core/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XapianCore(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xauth/package.py b/var/spack/repos/builtin/packages/xauth/package.py index 58d863c2af..fee23a0100 100644 --- a/var/spack/repos/builtin/packages/xauth/package.py +++ b/var/spack/repos/builtin/packages/xauth/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xauth(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xbacklight/package.py b/var/spack/repos/builtin/packages/xbacklight/package.py index 0aa4d5701a..42da4218f3 100644 --- a/var/spack/repos/builtin/packages/xbacklight/package.py +++ b/var/spack/repos/builtin/packages/xbacklight/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xbacklight(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xbiff/package.py b/var/spack/repos/builtin/packages/xbiff/package.py index 431e7075ee..16fc5b0059 100644 --- a/var/spack/repos/builtin/packages/xbiff/package.py +++ b/var/spack/repos/builtin/packages/xbiff/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xbiff(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xbitmaps/package.py b/var/spack/repos/builtin/packages/xbitmaps/package.py index 3999b6cb97..7dd6ae5852 100644 --- a/var/spack/repos/builtin/packages/xbitmaps/package.py +++ b/var/spack/repos/builtin/packages/xbitmaps/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xbitmaps(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xbraid/package.py b/var/spack/repos/builtin/packages/xbraid/package.py index 445f9596c8..e7920c95ec 100644 --- a/var/spack/repos/builtin/packages/xbraid/package.py +++ b/var/spack/repos/builtin/packages/xbraid/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xbraid(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xcalc/package.py b/var/spack/repos/builtin/packages/xcalc/package.py index 183480aa87..f6f578ec4e 100644 --- a/var/spack/repos/builtin/packages/xcalc/package.py +++ b/var/spack/repos/builtin/packages/xcalc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xcalc(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xcb-demo/package.py b/var/spack/repos/builtin/packages/xcb-demo/package.py index 8c414a30b5..6376760376 100644 --- a/var/spack/repos/builtin/packages/xcb-demo/package.py +++ b/var/spack/repos/builtin/packages/xcb-demo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbDemo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py index 798c9bc231..11d80f7ed6 100644 --- a/var/spack/repos/builtin/packages/xcb-proto/package.py +++ b/var/spack/repos/builtin/packages/xcb-proto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbProto(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py index a1817b8d3e..5f177858e3 100644 --- a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbUtilCursor(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-util-errors/package.py b/var/spack/repos/builtin/packages/xcb-util-errors/package.py index bf35014a4e..452461f8de 100644 --- a/var/spack/repos/builtin/packages/xcb-util-errors/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-errors/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbUtilErrors(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-util-image/package.py b/var/spack/repos/builtin/packages/xcb-util-image/package.py index 9a86d78569..2a984d6f42 100644 --- a/var/spack/repos/builtin/packages/xcb-util-image/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-image/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbUtilImage(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py index c003da86f3..d70c0204c0 100644 --- a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbUtilKeysyms(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py index f8ee7ddd36..b2732ef523 100644 --- a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbUtilRenderutil(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-util-wm/package.py b/var/spack/repos/builtin/packages/xcb-util-wm/package.py index 6ea081b904..95db9545a8 100644 --- a/var/spack/repos/builtin/packages/xcb-util-wm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-wm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbUtilWm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py index 929f5f17f0..fbd1531824 100644 --- a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbUtilXrm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcb-util/package.py b/var/spack/repos/builtin/packages/xcb-util/package.py index 335ecbe48c..966dcdfcf9 100644 --- a/var/spack/repos/builtin/packages/xcb-util/package.py +++ b/var/spack/repos/builtin/packages/xcb-util/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcbUtil(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xcfun/package.py b/var/spack/repos/builtin/packages/xcfun/package.py index 07e2a7988a..3698480f60 100644 --- a/var/spack/repos/builtin/packages/xcfun/package.py +++ b/var/spack/repos/builtin/packages/xcfun/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xcfun(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xclip/package.py b/var/spack/repos/builtin/packages/xclip/package.py index 031631b128..212ee20f69 100644 --- a/var/spack/repos/builtin/packages/xclip/package.py +++ b/var/spack/repos/builtin/packages/xclip/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xclip(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xclipboard/package.py b/var/spack/repos/builtin/packages/xclipboard/package.py index 776bfa0be0..096e872e5a 100644 --- a/var/spack/repos/builtin/packages/xclipboard/package.py +++ b/var/spack/repos/builtin/packages/xclipboard/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xclipboard(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xclock/package.py b/var/spack/repos/builtin/packages/xclock/package.py index e6ffd2600d..714c9d6d94 100644 --- a/var/spack/repos/builtin/packages/xclock/package.py +++ b/var/spack/repos/builtin/packages/xclock/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xclock(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xcmiscproto/package.py b/var/spack/repos/builtin/packages/xcmiscproto/package.py index 688b06f8be..a4de7f3667 100644 --- a/var/spack/repos/builtin/packages/xcmiscproto/package.py +++ b/var/spack/repos/builtin/packages/xcmiscproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xcmiscproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xcmsdb/package.py b/var/spack/repos/builtin/packages/xcmsdb/package.py index 5bbb3177d9..977bd2a424 100644 --- a/var/spack/repos/builtin/packages/xcmsdb/package.py +++ b/var/spack/repos/builtin/packages/xcmsdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xcmsdb(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xcompmgr/package.py b/var/spack/repos/builtin/packages/xcompmgr/package.py index bf1aa001c9..a0a8c96cf3 100644 --- a/var/spack/repos/builtin/packages/xcompmgr/package.py +++ b/var/spack/repos/builtin/packages/xcompmgr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xcompmgr(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xconsole/package.py b/var/spack/repos/builtin/packages/xconsole/package.py index d8289d7eaf..fe41d22e84 100644 --- a/var/spack/repos/builtin/packages/xconsole/package.py +++ b/var/spack/repos/builtin/packages/xconsole/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xconsole(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xcursor-themes/package.py b/var/spack/repos/builtin/packages/xcursor-themes/package.py index ce7b5dd023..c588f13429 100644 --- a/var/spack/repos/builtin/packages/xcursor-themes/package.py +++ b/var/spack/repos/builtin/packages/xcursor-themes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XcursorThemes(Package, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xcursorgen/package.py b/var/spack/repos/builtin/packages/xcursorgen/package.py index b81f8416a5..132b68b12e 100644 --- a/var/spack/repos/builtin/packages/xcursorgen/package.py +++ b/var/spack/repos/builtin/packages/xcursorgen/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xcursorgen(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xdbedizzy/package.py b/var/spack/repos/builtin/packages/xdbedizzy/package.py index 3b0a9841ff..53a9c81be8 100644 --- a/var/spack/repos/builtin/packages/xdbedizzy/package.py +++ b/var/spack/repos/builtin/packages/xdbedizzy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xdbedizzy(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xdelta/package.py b/var/spack/repos/builtin/packages/xdelta/package.py index 8c5d37fd21..3c1868b5a7 100644 --- a/var/spack/repos/builtin/packages/xdelta/package.py +++ b/var/spack/repos/builtin/packages/xdelta/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xdelta(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xditview/package.py b/var/spack/repos/builtin/packages/xditview/package.py index d7eae58192..c40ffe136f 100644 --- a/var/spack/repos/builtin/packages/xditview/package.py +++ b/var/spack/repos/builtin/packages/xditview/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xditview(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xdm/package.py b/var/spack/repos/builtin/packages/xdm/package.py index 2c0f5d66ab..699b4f91e3 100644 --- a/var/spack/repos/builtin/packages/xdm/package.py +++ b/var/spack/repos/builtin/packages/xdm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xdm(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xdmf3/package.py b/var/spack/repos/builtin/packages/xdmf3/package.py index eca3b7725b..ff80188edf 100644 --- a/var/spack/repos/builtin/packages/xdmf3/package.py +++ b/var/spack/repos/builtin/packages/xdmf3/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/xdotool/package.py b/var/spack/repos/builtin/packages/xdotool/package.py index 7260d86d97..c9f54f216f 100644 --- a/var/spack/repos/builtin/packages/xdotool/package.py +++ b/var/spack/repos/builtin/packages/xdotool/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xdotool(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xdpyinfo/package.py b/var/spack/repos/builtin/packages/xdpyinfo/package.py index 24453e0754..8cd4790178 100644 --- a/var/spack/repos/builtin/packages/xdpyinfo/package.py +++ b/var/spack/repos/builtin/packages/xdpyinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xdpyinfo(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xdriinfo/package.py b/var/spack/repos/builtin/packages/xdriinfo/package.py index b5aaab0271..5da1edae16 100644 --- a/var/spack/repos/builtin/packages/xdriinfo/package.py +++ b/var/spack/repos/builtin/packages/xdriinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xdriinfo(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xedit/package.py b/var/spack/repos/builtin/packages/xedit/package.py index d7cc8b7d86..9531d861c7 100644 --- a/var/spack/repos/builtin/packages/xedit/package.py +++ b/var/spack/repos/builtin/packages/xedit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xedit(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py index 60fcee9039..94094ceab4 100644 --- a/var/spack/repos/builtin/packages/xerces-c/package.py +++ b/var/spack/repos/builtin/packages/xerces-c/package.py @@ -5,7 +5,7 @@ import sys -from spack import * +from spack.package import * class XercesC(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xeus/package.py b/var/spack/repos/builtin/packages/xeus/package.py index 115199ee58..9d92544ddf 100644 --- a/var/spack/repos/builtin/packages/xeus/package.py +++ b/var/spack/repos/builtin/packages/xeus/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xeus(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xev/package.py b/var/spack/repos/builtin/packages/xev/package.py index b71f718082..4229ab4b17 100644 --- a/var/spack/repos/builtin/packages/xev/package.py +++ b/var/spack/repos/builtin/packages/xev/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xev(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xextproto/package.py b/var/spack/repos/builtin/packages/xextproto/package.py index d93928d222..28d4be0495 100644 --- a/var/spack/repos/builtin/packages/xextproto/package.py +++ b/var/spack/repos/builtin/packages/xextproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xextproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xeyes/package.py b/var/spack/repos/builtin/packages/xeyes/package.py index ebe832a226..b23b23e1a8 100644 --- a/var/spack/repos/builtin/packages/xeyes/package.py +++ b/var/spack/repos/builtin/packages/xeyes/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xeyes(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py index 0fe30929c6..130c71b29d 100644 --- a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py +++ b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xf86bigfontproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xf86dga/package.py b/var/spack/repos/builtin/packages/xf86dga/package.py index 6b41b998fc..383f117392 100644 --- a/var/spack/repos/builtin/packages/xf86dga/package.py +++ b/var/spack/repos/builtin/packages/xf86dga/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xf86dga(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xf86dgaproto/package.py b/var/spack/repos/builtin/packages/xf86dgaproto/package.py index 084956a38f..0bd7c3782e 100644 --- a/var/spack/repos/builtin/packages/xf86dgaproto/package.py +++ b/var/spack/repos/builtin/packages/xf86dgaproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xf86dgaproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xf86driproto/package.py b/var/spack/repos/builtin/packages/xf86driproto/package.py index 9b65848cc9..4bc3d0120d 100644 --- a/var/spack/repos/builtin/packages/xf86driproto/package.py +++ b/var/spack/repos/builtin/packages/xf86driproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xf86driproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xf86miscproto/package.py b/var/spack/repos/builtin/packages/xf86miscproto/package.py index 7cee2789b9..cd89b9fe63 100644 --- a/var/spack/repos/builtin/packages/xf86miscproto/package.py +++ b/var/spack/repos/builtin/packages/xf86miscproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xf86miscproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xf86rushproto/package.py b/var/spack/repos/builtin/packages/xf86rushproto/package.py index 79a2618375..254e422df6 100644 --- a/var/spack/repos/builtin/packages/xf86rushproto/package.py +++ b/var/spack/repos/builtin/packages/xf86rushproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xf86rushproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py index 9899c87b7f..e1a56ff9c1 100644 --- a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py +++ b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xf86vidmodeproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xfd/package.py b/var/spack/repos/builtin/packages/xfd/package.py index f44cf6f74f..b5c663c741 100644 --- a/var/spack/repos/builtin/packages/xfd/package.py +++ b/var/spack/repos/builtin/packages/xfd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xfd(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xfindproxy/package.py b/var/spack/repos/builtin/packages/xfindproxy/package.py index 94139720ff..e123f51395 100644 --- a/var/spack/repos/builtin/packages/xfindproxy/package.py +++ b/var/spack/repos/builtin/packages/xfindproxy/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xfindproxy(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xfontsel/package.py b/var/spack/repos/builtin/packages/xfontsel/package.py index 41e853635a..716510e33a 100644 --- a/var/spack/repos/builtin/packages/xfontsel/package.py +++ b/var/spack/repos/builtin/packages/xfontsel/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xfontsel(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xforms/package.py b/var/spack/repos/builtin/packages/xforms/package.py index 3a4d2b9fd2..f33cacc0ef 100644 --- a/var/spack/repos/builtin/packages/xforms/package.py +++ b/var/spack/repos/builtin/packages/xforms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xforms(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xfs/package.py b/var/spack/repos/builtin/packages/xfs/package.py index cd8734a95f..16634420a4 100644 --- a/var/spack/repos/builtin/packages/xfs/package.py +++ b/var/spack/repos/builtin/packages/xfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xfs(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xfsdump/package.py b/var/spack/repos/builtin/packages/xfsdump/package.py index 1b700827d6..1374185496 100644 --- a/var/spack/repos/builtin/packages/xfsdump/package.py +++ b/var/spack/repos/builtin/packages/xfsdump/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xfsdump(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xfsinfo/package.py b/var/spack/repos/builtin/packages/xfsinfo/package.py index b250b4795c..4d543020da 100644 --- a/var/spack/repos/builtin/packages/xfsinfo/package.py +++ b/var/spack/repos/builtin/packages/xfsinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xfsinfo(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xfsprogs/package.py b/var/spack/repos/builtin/packages/xfsprogs/package.py index a894b86e5d..41fd3ac4e0 100644 --- a/var/spack/repos/builtin/packages/xfsprogs/package.py +++ b/var/spack/repos/builtin/packages/xfsprogs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xfsprogs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xfwp/package.py b/var/spack/repos/builtin/packages/xfwp/package.py index 713db51ed9..250df59853 100644 --- a/var/spack/repos/builtin/packages/xfwp/package.py +++ b/var/spack/repos/builtin/packages/xfwp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xfwp(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xgamma/package.py b/var/spack/repos/builtin/packages/xgamma/package.py index 38cc3c52d5..184fbc5b65 100644 --- a/var/spack/repos/builtin/packages/xgamma/package.py +++ b/var/spack/repos/builtin/packages/xgamma/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xgamma(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xgboost/package.py b/var/spack/repos/builtin/packages/xgboost/package.py index c17a23acff..dc464576d4 100644 --- a/var/spack/repos/builtin/packages/xgboost/package.py +++ b/var/spack/repos/builtin/packages/xgboost/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xgboost(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/xgc/package.py b/var/spack/repos/builtin/packages/xgc/package.py index 77bbf786b3..502140e95a 100644 --- a/var/spack/repos/builtin/packages/xgc/package.py +++ b/var/spack/repos/builtin/packages/xgc/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xgc(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xhmm/package.py b/var/spack/repos/builtin/packages/xhmm/package.py index c3102cb976..d34c8ab2ac 100644 --- a/var/spack/repos/builtin/packages/xhmm/package.py +++ b/var/spack/repos/builtin/packages/xhmm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xhmm(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xhost/package.py b/var/spack/repos/builtin/packages/xhost/package.py index ab026834e0..319cfc6dd6 100644 --- a/var/spack/repos/builtin/packages/xhost/package.py +++ b/var/spack/repos/builtin/packages/xhost/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xhost(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xineramaproto/package.py b/var/spack/repos/builtin/packages/xineramaproto/package.py index 6aeaa3912e..b7b016f57c 100644 --- a/var/spack/repos/builtin/packages/xineramaproto/package.py +++ b/var/spack/repos/builtin/packages/xineramaproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xineramaproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xinit/package.py b/var/spack/repos/builtin/packages/xinit/package.py index 183178f5f2..e3eedcf5fe 100644 --- a/var/spack/repos/builtin/packages/xinit/package.py +++ b/var/spack/repos/builtin/packages/xinit/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xinit(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xinput/package.py b/var/spack/repos/builtin/packages/xinput/package.py index f6435ea138..256ac74bd1 100644 --- a/var/spack/repos/builtin/packages/xinput/package.py +++ b/var/spack/repos/builtin/packages/xinput/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xinput(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py index 4031c59576..cf8abdf3b0 100644 --- a/var/spack/repos/builtin/packages/xios/package.py +++ b/var/spack/repos/builtin/packages/xios/package.py @@ -5,8 +5,7 @@ import os -# -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/xkbcomp/package.py b/var/spack/repos/builtin/packages/xkbcomp/package.py index e0ddd77804..1defa28ce6 100644 --- a/var/spack/repos/builtin/packages/xkbcomp/package.py +++ b/var/spack/repos/builtin/packages/xkbcomp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xkbcomp(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xkbdata/package.py b/var/spack/repos/builtin/packages/xkbdata/package.py index d44720e010..a36d1ef618 100644 --- a/var/spack/repos/builtin/packages/xkbdata/package.py +++ b/var/spack/repos/builtin/packages/xkbdata/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xkbdata(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xkbevd/package.py b/var/spack/repos/builtin/packages/xkbevd/package.py index 7e7dece69b..090e456d62 100644 --- a/var/spack/repos/builtin/packages/xkbevd/package.py +++ b/var/spack/repos/builtin/packages/xkbevd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xkbevd(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xkbprint/package.py b/var/spack/repos/builtin/packages/xkbprint/package.py index ea15562ccf..0873b64d3b 100644 --- a/var/spack/repos/builtin/packages/xkbprint/package.py +++ b/var/spack/repos/builtin/packages/xkbprint/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xkbprint(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xkbutils/package.py b/var/spack/repos/builtin/packages/xkbutils/package.py index 0f8275b958..c193f28243 100644 --- a/var/spack/repos/builtin/packages/xkbutils/package.py +++ b/var/spack/repos/builtin/packages/xkbutils/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xkbutils(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xkeyboard-config/package.py b/var/spack/repos/builtin/packages/xkeyboard-config/package.py index 3dddd7f36b..1e2c15c15a 100644 --- a/var/spack/repos/builtin/packages/xkeyboard-config/package.py +++ b/var/spack/repos/builtin/packages/xkeyboard-config/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XkeyboardConfig(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xkill/package.py b/var/spack/repos/builtin/packages/xkill/package.py index a2eae99bac..9d600671ab 100644 --- a/var/spack/repos/builtin/packages/xkill/package.py +++ b/var/spack/repos/builtin/packages/xkill/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xkill(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xlc/package.py b/var/spack/repos/builtin/packages/xlc/package.py index bc3fa77b33..b672bd4578 100644 --- a/var/spack/repos/builtin/packages/xlc/package.py +++ b/var/spack/repos/builtin/packages/xlc/package.py @@ -8,6 +8,7 @@ import re import llnl.util.tty as tty import spack.compiler +from spack.package import * class Xlc(Package): diff --git a/var/spack/repos/builtin/packages/xlf/package.py b/var/spack/repos/builtin/packages/xlf/package.py index 9d6887a60b..0624dadceb 100644 --- a/var/spack/repos/builtin/packages/xlf/package.py +++ b/var/spack/repos/builtin/packages/xlf/package.py @@ -9,6 +9,7 @@ import re import llnl.util.tty as tty import spack.compiler +from spack.package import * class Xlf(Package): diff --git a/var/spack/repos/builtin/packages/xload/package.py b/var/spack/repos/builtin/packages/xload/package.py index 626f11445b..f4f7304020 100644 --- a/var/spack/repos/builtin/packages/xload/package.py +++ b/var/spack/repos/builtin/packages/xload/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xload(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xlogo/package.py b/var/spack/repos/builtin/packages/xlogo/package.py index ec61a753cb..197b4cb662 100644 --- a/var/spack/repos/builtin/packages/xlogo/package.py +++ b/var/spack/repos/builtin/packages/xlogo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xlogo(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xlsatoms/package.py b/var/spack/repos/builtin/packages/xlsatoms/package.py index 898bcc57f6..84cb6afde9 100644 --- a/var/spack/repos/builtin/packages/xlsatoms/package.py +++ b/var/spack/repos/builtin/packages/xlsatoms/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xlsatoms(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xlsclients/package.py b/var/spack/repos/builtin/packages/xlsclients/package.py index 4bb17838b6..7d0cfe987b 100644 --- a/var/spack/repos/builtin/packages/xlsclients/package.py +++ b/var/spack/repos/builtin/packages/xlsclients/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xlsclients(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xlsfonts/package.py b/var/spack/repos/builtin/packages/xlsfonts/package.py index 833494955d..83d60b22be 100644 --- a/var/spack/repos/builtin/packages/xlsfonts/package.py +++ b/var/spack/repos/builtin/packages/xlsfonts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xlsfonts(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xmag/package.py b/var/spack/repos/builtin/packages/xmag/package.py index c5b288906b..94fefc71ec 100644 --- a/var/spack/repos/builtin/packages/xmag/package.py +++ b/var/spack/repos/builtin/packages/xmag/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xmag(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xman/package.py b/var/spack/repos/builtin/packages/xman/package.py index 43f56c47c9..64403f41ba 100644 --- a/var/spack/repos/builtin/packages/xman/package.py +++ b/var/spack/repos/builtin/packages/xman/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xman(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xmessage/package.py b/var/spack/repos/builtin/packages/xmessage/package.py index ae621cb14d..dfda452837 100644 --- a/var/spack/repos/builtin/packages/xmessage/package.py +++ b/var/spack/repos/builtin/packages/xmessage/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xmessage(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xmh/package.py b/var/spack/repos/builtin/packages/xmh/package.py index 5519c9e075..f3fbf9a93e 100644 --- a/var/spack/repos/builtin/packages/xmh/package.py +++ b/var/spack/repos/builtin/packages/xmh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xmh(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xmlf90/package.py b/var/spack/repos/builtin/packages/xmlf90/package.py index 7abda0027a..e84da4e938 100644 --- a/var/spack/repos/builtin/packages/xmlf90/package.py +++ b/var/spack/repos/builtin/packages/xmlf90/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xmlf90(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xmlrpc-c/package.py b/var/spack/repos/builtin/packages/xmlrpc-c/package.py index 076a9de95b..07eca75692 100644 --- a/var/spack/repos/builtin/packages/xmlrpc-c/package.py +++ b/var/spack/repos/builtin/packages/xmlrpc-c/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XmlrpcC(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xmlto/package.py b/var/spack/repos/builtin/packages/xmlto/package.py index 526356bd2d..0cc2012d8e 100644 --- a/var/spack/repos/builtin/packages/xmlto/package.py +++ b/var/spack/repos/builtin/packages/xmlto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xmlto(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xmodmap/package.py b/var/spack/repos/builtin/packages/xmodmap/package.py index 2e86118fbe..ad8dbb87dc 100644 --- a/var/spack/repos/builtin/packages/xmodmap/package.py +++ b/var/spack/repos/builtin/packages/xmodmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xmodmap(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xmore/package.py b/var/spack/repos/builtin/packages/xmore/package.py index 5c7f8f2e52..b9de4c2285 100644 --- a/var/spack/repos/builtin/packages/xmore/package.py +++ b/var/spack/repos/builtin/packages/xmore/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xmore(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xnnpack/package.py b/var/spack/repos/builtin/packages/xnnpack/package.py index 9bea7b21c7..6c4e109024 100644 --- a/var/spack/repos/builtin/packages/xnnpack/package.py +++ b/var/spack/repos/builtin/packages/xnnpack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xnnpack(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xorg-cf-files/package.py b/var/spack/repos/builtin/packages/xorg-cf-files/package.py index 2fdc8b3301..378fe5cf2f 100644 --- a/var/spack/repos/builtin/packages/xorg-cf-files/package.py +++ b/var/spack/repos/builtin/packages/xorg-cf-files/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XorgCfFiles(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xorg-docs/package.py b/var/spack/repos/builtin/packages/xorg-docs/package.py index 95d6b973c8..060829bf2a 100644 --- a/var/spack/repos/builtin/packages/xorg-docs/package.py +++ b/var/spack/repos/builtin/packages/xorg-docs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XorgDocs(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xorg-gtest/package.py b/var/spack/repos/builtin/packages/xorg-gtest/package.py index 0052af681c..ac0b32adb0 100644 --- a/var/spack/repos/builtin/packages/xorg-gtest/package.py +++ b/var/spack/repos/builtin/packages/xorg-gtest/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XorgGtest(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xorg-server/package.py b/var/spack/repos/builtin/packages/xorg-server/package.py index fa9c813ea5..bfafd38968 100644 --- a/var/spack/repos/builtin/packages/xorg-server/package.py +++ b/var/spack/repos/builtin/packages/xorg-server/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XorgServer(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py index 5a91e78579..efd17b3aba 100644 --- a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py +++ b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XorgSgmlDoctools(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xphelloworld/package.py b/var/spack/repos/builtin/packages/xphelloworld/package.py index 2cf60e701d..3e7b4d59a4 100644 --- a/var/spack/repos/builtin/packages/xphelloworld/package.py +++ b/var/spack/repos/builtin/packages/xphelloworld/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xphelloworld(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xplor-nih/package.py b/var/spack/repos/builtin/packages/xplor-nih/package.py index e086e77834..bbbc122efb 100644 --- a/var/spack/repos/builtin/packages/xplor-nih/package.py +++ b/var/spack/repos/builtin/packages/xplor-nih/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class XplorNih(Package): diff --git a/var/spack/repos/builtin/packages/xplsprinters/package.py b/var/spack/repos/builtin/packages/xplsprinters/package.py index 6deec579db..600fb2ecb4 100644 --- a/var/spack/repos/builtin/packages/xplsprinters/package.py +++ b/var/spack/repos/builtin/packages/xplsprinters/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xplsprinters(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xpmem/package.py b/var/spack/repos/builtin/packages/xpmem/package.py index f2da727184..e0bdb2a9dd 100644 --- a/var/spack/repos/builtin/packages/xpmem/package.py +++ b/var/spack/repos/builtin/packages/xpmem/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xpmem(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xpr/package.py b/var/spack/repos/builtin/packages/xpr/package.py index 7f04dfa7a5..481bdc5b2b 100644 --- a/var/spack/repos/builtin/packages/xpr/package.py +++ b/var/spack/repos/builtin/packages/xpr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xpr(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py index d7f567ea2b..1e0b015891 100644 --- a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py +++ b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xprehashprinterlist(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xprop/package.py b/var/spack/repos/builtin/packages/xprop/package.py index fa2685982c..835fde88e5 100644 --- a/var/spack/repos/builtin/packages/xprop/package.py +++ b/var/spack/repos/builtin/packages/xprop/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xprop(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xproperty/package.py b/var/spack/repos/builtin/packages/xproperty/package.py index 05e8418c00..d96235c5cf 100644 --- a/var/spack/repos/builtin/packages/xproperty/package.py +++ b/var/spack/repos/builtin/packages/xproperty/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xproperty(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xproto/package.py b/var/spack/repos/builtin/packages/xproto/package.py index 5c050eb2d0..8b3a31729e 100644 --- a/var/spack/repos/builtin/packages/xproto/package.py +++ b/var/spack/repos/builtin/packages/xproto/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xproto(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py index 6227d3260e..374b3a1d2c 100644 --- a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py +++ b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xproxymanagementprotocol(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xqilla/package.py b/var/spack/repos/builtin/packages/xqilla/package.py index 2b46cc7577..bfc7cb0fd8 100644 --- a/var/spack/repos/builtin/packages/xqilla/package.py +++ b/var/spack/repos/builtin/packages/xqilla/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xqilla(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/xrandr/package.py b/var/spack/repos/builtin/packages/xrandr/package.py index fab83b90d0..940658633d 100644 --- a/var/spack/repos/builtin/packages/xrandr/package.py +++ b/var/spack/repos/builtin/packages/xrandr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xrandr(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xrdb/package.py b/var/spack/repos/builtin/packages/xrdb/package.py index c4fe633baa..beca8cff38 100644 --- a/var/spack/repos/builtin/packages/xrdb/package.py +++ b/var/spack/repos/builtin/packages/xrdb/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xrdb(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xrefresh/package.py b/var/spack/repos/builtin/packages/xrefresh/package.py index f1eff8e141..b58c777486 100644 --- a/var/spack/repos/builtin/packages/xrefresh/package.py +++ b/var/spack/repos/builtin/packages/xrefresh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xrefresh(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 7cefe530bd..ab44c738eb 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xrootd(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xrx/package.py b/var/spack/repos/builtin/packages/xrx/package.py index 154076758e..75c6ded51b 100644 --- a/var/spack/repos/builtin/packages/xrx/package.py +++ b/var/spack/repos/builtin/packages/xrx/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xrx(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index 7191939d77..5729ec8084 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xsbench(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xscope/package.py b/var/spack/repos/builtin/packages/xscope/package.py index e623a96bbe..c1a442bc8f 100644 --- a/var/spack/repos/builtin/packages/xscope/package.py +++ b/var/spack/repos/builtin/packages/xscope/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xscope(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xsd/package.py b/var/spack/repos/builtin/packages/xsd/package.py index 542f60c0e4..f96ceca3c9 100644 --- a/var/spack/repos/builtin/packages/xsd/package.py +++ b/var/spack/repos/builtin/packages/xsd/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xsd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xsdk-examples/package.py b/var/spack/repos/builtin/packages/xsdk-examples/package.py index 11a6b682a4..bc4e00c6f4 100644 --- a/var/spack/repos/builtin/packages/xsdk-examples/package.py +++ b/var/spack/repos/builtin/packages/xsdk-examples/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XsdkExamples(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index b4489d6b51..eec80e5b39 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -7,7 +7,7 @@ import sys from copy import deepcopy -from spack import * +from spack.package import * def xsdk_depends_on_accl(accl_name, accl_var, *args, **kwargs): diff --git a/var/spack/repos/builtin/packages/xset/package.py b/var/spack/repos/builtin/packages/xset/package.py index 140c0a185e..e06a5ba335 100644 --- a/var/spack/repos/builtin/packages/xset/package.py +++ b/var/spack/repos/builtin/packages/xset/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xset(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xsetmode/package.py b/var/spack/repos/builtin/packages/xsetmode/package.py index 3da2458d29..e14cb46bfb 100644 --- a/var/spack/repos/builtin/packages/xsetmode/package.py +++ b/var/spack/repos/builtin/packages/xsetmode/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xsetmode(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xsetpointer/package.py b/var/spack/repos/builtin/packages/xsetpointer/package.py index 1942914960..30ef77eb2d 100644 --- a/var/spack/repos/builtin/packages/xsetpointer/package.py +++ b/var/spack/repos/builtin/packages/xsetpointer/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xsetpointer(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xsetroot/package.py b/var/spack/repos/builtin/packages/xsetroot/package.py index 363bf569fe..c1a71c4325 100644 --- a/var/spack/repos/builtin/packages/xsetroot/package.py +++ b/var/spack/repos/builtin/packages/xsetroot/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xsetroot(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index fb80f2e112..83ec978444 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xsimd(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xsm/package.py b/var/spack/repos/builtin/packages/xsm/package.py index 32735cfe5b..343d4bdcde 100644 --- a/var/spack/repos/builtin/packages/xsm/package.py +++ b/var/spack/repos/builtin/packages/xsm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xsm(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xstdcmap/package.py b/var/spack/repos/builtin/packages/xstdcmap/package.py index 9df400add4..18f65faa31 100644 --- a/var/spack/repos/builtin/packages/xstdcmap/package.py +++ b/var/spack/repos/builtin/packages/xstdcmap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xstdcmap(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xtensor-python/package.py b/var/spack/repos/builtin/packages/xtensor-python/package.py index 81c6ce88fe..4bd87d48a7 100644 --- a/var/spack/repos/builtin/packages/xtensor-python/package.py +++ b/var/spack/repos/builtin/packages/xtensor-python/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class XtensorPython(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index 6701dfc94a..911d59d6f7 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xtensor(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xterm/package.py b/var/spack/repos/builtin/packages/xterm/package.py index 5467efa13f..8e6bfa9e1b 100644 --- a/var/spack/repos/builtin/packages/xterm/package.py +++ b/var/spack/repos/builtin/packages/xterm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xterm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py index bec81f7835..26e6d14fa5 100644 --- a/var/spack/repos/builtin/packages/xtl/package.py +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xtl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xtrans/package.py b/var/spack/repos/builtin/packages/xtrans/package.py index d47a48e0af..f2173eb5c1 100644 --- a/var/spack/repos/builtin/packages/xtrans/package.py +++ b/var/spack/repos/builtin/packages/xtrans/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xtrans(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xtrap/package.py b/var/spack/repos/builtin/packages/xtrap/package.py index dfdbd5a63d..1784ef8d8a 100644 --- a/var/spack/repos/builtin/packages/xtrap/package.py +++ b/var/spack/repos/builtin/packages/xtrap/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xtrap(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xts/package.py b/var/spack/repos/builtin/packages/xts/package.py index b5715b79c4..4df289b918 100644 --- a/var/spack/repos/builtin/packages/xts/package.py +++ b/var/spack/repos/builtin/packages/xts/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xts(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xvidtune/package.py b/var/spack/repos/builtin/packages/xvidtune/package.py index 245e528fb2..9fad6f5121 100644 --- a/var/spack/repos/builtin/packages/xvidtune/package.py +++ b/var/spack/repos/builtin/packages/xvidtune/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xvidtune(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xvinfo/package.py b/var/spack/repos/builtin/packages/xvinfo/package.py index c45175554b..d4e4632010 100644 --- a/var/spack/repos/builtin/packages/xvinfo/package.py +++ b/var/spack/repos/builtin/packages/xvinfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xvinfo(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xwd/package.py b/var/spack/repos/builtin/packages/xwd/package.py index 79b5418abc..23aa28b3c0 100644 --- a/var/spack/repos/builtin/packages/xwd/package.py +++ b/var/spack/repos/builtin/packages/xwd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xwd(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xwidgets/package.py b/var/spack/repos/builtin/packages/xwidgets/package.py index c44f134b8a..a8dccb9294 100644 --- a/var/spack/repos/builtin/packages/xwidgets/package.py +++ b/var/spack/repos/builtin/packages/xwidgets/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xwidgets(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xwininfo/package.py b/var/spack/repos/builtin/packages/xwininfo/package.py index 29a58b20a9..c2e7157704 100644 --- a/var/spack/repos/builtin/packages/xwininfo/package.py +++ b/var/spack/repos/builtin/packages/xwininfo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xwininfo(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xwud/package.py b/var/spack/repos/builtin/packages/xwud/package.py index 2d83fbd18f..1571fb19f8 100644 --- a/var/spack/repos/builtin/packages/xwud/package.py +++ b/var/spack/repos/builtin/packages/xwud/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xwud(AutotoolsPackage, XorgPackage): diff --git a/var/spack/repos/builtin/packages/xxd-standalone/package.py b/var/spack/repos/builtin/packages/xxd-standalone/package.py index 0a43c40399..31383c445c 100644 --- a/var/spack/repos/builtin/packages/xxd-standalone/package.py +++ b/var/spack/repos/builtin/packages/xxd-standalone/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class XxdStandalone(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xxhash/package.py b/var/spack/repos/builtin/packages/xxhash/package.py index a86597b13f..c4a7bbb186 100644 --- a/var/spack/repos/builtin/packages/xxhash/package.py +++ b/var/spack/repos/builtin/packages/xxhash/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xxhash(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py index 0a64e2d5b7..b366504f0f 100644 --- a/var/spack/repos/builtin/packages/xyce/package.py +++ b/var/spack/repos/builtin/packages/xyce/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Xyce(CMakePackage): diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py index b333e0af85..dc4661582e 100644 --- a/var/spack/repos/builtin/packages/xz/package.py +++ b/var/spack/repos/builtin/packages/xz/package.py @@ -5,7 +5,7 @@ import re -from spack import * +from spack.package import * class Xz(AutotoolsPackage, SourceforgePackage): diff --git a/var/spack/repos/builtin/packages/yajl/package.py b/var/spack/repos/builtin/packages/yajl/package.py index 516b0f9d8b..2fc292fa11 100644 --- a/var/spack/repos/builtin/packages/yajl/package.py +++ b/var/spack/repos/builtin/packages/yajl/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Yajl(CMakePackage): diff --git a/var/spack/repos/builtin/packages/yaksa/package.py b/var/spack/repos/builtin/packages/yaksa/package.py index 25f872f45e..a01ca4d34e 100644 --- a/var/spack/repos/builtin/packages/yaksa/package.py +++ b/var/spack/repos/builtin/packages/yaksa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Yaksa(AutotoolsPackage, CudaPackage, ROCmPackage): diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py index 60ba71b8db..e7b1866690 100644 --- a/var/spack/repos/builtin/packages/yambo/package.py +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Yambo(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index 7bb9325c6b..83789e3624 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * from spack.pkg.builtin.boost import Boost from spack.spec import ConflictsInSpecError diff --git a/var/spack/repos/builtin/packages/yara/package.py b/var/spack/repos/builtin/packages/yara/package.py index db16e17a77..1b1af95c24 100644 --- a/var/spack/repos/builtin/packages/yara/package.py +++ b/var/spack/repos/builtin/packages/yara/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Yara(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/yarn/package.py b/var/spack/repos/builtin/packages/yarn/package.py index 81b11371b0..24094d593d 100644 --- a/var/spack/repos/builtin/packages/yarn/package.py +++ b/var/spack/repos/builtin/packages/yarn/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Yarn(Package): diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py index 8734824217..53198fff05 100644 --- a/var/spack/repos/builtin/packages/yasm/package.py +++ b/var/spack/repos/builtin/packages/yasm/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Yasm(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/ycsb/package.py b/var/spack/repos/builtin/packages/ycsb/package.py index d2490f282a..35cf418263 100644 --- a/var/spack/repos/builtin/packages/ycsb/package.py +++ b/var/spack/repos/builtin/packages/ycsb/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Ycsb(MavenPackage): """Yahoo! Cloud Serving Benchmark.""" diff --git a/var/spack/repos/builtin/packages/yoda/package.py b/var/spack/repos/builtin/packages/yoda/package.py index 0dca0808ca..1b0c0b4693 100644 --- a/var/spack/repos/builtin/packages/yoda/package.py +++ b/var/spack/repos/builtin/packages/yoda/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/yorick/package.py b/var/spack/repos/builtin/packages/yorick/package.py index 67c9dfbcef..d7d7946702 100644 --- a/var/spack/repos/builtin/packages/yorick/package.py +++ b/var/spack/repos/builtin/packages/yorick/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Yorick(Package): diff --git a/var/spack/repos/builtin/packages/z-checker/package.py b/var/spack/repos/builtin/packages/z-checker/package.py index 14a54b6025..6b1466e3cd 100644 --- a/var/spack/repos/builtin/packages/z-checker/package.py +++ b/var/spack/repos/builtin/packages/z-checker/package.py @@ -3,9 +3,9 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -# ---------------------------------------------------------------------------- +from spack.package import * -from spack import * +# ---------------------------------------------------------------------------- class ZChecker(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/z3/package.py b/var/spack/repos/builtin/packages/z3/package.py index 279dce647a..643b8cea51 100644 --- a/var/spack/repos/builtin/packages/z3/package.py +++ b/var/spack/repos/builtin/packages/z3/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Z3(CMakePackage): diff --git a/var/spack/repos/builtin/packages/zabbix/package.py b/var/spack/repos/builtin/packages/zabbix/package.py index b1bf32596d..4db704d46e 100644 --- a/var/spack/repos/builtin/packages/zabbix/package.py +++ b/var/spack/repos/builtin/packages/zabbix/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zabbix(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/zfp/package.py b/var/spack/repos/builtin/packages/zfp/package.py index 3d1b8793ad..22bc12fd33 100644 --- a/var/spack/repos/builtin/packages/zfp/package.py +++ b/var/spack/repos/builtin/packages/zfp/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zfp(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/zfs/package.py b/var/spack/repos/builtin/packages/zfs/package.py index 23fcf21959..cbe21507bb 100644 --- a/var/spack/repos/builtin/packages/zfs/package.py +++ b/var/spack/repos/builtin/packages/zfs/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zfs(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/zig/package.py b/var/spack/repos/builtin/packages/zig/package.py index ea65c4e43c..d8365bc4b1 100644 --- a/var/spack/repos/builtin/packages/zig/package.py +++ b/var/spack/repos/builtin/packages/zig/package.py @@ -2,6 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Zig(CMakePackage): """A general-purpose programming language and toolchain for maintaining robust, optimal, and reusable software. diff --git a/var/spack/repos/builtin/packages/zip/package.py b/var/spack/repos/builtin/packages/zip/package.py index 514d666c2f..02c76999d7 100644 --- a/var/spack/repos/builtin/packages/zip/package.py +++ b/var/spack/repos/builtin/packages/zip/package.py @@ -5,6 +5,8 @@ import re +from spack.package import * + class Zip(MakefilePackage): """Zip is a compression and file packaging/archive utility.""" diff --git a/var/spack/repos/builtin/packages/zipkin/package.py b/var/spack/repos/builtin/packages/zipkin/package.py index 116935e925..0f3e9493d2 100644 --- a/var/spack/repos/builtin/packages/zipkin/package.py +++ b/var/spack/repos/builtin/packages/zipkin/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class Zipkin(MavenPackage): """Zipkin is a distributed tracing system. It helps gather timing data needed to troubleshoot latency problems in service diff --git a/var/spack/repos/builtin/packages/zlib-ng/package.py b/var/spack/repos/builtin/packages/zlib-ng/package.py index 9999fe8904..ad7d782874 100644 --- a/var/spack/repos/builtin/packages/zlib-ng/package.py +++ b/var/spack/repos/builtin/packages/zlib-ng/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class ZlibNg(CMakePackage): diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index f7bd9574d9..456114016d 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -9,6 +9,8 @@ import glob import os +from spack.package import * + class Zlib(Package): """A free, general-purpose, legally unencumbered lossless diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index 2f49ec76d9..cee116c16b 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -6,7 +6,7 @@ import re -from spack import * +from spack.package import * class Zoltan(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/zookeeper-benchmark/package.py b/var/spack/repos/builtin/packages/zookeeper-benchmark/package.py index 8db6bd56bb..a5eda430bb 100644 --- a/var/spack/repos/builtin/packages/zookeeper-benchmark/package.py +++ b/var/spack/repos/builtin/packages/zookeeper-benchmark/package.py @@ -4,6 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + class ZookeeperBenchmark(MavenPackage): """It is designed to measure the per-request latency of a ZooKeeper ensemble for a predetermined length of time""" diff --git a/var/spack/repos/builtin/packages/zookeeper/package.py b/var/spack/repos/builtin/packages/zookeeper/package.py index 76b9b1a016..b60df74eb0 100644 --- a/var/spack/repos/builtin/packages/zookeeper/package.py +++ b/var/spack/repos/builtin/packages/zookeeper/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zookeeper(Package): diff --git a/var/spack/repos/builtin/packages/zpares/package.py b/var/spack/repos/builtin/packages/zpares/package.py index 9abbaf5469..13f3573b0d 100644 --- a/var/spack/repos/builtin/packages/zpares/package.py +++ b/var/spack/repos/builtin/packages/zpares/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zpares(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py index fd4d9f1e38..12979114c6 100644 --- a/var/spack/repos/builtin/packages/zsh/package.py +++ b/var/spack/repos/builtin/packages/zsh/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zsh(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/zstd/package.py b/var/spack/repos/builtin/packages/zstd/package.py index c27d735d4e..d7baca0e73 100644 --- a/var/spack/repos/builtin/packages/zstd/package.py +++ b/var/spack/repos/builtin/packages/zstd/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zstd(MakefilePackage): diff --git a/var/spack/repos/builtin/packages/zstr/package.py b/var/spack/repos/builtin/packages/zstr/package.py index 0b074b76f6..a5a269faaf 100644 --- a/var/spack/repos/builtin/packages/zstr/package.py +++ b/var/spack/repos/builtin/packages/zstr/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zstr(Package): diff --git a/var/spack/repos/builtin/packages/zziplib/package.py b/var/spack/repos/builtin/packages/zziplib/package.py index d45238eead..bf2e4d208d 100644 --- a/var/spack/repos/builtin/packages/zziplib/package.py +++ b/var/spack/repos/builtin/packages/zziplib/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Zziplib(AutotoolsPackage): diff --git a/var/spack/repos/tutorial/packages/armadillo/package.py b/var/spack/repos/tutorial/packages/armadillo/package.py index 5d54d64f1a..7913ce354b 100644 --- a/var/spack/repos/tutorial/packages/armadillo/package.py +++ b/var/spack/repos/tutorial/packages/armadillo/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Armadillo(CMakePackage): diff --git a/var/spack/repos/tutorial/packages/elpa/package.py b/var/spack/repos/tutorial/packages/elpa/package.py index 6d7dc82b20..2fad884a88 100644 --- a/var/spack/repos/tutorial/packages/elpa/package.py +++ b/var/spack/repos/tutorial/packages/elpa/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class Elpa(AutotoolsPackage): diff --git a/var/spack/repos/tutorial/packages/hdf5/package.py b/var/spack/repos/tutorial/packages/hdf5/package.py index 73e54baeb8..733b549efe 100644 --- a/var/spack/repos/tutorial/packages/hdf5/package.py +++ b/var/spack/repos/tutorial/packages/hdf5/package.py @@ -9,6 +9,8 @@ import sys import llnl.util.tty as tty +from spack.package import * + class Hdf5(CMakePackage): """HDF5 is a data model, library, and file format for storing and managing diff --git a/var/spack/repos/tutorial/packages/mpich/package.py b/var/spack/repos/tutorial/packages/mpich/package.py index b5befe995d..1e372528a4 100644 --- a/var/spack/repos/tutorial/packages/mpich/package.py +++ b/var/spack/repos/tutorial/packages/mpich/package.py @@ -5,7 +5,7 @@ import os -from spack import * +from spack.package import * class Mpich(AutotoolsPackage): diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/package.py b/var/spack/repos/tutorial/packages/netlib-lapack/package.py index c73c977723..01c987aafd 100644 --- a/var/spack/repos/tutorial/packages/netlib-lapack/package.py +++ b/var/spack/repos/tutorial/packages/netlib-lapack/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.package import * class NetlibLapack(CMakePackage): |