Skip to content
Snippets Groups Projects

Workflow v2

Merged Workflow v2
workflow_v2 into dev
2 unresolved threads
Merged Loraine Gueguen requested to merge workflow_v2 into dev
2 unresolved threads

Merge request reports

Merged by Loraine GueguenLoraine Gueguen 3 years ago (May 6, 2021 9:39am UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
speciesData.py
59 59 self.genus_uppercase = self.genus[0].upper() + self.genus[1:]
60 60 self.chado_species_name = "{0} {1}".format(self.species, self.sex)
61 61 self.full_name = ' '.join(utilities.filter_empty_not_empty_items([self.genus_uppercase, self.species, self.strain, self.sex])["not_empty"])
62 62 self.full_name = self.full_name.replace("__", "_").replace("_ ", "_").replace(" _", "_")
  • Loraine Gueguen
    Loraine Gueguen @lgueguen ·
    Author Owner

    Sauf erreur de ma part, tout le nettoyage est fait en amont directement sur les attributs self.genus, self.species, self.sex et self.strain. Ces replace() sont donc inutiles.

  • Please register or sign in to reply
  • Loraine Gueguen
    Loraine Gueguen @lgueguen started a thread on the diff
    • speciesData.py
    88 97 self.datasets = dict()
    89 98 self.config = None # Custom config used to set environment variables inside containers
    90 99 self.species_folder_name = "_".join(utilities.filter_empty_not_empty_items([self.genus_lowercase.lower(), self.species.lower(), self.strain.lower(), self.sex.lower()])["not_empty"])
    91 self.species_folder_name = self.species_folder_name .replace("-", "_")
    100 self.species_folder_name = self.species_folder_name .replace("-", "_").replace('__', '_').replace("(", "_").replace(")", "_")
    101 if self.species_folder_name.endswith("_"):
    102 self.species_folder_name = self.species_folder_name[0:-2]
    • Loraine Gueguen
      Loraine Gueguen @lgueguen ·
      Author Owner 
              self.species_folder_name  = self.species_folder_name .replace("-", "_").replace('__', '_').replace("(", "_").replace(")", "_")
        if self.species_folder_name.endswith("_"):
            self.species_folder_name = self.species_folder_name[0:-2]

      idem, je supprimerais les replace()

    • Please register or sign in to reply
  • Loraine Gueguen merged

    merged

  • Loraine Gueguen mentioned in commit 9b4f2a91

    mentioned in commit 9b4f2a91

    • Please register or sign in to reply