diff options
author | lewo <lewo@abesis.fr> | 2018-02-21 19:59:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-21 19:59:56 +0100 |
commit | 4f7650bed0c5bc0142dfe60907b640d0edb7afb8 (patch) | |
tree | 8946ec4af0515ca5a5c73f1564bb2cde3dc23a62 /pkgs/development/tools | |
parent | f457933c4ceab0aef74580fc06bf112614b8cb9a (diff) | |
parent | 2788b226bcc9cb3be70700d3e0c4868dddeb9b33 (diff) | |
download | nixlib-4f7650bed0c5bc0142dfe60907b640d0edb7afb8.tar nixlib-4f7650bed0c5bc0142dfe60907b640d0edb7afb8.tar.gz nixlib-4f7650bed0c5bc0142dfe60907b640d0edb7afb8.tar.bz2 nixlib-4f7650bed0c5bc0142dfe60907b640d0edb7afb8.tar.lz nixlib-4f7650bed0c5bc0142dfe60907b640d0edb7afb8.tar.xz nixlib-4f7650bed0c5bc0142dfe60907b640d0edb7afb8.tar.zst nixlib-4f7650bed0c5bc0142dfe60907b640d0edb7afb8.zip |
Merge pull request #34983 from nlewo/pr/devpi-server-4.4.0
devpi-server: 4.3.1 -> 4.4.0
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/devpi-client/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/devpi-server/default.nix | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 6a98befd346e..905314efe5a9 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"; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 275e411fc8d7..6823ae3372cb 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 ''; |