Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove usage of distutils #127

Merged
merged 1 commit into from
Nov 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed datetime as well as it's not being used

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