diff options
author | Samuel Leathers <disasm@gmail.com> | 2018-09-27 13:42:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-27 13:42:34 -0400 |
commit | 2d15180ea2e300f78bf08b94bad2af0156688b21 (patch) | |
tree | 704351cfa2186b69b271cf59610d01c68af58fd4 /pkgs/development/python-modules | |
parent | c8f3e0f118a300a48e6c480239b4786bec425c24 (diff) | |
parent | d0199179bacc89571bbb79962e24b19aeb1b1e6f (diff) | |
download | nixpkgs-2d15180ea2e300f78bf08b94bad2af0156688b21.tar nixpkgs-2d15180ea2e300f78bf08b94bad2af0156688b21.tar.gz nixpkgs-2d15180ea2e300f78bf08b94bad2af0156688b21.tar.bz2 nixpkgs-2d15180ea2e300f78bf08b94bad2af0156688b21.tar.lz nixpkgs-2d15180ea2e300f78bf08b94bad2af0156688b21.tar.xz nixpkgs-2d15180ea2e300f78bf08b94bad2af0156688b21.tar.zst nixpkgs-2d15180ea2e300f78bf08b94bad2af0156688b21.zip |
Merge pull request #47420 from va1entin/pynacl-130
pythonPackages.pynacl: 1.2.1 -> 1.3.0
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/pynacl/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch | 49 |
2 files changed, 3 insertions, 55 deletions
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 463cd8044e1..3fe1952213e 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -2,18 +2,15 @@ buildPythonPackage rec { pname = "pynacl"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pyca"; repo = pname; rev = version; - sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f"; + sha256 = "0ac00d5bfdmz1x428h2scq5b34llp61yhxradl94qjwz7ikqv052"; }; - # set timeout to unlimited, remove deadline from tests, see https://github.com/pyca/pynacl/issues/370 - patches = [ ./pynacl-no-timeout-and-deadline.patch ]; - checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ libsodium cffi six ]; @@ -22,7 +19,7 @@ buildPythonPackage rec { checkPhase = '' py.test ''; - + meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; diff --git a/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch b/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch deleted file mode 100644 index 5f831df3c48..00000000000 --- a/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/tests/test_pwhash.py b/tests/test_pwhash.py -index 9634c85..7f20316 100644 ---- a/tests/test_pwhash.py -+++ b/tests/test_pwhash.py -@@ -20,7 +20,7 @@ import os - import sys - import unicodedata as ud - --from hypothesis import given, settings -+from hypothesis import given, settings, unlimited - from hypothesis.strategies import integers, text - - import pytest -@@ -411,7 +411,7 @@ def test_str_verify_argon2_ref_fail(password_hash, password): - integers(min_value=1024 * 1024, - max_value=16 * 1024 * 1024) - ) --@settings(deadline=1500, max_examples=20) -+@settings(timeout=unlimited, deadline=None, max_examples=20) - def test_argon2i_str_and_verify(password, ops, mem): - _psw = password.encode('utf-8') - pw_hash = nacl.pwhash.argon2i.str(_psw, opslimit=ops, memlimit=mem) -@@ -425,7 +425,7 @@ def test_argon2i_str_and_verify(password, ops, mem): - integers(min_value=1024 * 1024, - max_value=16 * 1024 * 1024) - ) --@settings(deadline=1500, max_examples=20) -+@settings(timeout=unlimited, deadline=None, max_examples=20) - def test_argon2id_str_and_verify(password, ops, mem): - _psw = password.encode('utf-8') - pw_hash = nacl.pwhash.argon2id.str(_psw, opslimit=ops, memlimit=mem) -@@ -439,7 +439,7 @@ def test_argon2id_str_and_verify(password, ops, mem): - integers(min_value=1024 * 1024, - max_value=16 * 1024 * 1024) - ) --@settings(deadline=1500, max_examples=20) -+@settings(timeout=unlimited, deadline=None, max_examples=20) - def test_argon2i_str_and_verify_fail(password, ops, mem): - _psw = password.encode('utf-8') - pw_hash = nacl.pwhash.argon2i.str(_psw, opslimit=ops, memlimit=mem) -@@ -448,7 +448,7 @@ def test_argon2i_str_and_verify_fail(password, ops, mem): - - - @given(text(alphabet=PASSWD_CHARS, min_size=5, max_size=20)) --@settings(deadline=1500, max_examples=5) -+@settings(timeout=unlimited, deadline=None, max_examples=5) - def test_pwhash_str_and_verify(password): - _psw = password.encode('utf-8') - |