From b31dd46ab86bd237793e39a7a6c8c5b2a51f7c68 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <me@harmenstoppels.nl>
Date: Tue, 3 Dec 2024 16:04:18 +0100
Subject: [PATCH] style.py: do not remove import spack in packages (#47895)

---
 lib/spack/spack/cmd/style.py                                | 2 --
 var/spack/repos/builtin/packages/singularity-eos/package.py | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/spack/spack/cmd/style.py b/lib/spack/spack/cmd/style.py
index 9d164875ae2..15efb64bfa8 100644
--- a/lib/spack/spack/cmd/style.py
+++ b/lib/spack/spack/cmd/style.py
@@ -323,8 +323,6 @@ def process_files(file_list, is_args):
             rewrite_and_print_output(output, args, pat, replacement)
 
     packages_isort_args = (
-        "--rm",
-        "spack",
         "--rm",
         "spack.pkgkit",
         "--rm",
diff --git a/var/spack/repos/builtin/packages/singularity-eos/package.py b/var/spack/repos/builtin/packages/singularity-eos/package.py
index 46a768ce47b..509a7177ee1 100644
--- a/var/spack/repos/builtin/packages/singularity-eos/package.py
+++ b/var/spack/repos/builtin/packages/singularity-eos/package.py
@@ -5,6 +5,7 @@
 
 import os
 
+import spack
 import spack.version
 from spack.package import *