diff --git a/src/unitgrade_private/pipelines/dtulearn.py b/src/unitgrade_private/pipelines/dtulearn.py index 3e4b01788c287360a6f6d5ee5a71f990952397e3..79fb17159b36d1ff3e5501ed2a1de47ff4258165 100644 --- a/src/unitgrade_private/pipelines/dtulearn.py +++ b/src/unitgrade_private/pipelines/dtulearn.py @@ -1,3 +1,4 @@ +import fnmatch import pickle import shutil import os @@ -262,13 +263,12 @@ def docker_stagewise_evaluation(base_directory, Dockerfile=None, instructor_grad # merge the files... for new_file in glob.glob(f +"/**/*", recursive=True): # print(os.path.relpath(new_file, f)) + if os.path.isdir(new_file): + continue shutil.copy(new_file, dest + "/"+os.path.relpath(new_file, f)) # Now remove blacklisted files to simplify it. for g in glob.glob(dest +"/**/*", recursive=True): - import fnmatch - # if g.endswith(".py"): - # print(g) if len([ex for ex in stage0_excluded_files if fnmatch.fnmatch(g, ex)]) > 0: # move to graveyeard of broken stuff. @@ -540,7 +540,7 @@ def docker_stagewise_evaluation(base_directory, Dockerfile=None, instructor_grad if Dockerfile is None: images = download_docker_images() Dockerfile = images['unitgrade-docker'] - tag = compile_docker_image(Dockerfile, verbose=verbose) + tag = compile_docker_image(Dockerfile, verbose=verbose or True) # This should create stage3. The directories that are ready for execution. recombined_evaluations = {} @@ -731,7 +731,7 @@ def docker_stagewise_evaluation(base_directory, Dockerfile=None, instructor_grad dockname = tag pycom = ".".join(grade_script_relative[:-3].split("/")) + " --noprogress" - pycom = "python3.11 -m " + pycom + pycom = f"{conf.get('python', 'python3.11')} -m {pycom}" #"python3.11 -m " + pycom if fix_user: user_cmd = ' --user "$(id -u):$(id -g)" ' else: