From 034f0fff30ec72bfdfb7f834fc5d81e292a330af Mon Sep 17 00:00:00 2001 From: psakievich <psakiev@sandia.gov> Date: Tue, 25 Jun 2024 17:40:32 -0600 Subject: [PATCH] Debug Failing Tests (#609) --- .github/workflows/tests.yml | 15 ++++++++------- manager/manager_cmds/location.py | 6 +++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6b1149ea..e8eb8a11 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: python-version: [3.8, 3.9, 3.12] - spack-version: [0.21.2, 0.22.0, develop] + spack-version: [v0.21.2, v0.22.0, develop] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -30,9 +30,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: | @@ -78,7 +78,7 @@ jobs: fail-fast: false matrix: python-version: [3.8, 3.9] - spack-version: [0.21.2, 0.22.0, develop] + spack-version: [v0.21.2, v0.22.0, develop] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -89,9 +89,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: | @@ -101,9 +101,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 index 939ca71d..7f51d4ad 100644 --- 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