Skip to content

Commit 262c10d

Browse files
committed
minor changes after deployment
1 parent c98cc7e commit 262c10d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

qiita_db/util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2775,7 +2775,7 @@ def update_resource_allocation_table(weeks=1, test=None):
27752775
sacct = [
27762776
'sacct', '-p',
27772777
'--format=JobID,ElapsedRaw,MaxRSS,Submit,Start,End,CPUTimeRAW,'
2778-
'ReqMem,AllocCPUs,AveVMSize', '--starttime',
2778+
'ReqMem,AllocCPUs,AveVMSize,MaxVMSizeNode', '--starttime',
27792779
dates[0].strftime('%Y-%m-%d'), '--endtime',
27802780
dates[1].strftime('%Y-%m-%d'), '--user', 'qiita', '--state', 'CD']
27812781

@@ -2894,6 +2894,7 @@ def merge_rows(rows):
28942894
df['MaxRSSRaw'] = df.MaxRSS.apply(lambda x: MaxRSS_helper(str(x)))
28952895
df['ElapsedRawTime'] = df.ElapsedRaw.apply(
28962896
lambda x: timedelta(seconds=float(x)))
2897+
df.replace({nan: None}, inplace=True)
28972898

28982899
for index, row in df.iterrows():
28992900
with qdb.sql_connection.TRN:

0 commit comments

Comments
 (0)