Skip to content

Commit

Permalink
Merge pull request #8 from ChrisKeefe/flake8
Browse files Browse the repository at this point in the history
Update for flake8 v3.6
  • Loading branch information
nbokulich committed Nov 1, 2018
2 parents 8d5547c + a6402b9 commit 27d8f55
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
12 changes: 6 additions & 6 deletions q2_shogun/_formats.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ def _validate_(self, level):


class Bowtie2IndexDirFmt(model.DirectoryFormat):
idx1 = model.File('.+(?<!\.rev)\.1\.bt2', format=Bowtie2IndexFileFormat)
idx2 = model.File('.+(?<!\.rev)\.2\.bt2', format=Bowtie2IndexFileFormat)
ref3 = model.File('.+\.3\.bt2', format=Bowtie2IndexFileFormat)
ref4 = model.File('.+\.4\.bt2', format=Bowtie2IndexFileFormat)
rev1 = model.File('.+\.rev\.1\.bt2', format=Bowtie2IndexFileFormat)
rev2 = model.File('.+\.rev\.2\.bt2', format=Bowtie2IndexFileFormat)
idx1 = model.File(r'.+(?<!\.rev)\.1\.bt2', format=Bowtie2IndexFileFormat)
idx2 = model.File(r'.+(?<!\.rev)\.2\.bt2', format=Bowtie2IndexFileFormat)
ref3 = model.File(r'.+\.3\.bt2', format=Bowtie2IndexFileFormat)
ref4 = model.File(r'.+\.4\.bt2', format=Bowtie2IndexFileFormat)
rev1 = model.File(r'.+\.rev\.1\.bt2', format=Bowtie2IndexFileFormat)
rev2 = model.File(r'.+\.rev\.2\.bt2', format=Bowtie2IndexFileFormat)

def get_name(self):
filename = str(self.idx1.path_maker().relative_to(self.path))
Expand Down
8 changes: 4 additions & 4 deletions q2_shogun/_shogun.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ def load_table(tab_fp):

def nobunaga(query: DNAFASTAFormat, reference_reads: DNAFASTAFormat,
reference_taxonomy: pd.Series, database: Bowtie2IndexDirFmt,
taxacut: float=0.8,
threads: int=1, percent_id: float=0.98) -> biom.Table:
taxacut: float = 0.8,
threads: int = 1, percent_id: float = 0.98) -> biom.Table:
with tempfile.TemporaryDirectory() as tmpdir:
setup_database_dir(tmpdir,
database, reference_reads, reference_taxonomy)
Expand All @@ -83,8 +83,8 @@ def nobunaga(query: DNAFASTAFormat, reference_reads: DNAFASTAFormat,

def minipipe(query: DNAFASTAFormat, reference_reads: DNAFASTAFormat,
reference_taxonomy: pd.Series, database: Bowtie2IndexDirFmt,
taxacut: float=0.8,
threads: int=1, percent_id: float=0.98) -> (
taxacut: float = 0.8,
threads: int = 1, percent_id: float = 0.98) -> (
biom.Table, biom.Table, biom.Table, biom.Table):
with tempfile.TemporaryDirectory() as tmpdir:
# database_dir = tmpdir.name
Expand Down
1 change: 1 addition & 0 deletions versioneer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

# Version: 0.18
# flake8: noqa

"""The Versioneer - like a rocketeer, but for versions.
Expand Down

0 comments on commit 27d8f55

Please sign in to comment.