refactor: packages import spack.package explicitly (#30404)

Explicitly import package utilities in all packages, and corresponding fallout.

This includes:

* rename `spack.package` to `spack.package_base`
* rename `spack.pkgkit` to `spack.package`
* update all packages in builtin, builtin_mock and tutorials to include `from spack.package import *`
* update spack style
  * ensure packages include the import
  * automatically add the new import and remove any/all imports of `spack` and `spack.pkgkit`
    from packages when using `--fix`
  * add support for type-checking packages with mypy when SPACK_MYPY_CHECK_PACKAGES
    is set in the environment
* fix all type checking errors in packages in spack upstream
* update spack create to include the new imports
* update spack repo to inject the new import, injection persists to allow for a deprecation period

Original message below:
 
As requested @adamjstewart, update all packages to use pkgkit.  I ended up using isort to do this,
so repro is easy:

```console
$ isort -a 'from spack.pkgkit import *' --rm 'spack' ./var/spack/repos/builtin/packages/*/package.py
$ spack style --fix
```

There were several line spacing fixups caused either by space manipulation in isort or by packages
that haven't been touched since we added requirements, but there are no functional changes in here.

* [x] add config to isort to make sure this is maintained going forward

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):

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):

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

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):

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):

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):

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):

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):

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):

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"""
 

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):

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):

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):

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):

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):

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):

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):

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')

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'
 

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.

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.

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"

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"

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"

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."""

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):

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):

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):

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):

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):

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

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

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

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):

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):

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):

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):

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"

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"

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.

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):

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):

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):

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"

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):

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):

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"""
 

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"

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"

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"

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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

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):

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):

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):

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):

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):

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):

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):

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):

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):

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"

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):

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):

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):

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):

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):

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):

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):

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):

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

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):

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):

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):

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):

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):

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):

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):

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):