Skip to content

Commit

Permalink
Blacklist pytest 3.2.0 because it breaks us (#3835) (#3844)
Browse files Browse the repository at this point in the history
* Blacklist pytest 3.2.0 because it breaks us (#3835)

See upstream: pytest-dev/pytest#2644

* fix for latest flake8 (#3829)
  • Loading branch information
reaperhulk authored and alex committed Aug 3, 2017
1 parent 38a2d0b commit 789b71d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
setup_requirements.append("cffi>=1.7")

test_requirements = [
"pytest>=2.9.0",
"pytest>=2.9.0,!=3.2.0",
"pretend",
"iso8601",
"pytz",
Expand Down
2 changes: 1 addition & 1 deletion src/cryptography/hazmat/backends/openssl/encode_asn1.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def _encode_name(backend, name):
name_entry, backend._lib.X509_NAME_ENTRY_free
)
res = backend._lib.X509_NAME_add_entry(
subject, name_entry, -1, set_flag)
subject, name_entry, -1, set_flag)
backend.openssl_assert(res == 1)
set_flag = -1
return subject
Expand Down

0 comments on commit 789b71d

Please sign in to comment.