Skip to content

python3Packages.cherrypy: fix tests after upgrade to pytest5 #68001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srhb merged 1 commit into from
Sep 3, 2019
Merged

python3Packages.cherrypy: fix tests after upgrade to pytest5 #68001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions pkgs/development/python-modules/cherrypy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, setuptools_scm
, cheroot, portend, more-itertools, zc_lockfile, routes
, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services
, fetchpatch
}:

buildPythonPackage rec {
Expand All @@ -16,6 +17,22 @@ buildPythonPackage rec {
sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8";
};

# Remove patches once 96b34df and 14c12d2
# become part of a release - they're currently only present in master.
# ref: https://github.com/cherrypy/cherrypy/pull/1791
patches = [
(fetchpatch {
name = "pytest5-1.patch";
url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch";
sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi";
})
(fetchpatch {
name = "pytest5-2.patch";
url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch";
sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz";
})
];

propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
Expand Down