@@ -1,34 +1,46 @@
11{ lib
22, buildPythonPackage
3−, fetchPypi
4−, requests
3+, cherrypy
4+, fetchFromGitHub
5+, lockfile
6+, mock
57, msgpack
6−, pytest
8+, pytestCheckHook
9+, requests
710}:
811
912buildPythonPackage rec {
10− version = "0.12.6";
11− pname = "CacheControl";
13+ pname = "cachecontrol";
14+ version = "0.12.8";
15+ format = "setuptools";
1216
13− src = fetchPypi {
14− inherit pname version;
15− sha256 = "be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8";
17+ src = fetchFromGitHub {
18+ owner = "ionrock";
19+ repo = pname;
20+ rev = "v${version}";
21+ sha256 = "0y15xbaqw2lxidwbyrgpy42v3cxgv4ys63fx2586h1szlrd4f3p4";
1622 };
1723
18− checkInputs = [ pytest ];
19− propagatedBuildInputs = [ requests msgpack ];
24+ propagatedBuildInputs = [
25+ msgpack
26+ requests
27+ ];
2028
21− # tests not included with pypi release
22− doCheck = false;
29+ checkInputs = [
30+ cherrypy
31+ mock
32+ lockfile
33+ pytestCheckHook
34+ ];
2335
24− checkPhase = ''
25− pytest tests
26− '';
36+ pythonImportsCheck = [
37+ "cachecontrol"
38+ ];
2739
2840 meta = with lib; {
29− homepage = "https://github.com/ionrock/cachecontrol";
3041 description = "Httplib2 caching for requests";
42+ homepage = "https://github.com/ionrock/cachecontrol";
3143 license = licenses.asl20;
32− maintainers = [ maintainers.costrouc ];
44+ maintainers = with maintainers; [ costrouc ];
3345 };
3446}