NixOS · Oct 17, 2019 · Oct 17, 2019 · Oct 17, 2019 · Oct 17, 2019
Showing with 30 additions and 36 deletions.

+16 −4 pkgs/development/python-modules/aiohttp/default.nix

+7 −8 pkgs/development/python-modules/numpydoc/default.nix

+2 −14 pkgs/development/python-modules/pybind11/default.nix

+5 −10 pkgs/development/python-modules/uarray/default.nix
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
@@ -19,29 +19,41 @@
 , pytest-mock
 , trustme
 , brotlipy
+, freezegun
 }:
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.5.4";
+  version = "3.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf";
+    sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5";
   };
 
   disabled = pythonOlder "3.5";
 
   checkInputs = [
     pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist
-    pytest-mock pytestcov trustme brotlipy
+    pytest-mock pytestcov trustme brotlipy freezegun
   ];
 
   propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
     ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];
 
+  # disable tests which attempt to do loopback connections
   checkPhase = ''
-    pytest -k "not test__get_valid_log_format_exc and not test_access_logger_atoms"
+    cd tests
+    pytest -k "not get_valid_log_format_exc \
+               and not test_access_logger_atoms \
+               and not aiohttp_request_coroutine \
+               and not server_close_keepalive_connection \
+               and not connector \
+               and not client_disconnect \
+               and not handle_keepalive_on_closed_connection \
+               and not partially_applied_handler \
+               and not middleware" \
+      --ignore=test_connector.py
   '';
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix
@@ -1,27 +1,26 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
+, jinja2
 , nose
+, pytest
 , sphinx
-, jinja2
 }:
 
 buildPythonPackage rec {
   pname = "numpydoc";
-  version = "0.8.0";
+  version = "0.9.1";
 
   src = fetchPypi {
     inherit pname;
     inherit version;
-    sha256 = "61f4bf030937b60daa3262e421775838c945dcdd671f37b69e8e4854c7eb5ffd";
+    sha256 = "09x6l1a4dcvj7001bvcmcayg1nwqwhaxlwbp6kzj9qrk57lqx3z0";
   };
 
-  checkInputs = [ nose ];
+  checkInputs = [ nose pytest ];
   propagatedBuildInputs = [ sphinx jinja2 ];
 
   meta = {
     description = "Sphinx extension to support docstrings in Numpy format";
     homepage = "https://github.com/numpy/numpydoc";
     license = lib.licenses.free;
    };
-}
+}
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
@@ -12,27 +12,15 @@
 
 buildPythonPackage rec {
   pname = "pybind11";
-  version = "2.3.0";
+  version = "2.4.3";
 
   src = fetchFromGitHub {
     owner = "pybind";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf";
+    sha256 = "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd";
   };
 
-  patches = [
-    (fetchpatch {
-      url = https://github.com/pybind/pybind11/commit/44a40dd61e5178985cfb1150cf05e6bfcec73042.patch;
-      sha256 = "047nzyfsihswdva96hwchnp4gj2mlbiqvmkdnhxrfi9sji8x31ka";
-    })
-    (fetchpatch {
-      name = "pytest-4-excinfo-fix.patch";
-      url = https://github.com/pybind/pybind11/commit/9fd4712121fdbb6202a35be4c788525e6c8ab826.patch;
-      sha256 = "07jjv8jlbszvr2grpm5xqxjac7jb0y68lgb1jcbb93k9vyp1hr33";
-    })
-  ];
-
   dontUseCmakeConfigure = true;
 
   checkInputs = [ pytest cmake ]

diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , matchpy
 , numpy
 , astunparse
@@ -16,24 +17,18 @@
 
 buildPythonPackage rec {
   pname = "uarray";
-  version = "0.4";
-  format = "flit";
-  # will have support soon see
-  # https://github.com/Quansight-Labs/uarray/pull/64
-  disabled = isPy37;
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4ec88f477d803a914d58fdf83aeedfb1986305355775cf55525348c62cce9aa4";
+    sha256 = "0j2pin54pwm1vdgza8irxcjb2za7h41c0ils04afssdn59cixslx";
   };
 
+  doCheck = false; # currently has circular dependency module import, remove when bumping to >0.5.1
   checkInputs = [ pytest nbval pytestcov numba ];
   propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions black ];
 
-  checkPhase = ''
-    ${python.interpreter} extract_readme_tests.py
-    pytest
-  '';
+  pythonImportsCheck = [ "uarray" ];
 
   meta = with lib; {
     description = "Universal array library";