Merge branch 'main' into b/spack-v0221-fixes

sandialabs · Jul 16, 2024 · 02de29a · 02de29a
2 parents 485443e + 034f0ff
commit 02de29a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,7 +19,8 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.8, 3.9, 3.12]
-        spack-version: [0.21.2, 0.22.0, 0.22.1, develop]
+
+        spack-version: [v0.21.2, v0.22.0, v0.22.1, develop]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -30,9 +31,9 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: spack/spack
-        ref: ${{ matrix.spack-verions }}
+        ref: ${{ matrix.spack-version }}
         path: spack
-    - name: Setup Spack ${{ matrix.spack-verion }}
+    - name: Setup Spack ${{ matrix.spack-version }}
       run: echo "$PWD/spack/bin" >> "$GITHUB_PATH"
     - name: Install extension
       run: |
@@ -80,7 +81,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.8, 3.9]
-        spack-version: [0.21.2, 0.22.0, 0.22.1, develop]
+        spack-version: [v0.21.2, v0.22.0, v0.22.1, develop]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -91,9 +92,9 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: spack/spack
-        ref: ${{ matrix.spack-verions }}
+        ref: ${{ matrix.spack-version }}
         path: spack
-    - name: Setup Spack ${{ matrix.spack-verion }}
+    - name: Setup Spack ${{ matrix.spack-version }}
       run: echo "$PWD/spack/bin" >> "$GITHUB_PATH"
     - name: Install extension
       run: |
@@ -103,9 +104,10 @@ jobs:
       run: |
         . spack/share/spack/setup-env.sh
         . scripts/quick_commands.sh
+        spack config add config:debug:True
         quick-create --name managed -s zlib
         spack env deactivate
         quick-create --dir unmanaged -s zlib
         spack env deactivate
-        quick-create-dev --name develop -s nalu-wind@master
+        quick-create-dev --name develop -s zlib-ng@2.1.5
         
diff --git a/manager/manager_cmds/location.py b/manager/manager_cmds/location.py
@@ -4,11 +4,15 @@
 #
 # This software is released under the BSD 3-clause license. See LICENSE file
 
+import spack
 import spack.extensions as ext
 
 
 def location(verbose=False):
-    path = ext.path_for_extension("manager", paths=ext.get_extension_paths())
+    if spack.spack_version_info[0:3] < (0, 22, 0):
+        path = ext.path_for_extension("manager", *ext.get_extension_paths())
+    else:
+        path = ext.path_for_extension("manager", paths=ext.get_extension_paths())
     if verbose:
         print(path)
     return path