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

Update branch with optimised C code #404

Merged
merged 8 commits into from
Apr 17, 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: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
3.3.5
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
- r
dependencies:
# python
- python>=3.8
- python>=3.8,<3.11
# installation
- autoconf
- automake
Expand Down
3 changes: 3 additions & 0 deletions python/gubbins/PreProcessFasta.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8

import sys
import hashlib
from Bio import AlignIO
Expand Down
3 changes: 3 additions & 0 deletions python/gubbins/ValidateFastaAlignment.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8

import os
import re
import sys
Expand Down
3 changes: 2 additions & 1 deletion python/gubbins/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /usr/bin/env python3
#!/usr/bin/env python
# encoding: utf-8

"""
Imports into the `gubbins` namespace all fundamental
Expand Down
4 changes: 3 additions & 1 deletion python/gubbins/common.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
#
# Wellcome Trust Sanger Institute
# Copyright (C) 2013 Wellcome Trust Sanger Institute
#
Expand Down Expand Up @@ -224,7 +226,7 @@ def parse_and_run(input_args, program_description=""):
printer.print("...done. Run time: {:.2f} s".format(time.time() - start_time))

# Find all SNP sites with Gubbins
gubbins_command = " ".join([gubbins_exec, input_args.alignment_filename])
gubbins_command = f"{gubbins_exec} \"{input_args.alignment_filename}\""
printer.print(["\nRunning Gubbins to detect SNPs...", gubbins_command])
try:
subprocess.check_call(gubbins_command, shell=True)
Expand Down
5 changes: 3 additions & 2 deletions python/gubbins/pyjar.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python3

#!/usr/bin/env python
# encoding: utf-8
#
# pyjar written by Simon Harris
# code modified from https://github.com/simonrharris/pyjar
# pyjar is free software, licensed under GPLv3.
Expand Down
2 changes: 1 addition & 1 deletion python/gubbins/run_gubbins.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/usr/bin/env python
# encoding: utf-8
#
# Wellcome Trust Sanger Institute
Expand Down
2 changes: 2 additions & 0 deletions python/gubbins/treebuilders.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
#
# Wellcome Trust Sanger Institute
# Copyright (C) 2013 Wellcome Trust Sanger Institute
#
Expand Down
2 changes: 2 additions & 0 deletions python/gubbins/utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
#
# Wellcome Trust Sanger Institute
# Copyright (C) 2013 Wellcome Trust Sanger Institute
#
Expand Down
Loading