From ad81ceec860d497d2f3833e1c5bda489ac445ae5 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 14 Feb 2018 23:01:43 +0100 Subject: [PATCH 1/2] devpi-server: 4.3.1 -> 4.4.0 We also disable 3 tests because they are failing with pytest 3.4.0. --- pkgs/development/tools/devpi-server/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 275e411fc8d..6823ae3372c 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -3,17 +3,24 @@ pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "devpi-server"; - version = "4.3.1"; + version = "4.4.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0x6ks2sbpknznxaqlh0gf5hcvhkmgixixq2zs91wgfqxk4vi4s6n"; + sha256 = "0y77kcnk26pfid8vsw07v2k61x9sdl6wbmxg5qxnz3vd7703xpkl"; }; propagatedBuildInputs = with pythonPackages; [ devpi-common execnet itsdangerous pluggy waitress pyramid passlib ]; - checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout pytest-catchlog mock pyyaml ]; + checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout mock pyyaml ]; + preCheck = '' + # These tests pass with pytest 3.3.2 but not with pytest 3.4.0. + sed -i 's/test_basic/noop/' test_devpi_server/test_log.py + sed -i 's/test_new/noop/' test_devpi_server/test_log.py + sed -i 's/test_thread_run_try_again/noop/' test_devpi_server/test_replica.py + ''; checkPhase = '' + runHook preCheck cd test_devpi_server/ PATH=$PATH:$out/bin pytest --slow -rfsxX ''; From 2788b226bcc9cb3be70700d3e0c4868dddeb9b33 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 15 Feb 2018 22:04:32 +0100 Subject: [PATCH 2/2] devpi-client: fix test error due to devpi-server upgrade --- pkgs/development/tools/devpi-client/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 6a98befd346..905314efe5a 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -29,8 +29,9 @@ pythonPackages.buildPythonApplication rec { # 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 + # test_pypi_index_attributes tries to connect to upstream pypi + # test_download_release_error is fixed in the next release + py.test -k 'not test_pypi_index_attributes and not test_download_release_error' testing ''; LC_ALL = "en_US.UTF-8";