From d35d7b35782b490a28ad6416ef7cd903aca41f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 13 Feb 2019 17:51:28 +0100
Subject: [PATCH] python3.pkgs.cherrypy: 18.0.1 -> 18.1.0

---
 .../python-modules/cherrypy/default.nix       | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 1763ccbce85..2f4ec42c7f8 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,14 +1,14 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k
 , cheroot, contextlib2, portend, routes, six
-, setuptools_scm, zc_lockfile
+, setuptools_scm, zc_lockfile, more-itertools
 , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
-, backports_functools_lru_cache, requests_toolbelt
+, backports_functools_lru_cache, requests_toolbelt, pytest-services
 }:
 
 let
   srcInfo = if isPy3k then {
-    version = "18.0.1";
-    sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
+    version = "18.1.0";
+    sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615";
   } else {
     version = "17.4.1";
     sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
@@ -22,14 +22,26 @@ in buildPythonPackage rec {
     inherit (srcInfo) version sha256;
   };
 
-  propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];
+  propagatedBuildInputs = if isPy3k then [
+    # required
+    cheroot portend more-itertools zc_lockfile
+    # optional
+    routes
+  ] else [
+    cheroot contextlib2 portend routes six zc_lockfile
+  ];
 
   buildInputs = [ setuptools_scm ];
 
-  checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ];
+  checkInputs = if isPy3k then [
+    objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
+  ] else [
+    backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
+  ];
 
   checkPhase = ''
-    LANG=en_US.UTF-8 pytest
+    # 3 out of 5 SignalHandlingTests need network access
+    LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload"
   '';
 
   meta = with lib; {