Skip to content

Commit

Permalink
Unpin pytest, pacify new flake8
Browse files Browse the repository at this point in the history
  • Loading branch information
hynek committed Oct 24, 2018
1 parent 290cf2a commit 4202dcb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"coverage",
"hypothesis",
"pympler",
"pytest<3.9",
"pytest",
"six",
"zope.interface",
],
Expand Down Expand Up @@ -87,7 +87,9 @@ def find_meta(meta):
+ "Release Information\n"
+ "===================\n\n"
+ re.search(
"(\d+.\d.\d \(.*?\)\n.*?)\n\n\n----\n\n\n", read("CHANGELOG.rst"), re.S
r"(\d+.\d.\d \(.*?\)\n.*?)\n\n\n----\n\n\n",
read("CHANGELOG.rst"),
re.S,
).group(1)
+ "\n\n`Full changelog "
+ "<{url}en/stable/changelog.html>`_.\n\n".format(url=URL)
Expand Down
2 changes: 1 addition & 1 deletion src/attr/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class _InValidator(object):
def __call__(self, inst, attr, value):
try:
in_options = value in self.options
except TypeError as e: # e.g. `1 in "abc"`
except TypeError: # e.g. `1 in "abc"`
in_options = False

if not in_options:
Expand Down

0 comments on commit 4202dcb

Please sign in to comment.