diff options
Diffstat (limited to 'pkgs/development/python-modules')
33 files changed, 119 insertions, 111 deletions
diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index b524cb0c6b3c..679725db307a 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.2.0"; + version = "1.2.1"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "0w9ggzi887w4z6i5mz24kcy7qbkd4d7gycqi0dhqgaj9lzxh7jjh"; + sha256 = "0br8ib9n17dfprfly93mjkhdhpndb7i4g57lwscvp2s69ssql32s"; }; meta = { diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 0afb1c432d6b..8d8467207ce1 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.0.1"; + version = "2.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db09e34dfc148279f303481c7da94b84c9b1442a41794f039c31253e81a58ffb"; + sha256 = "0znal1hi964acc8bl3z0ikscax7zziks838ld099rjsbffjwmwn5"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Client for ESPHome native API"; - homepage = https://github.com/esphome/aioesphomeapi; + homepage = "https://github.com/esphome/aioesphomeapi"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 520e01723e6c..654567cc23fc 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-application"; - version = "2.0.2"; + version = "2.7.0"; disabled = isPy3k; src = fetchdarcs { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; - sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; + sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla"; }; buildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 3b25ce6bcfbd..b3c6f3fa1cc9 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -1,8 +1,9 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , azure-nspkg , isPyPy +, setuptools , python , isPy3k }: @@ -20,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-nspkg - ]; + ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py @@ -28,7 +29,7 @@ buildPythonPackage rec { doCheck = false; - meta = with pkgs.lib; { + meta = with lib; { description = "This is the Microsoft Azure common code"; homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common; license = licenses.mit; diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index e948afd91cfd..482c0d190bc5 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; doCheck = false; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index e8683a68e295..84ebf617bae9 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "0.50.0"; + version = "0.50.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c5864cfc69402e3e2897e61b3bd224ade28d9e33dad849e4bd6afad26a3d2786"; + sha256 = "0i8ls5h2ny12h9gnqwyq13ysvxgdq7b1kxirj4n58dfy94a182gv"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index a86acbb23ac2..50f2023418ee 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { sha256 = "1hambr925ml2v2zcxnmnpi39395gl2928yac4p2kghk9xicymraw"; }; + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake cython ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index d499a937f501..19eaeaf8d827 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect +{ lib, buildPythonPackage, fetchPypi, libredirect , case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet }: @@ -17,19 +17,17 @@ buildPythonPackage rec { --replace "pytest>=4.3.1,<4.4.0" pytest ''; - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox - preCheck = stdenv.lib.optionalString stdenv.isLinux '' - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ - LD_PRELOAD=${libredirect}/lib/libredirect.so - ''; - postCheck = stdenv.lib.optionalString stdenv.isLinux '' - unset NIX_REDIRECTS LD_PRELOAD + # ignore test that's incompatible with pytest5 + # test_eventlet touches network + checkPhase = '' + pytest -k 'not restore_current_app_fallback' \ + --ignore=t/unit/concurrency/test_eventlet.py ''; checkInputs = [ case pytest boto3 moto ]; propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/celery/celery/; description = "Distributed task queue"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 8c55c3ac8bbb..591bb0fbe377 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" "" ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"} - pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} + pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 4847d57b67b3..201c8ccda705 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -65,7 +65,6 @@ buildPythonPackage rec { programming language. ''; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.targetPlatform.isDarwin; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix index 853beaf34a1c..265a4cb5712b 100644 --- a/pkgs/development/python-modules/demjson/default.nix +++ b/pkgs/development/python-modules/demjson/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "demjson"; version = "2.2.4"; - disabled = isPy36; + disabled = isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index d9b3bb93264e..a57d83075513 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -21,4 +21,7 @@ buildPythonPackage { ''; checkInputs = [ pytest more-itertools ]; + + enableParallelBuilding = true; + dontUseCmakeConfigure = true; } diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix index 147e18d45f42..837ffa0d86d7 100644 --- a/pkgs/development/python-modules/eventlib/default.nix +++ b/pkgs/development/python-modules/eventlib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-eventlib"; - version = "0.2.2"; + version = "0.2.4"; # Judging from SyntaxError disabled = isPy3k; src = fetchdarcs { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; - sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8"; + sha256 = "1w1axsm6w9bl2smzxmyk4in1lsm8gk8ma6y183m83cpj66aqxg4z"; }; propagatedBuildInputs = [ greenlet ]; diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index 960bffb903d6..12587e6792df 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, fetchPypi }: +{ buildPythonPackage, stdenv, fetchPypi, setuptools }: buildPythonPackage rec { pname = "face_recognition_models"; @@ -12,6 +12,8 @@ buildPythonPackage rec { # no module named `tests` as no tests are available doCheck = false; + propagatedBuildInputs = [ setuptools ]; + meta = with stdenv.lib; { homepage = https://github.com/ageitgey/face_recognition_models; license = licenses.cc0; diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index 5638447bceb8..bb38c7387607 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -1,7 +1,11 @@ -{ lib , buildPythonPackage, fetchPypi, isPy27 +{ lib , buildPythonPackage, fetchFromGitHub, isPy27 , falcon , pytestrunner , requests +, pytest +, marshmallow +, mock +, numpy }: buildPythonPackage rec { @@ -9,16 +13,22 @@ buildPythonPackage rec { version = "2.6.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "0iamrzjy8z1xibynkgfl6cn2sbm66awxbp75b26pi32fc41d0k50"; + src = fetchFromGitHub { + owner = "hugapi"; + repo = pname; + rev = version; + sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ falcon requests ]; - # tests are not shipped in the tarball - doCheck = false; + checkInputs = [ mock marshmallow pytest numpy ]; + checkPhase = '' + mv hug hug.hidden + # some tests attempt network access + PATH=$out/bin:$PATH pytest -k "not (test_request or test_datagram_request)" + ''; meta = with lib; { description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 10dbcafd04bc..f428e7dbfbac 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { cmake ]; + dontUseCmakeConfigure = true; + # we never actually explicitly call the install command so this is the only way # to inject these options to it - however, openmp-library doesn't appear to have # any effect, so we have to inject it into NIX_LDFLAGS manually below diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 364fa4d81be2..1438391dc406 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , nose , pyyaml }: @@ -14,6 +15,8 @@ buildPythonPackage rec { sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; }; + propagatedBuildInputs = [ setuptools ]; + checkInputs = [ nose pyyaml ]; meta = { diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 209ecf998ccf..bf66a886f764 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -1,29 +1,31 @@ -{ stdenv -, buildPythonPackage -, fetchurl +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k , nose +, pytest }: buildPythonPackage rec { pname = "minidb"; version = "2.0.2"; - src = fetchurl { - url = "https://github.com/thp/minidb/archive/${version}.tar.gz"; - sha256 = "17rvkpq8v7infvbgsi48vnxamhxb3f635nqn0sln7yyvh4i9k8a0"; + src = fetchFromGitHub { + owner = "thp"; + repo = "minidb"; + rev = version; + sha256 = "14y5vf8vhgviczhzy9h3xv99fjvrg975nz4w1fj5c1jv37da1lq3"; }; - checkInputs = [ nose ]; - + # module imports are incompatible with python2 + doCheck = isPy3k; + checkInputs = [ nose pytest ]; checkPhase = '' - nosetests test + pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple SQLite3-based store for Python objects"; - homepage = https://thp.io/2010/minidb/; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.tv ]; + homepage = "https://thp.io/2010/minidb/"; + license = licenses.isc; + maintainers = [ maintainers.tv ]; }; } diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index 32a759a6a49e..bba72ea62bb9 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "python-msrplib"; - version = "0.19"; + version = "0.19.2"; src = fetchdarcs { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; - sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd"; + sha256 = "0d0krwv4hhspjgppnvh0iz51bvdbz23cjasgrppip7x8b00514gz"; }; propagatedBuildInputs = [ eventlib application gnutls ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 85b53bd9df68..a4c66048953b 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -3,6 +3,7 @@ , fetchPypi , nose , decorator +, setuptools }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ decorator ]; + propagatedBuildInputs = [ decorator setuptools ]; meta = { homepage = "https://networkx.github.io/"; diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index 9523a3e28fab..2d1130490090 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -1,7 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k +, six }: buildPythonPackage rec { @@ -14,11 +12,14 @@ buildPythonPackage rec { sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = [ six ]; + + meta = with lib; { homepage = https://github.com/mooz/percol; description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; license = licenses.mit; maintainers = with maintainers; [ koral ]; + broken = true; # missing cmigemo package which is missing libmigemo.so + # also doesn't support python3 }; - } diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 28ca8a3e498c..b09c4a240e51 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,12 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , nose , mock -, pyyaml -, unittest2 -, pyev , twisted , tornado }: @@ -20,11 +16,7 @@ buildPythonPackage rec { sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz"; }; - # Tests require twisted which is only availalble for python-2.x - doCheck = !isPy3k; - - buildInputs = [ nose mock pyyaml unittest2 pyev ] - ++ stdenv.lib.optionals (!isPy3k) [ twisted tornado ]; + checkInputs = [ nose mock twisted tornado ]; meta = with stdenv.lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix deleted file mode 100644 index b5ca0c7ef6cf..000000000000 --- a/pkgs/development/python-modules/pyev/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage, libev }: - -buildPythonPackage rec { - pname = "pyev"; - version = "0.9.0"; - - src = fetchurl { - url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz"; - sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; - }; - - buildInputs = [ libev ]; - - libEvSharedLibrary = - if !stdenv.isDarwin - then "${libev}/lib/libev.so.4" - else "${libev}/lib/libev.4.dylib"; - - postPatch = '' - test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; } - sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py - ''; - - meta = with stdenv.lib; { - description = "Python bindings for libev"; - homepage = https://code.google.com/p/pyev/; - license = licenses.gpl3; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/python-modules/pytest/2.nix b/pkgs/development/python-modules/pytest/4.nix index 7a43a2e2517b..7a43a2e2517b 100644 --- a/pkgs/development/python-modules/pytest/2.nix +++ b/pkgs/development/python-modules/pytest/4.nix diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 506b560e01ae..1ddf52a33bd5 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -6,6 +6,8 @@ buildPythonPackage rec { version = "5.1.0"; pname = "pytest"; + disabled = !isPy3k; + preCheck = '' # don't test bash builtins rm testing/test_argcomplete.py @@ -19,7 +21,6 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix index b1c074faa8f6..92977331a847 100644 --- a/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.20.3"; + version = "0.20.4"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41"; + sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z"; }; buildInputs = [ pillow gfortran glibcLocales ]; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 7eb020bbe609..939782722c6e 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchPypi +, fetchpatch , gfortran, glibcLocales , numpy, scipy, pytest, pillow , cython @@ -40,6 +41,15 @@ buildPythonPackage rec { ]; checkInputs = [ pytest ]; + patches = [ + # Fixes tests by changing threshold of a test-case that broke + # with numpy versions >= 1.17. This should be removed for versions > 0.21.2. + ( fetchpatch { + url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch"; + sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv"; + }) + ]; + LC_ALL="en_US.UTF-8"; doCheck = !stdenv.isAarch64; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 82f1315ba3d2..5ade47587d17 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pbr , pytest }: @@ -16,7 +17,9 @@ buildPythonPackage rec { buildInputs = [ pbr ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ ]; + + # test suite uses new async primitives + doCheck = !isPy27; meta = with stdenv.lib; { homepage = https://github.com/codingjoe/ssdp; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 10b25460cefc..249ddb4be863 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -11,6 +11,7 @@ , attrs , pyopenssl , service-identity +, setuptools , idna }: buildPythonPackage rec { @@ -23,7 +24,7 @@ buildPythonPackage rec { sha256 = "294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395"; }; - propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs ]; + propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; passthru.extras.tls = [ pyopenssl service-identity idna ]; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index ff0c61c5e077..fc6c2b777945 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -1,24 +1,21 @@ -{ CFNetwork -, Security -, buildPythonPackage +{ lib, buildPythonPackage, fetchPypi, isPy3k , certifi +, CFNetwork , cmake , enum34 -, fetchPypi -, isPy3k -, lib , openssl -, stdenv +, Security , six +, stdenv }: buildPythonPackage rec { pname = "uamqp"; - version = "1.1.0"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "d3d4ff94bf290adb82fe8c19af709a21294bac9b27c821b9110165a34b922015"; + sha256 = "0wmyw2l2pha5s6khih96lkfa90zyfy2mqsg8cx6vplmrmpx2s52i"; }; buildInputs = [ @@ -31,6 +28,8 @@ buildPythonPackage rec { CFNetwork Security ]; + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index d8482872bc34..f3d60253ae47 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -30,6 +30,9 @@ buildPythonPackage rec { checkInputs = [ nose mock PasteDeploy wsgiproxy2 pyquery ]; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with stdenv.lib; { description = "Helper to test WSGI applications"; homepage = https://webtest.readthedocs.org/en/latest/; diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index 7dc670720465..7002c43cf2bc 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-xcaplib"; - version = "1.2.0"; + version = "1.2.1"; disabled = isPy3k; src = fetchdarcs { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; - sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn"; + sha256 = "15ww8f0a9zh37mypw5s4q1qk44cwf7jlhc9q1z4vjlpvnzimg54v"; }; propagatedBuildInputs = [ eventlib application ]; diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix index 143f609d8338..56fdbe45553a 100644 --- a/pkgs/development/python-modules/zake/default.nix +++ b/pkgs/development/python-modules/zake/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ kazoo six ]; buildInputs = [ testtools ]; checkPhase = '' + # Skip test - fails with our new kazoo version + substituteInPlace zake/tests/test_client.py \ + --replace "test_child_watch_no_create" "_test_child_watch_no_create" + ${python.interpreter} -m unittest discover zake/tests ''; |