Skip to content

Commit

Permalink
Merge branch 'master' into ga4_migration
Browse files Browse the repository at this point in the history
  • Loading branch information
utku-ozturk committed Sep 15, 2023
2 parents 0e70a1d + 680e833 commit 821f491
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ foursight
Change Log
----------

3.8.3
=====

* fixed a bug in keyword args to not use hyphens which caused syntax error

3.8.2
=====

Expand Down
8 changes: 4 additions & 4 deletions chalicelib_fourfront/checks/wfr_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def fastqc_start(connection, **kwargs):
return action


@check_function(lab_title=None, start_date=None, non-dcic=False, action="pairsqc_start")
@check_function(lab_title=None, start_date=None, non_dcic=False, action="pairsqc_start")
def pairsqc_status(connection, **kwargs):
"""Searches for pairs files produced by 4dn pipelines that don't have pairsqc
Keyword arguments:
Expand Down Expand Up @@ -418,7 +418,7 @@ def pairsqc_status(connection, **kwargs):
lab = kwargs.get('lab_title')
if lab:
query += '&lab.display_title=' + lab
if kwargs.get('non-dcic') is not True:
if kwargs.get('non_dcic') is not True:
query += '&source_experiments!=No+value'
# The search
res = ff_utils.search_metadata(query, key=my_auth)
Expand Down Expand Up @@ -1986,7 +1986,7 @@ def rna_seq_start(connection, **kwargs):
return action


@check_function(lab_title=None, start_date=None, non-dcic=False, action="bamqc_start")
@check_function(lab_title=None, start_date=None, non_dcic=False, action="bamqc_start")
def bamqc_status(connection, **kwargs):
"""Searches for annotated bam files that do not have a qc object
Keyword arguments:
Expand Down Expand Up @@ -2015,7 +2015,7 @@ def bamqc_status(connection, **kwargs):
stati = 'status=' + (kwargs.get('status') or default_stati)
query = 'search/?file_type=alignments&{}'.format(stati)
query += '&type=FileProcessed'
if kwargs.get('non-dcic') is not True: # skip this bit if running on non-DCIC bams
if kwargs.get('non_dcic') is not True: # skip this bit if running on non-DCIC bams
query += wfr_outputs
query += '&quality_metric.display_title=No+value'
# add date
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "foursight"
version = "3.8.2"
version = "3.8.3"
description = "Serverless Chalice Application for Monitoring"
authors = ["4DN-DCIC Team <[email protected]>"]
license = "MIT"
Expand Down

0 comments on commit 821f491

Please sign in to comment.