NixOS · Mar 19, 2019 · Mar 19, 2019 · Mar 19, 2019 · Mar 19, 2019
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , isPy27, isPyPy, python, pycares, typing, trollius }:
 
 buildPythonPackage rec {
   pname = "aiodns";
-  version = "1.2.0";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449";
+    sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d";
   };
 
-  propagatedBuildInputs = with stdenv.lib; [ pycares typing ]
+  propagatedBuildInputs = with stdenv.lib; [ pycares ]
+    ++ optional (pythonOlder "3.7") typing
     ++ optional (isPy27 || isPyPy) trollius;
 
   checkPhase = ''

diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix
@@ -1,25 +1,45 @@
-{ pkgs
+{ lib
 , buildPythonPackage
-, fetchPypi
-, python
-, certifi
+, fetchFromGitHub
+, requests
 , requests_oauthlib
-, typing
 , isodate
+, certifi
+, aiohttp
+, aiodns
+, pytest
+, httpretty
 }:
 
 buildPythonPackage rec {
-  version = "0.6.2";
+  version = "0.6.4";
   pname = "msrest";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0icklfjaagk0j9iwq897avmqhwwmgs7c5yy5jw3ppdqz6h0sm38v";
+  #src = fetchPypi {
+  #  inherit pname version;
+  #  sha256 = "5dadd54bec98d52cd9f43fb095015c346135b8cafaa35f24c7309cc25d3ad266";
+  #};
+
+  src = fetchFromGitHub {
+    owner = "Azure";
+    repo = "msrest-for-python";
+    rev = "v${version}";
+    sha256 = "0ilrc06qq0dw4qqzq1dq2vs6nymc39h19w52dwcyawwfalalnjzi";
   };
 
-  propagatedBuildInputs = [ certifi requests_oauthlib typing isodate ];
+  propagatedBuildInputs = [
+    requests requests_oauthlib isodate certifi
+    # optional
+    aiohttp aiodns
+  ];
+
+  checkInputs = [ pytest httpretty ];
+
+  checkPhase = ''
+    pytest tests/
+  '';
 
-  meta = with pkgs.lib; {
+  meta = with lib; {
     description = "The runtime library 'msrest' for AutoRest generated Python clients.";
     homepage = "https://azure.microsoft.com/en-us/develop/python/";
     license = licenses.mit;

diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix
@@ -1,21 +1,29 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pkgs
+, python
+, c-ares
+, cffi
 }:
 
 buildPythonPackage rec {
   pname = "pycares";
-  version = "2.4.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15pwsxsj1nr33n6x2918bfbzdnqv1qkwd2d5jgvxsm81zxnvgk0f";
+    sha256 = "b253f5dcaa0ac7076b79388a3ac80dd8f3bd979108f813baade40d3a9b8bf0bd";
   };
 
-  propagatedBuildInputs = [ pkgs.c-ares ];
+  buildInputs = [ c-ares ];
 
-  # No tests included
+  propagatedBuildInputs = [ cffi ];
+
+  checkPhase = ''
+    ${python.interpreter} tests/tests.py
+  '';
+
+  # requires network access
   doCheck = false;
 
   meta = with stdenv.lib; {

diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix
@@ -11,7 +11,8 @@ buildPythonPackage rec {
   disabled = isPy3k || isPyPy;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "SimpleParse";
+    inherit version;
     sha256 = "18ccdc249bb550717af796af04a7d50aef523368901f64036a48eee5daca149d";
   };