Skip to content
Snippets Groups Projects
Commit 46465ad3 authored by Arthur Le Bars's avatar Arthur Le Bars
Browse files

missing argument in README, minor changes to run_workflow

parent 36119149
No related branches found
No related tags found
1 merge request!1Release 1.0
......@@ -119,7 +119,7 @@ inside the repository root will be used if none is precised in the command line
- Copy source data file and load data into the galaxy container: ```$ python3 /path/to/repo/gga_load_data.py your_input_file.yml -c/--config your_config_file [-v/--verbose]```
- Run a workflow (currently for phaeoexplorer only): ```$ python3 /path/to/repo/run_workflow_phaeoexplorer.py your_input_file.yml -c/--config your_config_file [-v/--verbose]```
- Run a workflow (currently for phaeoexplorer only): ```$ python3 /path/to/repo/run_workflow_phaeoexplorer.py your_input_file.yml -c/--config your_config_file [-v/--verbose] ->/--workflow your_workflow```
**Warning: the "input file" and "config file" have to be the same for the 3 steps!**
......
......@@ -261,7 +261,7 @@ class RunWorkflow(speciesData.SpeciesData):
# TODO: Uncomment next lines in production
# workflow = workflow.replace('http://localhost/sp/genus_species/feature/Genus/species/mRNA/{id}',
# "http://abims-gga.sb-roscoff.fr/sp/" + self.genus_lowercase + "_" + self.species + "/feature/" + self.genus + "/mRNA/{id}")
workflow = workflow[2:-2] # if the line under doesn't output a correct json
# workflow = workflow[2:-2] # if the line under doesn't output a correct json
# workflow = "r'" + workflow
# workflow = workflow + "'"
# workflow = workflow[:-2] # if the line above doesn't output a correct json
......@@ -412,8 +412,14 @@ if __name__ == "__main__":
# Set the instance url attribute
for env_variable, value in run_workflow_for_current_organism.config.items():
if env_variable == "custom_host":
run_workflow_for_current_organism.instance_url = value + run_workflow_for_current_organism.genus_lowercase + \
"_" + run_workflow_for_current_organism.species + "/galaxy/"
# TODO:
run_workflow_for_current_organism.instance_url = "http://{0}:8888/sp/{1}_{2}/galaxy/".format(
value, run_workflow_for_current_organism.genus_lowercase, run_workflow_for_current_organism.species)
break
else:
run_workflow_for_current_organism.instance_url = "http://localhost:8888/sp/{0}_{1}/galaxy/".format(
run_workflow_for_current_organism.genus_lowercase,
run_workflow_for_current_organism.species)
run_workflow_for_current_organism.connect_to_instance()
run_workflow_for_current_organism.set_get_history()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment