Skip to content

Commit

Permalink
fix: do not change fqscreen path with shared resources
Browse files Browse the repository at this point in the history
they are no longer in shared resources dir
  • Loading branch information
kelly-sovacool committed Aug 6, 2024
1 parent d0702cc commit db74a4f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/renee/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def launch_gui(sub_args, debug=True):
output_dir, os.environ.get("SINGULARITY_CACHEDIR", None)
),
tmp_dir=get_tmp_dir(None, output_dir),
shared_resources=get_shared_resources_dir(None, output_dir),
shared_resources=get_shared_resources_dir(None),
star_2_pass_basic=False,
small_rna=False,
create_nidap_folder=False,
Expand Down
5 changes: 0 additions & 5 deletions src/renee/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@ def setup(sub_args, ifiles, repo_path, output_path):
] = os.path.join(
sub_args.shared_resources, "fastq_screen_db", "fastq_screen.conf"
)
config["bin"]["rnaseq"]["tool_parameters"][
"FASTQ_SCREEN_CONFIG2"
] = os.path.join(
sub_args.shared_resources, "fastq_screen_db", "fastq_screen_2.conf"
)
config["bin"]["rnaseq"]["tool_parameters"]["KRAKENBACDB"] = os.path.join(
sub_args.shared_resources, "20180907_standard_kraken2"
)
Expand Down
2 changes: 1 addition & 1 deletion src/renee/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def get_tmp_dir(tmp_dir, outdir, hpc=get_hpcname()):
return tmp_dir


def get_shared_resources_dir(shared_dir, outdir, hpc=get_hpcname()):
def get_shared_resources_dir(shared_dir, hpc=get_hpcname()):
"""Get default shared resources directory for biowulf and frce. Allow user override."""
if not shared_dir:
if hpc == "biowulf":
Expand Down
4 changes: 2 additions & 2 deletions tests/test_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
renee_base,
)
from renee.src.renee.cache import get_sif_cache_dir
from renee.src.renee.run import run_in_context
from renee.src.renee.run import run, run_in_context
from renee.src.renee.util import get_hpcname


Expand All @@ -28,7 +28,7 @@ def test_dryrun():
sif_cache=get_sif_cache_dir(),
singularity_cache=os.environ["SINGULARITY_CACHEDIR"],
tmp_dir=tmp_dir,
shared_resources=None,
shared_resources=get_shared_resources_dir(None),
star_2_pass_basic=False,
small_rna=False,
create_nidap_folder=False,
Expand Down

0 comments on commit db74a4f

Please sign in to comment.