From 7c464e3133bd4f0009b0b93fb6b56ede745cfaa9 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 4 Dec 2017 14:34:20 +0100 Subject: [PATCH 1/7] argon2_cffi: init at 16.3.0 --- .../python-modules/argon2_cffi/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/argon2_cffi/default.nix diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix new file mode 100644 index 00000000000..80985f868c7 --- /dev/null +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -0,0 +1,31 @@ +{ lib +, cffi +, six +, hypothesis +, pytest +, wheel +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "argon2_cffi"; + version = "16.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ap3il3j1pjyprrhpfyhc21izpmhzhfb5s69vlzc65zvd1nj99cr"; + }; + + propagatedBuildInputs = [ cffi six ]; + checkInputs = [ hypothesis pytest wheel ]; + checkPhase = '' + pytest tests + ''; + + meta = { + description = "Secure Password Hashes for Python"; + homepage = https://argon2-cffi.readthedocs.io/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52fab78be89..937bdb986f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -162,6 +162,8 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + asana = callPackage ../development/python-modules/asana { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; From 19ce61d79c63bd7e13a15524b678727671227e1a Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 5 Dec 2017 13:31:43 +0100 Subject: [PATCH 2/7] pytest-timeout: init at 1.2.1 --- .../python-modules/pytest-timeout/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-timeout/default.nix diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix new file mode 100644 index 00000000000..d3a4e375ec3 --- /dev/null +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pexpect +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-timeout"; + version = "1.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8"; + }; + buildInputs = [ pytest ]; + checkInputs = [ pytest pexpect ]; + checkPhase = ''pytest -ra''; + + meta = with lib;{ + description = "py.test plugin to abort hanging tests"; + homepage = http://bitbucket.org/pytest-dev/pytest-timeout/; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 937bdb986f0..93bd6ca84f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3768,6 +3768,8 @@ in { }; }; + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; pytestpep8 = buildPythonPackage rec { @@ -24463,6 +24465,7 @@ EOF parse-type = callPackage ../development/python-modules/parse-type { }; ephem = callPackage ../development/python-modules/ephem { }; + }); in fix' (extends overrides packages) From 6ad7626a6a3352848cf645229dd251c1c2eaa917 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 4 Dec 2017 15:09:21 +0100 Subject: [PATCH 3/7] passlib: build with argon2_cffi --- pkgs/development/python-modules/passlib/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index c269a414f82..165de7bd2ba 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -3,6 +3,7 @@ , fetchPypi , nose , bcrypt +, argon2_cffi }: buildPythonPackage rec { @@ -16,10 +17,10 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ bcrypt ]; + propagatedBuildInputs = [ bcrypt argon2_cffi ]; meta = { description = "A password hashing library for Python"; homepage = https://code.google.com/p/passlib/; }; -} \ No newline at end of file +} From 8002a3b760fb843b47e062b02802a3fdebaa9412 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 4 Dec 2017 15:09:50 +0100 Subject: [PATCH 4/7] devpi-common: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/devpi-common/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 67f8debc43a..f2be8ec5638 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,20 +2,18 @@ with pythonPackages;buildPythonPackage rec { pname = "devpi-common"; - version = "3.1.0"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "d89634a57981ed43cb5dcd25e00c9454ea111189c5ddc08d945b3d5187ada5fd"; + sha256 = "0rh119iw5hk41gsvbjr0wixvl1i4f0b1vcnw9ym35rmcp517z0wb"; }; propagatedBuildInputs = [ requests py ]; checkInputs = [ pytest ]; checkPhase = '' - # Don't know why this test is failing! - substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env" py.test ''; From 623f9c15e09533cce63ebf5a29ea59d76848bfe7 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 4 Dec 2017 15:11:12 +0100 Subject: [PATCH 5/7] devpi-server: init at 4.3.1 --- .../tools/devpi-server/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/devpi-server/default.nix diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix new file mode 100644 index 00000000000..275e411fc8d --- /dev/null +++ b/pkgs/development/tools/devpi-server/default.nix @@ -0,0 +1,27 @@ + { stdenv, pythonPackages, glibcLocales, nginx }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "devpi-server"; + version = "4.3.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0x6ks2sbpknznxaqlh0gf5hcvhkmgixixq2zs91wgfqxk4vi4s6n"; + }; + + propagatedBuildInputs = with pythonPackages; + [ devpi-common execnet itsdangerous pluggy waitress pyramid passlib ]; + checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout pytest-catchlog mock pyyaml ]; + checkPhase = '' + cd test_devpi_server/ + PATH=$PATH:$out/bin pytest --slow -rfsxX + ''; + + meta = with stdenv.lib;{ + homepage = http://doc.devpi.net; + description = "Github-style pypi index server and packaging meta tool"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6be0560abb8..9828db66514 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5535,6 +5535,8 @@ with pkgs; devpi-client = callPackage ../development/tools/devpi-client {}; + devpi-server = callPackage ../development/tools/devpi-server {}; + dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; drumstick = callPackage ../development/libraries/drumstick { }; From 29672cf7ce7ec30a19960210f88daca17232d2ad Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 4 Dec 2017 15:35:55 +0100 Subject: [PATCH 6/7] devpi-client: 3.1.0rc1 -> 3.1.0 enable tests with packaged devpi-server --- pkgs/development/tools/devpi-client/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 9da88f6c63d..76b35d65b21 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,17 +1,21 @@ -{ stdenv, pythonPackages, glibcLocales} : +{ stdenv +, pythonPackages +, glibcLocales +, devpi-server +} : pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "devpi-client"; - version = "3.1.0rc1"; + version = "3.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3"; + sha256 = "0w47x3lkafcg9ijlaxllmq4886nsc91w49ck1cd7vn2gafkwjkgr"; }; - # requires devpi-server which is currently not packaged + doCheck = true; - checkInputs = with pythonPackages; [ pytest webtest mock ]; + checkInputs = with pythonPackages; [ pytest webtest mock devpi-server ]; checkPhase = "py.test"; LC_ALL = "en_US.UTF-8"; From 7e39ecba684a9e1e64a6f18c69543a170a36bd52 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 5 Dec 2017 11:30:07 +0100 Subject: [PATCH 7/7] devpi-client: enable tests --- .../tools/devpi-client/default.nix | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 76b35d65b21..6a98befd346 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,7 +1,10 @@ { stdenv +, lib , pythonPackages , glibcLocales , devpi-server +, git +, mercurial } : pythonPackages.buildPythonApplication rec { @@ -14,19 +17,31 @@ pythonPackages.buildPythonApplication rec { sha256 = "0w47x3lkafcg9ijlaxllmq4886nsc91w49ck1cd7vn2gafkwjkgr"; }; - doCheck = true; - checkInputs = with pythonPackages; [ pytest webtest mock devpi-server ]; - checkPhase = "py.test"; + checkInputs = with pythonPackages; [ + pytest webtest mock + devpi-server tox + sphinx wheel git mercurial detox + setuptools + ]; + checkPhase = '' + export PATH=$PATH:$out/bin + + # setuptools do not get propagated into the tox call (cannot import setuptools) + rm testing/test_test.py + + # test tries to connect to upstream pypi + py.test -k 'not test_pypi_index_attributes' testing + ''; LC_ALL = "en_US.UTF-8"; - buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ]; - propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ]; + buildInputs = with pythonPackages; [ glibcLocales pkginfo check-manifest ]; + propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy setuptools ]; - meta = { + meta = with stdenv.lib; { homepage = http://doc.devpi.net; - description = "Github-style pypi index server and packaging meta tool"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ lewo makefu ]; - + description = "Client for devpi, a pypi index server and packaging meta tool"; + license = licenses.mit; + maintainers = with maintainers; [ lewo makefu ]; }; + }