From a26393e12b6cf8949fb5cdb8e4e8690cdd58c001 Mon Sep 17 00:00:00 2001
From: Adrian Ciu <adrian.ciu@codemart.ro>
Date: Tue, 11 Mar 2025 02:05:22 +0100
Subject: [PATCH] feat: import spack.package explicitly in all packages

---
 packages/acpype/package.py                       | 2 +-
 packages/apbs/package.py                         | 2 +-
 packages/build-brainscales/package.py            | 2 +-
 packages/clb-nb-utils/package.py                 | 2 +-
 packages/genpybind/package.py                    | 2 +-
 packages/hxtorch/package.py                      | 2 +-
 packages/inja/package.py                         | 2 +-
 packages/jaxsnn/package.py                       | 2 +-
 packages/nest/package.py                         | 2 +-
 packages/oppulance/package.py                    | 2 +-
 packages/psmisc/package.py                       | 2 +-
 packages/py-annarchy/package.py                  | 2 +-
 packages/py-bct/package.py                       | 2 +-
 packages/py-biobb-analysis/package.py            | 2 +-
 packages/py-biobb-chemistry/package.py           | 2 +-
 packages/py-cerebstats/package.py                | 2 +-
 packages/py-cerebunit/package.py                 | 2 +-
 packages/py-clang-format/package.py              | 2 +-
 packages/py-cons/package.py                      | 2 +-
 packages/py-dicthash/package.py                  | 2 +-
 packages/py-etuples/package.py                   | 2 +-
 packages/py-flask-restx/package.py               | 2 +-
 packages/py-formencode/package.py                | 3 +--
 packages/py-frites/package.py                    | 2 +-
 packages/py-hbp-archive/package.py               | 2 +-
 packages/py-hbp-neuromorphic-platform/package.py | 2 +-
 packages/py-hippounit/package.py                 | 2 +-
 packages/py-junitparser/package.py               | 2 +-
 packages/py-lems/package.py                      | 2 +-
 packages/py-lfpy/package.py                      | 2 +-
 packages/py-lfpykit/package.py                   | 2 +-
 packages/py-libneuroml/package.py                | 2 +-
 packages/py-logical-unification/package.py       | 2 +-
 packages/py-mini-kanren/package.py               | 2 +-
 packages/py-mmcif-pdbx/package.py                | 2 +-
 packages/py-morphounit/package.py                | 2 +-
 packages/py-nameparser/package.py                | 2 +-
 packages/py-neo/package.py                       | 2 +-
 packages/py-nested-dict/package.py               | 2 +-
 packages/py-nestml/package.py                    | 2 +-
 packages/py-nflows/package.py                    | 2 +-
 packages/py-nnmt/package.py                      | 2 +-
 packages/py-odetoolbox/package.py                | 2 +-
 packages/py-pdb2pqr/package.py                   | 2 +-
 packages/py-propka/package.py                    | 2 +-
 packages/py-pyaescrypt/package.py                | 2 +-
 packages/py-pycatch22/package.py                 | 2 +-
 packages/py-pyknos/package.py                    | 2 +-
 packages/py-pymc/package.py                      | 2 +-
 packages/py-pynn/package.py                      | 2 +-
 packages/py-pyspike/package.py                   | 2 +-
 packages/py-pyswarms/package.py                  | 2 +-
 packages/py-pytensor/package.py                  | 2 +-
 packages/py-python-keycloak/package.py           | 2 +-
 packages/py-pyunicore/package.py                 | 2 +-
 packages/py-quantities-scidash/package.py        | 2 +-
 packages/py-quantities/package.py                | 2 +-
 packages/py-sbi/package.py                       | 2 +-
 packages/py-sciunit/package.py                   | 2 +-
 packages/py-snudda/package.py                    | 2 +-
 packages/py-tvb-contrib/package.py               | 2 +-
 packages/py-tvb-data/package.py                  | 2 +-
 packages/py-tvb-ext-bucket/package.py            | 2 +-
 packages/py-tvb-framework/package.py             | 2 +-
 packages/py-tvb-gdist/package.py                 | 2 +-
 packages/py-tvb-library/package.py               | 2 +-
 packages/py-tvb-multiscale/package.py            | 2 +-
 packages/py-tvb-storage/package.py               | 2 +-
 packages/py-tvb-widgets/package.py               | 2 +-
 packages/py-umnn/package.py                      | 2 +-
 packages/py-vbi/package.py                       | 2 +-
 packages/py-viziphant/package.py                 | 2 +-
 packages/py-zuko/package.py                      | 2 +-
 packages/pynn-brainscales/package.py             | 2 +-
 packages/sda/package.py                          | 2 +-
 packages/wf-biobb/package.py                     | 2 +-
 packages/wf-brainscales2-demos/package.py        | 2 +-
 packages/wf-bsb/package.py                       | 2 +-
 packages/wf-custom-python/package.py             | 2 +-
 packages/wf-human-multi-area-model/package.py    | 2 +-
 packages/wf-multi-area-model/package.py          | 2 +-
 packages/wf-protein-association-rates/package.py | 2 +-
 packages/wf-uq-akar4/package.py                  | 2 +-
 83 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/packages/acpype/package.py b/packages/acpype/package.py
index cff6bc8e..c6382b76 100644
--- a/packages/acpype/package.py
+++ b/packages/acpype/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class Acpype(PythonPackage):
     """A tool based in Python to use Antechamber to generate topologies for chemical 
diff --git a/packages/apbs/package.py b/packages/apbs/package.py
index f7f45c6e..bbfac340 100644
--- a/packages/apbs/package.py
+++ b/packages/apbs/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Apbs(CMakePackage):
diff --git a/packages/build-brainscales/package.py b/packages/build-brainscales/package.py
index 2419107c..327501d1 100644
--- a/packages/build-brainscales/package.py
+++ b/packages/build-brainscales/package.py
@@ -7,7 +7,7 @@ import os
 import unittest.mock
 import xml.etree.ElementTree as ET
 
-from spack import *
+from spack.package import *
 from spack.util.environment import EnvironmentModifications
 import spack.build_environment
 
diff --git a/packages/clb-nb-utils/package.py b/packages/clb-nb-utils/package.py
index d75ae48c..40660252 100644
--- a/packages/clb-nb-utils/package.py
+++ b/packages/clb-nb-utils/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 # Usage
 # from clb_nb_utils import oauth
diff --git a/packages/genpybind/package.py b/packages/genpybind/package.py
index 012d2e5b..bca2c483 100644
--- a/packages/genpybind/package.py
+++ b/packages/genpybind/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Genpybind(WafPackage):
diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py
index d4a5ea66..7d3a26bf 100644
--- a/packages/hxtorch/package.py
+++ b/packages/hxtorch/package.py
@@ -7,7 +7,7 @@ import os
 import unittest.mock
 import xml.etree.ElementTree as ET
 
-from spack import *
+from spack.package import *
 from spack.util.environment import EnvironmentModifications
 import spack.build_environment
 
diff --git a/packages/inja/package.py b/packages/inja/package.py
index f8f653e4..47a20743 100644
--- a/packages/inja/package.py
+++ b/packages/inja/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Inja(CMakePackage):
diff --git a/packages/jaxsnn/package.py b/packages/jaxsnn/package.py
index b2b33296..8cca2481 100644
--- a/packages/jaxsnn/package.py
+++ b/packages/jaxsnn/package.py
@@ -7,7 +7,7 @@ import os
 import unittest.mock
 import xml.etree.ElementTree as ET
 
-from spack import *
+from spack.package import *
 from spack.util.environment import EnvironmentModifications
 import spack.build_environment
 
diff --git a/packages/nest/package.py b/packages/nest/package.py
index e97b81c8..d8e127da 100644
--- a/packages/nest/package.py
+++ b/packages/nest/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 import re
 
 
diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py
index 7e0d22b6..7dc37d0a 100644
--- a/packages/oppulance/package.py
+++ b/packages/oppulance/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 import unittest.mock
 
 
diff --git a/packages/psmisc/package.py b/packages/psmisc/package.py
index f1a67530..4b727f19 100644
--- a/packages/psmisc/package.py
+++ b/packages/psmisc/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Psmisc(AutotoolsPackage):
diff --git a/packages/py-annarchy/package.py b/packages/py-annarchy/package.py
index 4368d1e0..9fb9cab9 100644
--- a/packages/py-annarchy/package.py
+++ b/packages/py-annarchy/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyAnnarchy(PythonPackage):
diff --git a/packages/py-bct/package.py b/packages/py-bct/package.py
index bfa61d91..97ecec1b 100644
--- a/packages/py-bct/package.py
+++ b/packages/py-bct/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyBct(PythonPackage):
diff --git a/packages/py-biobb-analysis/package.py b/packages/py-biobb-analysis/package.py
index 9c580af0..79ce6edc 100644
--- a/packages/py-biobb-analysis/package.py
+++ b/packages/py-biobb-analysis/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyBiobbAnalysis(PythonPackage):
     """Biobb_analysis is the Biobb module collection to perform analysis 
diff --git a/packages/py-biobb-chemistry/package.py b/packages/py-biobb-chemistry/package.py
index c30b8092..969a5058 100644
--- a/packages/py-biobb-chemistry/package.py
+++ b/packages/py-biobb-chemistry/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyBiobbChemistry(PythonPackage):
     """Biobb_chemistry is the Biobb module collection to perform chemistry 
diff --git a/packages/py-cerebstats/package.py b/packages/py-cerebstats/package.py
index 5b1d3865..5c3a6f8a 100644
--- a/packages/py-cerebstats/package.py
+++ b/packages/py-cerebstats/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyCerebstats(PythonPackage):
diff --git a/packages/py-cerebunit/package.py b/packages/py-cerebunit/package.py
index d4a70054..62e29223 100644
--- a/packages/py-cerebunit/package.py
+++ b/packages/py-cerebunit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyCerebunit(PythonPackage):
diff --git a/packages/py-clang-format/package.py b/packages/py-clang-format/package.py
index 7be2c021..19d74273 100644
--- a/packages/py-clang-format/package.py
+++ b/packages/py-clang-format/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyClangFormat(PythonPackage):
diff --git a/packages/py-cons/package.py b/packages/py-cons/package.py
index 77b2e1ab..e114b5b5 100644
--- a/packages/py-cons/package.py
+++ b/packages/py-cons/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyCons(PythonPackage):
diff --git a/packages/py-dicthash/package.py b/packages/py-dicthash/package.py
index 2fd2daf0..55ae9198 100644
--- a/packages/py-dicthash/package.py
+++ b/packages/py-dicthash/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyDicthash(PythonPackage):
diff --git a/packages/py-etuples/package.py b/packages/py-etuples/package.py
index d3462437..d8cca9f6 100644
--- a/packages/py-etuples/package.py
+++ b/packages/py-etuples/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyEtuples(PythonPackage):
diff --git a/packages/py-flask-restx/package.py b/packages/py-flask-restx/package.py
index 171f1039..7f9c45ec 100644
--- a/packages/py-flask-restx/package.py
+++ b/packages/py-flask-restx/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyFlaskRestx(PythonPackage):
diff --git a/packages/py-formencode/package.py b/packages/py-formencode/package.py
index f78e0e63..56c94e3d 100644
--- a/packages/py-formencode/package.py
+++ b/packages/py-formencode/package.py
@@ -3,8 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
-
+from spack.package import *
 
 class PyFormencode(PythonPackage):
     """
diff --git a/packages/py-frites/package.py b/packages/py-frites/package.py
index 67c8f204..59aaca93 100644
--- a/packages/py-frites/package.py
+++ b/packages/py-frites/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyFrites(PythonPackage):
diff --git a/packages/py-hbp-archive/package.py b/packages/py-hbp-archive/package.py
index 580ec106..6f9921b0 100644
--- a/packages/py-hbp-archive/package.py
+++ b/packages/py-hbp-archive/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyHbpArchive(PythonPackage):
diff --git a/packages/py-hbp-neuromorphic-platform/package.py b/packages/py-hbp-neuromorphic-platform/package.py
index 06502497..3308957b 100644
--- a/packages/py-hbp-neuromorphic-platform/package.py
+++ b/packages/py-hbp-neuromorphic-platform/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyHbpNeuromorphicPlatform(PythonPackage):
diff --git a/packages/py-hippounit/package.py b/packages/py-hippounit/package.py
index 0317272c..0a6c294f 100644
--- a/packages/py-hippounit/package.py
+++ b/packages/py-hippounit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyHippounit(PythonPackage):
diff --git a/packages/py-junitparser/package.py b/packages/py-junitparser/package.py
index 5f93f3e2..b794a44c 100644
--- a/packages/py-junitparser/package.py
+++ b/packages/py-junitparser/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyJunitparser(PythonPackage):
diff --git a/packages/py-lems/package.py b/packages/py-lems/package.py
index 456c8676..ff0173af 100644
--- a/packages/py-lems/package.py
+++ b/packages/py-lems/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLems(PythonPackage):
diff --git a/packages/py-lfpy/package.py b/packages/py-lfpy/package.py
index bc3a1ee4..27cba28b 100644
--- a/packages/py-lfpy/package.py
+++ b/packages/py-lfpy/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLfpy(PythonPackage):
diff --git a/packages/py-lfpykit/package.py b/packages/py-lfpykit/package.py
index 3768a8c4..ccabc623 100644
--- a/packages/py-lfpykit/package.py
+++ b/packages/py-lfpykit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLfpykit(PythonPackage):
diff --git a/packages/py-libneuroml/package.py b/packages/py-libneuroml/package.py
index d660b23e..babb2b21 100644
--- a/packages/py-libneuroml/package.py
+++ b/packages/py-libneuroml/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLibneuroml(PythonPackage):
diff --git a/packages/py-logical-unification/package.py b/packages/py-logical-unification/package.py
index 7ba1620e..e4c453c1 100644
--- a/packages/py-logical-unification/package.py
+++ b/packages/py-logical-unification/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLogicalUnification(PythonPackage):
diff --git a/packages/py-mini-kanren/package.py b/packages/py-mini-kanren/package.py
index 2d24eb02..d777ee61 100644
--- a/packages/py-mini-kanren/package.py
+++ b/packages/py-mini-kanren/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyMiniKanren(PythonPackage):
diff --git a/packages/py-mmcif-pdbx/package.py b/packages/py-mmcif-pdbx/package.py
index 02daf8fc..25dfc8ed 100644
--- a/packages/py-mmcif-pdbx/package.py
+++ b/packages/py-mmcif-pdbx/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyMmcifPdbx(PythonPackage):
diff --git a/packages/py-morphounit/package.py b/packages/py-morphounit/package.py
index 3884482e..382a6d49 100644
--- a/packages/py-morphounit/package.py
+++ b/packages/py-morphounit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyMorphounit(PythonPackage):
diff --git a/packages/py-nameparser/package.py b/packages/py-nameparser/package.py
index a3e3eb71..f4eb768b 100644
--- a/packages/py-nameparser/package.py
+++ b/packages/py-nameparser/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNameparser(PythonPackage):
diff --git a/packages/py-neo/package.py b/packages/py-neo/package.py
index 90054098..3ce2a9bc 100644
--- a/packages/py-neo/package.py
+++ b/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/packages/py-nested-dict/package.py b/packages/py-nested-dict/package.py
index 5fc5ff00..96e9b79b 100644
--- a/packages/py-nested-dict/package.py
+++ b/packages/py-nested-dict/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNestedDict(PythonPackage):
diff --git a/packages/py-nestml/package.py b/packages/py-nestml/package.py
index a5ea9b1b..d3437f3b 100644
--- a/packages/py-nestml/package.py
+++ b/packages/py-nestml/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNestml(PythonPackage):
diff --git a/packages/py-nflows/package.py b/packages/py-nflows/package.py
index 72f82caf..b6c32ffe 100644
--- a/packages/py-nflows/package.py
+++ b/packages/py-nflows/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyNflows(PythonPackage):
     """It is a comprehensive collection of normalizing flows using PyTorch."""
diff --git a/packages/py-nnmt/package.py b/packages/py-nnmt/package.py
index 7b722a7f..c605bd72 100644
--- a/packages/py-nnmt/package.py
+++ b/packages/py-nnmt/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNnmt(PythonPackage):
diff --git a/packages/py-odetoolbox/package.py b/packages/py-odetoolbox/package.py
index 3ebd6e68..c5ccc459 100644
--- a/packages/py-odetoolbox/package.py
+++ b/packages/py-odetoolbox/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyOdetoolbox(PythonPackage):
diff --git a/packages/py-pdb2pqr/package.py b/packages/py-pdb2pqr/package.py
index 1e87023a..b737eb38 100644
--- a/packages/py-pdb2pqr/package.py
+++ b/packages/py-pdb2pqr/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPdb2pqr(PythonPackage):
diff --git a/packages/py-propka/package.py b/packages/py-propka/package.py
index edb466b4..b75a09b3 100644
--- a/packages/py-propka/package.py
+++ b/packages/py-propka/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPropka(PythonPackage):
diff --git a/packages/py-pyaescrypt/package.py b/packages/py-pyaescrypt/package.py
index d0b38eb1..ab15e7f7 100644
--- a/packages/py-pyaescrypt/package.py
+++ b/packages/py-pyaescrypt/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyaescrypt(PythonPackage):
diff --git a/packages/py-pycatch22/package.py b/packages/py-pycatch22/package.py
index 68c4be09..6707282e 100644
--- a/packages/py-pycatch22/package.py
+++ b/packages/py-pycatch22/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPycatch22(PythonPackage):
diff --git a/packages/py-pyknos/package.py b/packages/py-pyknos/package.py
index e9449a6d..151fd077 100644
--- a/packages/py-pyknos/package.py
+++ b/packages/py-pyknos/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyknos(PythonPackage):
diff --git a/packages/py-pymc/package.py b/packages/py-pymc/package.py
index b7dc999f..453829ab 100644
--- a/packages/py-pymc/package.py
+++ b/packages/py-pymc/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPymc(PythonPackage):
diff --git a/packages/py-pynn/package.py b/packages/py-pynn/package.py
index f75382bc..73df7c20 100644
--- a/packages/py-pynn/package.py
+++ b/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/packages/py-pyspike/package.py b/packages/py-pyspike/package.py
index ddf17e7e..c0ce25b6 100644
--- a/packages/py-pyspike/package.py
+++ b/packages/py-pyspike/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyspike(PythonPackage):
diff --git a/packages/py-pyswarms/package.py b/packages/py-pyswarms/package.py
index 60c85b39..f9d94540 100644
--- a/packages/py-pyswarms/package.py
+++ b/packages/py-pyswarms/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyswarms(PythonPackage):
diff --git a/packages/py-pytensor/package.py b/packages/py-pytensor/package.py
index 4c045393..b47935f4 100644
--- a/packages/py-pytensor/package.py
+++ b/packages/py-pytensor/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyPytensor(PythonPackage):
     """Python library that allows one to define, optimize, and efficiently evaluate mathematical expressions involving
diff --git a/packages/py-python-keycloak/package.py b/packages/py-python-keycloak/package.py
index 44c4d562..b7f3d7cc 100644
--- a/packages/py-python-keycloak/package.py
+++ b/packages/py-python-keycloak/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyPythonKeycloak(PythonPackage):
     """python-keycloak is a Python package providing access to the Keycloak API"""
diff --git a/packages/py-pyunicore/package.py b/packages/py-pyunicore/package.py
index 1d6b71b3..0eb54988 100644
--- a/packages/py-pyunicore/package.py
+++ b/packages/py-pyunicore/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyunicore(PythonPackage):
diff --git a/packages/py-quantities-scidash/package.py b/packages/py-quantities-scidash/package.py
index 08fcee32..f075e7fa 100644
--- a/packages/py-quantities-scidash/package.py
+++ b/packages/py-quantities-scidash/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyQuantitiesScidash(PythonPackage):
diff --git a/packages/py-quantities/package.py b/packages/py-quantities/package.py
index ffe38173..e5d14e95 100644
--- a/packages/py-quantities/package.py
+++ b/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/packages/py-sbi/package.py b/packages/py-sbi/package.py
index a560cd93..5e1c50df 100644
--- a/packages/py-sbi/package.py
+++ b/packages/py-sbi/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PySbi(PythonPackage):
diff --git a/packages/py-sciunit/package.py b/packages/py-sciunit/package.py
index 5684040b..ca8cf891 100644
--- a/packages/py-sciunit/package.py
+++ b/packages/py-sciunit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PySciunit(PythonPackage):
diff --git a/packages/py-snudda/package.py b/packages/py-snudda/package.py
index 621df60f..f8458a3f 100644
--- a/packages/py-snudda/package.py
+++ b/packages/py-snudda/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PySnudda(PythonPackage):
diff --git a/packages/py-tvb-contrib/package.py b/packages/py-tvb-contrib/package.py
index 8f940f0c..7a136a1a 100644
--- a/packages/py-tvb-contrib/package.py
+++ b/packages/py-tvb-contrib/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbContrib(PythonPackage):
diff --git a/packages/py-tvb-data/package.py b/packages/py-tvb-data/package.py
index 1e5e9353..abe486cd 100644
--- a/packages/py-tvb-data/package.py
+++ b/packages/py-tvb-data/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbData(PythonPackage):
diff --git a/packages/py-tvb-ext-bucket/package.py b/packages/py-tvb-ext-bucket/package.py
index 3d5e7c2b..29fdae03 100644
--- a/packages/py-tvb-ext-bucket/package.py
+++ b/packages/py-tvb-ext-bucket/package.py
@@ -1,4 +1,4 @@
-from spack import *
+from spack.package import *
 
 
 class PyTvbExtBucket(PythonPackage):
diff --git a/packages/py-tvb-framework/package.py b/packages/py-tvb-framework/package.py
index fb1ebc2f..12c01e6a 100644
--- a/packages/py-tvb-framework/package.py
+++ b/packages/py-tvb-framework/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbFramework(PythonPackage):
diff --git a/packages/py-tvb-gdist/package.py b/packages/py-tvb-gdist/package.py
index 34f70127..38cfa771 100644
--- a/packages/py-tvb-gdist/package.py
+++ b/packages/py-tvb-gdist/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbGdist(PythonPackage):
diff --git a/packages/py-tvb-library/package.py b/packages/py-tvb-library/package.py
index c624a102..8386fb5a 100644
--- a/packages/py-tvb-library/package.py
+++ b/packages/py-tvb-library/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbLibrary(PythonPackage):
diff --git a/packages/py-tvb-multiscale/package.py b/packages/py-tvb-multiscale/package.py
index b57b8f03..176f5532 100644
--- a/packages/py-tvb-multiscale/package.py
+++ b/packages/py-tvb-multiscale/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbMultiscale(PythonPackage):
diff --git a/packages/py-tvb-storage/package.py b/packages/py-tvb-storage/package.py
index d25e7690..4c6f89ad 100644
--- a/packages/py-tvb-storage/package.py
+++ b/packages/py-tvb-storage/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbStorage(PythonPackage):
diff --git a/packages/py-tvb-widgets/package.py b/packages/py-tvb-widgets/package.py
index 855ac583..07dd8cf1 100644
--- a/packages/py-tvb-widgets/package.py
+++ b/packages/py-tvb-widgets/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbWidgets(PythonPackage):
diff --git a/packages/py-umnn/package.py b/packages/py-umnn/package.py
index 545b1ec0..6cc01282 100644
--- a/packages/py-umnn/package.py
+++ b/packages/py-umnn/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyUmnn(PythonPackage):
diff --git a/packages/py-vbi/package.py b/packages/py-vbi/package.py
index 0ac988a2..9c4258de 100644
--- a/packages/py-vbi/package.py
+++ b/packages/py-vbi/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyVbi(PythonPackage, CudaPackage):
diff --git a/packages/py-viziphant/package.py b/packages/py-viziphant/package.py
index 22281cb4..8f409f9c 100644
--- a/packages/py-viziphant/package.py
+++ b/packages/py-viziphant/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyViziphant(PythonPackage):
diff --git a/packages/py-zuko/package.py b/packages/py-zuko/package.py
index 9c222273..5e712df7 100644
--- a/packages/py-zuko/package.py
+++ b/packages/py-zuko/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyZuko(PythonPackage):
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index e0836671..2a4a0a10 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -7,7 +7,7 @@ import os
 import unittest.mock
 import xml.etree.ElementTree as ET
 
-from spack import *
+from spack.package import *
 from spack.util.environment import EnvironmentModifications
 import spack.build_environment
 
diff --git a/packages/sda/package.py b/packages/sda/package.py
index 77f19f54..3fb569c5 100644
--- a/packages/sda/package.py
+++ b/packages/sda/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Sda(MakefilePackage):
diff --git a/packages/wf-biobb/package.py b/packages/wf-biobb/package.py
index 28ff7c41..61d14695 100644
--- a/packages/wf-biobb/package.py
+++ b/packages/wf-biobb/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfBiobb(BundlePackage):
diff --git a/packages/wf-brainscales2-demos/package.py b/packages/wf-brainscales2-demos/package.py
index 1dc5b24b..02592a1d 100644
--- a/packages/wf-brainscales2-demos/package.py
+++ b/packages/wf-brainscales2-demos/package.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from glob import glob
-from spack import *
+from spack.package import *
 import os
 
 
diff --git a/packages/wf-bsb/package.py b/packages/wf-bsb/package.py
index 2e843818..37ec15a7 100644
--- a/packages/wf-bsb/package.py
+++ b/packages/wf-bsb/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfBsb(BundlePackage):
diff --git a/packages/wf-custom-python/package.py b/packages/wf-custom-python/package.py
index 84ebe4cc..6fae2ed1 100644
--- a/packages/wf-custom-python/package.py
+++ b/packages/wf-custom-python/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfCustomPython(BundlePackage):
diff --git a/packages/wf-human-multi-area-model/package.py b/packages/wf-human-multi-area-model/package.py
index 5bcefe0d..d5246fc8 100644
--- a/packages/wf-human-multi-area-model/package.py
+++ b/packages/wf-human-multi-area-model/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfHumanMultiAreaModel(Package):
diff --git a/packages/wf-multi-area-model/package.py b/packages/wf-multi-area-model/package.py
index 51d59bb3..fa4828a0 100644
--- a/packages/wf-multi-area-model/package.py
+++ b/packages/wf-multi-area-model/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfMultiAreaModel(Package):
diff --git a/packages/wf-protein-association-rates/package.py b/packages/wf-protein-association-rates/package.py
index b20c409a..3d13eb8d 100644
--- a/packages/wf-protein-association-rates/package.py
+++ b/packages/wf-protein-association-rates/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfProteinAssociationRates(BundlePackage):
diff --git a/packages/wf-uq-akar4/package.py b/packages/wf-uq-akar4/package.py
index 10c3fb8f..5e819976 100644
--- a/packages/wf-uq-akar4/package.py
+++ b/packages/wf-uq-akar4/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfUqAkar4(BundlePackage):
-- 
GitLab