Skip to content

Commit

Permalink
Merge pull request #82 from borrob/flake8
Browse files Browse the repository at this point in the history
Update contributing document: run nose and flake8 before pull request
  • Loading branch information
justb4 committed Feb 9, 2019
2 parents 4d07e58 + 56fc744 commit 1549204
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ project's developers might not want to merge into the project.

Please adhere to the coding conventions used throughout a project (indentation,
accurate comments, etc.) and any other requirements (such as test coverage).
You can run the `nose` and `flake8` tools to check your code with respect to
unit tests and coding style.

Follow this process if you'd like your work considered for inclusion in the
project:
Expand Down Expand Up @@ -144,4 +146,4 @@ license your work under the same license as that used by the project.
## Thanks

This doc copied and adapted from original at:
https://github.com/necolas/issue-guidelines/blob/master/CONTRIBUTING.md
https://github.com/necolas/issue-guidelines/blob/master/CONTRIBUTING.md
2 changes: 1 addition & 1 deletion stetl/etl.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(self, options_dict, args_dict=None):

# Parse unique list of argument names from config file string.
# https://www.machinelearningplus.com/python/python-regex-tutorial-examples/
args_names = list(set(re.findall('{[A-Z|a-z]\w+}', config_str)))
args_names = list(set(re.findall(r'{[A-Z|a-z]\w+}', config_str)))
args_names = [name.split('{')[1].split('}')[0] for name in args_names]

# Optional: expand from equivalent env vars
Expand Down
2 changes: 1 addition & 1 deletion stetl/utils/apachelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def _parse_format(self, format):

self._names.append(self.alias(element))

subpattern = '(\S*)'
subpattern = r'(\S*)'

if hasquotes:
if element == '%r' or findreferreragent.search(element):
Expand Down

0 comments on commit 1549204

Please sign in to comment.