Merge branch 'master' into staging-next

pkgs/development/python-modules/loguru/default.nix

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "loguru";
-  version = "0.3.1";
+  version = "0.3.2";
   
   disabled = isPy27;
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14pmxyx4kwyafdifqzal121mpdd89lxbjgn0zzi9z6fmzk6pr5h2";
+    sha256 = "0apd3wcjbyhwzgw0fgzzn4dcgy10pqa8f1vf58d4hmszxvyqn4z3";
   };
 
   checkInputs = [ pytest colorama ];

pkgs/development/python-modules/purl/default.nix

@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, nose
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "purl";
+  version = "1.5";
+
+  src = fetchFromGitHub {
+    owner = "codeinthehole";
+    repo = "purl";
+    rev = version;
+    sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ nose ];
+
+  meta = with lib; {
+    description = "Immutable URL class for easy URL-building and manipulation";
+    homepage = "https://github.com/codeinthehole/purl";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}

pkgs/development/python-modules/requests-mock/default.nix

@@ -1,21 +1,33 @@
-{ buildPythonPackage, fetchPypi, python
-, mock, testrepository, testtools
-, requests, six }:
+{ lib, buildPythonPackage, fetchPypi, python
+, mock
+, purl
+, requests
+, six
+, testrepository
+, testtools
+}:
 
 buildPythonPackage rec {
   pname = "requests-mock";
-  version = "1.5.2";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb";
+    sha256 = "0ij6ir5cy0gpy5xw4sykxz320ndi26np6flx9yg9mimkv0nl1lw8";
   };
 
   patchPhase = ''
     sed -i 's@python@${python.interpreter}@' .testr.conf
   '';
 
-  checkInputs = [ mock testrepository testtools ];
-
   propagatedBuildInputs = [ requests six ];
+
+  checkInputs = [ mock purl testrepository testtools ];
+
+  meta = with lib; {
+    description = "Mock out responses from the requests package";
+    homepage = "https://requests-mock.readthedocs.io";
+    license = licenses.asl20;
+    maintainers = [ ];
+  };
 }