Skip to content

Commit

Permalink
Merge pull request #587 from 4dn-dcic/ajs_250107_rm_restricted_from_c…
Browse files Browse the repository at this point in the history
…heck_srch

Remove restricted status from 2 checks
  • Loading branch information
aschroed authored Jan 8, 2025
2 parents eaccc5c + dc43b90 commit 9a024e5
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ foursight
Change Log
----------

4.9.9
=====

`PR 587: Remove restricted status from search query <https://github.com/4dn-dcic/foursight/pull/587>`_

* Remove the 'restricted' status from the search query in the fastq_first_line check
* Remove the 'restricted' status from the search query in the bamQC check (and add pre-release)
* will allow files that have not been uploaded to be set to 'restricted' status and not trigger runs of these checks


4.9.8
=====

Expand Down
4 changes: 2 additions & 2 deletions chalicelib_fourfront/checks/wfr_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@ def bamqc_status(connection, **kwargs):
if skip:
return check
# Build the query
default_stati = 'released&status=uploaded&status=released+to+project&status=restricted'
default_stati = 'released&status=uploaded&status=released+to+project&status=pre-release'
# find bam files produced bt the Hi-C Post Alignment Processing wfr
wfr_outputs = "&workflow_run_outputs.workflow.title=Hi-C+Post-alignment+Processing+0.2.6"
stati = 'status=' + (kwargs.get('status') or default_stati)
Expand Down Expand Up @@ -2069,7 +2069,7 @@ def fastq_first_line_status(connection, **kwargs):
return check

query = ('/search/?status=uploaded&status=pre-release&status=released+to+project&status=released'
'&type=FileFastq&file_format.file_format=fastq&file_first_line=No value&status=restricted')
'&type=FileFastq&file_format.file_format=fastq&file_first_line=No value')

# The search
print('About to query ES for files')
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 = "4.9.8"
version = "4.9.9"
description = "Serverless Chalice Application for Monitoring"
authors = ["4DN-DCIC Team <[email protected]>"]
license = "MIT"
Expand Down

0 comments on commit 9a024e5

Please sign in to comment.