Merge branch 'release_2.1' of gitlab.sb-roscoff.fr:abims/e-infra/gga_load_data into release_2.1

gga_init.py

@@ -126,19 +126,11 @@ class DeploySpeciesStack(speciesData.SpeciesData):
         # To do so we need both input file vars and config vars
         # Create input file vars dict
 
-        input_vars = {}
-        if self.picture_path is not None:
-            input_vars = {"genus": self.genus_lowercase, "Genus": self.genus_uppercase, "species": self.species,
+        input_vars = {"genus": self.genus_lowercase, "Genus": self.genus_uppercase, "species": self.species,
                           "genus_species": self.genus_species, "genus_species_strain_sex": self.species_folder_name,
                           "genus_species_sex": "{0}_{1}_{2}".format(self.genus_lowercase, self.species.lower(), self.sex),
                           "strain": self.strain, "sex": self.sex, "Genus_species": self.genus_species[0].upper() + self.genus_species[1:],
                           "blast": self.blast, "picture_path": self.picture_path}
-        else:
-            input_vars = {"genus": self.genus_lowercase, "Genus": self.genus_uppercase, "species": self.species,
-                          "genus_species": self.genus_species, "genus_species_strain_sex": self.species_folder_name,
-                          "genus_species_sex": "{0}_{1}_{2}".format(self.genus_lowercase, self.species.lower(), self.sex),
-                          "strain": self.strain, "sex": self.sex, "Genus_species": self.genus_species[0].upper() + self.genus_species[1:],
-                          "blast": self.blast}
         if (len(self.config.keys()) == 0):
             logging.error("Empty config dictionary")
         # Merge the two dicts

templates/organisms.yml.j2

@@ -6,9 +6,7 @@
     {{ org_param_desc_strain }}: {{ org_param_desc_strain_value }}
     {{ org_param_desc_common_name }}: {{ org_param_desc_common_name_value }}
     {{ org_param_desc_origin }}: {{ org_param_desc_origin_value }}
-    {% if org_param_desc_picture_path_value is defined %}
     {{ org_param_desc_picture_path }}: {{ org_param_desc_picture_path_value }}
-    {% endif %}
     {% if org_param_desc_main_species_value is defined and org_param_desc_main_species_value is sameas true %}
     {{ org_param_desc_main_species }}: yes
     {% endif %}