@@ -1,43 +1,27 @@
1−{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
1+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
22, setuptools-scm
33, cheroot, portend, more-itertools, zc_lockfile, routes
44, jaraco_collections
55, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services
6−, fetchpatch
76}:
87
98buildPythonPackage rec {
109 pname = "cherrypy";
11− version = "18.6.0";
10+ version = "18.6.1";
11+ format = "setuptools";
1212
13− disabled = !isPy3k;
13+ disabled = pythonOlder "3.7";
1414
1515 src = fetchPypi {
1616 pname = "CherryPy";
1717 inherit version;
18− sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n";
18+ hash = "sha256-8z6HKG57PjCeBOciXY5JOC2dd3PmCSJB1/YTiTxWNJU=";
1919 };
2020
21− patches = [
22− # 1/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
23− (fetchpatch {
24− url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/59c0e19d7df8680e36afc96756dce72435121448.patch";
25− sha256 = "1jachbvp505gndccdhny0c3grzdrmvmbzq4kw55jx93ay94ni6p0";
26− })
27− # 2/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
28− (fetchpatch {
29− url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/4a6287b73539adcb7b0ae72d69644a1ced1f7eaa.patch";
30− sha256 = "0nz40qmgxknkbjsdzfzcqfxdsmsxx3v104fb0h04yvs76mqvw3i4";
31− })
32− # 3/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
33− (fetchpatch {
34− url = "https://github.com/cherrypy/cherrypy/commit/3bae7f06868553b006915f05ff14d86163f59a7d.patch";
35− sha256 = "1z0bv23ybyw87rf1i8alsdi3gc2bzmdj9d0kjsghdkvi3zdp4n8q";
36− })
21+ nativeBuildInputs = [
22+ setuptools-scm
3723 ];
3824
39− nativeBuildInputs = [ setuptools-scm ];
40−
4125 propagatedBuildInputs = [
4226 # required
4327 cheroot portend more-itertools zc_lockfile
@@ -50,10 +34,10 @@ buildPythonPackage rec {
5034 objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services
5135 ];
5236
53− # Keyboard interrupt ends test suite run
37+
5438 # daemonize and autoreload tests have issue with sockets within sandbox
5539 # Disable doctest plugin because times out
56− checkPhase = ''
40+ preCheck = ''
5741 substituteInPlace pytest.ini --replace "--doctest-modules" ""
5842 pytest \
5943 -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \
@@ -63,11 +47,28 @@ buildPythonPackage rec {
6347 "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block --deselect=cherrypy/test/test_config_server.py"}
6448 '';
6549
50+ disabledTests = [
51+ # Keyboard interrupt ends test suite run
52+ ""
53+ ""
54+ ""
55+ ""
56+ ];
57+
58+ disabledTestPaths = [
59+ ""
60+ ];
61+
6662 __darwinAllowLocalNetworking = true;
6763
64+ pythonImportsCheck = [
65+ "cherrypy"
66+ ];
67+
6868 meta = with lib; {
69+ description = "Object-oriented HTTP framework";
6970 homepage = "https://www.cherrypy.org";
70− description = "A pythonic, object-oriented HTTP framework";
7171 license = licenses.bsd3;
72+ maintainers = with maintainers; [ ];
7273 };
7374}