Skip to content

Commit

Permalink
style: make black formatting happy
Browse files Browse the repository at this point in the history
  • Loading branch information
Smeds committed Jun 15, 2022
1 parent 7d1a26e commit a029a0a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
5 changes: 3 additions & 2 deletions snakemake/modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@ def __init__(
self.namespace = namespace

def skip_rule(self, rulename):
return (self.rule_whitelist is not None and rulename not in self.rule_whitelist) or \
(self.rule_exclude_list is not None and rulename in self.rule_exclude_list)
return (
self.rule_whitelist is not None and rulename not in self.rule_whitelist
) or (self.rule_exclude_list is not None and rulename in self.rule_exclude_list)

def modify_rulename(self, rulename):
if self.rulename_modifier is not None:
Expand Down
9 changes: 6 additions & 3 deletions snakemake/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,8 @@ def state_with(self, token):
yield from ()
else:
self.error(
"Expecting colon after 'with' keyword in 'use rule' statement.", token
"Expecting colon after 'with' keyword in 'use rule' statement.",
token,
)

def state_exclude(self, token):
Expand All @@ -1125,15 +1126,17 @@ def state_exclude(self, token):
yield from ()
else:
self.error(
"Expecting rule name(s) after 'exclude' keyword in 'use rule' statement.", token
"Expecting rule name(s) after 'exclude' keyword in 'use rule' statement.",
token,
)

def state_exclude_comma_or_end(self, token):
if is_name(token):
if token.string == "from" or token.string == "as":
if not self.exclude_rules:
self.error(
"Expecting rule names after 'exclude' statement.", token
"Expecting rule names after 'exclude' statement.",
token,
)
if token.string == "from":
self.state = self.state_from
Expand Down
9 changes: 8 additions & 1 deletion snakemake/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,14 @@ def module(
prefix=prefix,
)

def userule(self, rules=None, from_module=None, exclude_rules=None, name_modifier=None, lineno=None):
def userule(
self,
rules=None,
from_module=None,
exclude_rules=None,
name_modifier=None,
lineno=None,
):
def decorate(maybe_ruleinfo):
if from_module is not None:
try:
Expand Down

0 comments on commit a029a0a

Please sign in to comment.