diff options
Diffstat (limited to 'pkgs/development/python-modules')
18 files changed, 216 insertions, 71 deletions
diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index c71227811111..ec19f4730a55 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -1,13 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, future, networkx, pygments, lxml, colorama, matplotlib, - asn1crypto, click, pydot, ipython, pyqt5, pyperclip }: +{ lib +, fetchpatch +, buildPythonPackage +, fetchFromGitHub +, future +, networkx +, pygments +, lxml +, colorama +, matplotlib +, asn1crypto +, click +, pydot +, ipython +, pyqt5 +, pyperclip +, nose +, nose-timer +, mock +, python_magic +, codecov +, coverage +, qt5 +# This is usually used as a library, and it'd be a shame to force the gui +# libraries to the closure if gui is not desired. +, withGui ? false +# Tests take a very long time, and currently fail, but next release' tests +# shouldn't fail +, doCheck ? false +}: buildPythonPackage rec { version = "3.3.5"; pname = "androguard"; - src = fetchPypi { - inherit pname version; - sha256 = "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2"; + # No tests in pypi tarball + src = fetchFromGitHub { + repo = pname; + owner = pname; + rev = "v${version}"; + sha256 = "0zc8m1xnkmhz2v12ddn47q0c01p3sbna2v5npfxhcp88szswlr9y"; }; propagatedBuildInputs = [ @@ -21,12 +52,37 @@ buildPythonPackage rec { click pydot ipython + ] ++ lib.optionals withGui [ pyqt5 pyperclip ]; - # Tests are not shipped on PyPI. - doCheck = false; + checkInputs = [ + pyqt5 + pyperclip + nose + nose-timer + codecov + coverage + mock + python_magic + ]; + inherit doCheck; + + nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ]; + + # If it won't be verbose, you'll see nothing going on for a long time. + checkPhase = '' + runHook preCheck + + nosetests --verbosity=3 + + runHook postCheck + ''; + + preFixup = lib.optionalString withGui '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; meta = { description = "Tool and python library to interact with Android Files"; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index b0f3cdb6e119..16b8f317a223 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , fetchpatch -, pytest +, pytestCheckHook , unittest2 , future , numpy @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "batchgenerators"; - version = "0.20.0"; + version = "0.20.1"; disabled = isPy27; @@ -24,11 +24,12 @@ buildPythonPackage rec { owner = "MIC-DKFZ"; repo = pname; rev = "v${version}"; - sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf"; + sha256 = "1f91yflv9rschyl5bnfn735hp1rxrzcxkx18aajmlzb067h0ip8m"; }; patches = [ + # lift Pillow bound; should be merged in next release (fetchpatch { url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch"; sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0"; @@ -39,9 +40,7 @@ buildPythonPackage rec { future numpy pillow scipy scikitlearn scikitimage threadpoolctl ]; - checkInputs = [ pytest unittest2 ]; - - checkPhase = "pytest tests"; + checkInputs = [ pytestCheckHook unittest2 ]; meta = { description = "2D and 3D image data augmentation for deep learning"; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index adbf9a46ab40..b3232f8eca54 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.3.1"; + version = "2.3.2"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e12abfe0a6b38ce3525adb471ca5b8e3fa4056ff712108de48da53405c518a11"; + sha256 = "1wfpf2b0sha84rz0qgkanc82wharjqr2nr7xxg1rngrci2h0aqhd"; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 2381f52614e1..1627159e6fbd 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy27, pythonAtLeast , graphviz , multipledispatch , numpy @@ -23,6 +23,14 @@ buildPythonPackage rec { sha256 = "1my94a11jzg1hv6ln8wxklbqrg6z5l2l77vr89aq0829yyxacmv7"; }; + patches = [ + # fix tests for pandas 1.1 + (fetchpatch { + url = "https://github.com/ibis-project/ibis/commit/53ef3cefc4ae90d61f3612310cb36da2bcd11305.diff"; + sha256 = "1i5yjmqridjqpggiinsjaz5spcxca5bd48vy7a0mj4mm1b5flw2m"; + }) + ]; + propagatedBuildInputs = [ multipledispatch numpy diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index ecf39000661e..2683f0f1afcf 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, fetchFromGitHub +, fetchPypi , pytest , six , tqdm @@ -19,14 +19,11 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.4"; - - # Can't use pypi, data files for tests missing - src = fetchFromGitHub { - owner = "jjjake"; - repo = "internetarchive"; - rev = "v${version}"; - sha256 = "10xlblj21hanahsmw6lfggbrbpw08pdmvdgds1p58l8xd4fazli8"; + version = "1.9.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "759053685c75e6e969d690043b82643c4016500abcbbc44e4daf52ec097a9a15"; }; propagatedBuildInputs = [ @@ -50,6 +47,8 @@ buildPythonPackage rec { LC_ALL=en_US.utf-8 pytest tests ''; + pythonImportsCheck = [ "internetarchive" ]; + meta = with lib; { description = "A Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 99b7f304a9ef..125270ef1230 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -3,41 +3,40 @@ , fetchFromGitHub , pythonOlder , python -, blinker, bugsnag, click, dbus-next, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, sqlalchemy, u-msgpack-python, watchdog -, sdnotify -, systemd +, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, watchdog +, dbus-next }: buildPythonPackage rec { pname = "maestral"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-/xm6sGios5N68X94GqFFzH1jNSMK1OnvQiEykU9IAZU="; + sha256 = "sha256-kh3FYBSVOU4ywrYl6ONEIbLbkSuZmexNJC9dB+JtUjM="; }; propagatedBuildInputs = [ - blinker + alembic bugsnag click - dbus-next dropbox fasteners keyring keyrings-alt + packaging pathspec Pyro5 requests + setuptools + sdnotify sqlalchemy - u-msgpack-python watchdog ] ++ stdenv.lib.optionals stdenv.isLinux [ - sdnotify - systemd + dbus-next ]; makeWrapperArgs = [ diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 234fdbebc00b..1a705ab21bc1 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.0"; + version = "3.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1n1h9xbi1my0vgjsh7mfkd51qfa6imjzxnwqccsvshqa8grcv1wm"; + sha256 = "1bp6642qh8fkjqgvp1vif2zbzpappbbq3sgs7vfr87inn4frc2cz"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix new file mode 100644 index 000000000000..c93f5bda9838 --- /dev/null +++ b/pkgs/development/python-modules/nose-timer/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi, lib, nose, }: + +buildPythonPackage rec { + pname = "nose-timer"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09hwjwbczi06bfqgiylb2yxs5h88jdl26zi1fdqxdzvamrkksf2c"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = with lib; { + homepage = "https://github.com/mahmoudimus/nose-timer"; + license = licenses.mit; + description = "A timer plugin for nosetests (how much time does every test take?)"; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index e85fc4693aee..c85e45a239cd 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,4 +1,21 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook, setuptools, toml, structlog, appdirs, pytest-asyncio, flaky, tornado, pycurl, aiohttp, pytest-httpbin }: +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, toml +, structlog +, appdirs +, pytest-asyncio +, flaky +, tornado +, pycurl +, aiohttp +, pytest-httpbin +, docutils +, installShellFiles +}: buildPythonPackage rec { pname = "nvchecker"; @@ -12,11 +29,21 @@ buildPythonPackage rec { sha256 = "0zf9vhf8ka0v1mf1xhbvkc2nr54m0rkiw1i68ps4sgx2mdj6qrfk"; }; + nativeBuildInputs = [ installShellFiles docutils ]; propagatedBuildInputs = [ setuptools toml structlog appdirs tornado pycurl aiohttp ]; checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; disabled = pythonOlder "3.7"; + postBuild = '' + patchShebangs docs/myrst2man.py + make -C docs man + ''; + + postInstall = '' + installManPage docs/_build/man/nvchecker.1 + ''; + pytestFlagsArray = [ "-m 'not needs_net'" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index ec959740f9ec..b0e8ac5d250f 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage -, fetchPypi +, pythonOlder +, fetchFromGitHub , oauthlib , requests , requests_oauthlib +, freezegun +, pytestCheckHook +, requests-mock }: buildPythonPackage rec { pname = "pyatmo"; - version = "4.0.0"; + version = "4.1.0"; + disabled = pythonOlder "3.5"; # uses type hints - src = fetchPypi { - inherit pname version; - sha256 = "148713395d51a57f1f3102eacbb9286a859fc5c18c066238a961a1acf189b930"; + src = fetchFromGitHub { + owner = "jabesq"; + repo = "netatmo-api-python"; + rev = "v${version}"; + sha256 = "0x3xq6ni9rl5k3vi0ydqafdzvza785ycnlgyikgqbkppbh3j33ig"; }; propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; - # Upstream provides no unit tests. - doCheck = false; + checkInputs = [ + freezegun + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "pyatmo" ]; meta = with lib; { description = "Simple API to access Netatmo weather station data"; diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 1e4b0d2adaef..92e26c4f6e53 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "PyMetno"; - version = "0.5.1"; + version = "0.8.1"; src = fetchFromGitHub { repo = pname; owner = "Danielhiversen"; rev = version; - sha256 = "1ihq1lzgzcxbg916izakx9jp0kp1vdrcdwcwwwsws838wc08ax6m"; + sha256 = "1jngf0mbn5hn166pqh1ga5snwwvv7n5kv1k9kaksrfibixkvpw6h"; }; propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ece9ad5b4a3f..5b971c48d785 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "PyQt5"; - version = "5.14.2"; + version = "5.15.1"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx"; + sha256 = "18grs2p698ihjgi8agksv6sajakciywyr29ihslqvl260a2np9yr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index ff511103e553..51506598ca18 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -7,6 +7,10 @@ let inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34; inherit (pyqt5) sip; + # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html + patches = lib.optional (lib.hasPrefix "5.14" pyqt5.version) + [ ./fix-build-with-qt-514.patch ] + ; in buildPythonPackage rec { pname = "PyQtWebEngine"; @@ -18,10 +22,7 @@ in buildPythonPackage rec { sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237"; }; - patches = [ - # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html - ./fix-build-with-qt-514.patch - ]; + inherit patches; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index 4798bc4ff7e6..4fec2a3f04c0 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, isPy3k , fetchPypi , pep8 }: @@ -8,6 +9,8 @@ buildPythonPackage rec { pname = "shortuuid"; version = "1.0.1"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "3c11d2007b915c43bee3e10625f068d8a349e04f0d81f08f5fa08507427ebf1f"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 2bc8b70e4ca5..0027c1c0ba5f 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = sip-module; - version = "4.19.22"; + version = "4.19.24"; format = "other"; disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1"; + sha256 = "1ra15vb5i9gkg2vdvh16cq9x2mmzw1yi3xphxs8q34q1pf83gkgd"; }; configurePhase = '' diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index e57b5c3b1567..fb2c6094b37c 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , flit -, pytest +, pytestCheckHook , pytestcov , numpy , scipy @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "threadpoolctl"; - version = "2.0.0"; + version = "2.1.0"; disabled = isPy27; format = "flit"; @@ -20,13 +20,10 @@ buildPythonPackage rec { owner = "joblib"; repo = pname; rev = version; - sha256 = "16z4n82f004i4l1jw6qrzazda1m6v2yjnpqlp71ipa8mzy9kw7dw"; + sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df"; }; - checkInputs = [ pytest pytestcov numpy scipy ]; - - checkPhase = "pytest tests -k 'not test_nested_prange_blas'"; - # cython doesn't get run on the tests when added to nativeBuildInputs, breaking this test + checkInputs = [ pytestCheckHook pytestcov numpy scipy ]; meta = with lib; { homepage = "https://github.com/joblib/threadpoolctl"; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 6dd8ab869389..4d5b5d48fda5 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -2,14 +2,17 @@ buildPythonPackage rec { pname = "voluptuous"; - version = "0.11.7"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0mplkcpb5d8wjf8vk195fys4y6a3wbibiyf708imw33lphfk9g1a"; + sha256 = "1p5j3fgbpqj31fajkaisdrz10ah9667sijz4kp3m0sbgw6ag4kis"; }; checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; meta = with stdenv.lib; { description = "Voluptuous is a Python data validation library"; diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 4cc7056da19a..443b4daec854 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -1,17 +1,38 @@ -{ stdenv, fetchPypi, buildPythonPackage, future, enum-compat }: +{ lib +, fetchgit +, buildPythonPackage +, pythonOlder +, enum-compat +, future +, ifaddr +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "yeelight"; - version = "0.5.3"; + version = "0.5.4"; - src = fetchPypi { - inherit pname version; - sha256 = "8d49846f0cede1e312cbcd1d0e44c42073910bbcadb31b87ce2a7d24dea3af38"; + src = fetchgit { + url = "https://gitlab.com/stavros/python-yeelight.git"; + rev = "119faeff0d4f9de8c7f6d0580bdecc1c79bcdaea"; # v0.5.4 wasn't tagged + sha256 = "0j2c5pzd3kny7ghr9q7xn9vs8dffvyzz5igaavvvd04w7aph29sy"; }; - propagatedBuildInputs = [ future enum-compat ]; + propagatedBuildInputs = [ + future + ifaddr + ] ++ lib.optional (pythonOlder "3.4") enum-compat; - meta = with stdenv.lib; { + checkInputs = [ + pytestCheckHook + ] ++ lib.optional (pythonOlder "3.3") mock; + + pytestFlagsArray = [ "yeelight/tests.py" ]; + + pythonImportsCheck = [ "yeelight" ]; + + meta = with lib; { description = "A Python library for controlling YeeLight RGB bulbs"; homepage = "https://gitlab.com/stavros/python-yeelight/"; license = licenses.asl20; |