Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve inconsistent parsing in module autoclean-sftp for certain folders #211

Merged
merged 3 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Code contributions to the hotfix:

#### Fixes

- Added missing url for service assembly_annotation in module list
- Autoclean-sftp refined folder name parsing with regex label adjustment
- Autoclean_sftp does not crash anymore. New argument from 'utils.prompt_yn_question()' in v2.0.0 was missing: 'dflt'
- Bioinfo-doc now sends email correctly to multiple CCs

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Output:
┏━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
┃ Service name ┃ Description ┃ Github ┃
┡━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
│ assembly_annotation │ Nextflow assembly pipeline to assemble │
│ assembly_annotation │ Nextflow assembly pipeline to assemble │ https://github.com/Daniel-VM/bacass/...
│ │ bacterial genomes │ │
│ mtbseq_assembly │ Mycobacterium tuberculosis mapping, │ https://github.com/ngs-fzb/MTBseq_source │
│ │ variant calling and detection of │ │
Expand Down
2 changes: 1 addition & 1 deletion bu_isciii/autoclean_sftp.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def check_path_exists(self):
def get_sftp_services(self):
self.sftp_services = {} # {sftp-service_path : last_update}
service_pattern = (
r"^[SRV][A-Z]+[0-9]+_\d{8}_[A-Z0-9]+_[a-zA-Z]+(?:\.[a-zA-Z]+)?_[a-zA-Z]$"
r"^[SRV][A-Z]+[0-9]+_\d{8}_[A-Z0-9.-]+_[a-zA-Z]+(?:\.[a-zA-Z]+)?_[a-zA-Z]$"
)

stderr.print("[blue]Scanning " + self.path + "...")
Expand Down
2 changes: 1 addition & 1 deletion bu_isciii/templates/services.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"assembly_annotation": {
"label": "",
"template": "assembly",
"url": "",
"url": "https://github.com/Daniel-VM/bacass/tree/buisciii-develop",
"order": 1,
"begin": "",
"end": "",
Expand Down
Loading