diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2023-09-22 13:04:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 13:04:58 +0200 |
| commit | 716196930aff66253eb3f6339531a06c65f174ac (patch) | |
| tree | d0bd4593fad5359854eac9000e7284de46c436ad /lib | |
| parent | f42402129ace15b6495c663320f2eca518d5f9d4 (diff) | |
| download | spack-716196930aff66253eb3f6339531a06c65f174ac.tar.gz spack-716196930aff66253eb3f6339531a06c65f174ac.tar.bz2 spack-716196930aff66253eb3f6339531a06c65f174ac.tar.xz spack-716196930aff66253eb3f6339531a06c65f174ac.zip | |
Remove distutils dependency in Spack (#40153)
* msvc.py: don't import distutils
Introduced in #27021, makes Spack forward incompatible with Python.
The module was already deprecated at the time of the PR.
* update spack package
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/compilers/msvc.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/spack/spack/compilers/msvc.py b/lib/spack/spack/compilers/msvc.py index 27375a804a..3699a65481 100644 --- a/lib/spack/spack/compilers/msvc.py +++ b/lib/spack/spack/compilers/msvc.py @@ -7,7 +7,6 @@ import os import re import subprocess import sys -from distutils.version import StrictVersion from typing import Dict, List, Set import spack.compiler @@ -115,11 +114,11 @@ class VCVarsInvocation(VarsInvocation): def get_valid_fortran_pth(comp_ver): cl_ver = str(comp_ver) - sort_fn = lambda fc_ver: StrictVersion(fc_ver) + sort_fn = lambda fc_ver: Version(fc_ver) sort_fc_ver = sorted(list(avail_fc_version), key=sort_fn) for ver in sort_fc_ver: if ver in fortran_mapping: - if StrictVersion(cl_ver) <= StrictVersion(fortran_mapping[ver]): + if Version(cl_ver) <= Version(fortran_mapping[ver]): return fc_path[ver] return None |