Skip to content

Commit d98c4b5

Browse files
authored
Update import for COMMIT_VERSION from spack.util.git (#642)
* Update import for COMMIT_VERSION from spack.util.git * Update Python version in GitHub Actions workflow for style * Style Signed-off-by: psakiev <[email protected]> --------- Signed-off-by: psakiev <[email protected]>
1 parent 41f2c7c commit d98c4b5

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
python-version: [3.9]
56+
python-version: [3.11]
5757
steps:
5858
- uses: actions/checkout@v4
5959
- name: Set up Python ${{ matrix.python-version }}

manager/manager_cmds/pin.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"""
1111
import os
1212

13+
import spack.cmd
1314
import spack.llnl.util.tty as tty
1415
import spack.main
1516
import spack.traverse as traverse
@@ -18,9 +19,12 @@
1819
from spack.version import GitVersion
1920

2021
try:
21-
from spack.version.common import COMMIT_VERSION
22+
from spack.util.git import COMMIT_VERSION
2223
except ImportError:
23-
from spack.version import COMMIT_VERSION
24+
try:
25+
from spack.version.common import COMMIT_VERSION
26+
except ImportError:
27+
from spack.version import COMMIT_VERSION
2428

2529
git = spack.util.executable.which("git")
2630
concretize = spack.main.SpackCommand("concretize")

0 commit comments

Comments
 (0)