Skip to content

Commit 5886d11

Browse files
committed
some updates
1 parent 346daa4 commit 5886d11

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Qiita changelog
22

3-
Version 2024.02
3+
Version 2024.07
44
---------------
55

66
Deployed on July 15th, 2024
@@ -16,6 +16,7 @@ Deployed on July 15th, 2024
1616
* Added `current_human_filtering` to the prep-information and `human_reads_filter_method` to the artifact to keep track of the method that it was used to human reads filter the raw artifact and know if it's up to date with what is expected via the best practices.
1717
* Added `reprocess_job_id` to the prep-information so we keep track if a preparation has been reprocessed with another job.
1818
* Other general fixes, like [#3385](https://github.com/qiita-spots/qiita/pull/3385), [#3397](https://github.com/qiita-spots/qiita/pull/3397), [#3399](https://github.com/qiita-spots/qiita/pull/3399), [#3400](https://github.com/qiita-spots/qiita/pull/3400), [#3409](https://github.com/qiita-spots/qiita/pull/3409), [#3410](https://github.com/qiita-spots/qiita/pull/3410).
19+
* On June 14th, 2024 we modified the SPP to use XXXX to filter human-reads from the per-sample-FASTQ loaded to Qiita.
1920

2021

2122
Version 2024.02

qiita_db/util.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
from bcrypt import hashpw, gensalt
5050
from functools import partial
5151
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
5353
from glob import glob
5454
from shutil import move, rmtree, copy as shutil_copy
5555
from openpyxl import load_workbook
5656
from tempfile import mkstemp
5757
from csv import writer as csv_writer
58-
from datetime import datetime
58+
from datetime import datetime, timedelta
5959
from time import time as now
6060
from itertools import chain
6161
from contextlib import contextmanager
@@ -64,18 +64,15 @@
6464
import hashlib
6565
from smtplib import SMTP, SMTP_SSL, SMTPException
6666

67-
from os import makedirs
6867
from errno import EEXIST
6968
from qiita_core.exceptions import IncompetentQiitaDeveloperError
7069
from qiita_core.qiita_settings import qiita_config
7170
from subprocess import check_output
7271
import qiita_db as qdb
7372

74-
7573
from email.mime.multipart import MIMEMultipart
7674
from email.mime.text import MIMEText
7775

78-
from datetime import timedelta
7976
import matplotlib.pyplot as plt
8077
import numpy as np
8178
import pandas as pd
@@ -2742,7 +2739,7 @@ def update_resource_allocation_table(weeks=1, test=None):
27422739
slurm_external_id = sei
27432740
if sd is not None:
27442741
start_date = sd
2745-
dates = [start_date, start_date + timedelta(weeks)]
2742+
dates = [start_date, start_date + timedelta(weeks=weeks)]
27462743

27472744
sql_command = """
27482745
SELECT
@@ -2780,8 +2777,9 @@ def update_resource_allocation_table(weeks=1, test=None):
27802777
sacct = [
27812778
'sacct', '-p',
27822779
'--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']
27852783

27862784
if test is not None:
27872785
slurm_data = test

0 commit comments

Comments
 (0)