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

@@ -10,6 +10,7 @@ import sys
 import time
 import json
 import yaml
+import subprocess
 
 from bioblend import galaxy
 from bioblend.galaxy.objects import GalaxyInstance
@@ -142,7 +143,7 @@ class LoadData(speciesData.SpeciesData):
 
             for fname, files in folders.items():
                 if fname and files:
-                    folder_name = re.sub(data_dir_root, CONTAINER_DATA_DIR_ROOT, fname)
+                    folder_name = re.sub(data_dir_root + "/", "", fname)
                     logging.info("Creating folder: %s" % folder_name)
                     folder = self.create_deep_folder(prj_lib, folder_name)
 
@@ -205,10 +206,10 @@ class LoadData(speciesData.SpeciesData):
 
                     time.sleep(1)
 
-        # Wait for uploads to complete
-        logging.info("Waiting for import jobs to finish... please wait")
-
-        # Checking job state (only necessary if ran using SLURM)
+        # # Wait for uploads to complete
+        # logging.info("Waiting for import jobs to finish... please wait")
+        #
+        # # Checking job state (only necessary if ran using SLURM)
         # while True:
         #     try:
         #         # "C" state means the job is completed, no need to wait for it
@@ -222,8 +223,8 @@ class LoadData(speciesData.SpeciesData):
         #             break
         #         else:
         #             raise
-
-        time.sleep(10)
+        #
+        # time.sleep(10)
 
         # Batch renaming --> Throws a critical error at the moment
         # logging.info("Import finished, now renaming datasets with pretty names")