Merge branch 'master' into xen-4.15-pr

1 files changed, 32 insertions, 11 deletions

diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix
index 5a5c3b1449f2..feae84901304 100644
--- a/pkgs/development/python-modules/pytest-httpserver/default.nix
+++ b/pkgs/development/python-modules/pytest-httpserver/default.nix
@@ -1,35 +1,56 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, pytest-cov
+, fetchFromGitHub
+, poetry-core
 , pytestCheckHook
+, pythonOlder
 , requests
+, toml
 , werkzeug
 }:
 
 buildPythonPackage rec {
   pname = "pytest-httpserver";
-  version = "1.0.2";
+  version = "1.0.6";
+  format = "pyproject";
 
-  src = fetchPypi {
-    pname = "pytest_httpserver";
-    inherit version;
-    sha256 = "sha256-JwH9HZgU1YVR+dEETbM1xrqYcxaTZsWDSVI6WM907UA=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "csernazs";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-LY5Ur0cIcsNrgvyQlY2E479ZzRcuwqTuiT2MtRupVcs=";
   };
 
-  propagatedBuildInputs = [ werkzeug ];
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    werkzeug
+  ];
 
-  checkInputs = [
-    pytest-cov
+  nativeCheckInputs = [
     pytestCheckHook
     requests
+    toml
   ];
 
-  pythonImportsCheck = [ "pytest_httpserver" ];
+  __darwinAllowLocalNetworking = true;
+
+  disabledTests = [
+    "test_wait_raise_assertion_false" # racy
+  ];
+
+  pythonImportsCheck = [
+    "pytest_httpserver"
+  ];
 
   meta = with lib; {
     description = "HTTP server for pytest to test HTTP clients";
     homepage = "https://www.github.com/csernazs/pytest-httpserver";
+    changelog = "https://github.com/csernazs/pytest-httpserver/blob/${version}/CHANGES.rst";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };