Release 2.0

gga_load_data.py:

• Factorize goto_species_dir(), create_galaxy_instance(), run_tool(), get_species_dir()
• Move constants at the beginning
• Revert upload_from_local() to upload_from_galaxy_fs() (to enable symlink, instead of copy)
• Add missing get_bam_label()

README:

• update contributors

gga_load_data.py

@@ -28,6 +28,8 @@ Do not call this script before the galaxy container is ready
 GET_ORGANISMS_TOOL = "toolshed.g2.bx.psu.edu/repos/gga/chado_organism_get_organisms/organism_get_organisms/2.3.4+galaxy0"
 DELETE_ORGANISMS_TOOL = "toolshed.g2.bx.psu.edu/repos/gga/chado_organism_delete_organisms/organism_delete_organisms/2.3.4+galaxy0"
 
+HOST_DATA_DIR='src_data'
+CONTAINER_DATA_DIR_ROOT='/project_data'
 
 class LoadData(speciesData.SpeciesData):
     """
@@ -101,7 +103,7 @@ class LoadData(speciesData.SpeciesData):
 
         return histories
 
-    def setup_library(self, data_dir_root='./src_data'):
+    def setup_library(self):
         """
         Create a "Project Data" library in galaxy, mirroring the "src_data" folder of the current organism
         directory tree
@@ -109,7 +111,7 @@ class LoadData(speciesData.SpeciesData):
         :return:
         """
 
-        self.goto_species_dir()
+        data_dir_root=os.path.join(self.get_species_dir(), HOST_DATA_DIR)
 
         instance = GalaxyInstance(url=self.instance_url,
                                               email=self.config["galaxy_default_admin_email"],
@@ -181,9 +183,11 @@ class LoadData(speciesData.SpeciesData):
                             logging.info("Skipping useless file '%s'" % single_file)
                             continue
 
+                        single_file_path=os.path.join(CONTAINER_DATA_DIR_ROOT,single_file)
+
                         logging.info("Adding file '%s' with type '%s' and name '%s'" % (single_file, ftype, clean_name))
                         datasets = prj_lib.upload_from_galaxy_fs(
-                            single_file,
+                            single_file_path,
                             folder=folder,
                             link_data_only='link_to_files',
                             file_type=ftype,