Skip to content

Commit

Permalink
Remove usage of distutils
Browse files Browse the repository at this point in the history
  • Loading branch information
chapman39 committed Nov 9, 2023
1 parent 991a9ce commit 1c30d33
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions uberenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,10 @@
import socket
import platform
import json
import datetime
import glob
import re
import argparse

from distutils.version import LooseVersion
from functools import partial

from os import environ as env
Expand Down Expand Up @@ -529,12 +527,10 @@ def clone_repo(self):
def patch(self):
""" hot-copy our ports into vcpkg """

import distutils.dir_util

dest_vcpkg_ports = pjoin(self.dest_vcpkg, "ports")

print("[info: copying from {0} to {1}]".format(self.vcpkg_ports_path, dest_vcpkg_ports))
distutils.dir_util.copy_tree(self.vcpkg_ports_path, dest_vcpkg_ports)
shutil.copytree(self.vcpkg_ports_path, dest_vcpkg_ports)


def clean_build(self):
Expand Down Expand Up @@ -666,7 +662,7 @@ def spack_exe(self, use_spack_env = True):
# Returns version of Spack being used
def spack_version(self):
res, out = sexe('{0} --version'.format(self.spack_exe(use_spack_env=False)), ret_output=True)
return LooseVersion(out[:-1])
return out

def check_concretizer_args(self):
cmd = "{0} help install".format(self.spack_exe(use_spack_env=False))
Expand Down

0 comments on commit 1c30d33

Please sign in to comment.