diff --git a/tools/jbrowse2/jbrowse2.py b/tools/jbrowse2/jbrowse2.py index 24188ca42b..b8a0024a4b 100644 --- a/tools/jbrowse2/jbrowse2.py +++ b/tools/jbrowse2/jbrowse2.py @@ -411,7 +411,7 @@ def __init__(self, outdir, jbrowse2path): [] ) # for default session - these are read as first line of the assembly .fai self.giURL = GALAXY_INFRASTRUCTURE_URL - self.outdir = outdir + self.outdir = os.path.abspath(outdir) self.jbrowse2path = jbrowse2path os.makedirs(self.outdir, exist_ok=True) self.genome_names = [] @@ -444,7 +444,7 @@ def subprocess_popen(self, command, cwd=True): log.debug(command) p = subprocess.Popen( command, - cwd=self.get_cwd(cwd), + cwd=self.outdir, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, @@ -1440,8 +1440,6 @@ def add_default_session(self, default_data): ) session_views.append(view_json) session_name = default_data.get("session_name", "New session") - for key, value in mapped_chars.items(): - session_name = session_name.replace(value, key) session_json["name"] = session_name if "views" not in session_json: diff --git a/tools/jbrowse2/jbrowse2.xml b/tools/jbrowse2/jbrowse2.xml index 5b863f1204..027617fda0 100644 --- a/tools/jbrowse2/jbrowse2.xml +++ b/tools/jbrowse2/jbrowse2.xml @@ -639,13 +639,10 @@ export JBROWSE2_PATH=\$(dirname \$(which jbrowse))/../opt/jbrowse2 && - - - + - @@ -697,13 +694,10 @@ export JBROWSE2_PATH=\$(dirname \$(which jbrowse))/../opt/jbrowse2 && - - - + - @@ -1119,10 +1113,8 @@ export JBROWSE2_PATH=\$(dirname \$(which jbrowse))/../opt/jbrowse2 && - - + - diff --git a/tools/jbrowse2/macros.xml b/tools/jbrowse2/macros.xml index a8e4f962a9..6300e4ad5d 100644 --- a/tools/jbrowse2/macros.xml +++ b/tools/jbrowse2/macros.xml @@ -1,5 +1,5 @@ - 2.13.1 + 2.15.4 topic_3307 @@ -15,17 +15,17 @@ jbrowse2 biopython bcbio-gff - samtools + samtools pyyaml tabix findutils - hictk + hictk zip \$GALAXY_JBROWSE_SHARED_DIR - 1 + 0