Skip to content

Commit

Permalink
Updated flake8 config
Browse files Browse the repository at this point in the history
  • Loading branch information
marshallmcdonnell committed Dec 11, 2018
1 parent c6b5dbb commit 98ba4e8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions pystog/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ def git_get_keywords(versionfile_abs):
f = open(versionfile_abs, "r")
for line in f.readlines():
if line.strip().startswith("git_refnames ="):
mo = re.search(r'=\s*"(.*)"', line)
mo = re.search('=\s*"(.*)"', line) # nopep8
if mo:
keywords["refnames"] = mo.group(1)
if line.strip().startswith("git_full ="):
mo = re.search(r'=\s*"(.*)"', line)
mo = re.search('=\s*"(.*)"', line) # nopep8
if mo:
keywords["full"] = mo.group(1)
if line.strip().startswith("git_date ="):
mo = re.search(r'=\s*"(.*)"', line)
mo = re.search('=\s*"(.*)"', line)
if mo:
keywords["date"] = mo.group(1)
f.close()
Expand Down Expand Up @@ -190,7 +190,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
# between branches and tags. By ignoring refnames without digits, we
# filter out many common branch names like "release" and
# "stabilization", as well as "HEAD" and "master".
tags = set([r for r in refs if re.search(r'\d', r)])
tags = set([r for r in refs if re.search('\d', r)])
if verbose:
print("discarding '%s', no digits" % ",".join(refs - tags))
if verbose:
Expand Down Expand Up @@ -266,7 +266,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):

if "-" in git_describe:
# TAG-NUM-gHEX
mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
mo = re.search('^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
if not mo:
# unparseable. Maybe git-describe is misbehaving?
pieces["error"] = ("unable to parse git-describe output: '%s'"
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[flake8]
max-line-length = 100
exclude = .git,.eggs,ENV
exclude = .git,.eggs,ENV,./versioneer.py,pystog/_version.py

# See the docstring in versioneer.py for instructions. Note that you must
# re-run 'versioneer.py setup' after changing this section, and commit the
Expand Down

0 comments on commit 98ba4e8

Please sign in to comment.