diff --git a/deprecated/xlsx_example_input.xlsx b/deprecated/xlsx_example_input.xlsx index 8530103dd049d58ff2f90dd1fe7799e427ba8218..4d75e1ae55b74c096ce229daf452e911b426a165 100644 Binary files a/deprecated/xlsx_example_input.xlsx and b/deprecated/xlsx_example_input.xlsx differ diff --git a/gga_load_data.py b/gga_load_data.py index f3eb17e7cc27131aa1757200580e41146a64ab94..c499ca135d6a85636b39f2e1f3d8312908b427ab 100644 --- a/gga_load_data.py +++ b/gga_load_data.py @@ -91,7 +91,7 @@ class LoadData(speciesData.SpeciesData): subprocess.run(["mv", annotation_dir + "/outfile_proteins.fa", proteins_file], stdout=subprocess.PIPE, cwd=annotation_dir) - subprocess.run(["rm", annotation_dir + "/outfile_proteins.fa"], stdout=subprocess.PIPE, cwd=annotation_dir) + # subprocess.run(["rm", annotation_dir + "/outfile_proteins.fa"], stdout=subprocess.PIPE, cwd=annotation_dir) else: logging.warning("Skipping proteins fasta headers formatting (FileNotFound)") @@ -663,6 +663,7 @@ if __name__ == "__main__": # Set the instance url attribute for env_variable, value in load_data_for_current_species.config.items(): if env_variable == "custom_host": + # TODO: load_data_for_current_species.instance_url = "http://{0}:8888/sp/{1}_{2}/galaxy/".format( value, load_data_for_current_species.genus_lowercase, load_data_for_current_species.species) break diff --git a/speciesData.py b/speciesData.py index 530fc6718483ebb686cd94a2e9d030de4208d9df..1e9305b39251dba1a3855205765d5df6bc367244 100644 --- a/speciesData.py +++ b/speciesData.py @@ -40,7 +40,7 @@ class SpeciesData: self.full_name_lowercase = self.full_name.lower() self.abbreviation = "_".join(utilities.filter_empty_not_empty_items([self.genus_lowercase[0], self.species, self.strain, self.sex])["not_empty"]) self.genus_species = self.genus_lowercase + "_" + self.species - self.instance_url = "http://scratchgmodv1:8888/sp/" + self.genus_lowercase + "_" + self.species + "/galaxy/" # Testing with scratchgmodv1 (replace by what?) + self.instance_url = "http://scratchgmodv1:8888/sp/" + self.genus_lowercase + "_" + self.species + "/galaxy/" # Testing with scratchgmodv1, is overwritten in the script by the provided hostname anyway self.instance = None self.history_id = None self.library = None diff --git a/templates/compose_template.yml b/templates/compose_template.yml index f56eac8504ee0588666071125f10e7181897b7cd..1fe698f9624e117e0cdf0769826ae5d232e9ac59 100644 --- a/templates/compose_template.yml +++ b/templates/compose_template.yml @@ -48,7 +48,7 @@ services: TRIPAL_ENABLE_MODULES: "tripal_analysis_blast tripal_analysis_interpro tripal_analysis_go tripal_rest_api tripal_elasticsearch" SITE_NAME: "Genus species" ELASTICSEARCH_HOST: elasticsearch.genus_species - ENABLE_JBROWSE: /jbrowse/?data=data/genus_species_strain_sex + ENABLE_JBROWSE: /jbrowse/?data=data/genus_species_sex ENABLE_APOLLO: 0 ENABLE_BLAST: 1 ENABLE_DOWNLOAD: 1