|
49 | 49 | from bcrypt import hashpw, gensalt
|
50 | 50 | from functools import partial
|
51 | 51 | from os.path import join, basename, isdir, exists, getsize
|
52 |
| -from os import walk, remove, listdir, rename, stat |
| 52 | +from os import walk, remove, listdir, rename, stat, makedirs |
53 | 53 | from glob import glob
|
54 | 54 | from shutil import move, rmtree, copy as shutil_copy
|
55 | 55 | from openpyxl import load_workbook
|
56 | 56 | from tempfile import mkstemp
|
57 | 57 | from csv import writer as csv_writer
|
58 |
| -from datetime import datetime |
| 58 | +from datetime import datetime, timedelta |
59 | 59 | from time import time as now
|
60 | 60 | from itertools import chain
|
61 | 61 | from contextlib import contextmanager
|
|
64 | 64 | import hashlib
|
65 | 65 | from smtplib import SMTP, SMTP_SSL, SMTPException
|
66 | 66 |
|
67 |
| -from os import makedirs |
68 | 67 | from errno import EEXIST
|
69 | 68 | from qiita_core.exceptions import IncompetentQiitaDeveloperError
|
70 | 69 | from qiita_core.qiita_settings import qiita_config
|
71 | 70 | from subprocess import check_output
|
72 | 71 | import qiita_db as qdb
|
73 | 72 |
|
74 |
| - |
75 | 73 | from email.mime.multipart import MIMEMultipart
|
76 | 74 | from email.mime.text import MIMEText
|
77 | 75 |
|
78 |
| -from datetime import timedelta |
79 | 76 | import matplotlib.pyplot as plt
|
80 | 77 | import numpy as np
|
81 | 78 | import pandas as pd
|
@@ -2742,7 +2739,7 @@ def update_resource_allocation_table(weeks=1, test=None):
|
2742 | 2739 | slurm_external_id = sei
|
2743 | 2740 | if sd is not None:
|
2744 | 2741 | start_date = sd
|
2745 |
| - dates = [start_date, start_date + timedelta(weeks)] |
| 2742 | + dates = [start_date, start_date + timedelta(weeks=weeks)] |
2746 | 2743 |
|
2747 | 2744 | sql_command = """
|
2748 | 2745 | SELECT
|
@@ -2780,8 +2777,9 @@ def update_resource_allocation_table(weeks=1, test=None):
|
2780 | 2777 | sacct = [
|
2781 | 2778 | 'sacct', '-p',
|
2782 | 2779 | '--format=JobID,ElapsedRaw,MaxRSS,Submit,Start,End,CPUTimeRAW,'
|
2783 |
| - 'ReqMem,AllocCPUs,AveVMSize', '--starttime', dates[0], '--endtime', |
2784 |
| - dates[1], '--user', 'qiita', '--state', 'CD'] |
| 2780 | + 'ReqMem,AllocCPUs,AveVMSize', '--starttime', |
| 2781 | + dates[0].strftime('%Y-%m-%d'), '--endtime', |
| 2782 | + dates[1].strftime('%Y-%m-%d'), '--user', 'qiita', '--state', 'CD'] |
2785 | 2783 |
|
2786 | 2784 | if test is not None:
|
2787 | 2785 | slurm_data = test
|
|
0 commit comments