diff options
Diffstat (limited to 'pkgs/development/python-modules')
623 files changed, 4100 insertions, 1889 deletions
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 2d987abb3e48..3d5afd52abdd 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -5,7 +5,7 @@ , fetchpatch , python , glibcLocales -, pkgconfig +, pkg-config , gdb , numpy , ncurses @@ -26,15 +26,15 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.14"; + version = "0.29.19"; src = fetchPypi { inherit pname version; - sha256 = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414"; + sha256 = "0n2j87nka8cs772qc60d0c7lrpvsw0y8p3qzvhrsi3nmq1yqmycp"; }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; checkInputs = [ numpy ncurses diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index b15b5ebf3441..7b39ebb7a390 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.1.3"; pname = "GitPython"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "1jzllsy9lwc9yibccgv7h9naxisazx2n3zmpy21c8n5xhysw69p4"; + sha256 = "e107af4d873daed64648b4f4beb89f89f0cfbe3ef558fc7821ed2331c2f8da1a"; }; patches = [ diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index ef034b0f627b..b70879952f4e 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.7.1"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "c16d01cde9c2c955d76d45675e64b06c3255784d49cea4147024e99a01fbbb18"; + sha256 = "7bbd25453dc04704d77d854c80acb5537ecb18b9de8a5572e5f22649a2160aaf"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 8d22094526da..375a02968646 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.1"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4"; + sha256 = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27"; }; checkInputs = [ markupsafe nose mock ]; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index d3b6fa58750e..31915383275b 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.0.3"; + version = "8.0.4"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a53470be082fce1843fb73002be2504828f9abc49a84eab5d1effc06ae2a5ddc"; + sha256 = "2e5c8305ec4423b56af2223336c3309e5c9b8c96df0d6fde46d26cff4c5d6f1a"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index dc3ff1dbf4d4..c3c67194ebb7 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "6.2"; + version = "6.3"; src = fetchPypi { inherit pname version; - sha256 = "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh"; + sha256 = "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9"; }; propagatedBuildInputs = [ capstone ]; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 872cda33b592..e71d07242876 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.9"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0a4v5cwnwsjxril7514ssvdqxsad227v5w7hcfqjkqzvaf7agb3f"; + sha256 = "1wg7dlz6mhjp7mkqm5f8a2ak87p1zn46b6i754ys8f29nnqq01yz"; }; postPatch = '' diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 05f0e29f4e2e..7b62c6791cb1 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.4"; + version = "0.2.4.post0"; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; - sha256 = "8ccb68ac258ba81a0b9064523e85eae013f9bfce7244d01db42d7d2d21d712cc"; + sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 4b8bd8149344..2fe70864c197 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "5a7f1e037c6290c6d7609cab33a9e5e988c2fbec5c51d1c4c649ee3faff37eaf"; + sha256 = "2ae7e02cea4552349fed6d8c9912da400f7e643fc30098defe0dcd01945e7c54"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 917e3914c10d..7db56622759f 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "021ea0ba314a86027c166ecc4b4c07f2d40fc0f4b3a950d1868a0f2571c2bbee"; + sha256 = "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index 13769bbeaed3..09b6919495de 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.1"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "8c8f6e3b776e4e7eba5a1d2ae739aac6a1dd558a7f15951c34ffe0ee28f7f538"; + sha256 = "445323810978454ba3b32be53ba6b43cf9948586de3f9734b8743b55858b3cc7"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 392c77036ca3..7b0bfe80684a 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.7"; + version = "0.3.9"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "00zqlkhfrp1jczgjppaksriidyfshnj0jvrcryn1x77dmy73m023"; + sha256 = "1mn2ng66951mri49f99zh3660j83kvqhr6dpx90s9fkjwk83hmjy"; }; propagatedBuildInputs = [ aiohttp attrs ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 7d164cf5e4f0..2f623dd0f0ef 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -12,7 +12,7 @@ , idna-ssl , typing-extensions , pytestrunner -, pytest +, pytestCheckHook , gunicorn , pytest-timeout , async_generator @@ -22,13 +22,14 @@ , trustme , brotlipy , freezegun +, isPy38 }: buildPythonPackage rec { pname = "aiohttp"; version = "3.6.2"; # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures - disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -36,28 +37,38 @@ buildPythonPackage rec { }; checkInputs = [ - pytestrunner pytest gunicorn async_generator pytest_xdist + pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist 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 = '' + disabledTests = [ + # disable tests which attempt to do loopback connections + "get_valid_log_format_exc" + "test_access_logger_atoms" + "aiohttp_request_coroutine" + "server_close_keepalive_connection" + "connector" + "client_disconnect" + "handle_keepalive_on_closed_connection" + "proxy_https_bad_response" + "partially_applied_handler" + "middleware" + ] ++ lib.optionals stdenv.is32bit [ + "test_cookiejar" + ] ++ lib.optionals isPy38 [ + # Python 3.8 https://github.com/aio-libs/aiohttp/issues/4525 + "test_read_boundary_with_incomplete_chunk" + "test_read_incomplete_chunk" + "test_request_tracing_exception" + ]; + + # aiohttp in current folder shadows installed version + # Probably because we run `python -m pytest` instead of `pytest` in the hook. + preCheck = '' 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 proxy_https_bad_response \ - and not partially_applied_handler \ - ${lib.optionalString stdenv.is32bit "and not test_cookiejar"} \ - and not middleware" \ - --ignore=test_connector.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index c40f8d3b4471..7b33b1c508f8 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.6.7"; + version = "0.6.8"; src = fetchPypi { inherit pname version; - sha256 = "cf53c9faea6eee25a466e73eef1753b82a75c7497648149c19c15342df2678f2"; + sha256 = "9f9055bc2a9a72c5eab17e0ce5522edecd6de07e21cf347bf0cffabdabe5570e"; }; # tests are not implemented diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index bbeca1c31507..9034e6a67316 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.3"; + version = "0.6.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "06w15iyr07s861hkzqfdclzxkpvgg83sx8f235mz8k2490hnyqvv"; + sha256 = "4397ca736238a1ada8c7f47e557dda05e9ecfdd467b9f6b83871efd365af7e9f"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 373c35440620..5f42646dd998 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ajpy"; - version = "0.0.4"; + version = "0.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0a5f62b765f59ffc37e759d3f343de16cd782cc4e9e8be09c73b71dfbe383d9b"; + sha256 = "173wm207zyi86m2ms7vscakdi4mmjqfxqsdx1gn0j9nn0gsf241h"; }; # ajpy doesn't have tests diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 0a22f7aa2890..4161dfbedfe4 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "3b0cb1948833e062f4048992fbc97ecfaaaac24aaa0d83a1202a99fb58af8c6d"; + sha256 = "d412982920653db6e5a44bfd13b1d0db5685cbaaccaf226195749c706e1e862a"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index 55d6a5c6bdf7..5f545c6ee2fe 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "7.4.1"; + version = "7.4.6"; src = fetchPypi { inherit pname version; - sha256 = "a6f7740c97f2ae552a4b50bfb709596eabb01bf73715685c9b93ea9fec1821f3"; + sha256 = "f91889777a4d01f8ffca2f01d35cad3996a61178c26e8819c6d8eb746b951dd4"; }; propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index c75ad2d14f94..4a4d61bff7d6 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "7.4.0"; + version = "7.4.5"; src = fetchPypi { inherit pname version; - sha256 = "2c8d9cf174d7f66401a5deb104b96375f3877b6c768568705f700faf3adbf448"; + sha256 = "926f1101a1b57a9fad611f1e1d5af751693efcc344a9db01af50e2fe0d362d84"; }; propagatedBuildInputs = [ six click requests pytz tabulate ]; diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index d15d1ea0110e..04b2d898e66a 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "alot"; - version = "0.9"; + version = "0.9.1"; outputs = [ "out" ] ++ lib.optional withManpage "man"; disabled = !isPy3k; @@ -16,18 +16,9 @@ buildPythonPackage rec { owner = "pazz"; repo = "alot"; rev = version; - sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI="; + sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"; }; - patches = [ - # can't compose email if signature is set: https://github.com/pazz/alot/issues/1468 - (fetchpatch { - name = "envelope-body.patch"; - url = "https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55.patch"; - sha256 = "1iwvmjyz4mh1g08vr85ywhah2xarcqg8dazagygk19icgsn45w06"; - }) - ]; - nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ @@ -70,6 +61,6 @@ buildPythonPackage rec { description = "Terminal MUA using notmuch mail"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ edibopp ]; }; } diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 27188246b53c..7f29bb5695c6 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.4.4"; + version = "1.4.6"; src = fetchPypi { inherit pname version; - sha256 = "e6ccb7ccf9bab9c49a391db37e0d399ba0e73f969801ae35ff74020bfd4fc346"; + sha256 = "53605de32f7d3d3442a6deb8937bf1d9c1f91c785e3f71003d22c3e63f85c71d"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index bd3e5662e185..07ae08ada78c 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.2"; + version = "2.9.9"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8"; + sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml"; }; prePatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "http://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; - maintainers = with maintainers; [ joamaki costrouc ]; + maintainers = with maintainers; [ joamaki costrouc hexa ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 4943a2e53f79..f8ef6b9492a3 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -52,13 +52,16 @@ , typing , nose , python -, isPy3k +, pythonOlder +, pythonAtLeast }: buildPythonPackage rec { pname = "apache-airflow"; version = "1.10.5"; - disabled = (!isPy3k); + # Upstream does not yet support python 3.8 + # https://github.com/apache/airflow/issues/8674 + disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; src = fetchFromGitHub rec { owner = "apache"; @@ -167,6 +170,9 @@ buildPythonPackage rec { --replace "/bin/bash" "${stdenv.shell}" ''; + # allow for gunicorn processes to have access to python packages + makeWrapperArgs = [ "--prefix PYTHONPATH : $PYTHONPATH" ]; + checkPhase = '' export HOME=$(mktemp -d) export AIRFLOW_HOME=$HOME @@ -186,6 +192,6 @@ buildPythonPackage rec { description = "Programmatically author, schedule and monitor data pipelines"; homepage = "http://airflow.apache.org/"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ingenieroariel ]; + maintainers = with maintainers; [ bhipple costrouc ingenieroariel ]; }; } diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index 2f7f2ae0281b..22fa3dc98fb0 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "appdirs"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92"; + sha256 = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"; }; meta = { diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 69926bec8f5f..d6da2610f8c5 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.8.4"; + version = "0.8.5"; src = fetchPypi { inherit pname version; - sha256 = "15kwnvs2ka6sg1gq65bbf9lk0jp104br813y6wvrbwipiz8kkjn1"; + sha256 = "aacdd54640a9c66d1c84c8f4390f63feb5a7a8741867a6b451f82ff74c8c792c"; }; nativeBuildInputs = [ Babel ]; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 141ce20fdcbc..4fdf55bc2bd3 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,30 +1,37 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache -, dateutil, pytz, mock, dateparser +, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov, pytest }: buildPythonPackage rec { pname = "arrow"; - version = "0.15.5"; + version = "0.15.6"; src = fetchPypi { inherit pname version; - sha256 = "0yq2bld2bjxddmg9zg4ll80pb32rkki7xyhgnrqnkxy5w9jf942k"; + sha256 = "eb5d339f00072cc297d7de252a2e75f272085d1231a3723f1026d1fa91367118"; }; - checkPhase = '' - nosetests --cover-package=arrow - ''; + propagatedBuildInputs = [ python-dateutil ] + ++ lib.optionals isPy27 [ backports_functools_lru_cache ]; - checkInputs = [ nose chai simplejson pytz ]; - propagatedBuildInputs = [ dateutil backports_functools_lru_cache mock dateparser]; + checkInputs = [ + dateparser + pytest + pytestcov + pytest-mock + pytz + simplejson + sphinx + ]; - postPatch = '' - substituteInPlace setup.py --replace "==1.2.1" "" + checkPhase = '' + pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for date manipulation"; + homepage = "https://github.com/crsmithdev/arrow"; license = licenses.asl20; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index dd845b1d3496..f3c3615d9262 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.5.2"; + version = "2.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0ai5l62ldaq1cqfmq3hvnzp8gp0hjjmjnck9d3cnx5r8la5ig18y"; + sha256 = "1ym9mmxjpnnlinly1rxfqj9rlyl2fv7dxc81f30n1b8n9pwc6jb5"; }; postPatch = '' diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 57a7c35215ef..147a4d65de5e 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "4.0"; + version = "4.0.1.post1"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "404200e0baa84de09ac563ad9ccab3817e9b9669d0025cee74a8752f4bc2771b"; + sha256 = "1da4xj793ldck29aajyb514wpz330cml26f3gdp45jj531n4lc2w"; }; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index e58fa446f819..5f124cc09434 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.15.6"; + version = "1.15.9"; src = fetchPypi { inherit pname version; - sha256 = "0nn3g2sb0pqfacsqcw94n8v9jbn4ip0pvhvczasfvks2w9q9sij7"; + sha256 = "c6a3125ee68ecf4d11947497c1f891b6436df9d8453f8865cabf595813504cc1"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 7e2b09cca684..4efe1f50ef2c 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.9.1"; + version = "3.9.2"; src = fetchPypi { inherit pname version; - sha256 = "c2fdc3ff230638a2776d2b3761e787ca93dc33a26f841504fc260f947256f453"; + sha256 = "12870b4806095b707c4eed7bf8cdfeb3722d990366bc6a9772d1520e90efa73b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index a2f2742ee883..c8938c649b97 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "authheaders"; - version = "0.12.1"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0hf1p6ws3jma608pmcb5qsl58xg33wz2s51qqzi9zix0llcnyc97"; + sha256 = "a6f96d1dfb7a6cffcdd78d1582914d4f9a0b25d66e1cf5ce959446c92cd8b74f"; }; propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix ] diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index cbbf64524f57..bf82d106598e 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.14.1"; + version = "0.14.3"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "0z56r5s8z8pfp0p8zrf1chgzan4q25zg0awgc7bgkvkwgxbhzx4m"; + sha256 = "0ph97j94i40jj7nc5ya8pfq0ccx023zbqpcs5hrxmib53g64k5xy"; }; propagatedBuildInputs = [ cryptography requests ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index c3d95f8915c7..1f2972c7663b 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "19.11.1"; + version = "19.11.2"; src = fetchPypi { inherit pname version; - sha256 = "201b9879b49c6e259d4126dbafe9e3c73807de0c242d50065fbebc62c6ccb181"; + sha256 = "64fa063b3a1ab16588037d4713f13f66167f7ad2a2e95fd675decbc3bc85c089"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index ccefe60ea089..7b7131f2a7fc 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.1"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "1swr8ccm3mafcm3zpbwyn22kjs39lbqmg8w41sh7yb3gskgy2syc"; + sha256 = "60fd8c4341bab59963dafd5d2a566e94f547e660b9b396f772afe67d8481dbf0"; }; propagatedBuildInputs = [ pycodestyle ]; diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index 3efb1dd00694..1ec3d296222c 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro-python3"; - version = "1.9.1"; + version = "1.9.2.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "daab2cea71b942a1eb57d700d4a729e9d6cd93284d4dd4d65a378b9f958aa0d2"; + sha256 = "ca1e77a3da5ac98e8833588f71fb2e170b38e34787ee0e04920de0e9470b7d32"; }; doCheck = false; # No such file or directory: './run_tests.py diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index d4d14ce97443..48ccd891c857 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro"; - version = "1.9.1"; + version = "1.9.2"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "16pvgdv5pqx4zgjj0a4v5fz4brfjcrfx72mcmyvb2xqqp7q6ph4z"; + sha256 = "4487f0e91d0d44142bd08b3c6da57073b720c3effb02eeb4e2e822804964c56b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index bd933205f6a9..10e8355297cf 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -3,7 +3,6 @@ , fetchPypi , numpy , pandas -, pyarrow , pytestrunner , pytest , h5py @@ -11,15 +10,15 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.20"; + version = "0.12.21"; src = fetchPypi { inherit pname version; - sha256 = "13494pnzz68qfnx17975h4c5l15idgg7wxl9r86q7jp5s1pphvb3"; + sha256 = "1253f1d85bda79a45d209ea467e4ba6fcaa5354c317c194945dc354a259f5aa8"; }; nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pandas pyarrow pytest h5py ]; + checkInputs = [ pandas pytest h5py ]; propagatedBuildInputs = [ numpy ]; checkPhase = '' diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index ce0d5e747c03..0c2b3338690f 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.2.12"; + version = "0.2.22"; src = fetchPypi { inherit pname version; - sha256 = "a87d89c218151d840c032be4cba6801801683ea00e91dc17fd7bc527ad8eb09b"; + sha256 = "c64a8ad0204743d49cf2f8775f92d9c23dd9d7eb6996a61f4a9de57a53d429f9"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index de3aab936c66..dc31669f7182 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0vfcfpb01qsrqh9xg4xyfm153bczwjglkv59zpdvrn7x0rrdc1cc"; + sha256 = "181iyigm11y56lf1kwv7pcdyppavpwjb1b6k3qp3jnbqaypad9mg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 91936af014f5..5a1b7600ecfc 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "7.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n"; + sha256 = "03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index 54b48427475c..b2737826ae32 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + sha256 = "049dfb0bcc7961d0d988fee493d1ec4f4480e109e4661e360bad054cc297d43c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 66c4e52e23b0..61bc17df0148 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e83d21462f9d5b02e90f5590c4247ab73e0ff85fc4ac1fba32be119a15b10c98"; + sha256 = "692544dd2fa6276a7a4b4e094e2a5e0915d29b7829e266c6ade2b17a5fdcc2a9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index c780d07c7ce1..1057322a8e6a 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; + sha256 = "c823a0ed879230a3ec9f15c32c9788610af1db56e6aeae6b2725476ddbe0d138"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index c23ebfc2ce9c..fd0c527344c0 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cc4058174e371a0b68b305cd5a082fcca47f3446dd9aefd9ada72da4bd637da9"; + sha256 = "7f8b912ca62431c1697b4914c12cc5f8123e60ee6c65d123591f937744d204e0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index f5b04c36b0d6..404caf4ebf5b 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "azure-mgmt-imagebuilder"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0r4sxr3pbcci5qif1ip1lrix3cryj0b3asqch3zds4q705jiakc4"; + sha256 = "4c9291bf16b40b043637e5e4f15650f71418ac237393e62219cab478a7951733"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 57ec64f3d562..1e13919f340a 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f6fbb87d9bf29ce325543c9a3a125fbe45f4797f3a7f260c6c21ca60dc3f0885"; + sha256 = "da20ee2b9b9a2c2f89be9037c3ee5421152e7f6d718eafbf50a91dbf0a07ffa0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index eb4772ce5439..69c1aaffada3 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "16f4c4f676ea718b7e1c59bd9a516fcfc796f1aff844b183a7ce9afe69fb214d"; + sha256 = "a1527fe8b1e8a47558bfa03bd6c587706d8fb9213142aea42da07397daa2d039"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 82aa1d6fa014..24f7165281d4 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.1.0"; + version = "10.2.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e5ac0ee14b71ab57035c45bef15d3698b0b6026ecafb8320a7c704eb3f6fba3a"; + sha256 = "d50c74cdc1c9be6861ddef9adffd3b05afc5a5092baf0209eea30f4439cba2d9"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix index 2ccb773c105a..8192064626ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-signalr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a"; + sha256 = "6503ddda9d6f4b634dfeb8eb4bcd14ede5e0900585f6c83bf9010cf82215c126"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index e786731dcd0b..e3ac0961542b 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "10.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; + sha256 = "d1edead1ad36e957c9f9b605f547ad1ff7152f8f785fa03d3c7891bb428a68ef"; }; propagatedBuildInputs = [ azure-mgmt-common ]; diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 677b8bbeb124..d10045b41d78 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -1,20 +1,28 @@ { lib, python, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-core , msrest , msrestazure +, requests }: buildPythonPackage rec { - version = "0.2.4"; + version = "0.3.2"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0zqapc4dx6qd9bcim5fjykk3n1j84p85nwqyb876nb7qmqx9spig"; + sha256 = "c403a47e40e4a80d9c42c854993f5c07f12c2a75bd9a85ba8225985493a9b792"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-core + msrest + msrestazure + requests + ]; # fix namespace pythonNamespaces = [ "azure.multiapi" ]; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 02460b27952e..2a3552d1fb5f 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.2"; + version = "0.50.3"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "836649d510aa2b7467bc87d8dab18f2db917b63aa2fe8f3e5d0bb44011e465f5"; + sha256 = "2b1e60c81fcf5b6a5bb3ceddb27f24543f479912e39a4706a390a16d8c0a71f4"; }; buildInputs = [ @@ -29,6 +29,9 @@ buildPythonPackage rec { # has no tests doCheck = false; + # python2 will fail due to pep 420 + pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ]; + meta = with lib; { description = "This is the Microsoft Azure Service Bus Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix index 19420b0526d9..ad89f23c3c29 100644 --- a/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "7.0.0.0"; + version = "7.1.0.45"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "27712658fed7f5db6965d1035bbc0f3b16964fc88d6f3ad3e86cf4fae2b01bb9"; + sha256 = "8dd0eb419ca62f2436c31982f6d236868f15f65bb062c4e5a98e50b16298dcda"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 63aa7883e3a9..bfc52c99ef5d 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchFromGitHub +, fetchpatch , pytest , unittest2 , future @@ -27,6 +28,13 @@ buildPythonPackage rec { }; + patches = [ + (fetchpatch { + url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch"; + sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0"; + }) + ]; + propagatedBuildInputs = [ future numpy pillow scipy scikitlearn scikitimage threadpoolctl ]; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 84ff0e88b147..e29263a6b4f9 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.18.3"; + version = "0.19.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1742a25a9ef1b1ac4000683406879a3e1a6577faa02f31e482e6c84e2e3bf628"; + sha256 = "11wiis62kcw6g3n4gdj39fx1yrlq5vz3zx3kmb6g79mliyhn2x7g"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 6b7bad58bc4c..036f54346144 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.3.12"; + version = "1.5.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "7a244b09adfd083292ed1f7ff335676a1e2effbbffe62b02a4abaf377d33ef86"; + sha256 = "6f3bd0402d41ee9be03637d74f34a7db279d00cb9c6386b0597cbbac16ee8f4e"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 06329c8ab902..2036d4dba4bd 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,17 +1,18 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.2.1"; pname = "bitarray"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1kxrlxfj9nrx512sfwifwl9z4v6ky3qschl0zmk3s3dvc3s7bmif"; + sha256 = "0m29k3lq37v53pczyr2d5mr3xdh2kv31g2yfnfx8m1ivxvy9z9i7"; }; meta = with lib; { description = "Efficient arrays of booleans"; homepage = "https://github.com/ilanschnell/bitarray"; + changelog = "https://github.com/ilanschnell/bitarray/blob/master/CHANGE_LOG"; license = licenses.psfl; maintainers = [ maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 7c58aab85c4c..aff3f70cb88a 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.8.1"; + version = "8.10.0"; src = fetchPypi { inherit pname version; - sha256 = "84893f90eb78f8179af24a87622ef964ede5c7e785562022917033987d6ce198"; + sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index d8760d2e1283..1b10fe166f8a 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "bleach"; - version = "3.1.0"; + version = "3.1.5"; src = fetchPypi { inherit pname version; - sha256 = "3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa"; + sha256 = "3c4c520fdb9db59ef139915a5db79f8b51bc2a7257ea0389f30c846883430a4b"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix new file mode 100644 index 000000000000..b7ebca9eb034 --- /dev/null +++ b/pkgs/development/python-modules/bleak/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "bleak"; + version = "0.6.4"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1dc32899d0700c5b5ed9abf642dfee28ac62b1fb5d7be5fa5a6db104dec9a03c"; + }; + + postPatch = '' + # bleak checks BlueZ's version with a call to `bluetoothctl -v` twice + substituteInPlace bleak/__init__.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + substituteInPlace bleak/backends/bluezdbus/client.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + ''; + + propagatedBuildInputs = [ txdbus ]; + checkInputs = [ pytest pytestcov ]; + + checkPhase = "AGENT_OS=linux py.test"; + + meta = with stdenv.lib; { + description = "Bluetooth Low Energy platform Agnostic Klient for Python"; + homepage = "https://github.com/hbldh/bleak"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index f80c8a8c145f..505d3ffe149c 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.10"; + version = "1.1.13"; src = fetchPypi { inherit pname version; - sha256 = "ba2e750085d9da4d1567932f3f719974fdc3f02649ee0d5c2f85fce592208723"; + sha256 = "a45e31361d17ce272a0d563a689d6b87b65cc16e9348f8cd3a6460c93359b1bd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 7157cf140967..a3ed2c6b8aee 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -10,6 +10,7 @@ , nodejs , packaging , pillow +#, pytestCheckHook# , pytest , python , python-dateutil @@ -18,15 +19,25 @@ , six , substituteAll , tornado +, typing-extensions +, pytz +, flaky +, networkx +, beautifulsoup4 +, requests +, nbconvert +, icalendar +, pandas +, pythonImportsCheckHook }: buildPythonPackage rec { pname = "bokeh"; - version = "1.4.0"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1rywd6c6hi0c6yg18j5zxssjd07a5hafcd21xr3q2yvp3aj3h3f6"; + sha256 = "d9248bdb0156797abf6d04b5eac581dcb121f5d1db7acbc13282b0609314893a"; }; patches = [ @@ -37,13 +48,29 @@ buildPythonPackage rec { }) ]; - disabled = isPyPy; + disabled = isPyPy || isPy27; + + nativeBuildInputs = [ + pythonImportsCheckHook + ]; + + pythonImportsCheck = [ + "bokeh" + ]; checkInputs = [ mock pytest pillow selenium + pytz + flaky + networkx + beautifulsoup4 + requests + nbconvert + icalendar + pandas ]; propagatedBuildInputs = [ @@ -55,14 +82,14 @@ buildPythonPackage rec { tornado numpy packaging + typing-extensions ] ++ lib.optionals ( isPy27 ) [ futures ]; - checkPhase = '' - ${python.interpreter} -m unittest discover -s bokeh/tests - ''; + # This test suite is a complete pain. Somehow it can't find its fixtures. + doCheck = false; meta = { description = "Statistical and novel interactive HTML plots for Python"; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 4bbb98d6a299..1baa668d3c89 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.11.13"; # N.B: if you change this, change botocore too + version = "1.13.23"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "09eccb6cd41381c4ff1d626c3a19884b5b1f1424d15a96004d077b532ef393d1"; + sha256 = "bcaa88b2f81b88741c47da52f3414c876236700441df87b6198f860e6a200d6f"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index b7061eb0a1de..9bf977f831dd 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.14.13"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.16.6"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "6478d9207db6dbcb5106fd4db2cdd5194d0b2dc0b73776019d56877ab802fe87"; + sha256 = "b9c8e0aa07770b7b371d586db41eef46e70bfc4ab47f7a1ee1acd4e9c811c6c9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index f45eea2c5df3..f7e7dc7c390c 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Bottleneck"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "0a2a94zahl3kqld2n9dm58fvazz9s52sa16nd8yn5jv20hvqc5a5"; + sha256 = "20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index f4d09ca5e5ed..8e8c89e7f59e 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1m8z0ig40xmgcnmf508nflyy1w4qmff4kqxarrpg7rvsfj4pjsmh"; + sha256 = "1fqh1bdkk3g222vbrmw3ab4r4mmd1k4x2jayshnqpbspszcqzcdq"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 95ba6d537c37..7884ff65f288 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "branca"; - version = "0.3.1"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "3e762c9bdf40725f3d05ea1fda8fae9b470bfada6474e43a1242c8204a7bb15e"; + sha256 = "1f7drarwiw8fh17hpq8b3p4mfqgjbh3k045dvpx5z12d3a0zg7ca"; }; checkInputs = [ pytest selenium ]; diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index 2df937f4232c..8050f886db5a 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.1"; + version = "1.0.5"; disabled = isPy27; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "0jlrin5qw3ny2r961y5divd5xa9giprxhhxdc84rjlq9qdmnsk68"; + sha256 = "17nd0v3pgmbfafi3vypls9jnpg4dk7wyh7fl7gpzcnkq1f8pf087"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 2f0e67683d9a..612ab13c1934 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "17cjh7g8gbr0gb22nzybkw7vq9x5wfa5ln94hhzijbz934bw1f37"; + sha256 = "8878437aa44ec485cecb255742035b3b98a6c7e7d167a943b5fbe597b2f8f7f9"; }; propagatedBuildInputs = [ six webob ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index b088480f5de4..2b2e703026d8 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.7.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0jj8fh611n7xc3vsfbgpqsllp38cfj3spkr2kz3ara2x7jvh3406"; + sha256 = "1nrbn8a2c56l5j0axmn9ijaviw0a6nrd34sg81r5j05mzzpb69is"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index cb3124ec7e38..ebf8fb9c94e7 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -1,12 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }: buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.7.0"; + inherit (buildbot) version; src = fetchPypi { inherit pname version; - sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb"; + sha256 = "03ppmrnpyd77azylv1c673cffk6x53j9flx4i99k33bljmdy8iv4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index cd35f14fb37d..302615dc469c 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi"; + sha256 = "051y4z70dq0j343rb02wn3a1vkdbi8khjfib2msa80vdld3nxcyv"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8"; + sha256 = "0chw111j2c6ybvbb09x39zg7ghjz4ysw67wbpcmzd1v5jnwbaqdi"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58"; + sha256 = "14v2lj65ccgmijxqrr61vpgba30q6w5vnisz78y3hbf3qpxmmd7g"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4"; + sha256 = "03q9am237f2r8ivqm1dfkyzm3bmns4xjn99c27ps6dw9an15f73a"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg"; + sha256 = "0wv5ghsfmhkbk96zimihcwn16rxjz1q1g5ppahb8gfrclmzhdynl"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 365ca0bcf14a..936ef661eeee 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,13 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future, - coreutils }: +{ lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, + future, coreutils }: buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.7.0"; + inherit (buildbot) version; src = fetchPypi { inherit pname version; - sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6"; + sha256 = "1cba1zmm3gfw3ikax7q4vbrxnvjxlby79x5lc4fg9c3igbm0nmwj"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 6f3632f743be..886224d16918 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy3k , pythonOlder + , pythonAtLeast , fetchFromGitHub , pyparsing , opencascade @@ -16,9 +17,12 @@ , libGLU , libX11 , six + , pytest + , makeFontsConf + , freefont_ttf }: -let +let pythonocc-core-cadquery = stdenv.mkDerivation { pname = "pythonocc-core-cadquery"; version = "0.18.2"; @@ -31,7 +35,7 @@ let sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ cmake swig ninja @@ -63,27 +67,34 @@ let in buildPythonPackage rec { pname = "cadquery"; - version = "2.0RC0"; - + version = "2.0"; + src = fetchFromGitHub { owner = "CadQuery"; repo = pname; rev = version; - sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3"; + sha256 = "1n63b6cjjrdwdfmwq0zx1xabjnhndk9mgfkm4w7z9ardcfpvg84l"; }; - + buildInputs = [ opencascade ]; - + propagatedBuildInputs = [ pyparsing pythonocc-core-cadquery ]; - - # Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7). - disabled = !(isPy3k && (pythonOlder "3.8")); - + + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + checkInputs = [ + pytest + ]; + + disabled = pythonOlder "3.6" || pythonAtLeast "3.8"; + meta = with lib; { description = "Parametric scripting language for creating and traversing CAD models"; homepage = "https://github.com/CadQuery/cadquery"; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 3629e0097eda..0a7e58ac8006 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-can"; - version = "3.3.2"; + version = "3.3.3"; src = fetchPypi { inherit pname version; - sha256 = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e"; + sha256 = "ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488"; }; propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 2b46368381c2..cfc66376d9b2 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "catalogue"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0zha0gzqfkazc9da0cyjys5ghf20ihyhkgd1h5zxkxlf8zhz03s3"; + sha256 = "1720242b2d0c11e666f9ceed39f0611236815b06af5421f7d8cbca48a4cff3af"; }; propagatedBuildInputs = [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index d0d4f2e69fb8..740023c1fdb9 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -4,14 +4,16 @@ buildPythonPackage rec { pname = "celery"; - version = "4.4.2"; + version = "4.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0ps1c6ill7q0m5kzb87hisgshdk3kzpa6cvcjch1d1wa07whp2hh"; + sha256 = "0zk42fxznrhww0dxak9b6nkfqg02z49zr839k6ql7nk3him7n0y2"; }; postPatch = '' + substituteInPlace requirements/default.txt \ + --replace "kombu>=4.6.10,<4.7" "kombu" substituteInPlace requirements/test.txt \ --replace "moto==1.3.7" moto \ --replace "pytest>=4.3.1,<4.4.0" pytest @@ -20,9 +22,13 @@ buildPythonPackage rec { # ignore test that's incompatible with pytest5 # test_eventlet touches network # test_mongodb requires pymongo + # test_multi tries to create directories under /var checkPhase = '' - pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply' \ + pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply and not pytest' \ + --ignore=t/unit/contrib/test_pytest.py \ --ignore=t/unit/concurrency/test_eventlet.py \ + --ignore=t/unit/bin/test_multi.py \ + --ignore=t/unit/apps/test_multi.py \ --ignore=t/unit/backends/test_mongodb.py ''; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 04ae5a78bdbb..94619956cff4 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,13 +5,17 @@ buildPythonPackage rec { pname = "certifi"; - version = "2019.11.28"; + version = "2020.4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; + sha256 = "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i"; }; + pythonImportsCheck = [ "certifi" ]; + + dontUseSetuptoolsCheck = true; + meta = { homepage = "https://certifi.io/"; description = "Python package for providing Mozilla's CA Bundle"; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index c632bb6a68c8..79482ae5c168 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.26.2"; + version = "0.26.3"; src = fetchPypi { inherit pname version; - sha256 = "5449313b5f176024bd5fd6ebe69ce986a2d9b8a9d6a147b2d442c8d9fa99a6c5"; + sha256 = "384c37d239579c7b9f61a3aaadb92ebe81f37cd6ee6a161485401179af6c7a44"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 5046017a94d3..7638695ff2da 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.0.4.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1ac64f8f9066ea756ea27d67cedaf064e7c866275218fa7c84684066a5890f70"; + sha256 = "1w2iakkzxfhyrqrspn40am8x7bzdp5qqdqbm1asbj7fa3mivi17x"; }; checkInputs = [ pytest coveralls pytestcov ]; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index f99905950c9a..1cf489d7fa5c 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.13.0"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "07xzpbz7znr853xm6p27lkrcgdib3ym5dlwys0n4zvkjm5x7jn2a"; + sha256 = "c898c8726ed008615f0b1988b9cd1e1f74fd230e7b24bca53bfd5f96af6e55a1"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 18c1e7f8c0de..98fc3b9ff058 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -3,7 +3,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, google_api_python_client +, fetchpatch +, freezegun +, google_api_core , matplotlib , networkx , numpy @@ -16,6 +18,7 @@ , typing-extensions # test inputs , pytestCheckHook +, pytest-asyncio , pytest-benchmark , ply , pydot @@ -25,7 +28,7 @@ buildPythonPackage rec { pname = "cirq"; - version = "0.6.1"; + version = "0.8.0"; disabled = pythonOlder "3.5"; @@ -33,25 +36,29 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "0lhr2dka7vpz9xd6akxphrcv2b3ni2cgjywpc1r7qpqa5mrq1q7f"; + sha256 = "01nnv7r595sp60wvp7750lfdjwdsi4q0r4lmaj6li09zsdw0r4b3"; }; - # Cirq 0.6 requires networkx==2.3 only for optional qiskit dependency/test, disable this to avoid networkx version conflicts. https://github.com/quantumlib/Cirq/issues/2368 + patches = [ + (fetchpatch { + # Fixes serialization issues on certain versions of protobuf & numpy. + name = "cirq-pr-2986-protobuf-bools.patch"; + url = "https://github.com/quantumlib/Cirq/commit/78ddfb574c0f3936f713613bf4ba102163efb7b3.patch"; + sha256 = "0hmad9ndsqf5ci7shvd924d2rv4k9pzx2r2cl1bm5w91arzz9m18"; + }) + ]; + # Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts postPatch = '' - substituteInPlace requirements.txt --replace "networkx==2.3" "networkx" \ - --replace "protobuf==3.8.0" "protobuf" - - # Fix sympy 1.5 test failures. Should be fixed in v0.7 - substituteInPlace cirq/optimizers/eject_phased_paulis_test.py --replace "phase_exponent=0.125 + x / 8" "phase_exponent=0.125 + x * 0.125" - substituteInPlace cirq/contrib/quirk/cells/parse_test.py --replace "parse_formula('5t') == 5 * t" "parse_formula('5t') == 5.0 * t" - - # Fix pandas >= 1.0 error, #2886 - substituteInPlace cirq/experiments/t1_decay_experiment.py --replace "del tab.columns.name" 'tab.rename_axis(None, axis="columns", inplace=True)' + substituteInPlace requirements.txt \ + --replace "networkx~=2.4" "networkx" \ + --replace "protobuf==3.8.0" "protobuf" \ + --replace "freezegun~=0.3.15" "freezegun" ''; propagatedBuildInputs = [ - google_api_python_client + freezegun + google_api_core numpy matplotlib networkx @@ -69,19 +76,26 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; checkInputs = [ pytestCheckHook + pytest-asyncio pytest-benchmark ply pydot pyyaml pygraphviz ]; - # TODO: enable op_serializer_test. Error is type checking, for some reason wants bool instead of numpy.bool_. Not sure if protobuf or internal issue + pytestFlagsArray = [ "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope - "--ignore=cirq/google/op_serializer_test.py" # investigating in https://github.com/quantumlib/Cirq/issues/2727 ]; disabledTests = [ + "test_serialize_sympy_constants" # fails due to small error in pi (~10e-7) "test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2 + + # Newly disabled tests on cirq 0.8 + # TODO: test & figure out why failing + "engine_job_test" + "test_health" + "test_run_delegation" ] ++ lib.optionals stdenv.isAarch64 [ # Seem to fail due to math issues on aarch64? "expectation_from_wavefunction" diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix new file mode 100644 index 000000000000..bd1ae0c563a4 --- /dev/null +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, git +, lxml +, rnc2rng +}: + +buildPythonPackage rec { + pname = "citeproc-py"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "00aaff50jy4j0nakdzq9258z1gzrac9baarli2ymgspj88jg5968"; + }; + + buildInputs = [ rnc2rng ]; + + propagatedBuildInputs = [ lxml ]; + + checkInputs = [ nose git ]; + checkPhase = "nosetests tests"; + doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails + pythonImportsCheck = [ "citeproc" ]; + + meta = with lib; { + homepage = "https://github.com/brechtm/citeproc-py"; + description = "Citation Style Language (CSL) parser for Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix index 5ceb26bfeb6d..1ecd43fccdee 100644 --- a/pkgs/development/python-modules/cjson/default.nix +++ b/pkgs/development/python-modules/cjson/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "python-cjson"; - version = "1.2.1"; + version = "1.2.2"; disabled = isPy3k || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "52db2745264624768bfd9b604acb38f631bde5c2ec9b23861677d747e4558626"; + sha256 = "3006c2c218297be3448dc793218e0b15d20fe9839775521bfc294fc6aa24972b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index ac96ef32618c..fcbd4d0981af 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "click"; - version = "7.1.1"; + version = "7.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1k60i2fvxf8rxazlv04mnsmlsjrj5i5sda3x1ifhr0nqi7mb864a"; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; }; postPatch = '' diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index d35c356c8220..b2e23dc55bdb 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -14,8 +14,10 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytestcov ]; propagatedBuildInputs = [ flake8 click pyyaml six ]; - disabledTests = lib.optionals isPy36 [ + # test_cli asserts on exact quoting style of output + disabledTests = [ "test_cli" + ] ++ lib.optionals isPy36 [ "test_choice_default" ]; diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 32e9b4fcb4a6..98533f95f922 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPy27, isPy34 +, isPy27 , pylev, pastel, typing, enum34 }: buildPythonPackage rec { @@ -13,8 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pylev pastel - ] ++ lib.optional (isPy27 || isPy34) typing - ++ lib.optional isPy27 enum34; + ] ++ lib.optionals isPy27 [ typing enum34 ]; # The Pypi tarball doesn't include tests, and the GitHub source isn't # buildable until we bootstrap poetry, see diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 02454b74efa9..802235d674b9 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.6.5"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "4463d5f2927338384169315f34c2a8ac0840075b59489f8d1d773b91caba6c39"; + sha256 = "0w8ihj9gram2d4wkbki8f6gr8hsd950b3wzfi1qqqm17lqfk8k7h"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 13f68d6a3927..9d58c130582e 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0fjwc095y97n3a7jxl9pk4h1i5hghas7y6zhgprl5lv5ixnicffk"; + sha256 = "1f18plbc9yyvhn0js3d2bii9yld8zfl775gxsaw9jza5pmlg9ss2"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 054e302dfe76..f4f46f2dff0f 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "CNVkit"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "1hj8c98s538i0hg5mrz4bw4v07qmcl51rhxq611rj2nglnc9r25y"; + sha256 = "d68adc0121e17c61a3aa28c0a9ba6526510a5a0df0f0a6eb1818bab71b7e927a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 6ebdefedeaf6..e994c6663cde 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "codecov"; - version = "2.0.15"; + version = "2.0.22"; src = fetchPypi { inherit pname version; - sha256 = "8ed8b7c6791010d359baed66f84f061bba5bd41174bf324c31311e8737602788"; + sha256 = "aeeefa3a03cac8a78e4f988e935b51a4689bb1f17f20d4e827807ee11135f845"; }; checkInputs = [ unittest2 ]; # Tests only diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix index dc531c77fb5d..70c634737635 100644 --- a/pkgs/development/python-modules/codespell/default.nix +++ b/pkgs/development/python-modules/codespell/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonApplication, fetchPypi, pytest, chardet }: buildPythonApplication rec { pname = "codespell"; - version = "1.16.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "1s9dl07ib77gq0iq26mrdpl1c46nkfm7nlhqwxpx5vvs6a1pqfxz"; + sha256 = "08ydpw8pim7rhg1x2n711hxf2y6553nx0c0aqhfi3p4wdgcfr8i5"; }; checkInputs = [ pytest chardet ]; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 75255badf988..d1dcce9699b3 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ConfigArgParse"; - version = "1.0"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0cvinm7bb03qfjpq2zhfacm0qs4ip4378nvya8x41p4wpi2q4dxz"; + sha256 = "1p1pzpf5qpf80bfxsx1mbw9blyhhypjvhl3i60pbmhfmhvlpplgd"; }; # no tests in tarball diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index 5a8608c5037f..c60d4778012c 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "convertdate"; - version = "2.2.0"; + version = "2.2.1"; # Tests are not available in the PyPI tarball so use GitHub instead. src = fetchFromGitHub { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "04j8k7a9qndmawy3m345py74y18hw7lb6gc0qp0mr8d68x99xjq0"; + sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; }; propagatedBuildInputs = [ pymeeus pytz ]; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index c11ee6798a37..873cbe142d9b 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,22 +1,23 @@ { stdenv, buildPythonPackage, fetchPypi, isPyPy , pytest, pytestcov, pytest-mock, freezegun -, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests }: +, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests +, python-slugify }: buildPythonPackage rec { pname = "cookiecutter"; - version = "1.7.0"; + version = "1.7.2"; # not sure why this is broken disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1bh4vf45q9nanmgwnw7m0gxirndih9yyz5s0y2xbnlbcqbhrg6a7"; + sha256 = "efb6b2d4780feda8908a873e38f0e61778c23f6a2ea58215723bcceb5b515dac"; }; checkInputs = [ pytest pytestcov pytest-mock freezegun ]; propagatedBuildInputs = [ - jinja2 future binaryornot click whichcraft poyo jinja2_time requests + jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; # requires network access for cloning git repos diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 04c469204d78..a22009ac9db1 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "4.5.4"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c"; + sha256 = "0ll0hr8g3szbxa4al6khhzi6l92a3vwyldj0085whl44s55gq2zr"; }; # No tests in archive diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 90334fd42250..15aaf97d15c0 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "0.3.31"; + version = "0.3.32"; src = fetchPypi { inherit pname version; - sha256 = "15riw8sl8jzzkvvjlz3i3p7jcx423zipxhff5ddvki6zgnrb9149"; + sha256 = "0d5bf45f12861c1b718c51bd6e2ab056da94e651bf22900658421cdde0ff7088"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index ba807cc99fd5..7219f48e6f99 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.9.1"; # Also update the hash in vectors.nix + version = "2.9.2"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "13inbbc3vqv0vpfww65f8pj3isghbcrd3m63xfyd8swl9f5xc2yf"; + sha256 = "a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 520e44cccc78..096eab77bec3 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1ydkrj67jf26ys8v5qflqsnlj3hd4494ym44120dpvk7b7v037ci"; + sha256 = "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r"; }; # No tests included diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index 50f20164f646..a7256a54e3be 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { description = "A python port of YUI CSS Compressor"; homepage = "https://pypi.python.org/pypi/csscompressor"; license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.ahmedtd]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 2b6d1b4d2484..bafa75072f7a 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -18,13 +18,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.4"; + version = "1.2.5"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "1h9g79gxpgpy6xciqyypihw5q4ngp322lpkka1nkwk0ysybfsp7s"; + sha256 = "0widrfxr0x0cyg72ibkv7fdzkvmf5mllchq1x4fs2a36plv8rv4l"; }; buildInputs = [ blas lapack ]; diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index 1a1e3db46ffa..e88591aba9af 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1wr6989hq7q9vyh1qqdpbp8igk9rfca4phfpaim3nnk4swvm5m75"; + sha256 = "1bqvxm7h3b0wah32jrsn919hp4xr1zlkxclbs261mvd57ps0rf9h"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index 348deba7123b..a92f6617abec 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "07nyajjc3209ha2nbvk43sh5bnslwb2hs9wn8q5dpfngsc96wr9g"; + sha256 = "11fl7756zshlrfiqcr6rcg1m0c4434vdg1bkrcjl54hl02k3pcmv"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 3ea04666249d..9c323c6fa33f 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.6.2"; + version = "4.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1hn1yjz5ig2kzkk0wkr75q3l4lrfbnsh0kxzlld9sfn69d1vvsjw"; + sha256 = "0md7qqjpsarc8ymfccvsqgj6mgq8gxl09im5v5yxhv8hv24yy4jm"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 83632ff6db68..4a9a9a60af87 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "18rrysfhmjfzb5b3n8fjbwk755p4slbb8fh9myq4qp76v00lfpnh"; + sha256 = "0nr5ppjbfmay0d3bah26i4k8xj6xyp24gq0cqlv9lzdrbdd3j9wy"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index b651dca7265d..52e22a093311 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.7.1"; pname = "dask-jobqueue"; src = fetchPypi { inherit pname version; - sha256 = "660cd4cd052ada872fd6413f224a2d9221026dd55a8a29a9a7d52b262bec67e7"; + sha256 = "d32ddf3e3c7db29ace102037fa5f61c8db2d945176454dc316a6ffdb8bbfe88b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index e5a94b491da0..9b9388e56c71 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "0.1.9"; + version = "0.1.10"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "6faeeed044112151e28770b69fb1ad06b026597726ce8dc185fd3ae45363d0c0"; + sha256 = "454c47ccf64315d35beeca32c7cedf20d8a8d42471d5e6ce0c51f4af0a6e021e"; }; checkInputs = [ pytest scikitlearn ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b8dfd8deb4a5..1b3a08aa9975 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fsspec -, pytest +, pytestCheckHook , pythonOlder , cloudpickle , numpy @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2.10.1"; + version = "2.14.0"; disabled = pythonOlder "3.5"; @@ -23,13 +23,15 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "035mr7385yf5ng5wf60qxr80529h8dsla5hymkyg68dxhkd0jvbr"; + sha256 = "0kj46pwzvdw8ii1h45y48wxvjid89yp4cfak2h4b8z8xic73fqgj"; }; checkInputs = [ - pytest + pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + propagatedBuildInputs = [ bokeh cloudpickle @@ -50,9 +52,10 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - checkPhase = '' - pytest - ''; + disabledTests = [ + "test_argwhere_str" + "test_count_nonzero_str" + ]; meta = { description = "Minimal task scheduling abstraction"; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index d08d0903886e..807ed5f9a3d1 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.35.0"; + version = "0.36.0"; src = fetchPypi { inherit pname version; - sha256 = "0qpy6mg9gfjxvjms0aaglzayhmdds4agv0lh05g2mkfw620nm8zl"; + sha256 = "1kkbsrzxc2a6k319lh98qkinn99dzcqz8h4fm25q17dlgmc9gq9z"; }; postPatch = '' diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 06e611c8cbff..b5d9c3dfad6a 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -18,6 +18,7 @@ , aiohttp , beautifulsoup4 , asgiref +, setuptools }: buildPythonPackage rec { @@ -43,6 +44,7 @@ buildPythonPackage rec { pint pluggy uvicorn + setuptools ]; checkInputs = [ diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 6f7925a49982..b5ae4a4c437f 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,15 +25,16 @@ , fastparquet , testpath , nbconvert +, pytest_xdist }: buildPythonPackage rec { pname = "datashader"; - version = "0.9.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "3a423d61014ae8d2668848edab6c12a6244be6f249570bd7811dd5698d5ff633"; + sha256 = "05p81aff7x70yj8llclclgz6klvfzqixwxfng6awn3y5scv18w40"; }; propagatedBuildInputs = [ @@ -60,6 +61,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-benchmark + pytest_xdist # not needed flake8 nbsmoke fastparquet @@ -69,11 +71,11 @@ buildPythonPackage rec { postConfigure = '' substituteInPlace setup.py \ - --replace "'testpath<0.4'" "'testpath'" + --replace "'numba >=0.37.0,<0.49'" "'numba'" ''; checkPhase = '' - pytest datashader + pytest -n $NIX_BUILD_CORES datashader ''; meta = with lib; { diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index f8810c954641..730e1456a5f6 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -2,6 +2,7 @@ , nose , parameterized , mock +, flake8 , glibcLocales , six , jdatetime @@ -14,14 +15,14 @@ buildPythonPackage rec { pname = "dateparser"; - version = "0.7.2"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "e1eac8ef28de69a554d5fcdb60b172d526d61924b1a40afbbb08df459a36006b"; + sha256 = "fb5bfde4795fa4b179fe05c2c25b3981f785de26bec37e247dee1079c63d5689"; }; - checkInputs = [ nose mock parameterized six glibcLocales ]; + checkInputs = [ flake8 nose mock parameterized six glibcLocales ]; preCheck ='' # skip because of missing convertdate module, which is an extra requirement rm tests/test_jalali.py diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 4399e6bc83ef..dec6fc2dadd1 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.36"; + version = "0.1.37"; src = fetchPypi { inherit pname version; - sha256 = "c953bb0c54e96887badd2324cc66e1887bf2734f301882cd4fe847a844b518a6"; + sha256 = "ab04f535155810c46c8abf3f7d46364b67b034c49ff8690cdb510092eee56750"; }; propagatedBuildInputs = [ chardet six ]; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 6c338ce6dc28..d6e5acdeaf8c 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.8"; + version = "1.2.10"; src = fetchPypi { inherit pname version; - sha256 = "029mr75wgah0z1ilsf3vf3dmjn65y4fy1jgq5qny2qsb9hvwbblw"; + sha256 = "0x3zkmykcyjn8k57g8lcf89fxw8q7hvvcj6xkwb0f2zrnmpscnsj"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 7478c18b2c0f..fb5698062f77 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.7"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1vcjy6flqbzgjh4zhcs0sl83b946wxrlsx5miliz0ik1d9kjyff0"; + sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj"; }; propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix new file mode 100644 index 000000000000..abc07346efd3 --- /dev/null +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, gdcm +, nose +, nibabel +, numpy +, pydicom +, scipy +}: + +buildPythonPackage rec { + pname = "dicom2nifti"; + version = "2.2.8"; + disabled = isPy27; + + # no tests in PyPI dist + src = fetchFromGitHub { + owner = "icometrix"; + repo = pname; + rev = version; + sha256 = "1qi2map6f4pa1l8wsif7ff7rhja6ynrjlm7w306dzvi9l25mia34"; + }; + + propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy ]; + + checkInputs = [ nose gdcm ]; + checkPhase = "nosetests tests"; + + meta = with lib; { + homepage = "https://github.com/icometrix/dicom2nifti"; + description = "Library for converting dicom files to nifti"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 88cbee2649da..457e9d3e530b 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "17wsybqq0916i1yh7bpf2cmicldn7d0y2b9mzlgs503fkcpxda5w"; + sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/dictionaries/default.nix b/pkgs/development/python-modules/dictionaries/default.nix index 0deab2762552..2a3e752c2062 100644 --- a/pkgs/development/python-modules/dictionaries/default.nix +++ b/pkgs/development/python-modules/dictionaries/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dictionaries"; - version = "0.0.1"; + version = "0.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1jx2ph509sk4l7spslz16y8l6xn97d13nspn4ds2lxn5ward9ihy"; + sha256 = "8fa92745eb7c707b8588888875234f2f0a61b67936d8deb91b2b7b4c32366112"; }; buildInputs = [ six ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 971b811a221f..47419ec559e0 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "1.2.5"; + version = "1.3.3"; disabled = pythonOlder "3.5.3"; # only distributes wheels on pypi now @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "17l6mlfi9ikqndpmi4pwlvb53g132cycyfm9nzdyiqr96k8ly4ig"; + sha256 = "0ld92vh7kjk3f02nbqyib68844yi4p2kmkyir6v9wi00y1l287l3"; }; propagatedBuildInputs = [ aiohttp websockets ]; patchPhase = '' substituteInPlace "requirements.txt" \ - --replace "aiohttp>=3.3.0,<3.6.0" "aiohttp~=3.3" \ - --replace "websockets>=6.0,<7.0" "websockets>=6" + --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp~=3.6.0" \ + --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets>=6" '' + lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index d85b4496e22a..1104834d879e 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.9.1"; + version = "2.9.3"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "d37a5c5be992f3b16db24b54d2801cbe370990fbc63089c6e7ef40d6f03cf5dd"; + sha256 = "70e29fed075270df4ca7dda2b26a79523b753fe90fb278b2a7d6b0290ba53d9a"; }; checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 6e699391705a..879e73c11e22 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "84933651fbbde8f2bc084bef2f077b79db1ec1389432f21dd661eaae6b3d6a95"; + sha256 = "a5960addecc04527ab26617e51b8ed42f0adab4594b24bb0f3c33e2bd3857c3f"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 5d50c628920c..d18f5924fdcc 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.8"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1v7mf48gb2qmmks3ifnhkh0vfd7hpvx5v81ypc9cqy35n3ir0q4a"; + sha256 = "727f71f865ff29df93c01a0a1686af0dca19776ee786f876ea0ae7e062719b24"; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index bcb39633f7ea..c8fdd57c98e1 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1vq5qa136h4rz4hjznnk6y8l443i41yh4w4wxg20f9b059xrsld1"; + sha256 = "1q9ciy2yawgvbha5kwlzwdmdqvas287dc0i60ygp2799jnfr5dr6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index 67977caf9ec3..51c5b26bdf27 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256:1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw"; + sha256 = "1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index 90993db4c5bf..4eb9a8da773e 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -4,6 +4,7 @@ , django , python , pillow +, python_magic }: buildPythonPackage rec { @@ -14,7 +15,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "8322ee9d7bf5ffa5360990320d2cc2efc7017feff35422636d49f625721edf82"; }; - propagatedBuildInputs = [ pillow ]; + propagatedBuildInputs = [ pillow python_magic ]; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 70cba819e92d..42af34659c0f 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.11"; + version = "2.2.13"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0l0gndky4nwc1jk68b31m583a9g0fhmll903p0xislyyddz3iqk5"; + sha256 = "103db5gmny6bkq9jgr2m6gdfy1n29bj2v87184y1zgpdmkv71ww4"; }; patches = stdenv.lib.optional withGdal diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 27060e18ae27..4ded69bc3256 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1fk7fh30i0fzi0hjd841vxh25iryvgp4lirmxfpq428w4nq7p1bg"; + sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 8b536a40ebc4..9c61cfdfe86a 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.5"; + version = "3.0.7"; src = fetchPypi { inherit pname version; - sha256 = "1add55bb05311f4acd26683dd71af60729d4f33dfe42c608da8e15e679a32009"; + sha256 = "72fc53580a6b538f0cfff10f27f42333f67d79c406399289c94ec5a193cfb3e1"; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 08dbafe019e4..ffff1829948e 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -36,7 +36,7 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "0wb2gh9ji8bgq4s9ci9x017dybxqzjhncpw33b1wjksm2yhbkvlz"; + sha256 = "1xwrha692if7rwqc0qalgpx9b8indgdan8ppwlcs2v47wjvgg6h3"; }; bazelFlags = [ diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index fafa4c5cbf57..df9843893238 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.12"; + version = "0.9.13"; src = fetchPypi { inherit pname version; - sha256 = "c206f09948f3ad17884adffdb552b700072c6022fa59744a0f0606114c475e19"; + sha256 = "a0fed3e139c12ee4884b19bcde1d4a170745bcabb6026397876e3236ce38b9db"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index f7e620f491cb..c2a7df098f4b 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "doc8"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543"; + sha256 = "4d1df12598807cf08ffa9a1d5ef42d229ee0de42519da01b768ff27211082c12"; }; buildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index a31ba7c69c03..9c788bde123d 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx"; + sha256 = "380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2"; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 5c3e517a4947..580945656b4c 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { - version = "0.0.15"; + version = "0.0.18"; pname = "dockerfile-parse"; src = fetchPypi { inherit pname version; - sha256 = "1s05s1hc834yk6qxj2yv3fh7grj3q52d6jjy0sv1p05938baprfm"; + sha256 = "a09eae6871b7b314f8a8bddb67b6c5002708b22247511906cf2a9a45564b83db"; }; postPatch = '' diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index af811903505a..cdc244bc1b49 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.9.0"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "0sr1fn6b4k5bh0cscd9yi8csqxvj4ngzildav58x5p694mc86j5k"; + sha256 = "bc9dde1ffa5de0179efbcdc73773ef0553921130ad01955422f2932be35c059e"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index f671cdc9642a..03445f79117f 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -1,8 +1,11 @@ { stdenv +, python , buildPythonPackage , fetchPypi -, isPy3k +, substituteAll , pyparsing +, graphviz +, texlive }: buildPythonPackage rec { @@ -14,11 +17,26 @@ buildPythonPackage rec { sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9"; }; - # Tests fail with 3.x. Furthermore, package is no longer maintained. - disabled = isPy3k; + patches = [ + (substituteAll { + src = ./path.patch; + inherit graphviz; + }) + ./test.patch # https://github.com/kjellmf/dot2tex/issues/5 + ]; propagatedBuildInputs = [ pyparsing ]; + checkInputs = [ + (texlive.combine { + inherit (texlive) scheme-small preview pstricks; + }) + ]; + + checkPhase = '' + ${python.interpreter} tests/test_dot2tex.py + ''; + meta = with stdenv.lib; { description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; homepage = "https://github.com/kjellmf/dot2tex"; diff --git a/pkgs/development/python-modules/dot2tex/path.patch b/pkgs/development/python-modules/dot2tex/path.patch new file mode 100644 index 000000000000..4e05b7a8dff3 --- /dev/null +++ b/pkgs/development/python-modules/dot2tex/path.patch @@ -0,0 +1,104 @@ +diff --git a/dot2tex/dotparsing.py b/dot2tex/dotparsing.py +index 391b5dc..6dc77a3 100644 +--- a/dot2tex/dotparsing.py ++++ b/dot2tex/dotparsing.py +@@ -180,18 +180,8 @@ def __find_executables(path): + def find_graphviz(): + """Locate Graphviz's executables in the system. + +- Tries three methods: +- +- First: Windows Registry (Windows only) +- This requires Mark Hammond's pywin32 is installed. +- +- Secondly: Search the path +- It will look for 'dot', 'twopi' and 'neato' in all the directories +- specified in the PATH environment variable. +- +- Thirdly: Default install location (Windows only) +- It will look for 'dot', 'twopi' and 'neato' in the default install +- location under the "Program Files" directory. ++ It will look for 'dot', 'twopi' and 'neato' in ++ @graphviz@/bin. + + It will return a dictionary containing the program names as keys + and their paths as values. +@@ -199,75 +189,9 @@ def find_graphviz(): + If this fails, it returns None. + """ + +- # Method 1 (Windows only) +- # +- if os.sys.platform == 'win32': +- try: +- import win32api, win32con +- +- # Get the GraphViz install path from the registry +- # +- hkey = win32api.RegOpenKeyEx(win32con.HKEY_LOCAL_MACHINE, +- "SOFTWARE\AT&T Research Labs\Graphviz", 0, win32con.KEY_QUERY_VALUE) +- +- path = win32api.RegQueryValueEx(hkey, "InstallPath")[0] +- win32api.RegCloseKey(hkey) +- +- # Now append the "bin" subdirectory: +- # +- path = os.path.join(path, "bin") +- progs = __find_executables(path) +- if progs is not None: +- # print("Used Windows registry") +- return progs +- +- except ImportError: +- # Print a messaged suggesting they install these? +- # +- log.debug('The win32api is not installed') +- pass +- except: +- log.debug('Failed to access the registry key') +- +- # Method 2 (Linux, Windows etc) +- # +- if 'PATH' in os.environ: +- for path in os.environ['PATH'].split(os.pathsep): +- progs = __find_executables(path) +- if progs is not None: +- return progs +- +- # Method 3 (Windows only) +- # +- if os.sys.platform == 'win32': +- # Try and work out the equivalent of "C:\Program Files" on this +- # machine (might be on drive D:, or in a different language) +- # +- if 'PROGRAMFILES' in os.environ: +- # Note, we could also use the win32api to get this +- # information, but win32api may not be installed. +- +- path = os.path.join(os.environ['PROGRAMFILES'], 'ATT', 'GraphViz', 'bin') +- +- else: +- # Just in case, try the default... +- path = r"C:\Program Files\att\Graphviz\bin" +- +- progs = __find_executables(path) +- +- if progs is not None: +- # print("Used default install location") +- return progs +- +- for path in ( +- '/usr/bin', '/usr/local/bin', +- '/opt/local/bin', +- '/opt/bin', '/sw/bin', '/usr/share', +- '/Applications/Graphviz.app/Contents/MacOS/'): +- progs = __find_executables(path) +- if progs is not None: +- # print("Used path") +- return progs ++ progs = __find_executables('@graphviz@/bin') ++ if progs is not None: ++ return progs + + # Failed to find GraphViz + # diff --git a/pkgs/development/python-modules/dot2tex/test.patch b/pkgs/development/python-modules/dot2tex/test.patch new file mode 100644 index 000000000000..9ead8ac5ee5c --- /dev/null +++ b/pkgs/development/python-modules/dot2tex/test.patch @@ -0,0 +1,12 @@ +diff --git a/tests/test_dot2tex.py b/tests/test_dot2tex.py +index 74b01ed..7be9aba 100644 +--- a/tests/test_dot2tex.py ++++ b/tests/test_dot2tex.py +@@ -147,6 +147,7 @@ class NeedsQuotesTests(unittest.TestCase): + + class MultipleStatements(unittest.TestCase): + # https://github.com/kjellmf/dot2tex/issues/5 ++ @unittest.skip('fails upstream') + def test_semicolon(self): + """Test for issue 5""" + testgraph1 = """ diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix index eeb962a845fd..7cc069707aad 100644 --- a/pkgs/development/python-modules/dotnetcore2/default.nix +++ b/pkgs/development/python-modules/dotnetcore2/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "dotnetcore2"; - version = "2.1.13"; + version = "2.1.14"; format = "wheel"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { inherit pname version format; python = "py3"; platform = "manylinux1_x86_64"; - sha256 = "1fbg3pn7g0a6pg0gb5vaapcc3cdp6wfnliim57fn3cnzmx5d8p6i"; + sha256 = "0dxp9a73ncjylc09bjwq81fgj5ysk1yi27l8ka5f98121k1kmn6q"; }; nativeBuildInputs = [ unzip ]; @@ -35,14 +35,18 @@ buildPythonPackage rec { ) ]; - # prevent exposing a broken dotnet executable - postInstall = '' - rm -r $out/${python.sitePackages}/${pname}/bin + # remove bin, which has a broken dotnetcore installation + installPhase = '' + rm -rf dotnetcore2/bin + mkdir -p $out/${python.sitePackages}/ + cp -r dotnetcore2 $out/${python.sitePackages}/ ''; # no tests, ensure it's one useful function works checkPhase = '' - ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path())' + rm -r dotnetcore2 # avoid importing local directory + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path()); runtime.ensure_dependencies()' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix new file mode 100644 index 000000000000..6433e0d17a72 --- /dev/null +++ b/pkgs/development/python-modules/dparse/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, toml, pyyaml }: + +buildPythonPackage rec { + pname = "dparse"; + version = "0.5.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367"; + }; + + propagatedBuildInputs = [ toml pyyaml ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "A parser for Python dependency files"; + homepage = "https://github.com/pyupio/safety"; + license = licenses.mit; + maintainers = with maintainers; [ thomasdesr ]; + }; +} diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix new file mode 100644 index 000000000000..c839dea3d1a6 --- /dev/null +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, duckdb +, numpy +, pandas +, pybind11 +, setuptools_scm +, pytestrunner +, pytest +}: + +buildPythonPackage rec { + pname = "duckdb"; + inherit (duckdb) version src; + + postConfigure = '' + cd tools/pythonpkg + export SETUPTOOLS_SCM_PRETEND_VERSION=${version} + ''; + + nativeBuildInputs = [ + pybind11 + setuptools_scm + pytestrunner + ]; + + checkInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + numpy + pandas + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "DuckDB is an embeddable SQL OLAP Database Management System"; + homepage = "https://pypi.python.org/pypi/duckdb"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix new file mode 100644 index 000000000000..28aaf8ee47c9 --- /dev/null +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, contextlib2 +, pytest +, pytestCheckHook +, vcrpy +, citeproc-py +, requests +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "duecredit"; + version = "0.8.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1yxd8579pakrfhq0hls0iy37nxllsm8y33na220g08znibrp7ix0"; + }; + + # bin/duecredit requires setuptools at runtime + propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + + checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + disabledTests = [ "test_io" ]; + + meta = with lib; { + homepage = "https://github.com/duecredit/duecredit"; + description = "Simple framework to embed references in code"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 01ad71883cec..82b9bed492cc 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.14"; + version = "0.19.16"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "d1320232c859ab086fff79eee8fa6ddbcbcbe01ff0c64c9bed48eca470b00b46"; + sha256 = "f74561c448bfb6f04c07de731c1181ae4280017f759b0bb04fa5770aa84ca850"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 41a4c1a7a2a5..3dda2c914556 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.8"; + version = "0.3"; src = fetchPypi { inherit pname version; - sha256 = "da7f67a006e2eb63d86a8f3f4baa9d6752dab9676009a67193a4e433f2f41c2a"; + sha256 = "115rzzr0hx4af4m6krf7dxn8851n4l8jfxahjzjc2r0zq2m8v57v"; }; # No tests diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index d10c1a0be654..8c7d7679005e 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface zope_testing ]; - # tests fail, see http://hydra.nixos.org/build/4316603/log/raw + # tests fail, see https://hydra.nixos.org/build/4316603/log/raw doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index deef21985c6e..68d658f4989e 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.1.0"; + version = "7.2.1"; src = fetchPypi { inherit pname version; - sha256 = "3f860e0304d703f63b458fea3782f09a823ab07da7ee84ae4bff1aa63e22aedb"; + sha256 = "1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index ce8c0dc77a0e..b04bc9069f71 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.1.0"; + version = "7.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0140787216646e1eb7eb001f8146aff7071d7ca438854249787b6cc221ddd266"; + sha256 = "9bfcb2bd137d6d7ca123e252b9d7261cfe4f7723f7b749a99c52b47766cf387c"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index c8b1a376f263..2ab878b081c3 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.4.3"; + version = "1.4.5"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "18gqqdsrdlgwn93xnxy6ifxrk7ppaimijinflphxia2qcm8czkgf"; + sha256 = "1hqvi7ibhdz812dsjbyyz3rysc6242hi1k9187wwnjmilbbngi3c"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 8dc28f823e10..371c9bcc9e04 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -18,11 +18,11 @@ in buildPythonPackage rec { pname = "entrance"; - version = "1.1.10"; + version = "1.1.12"; src = fetchPypi { inherit pname version; - sha256 = "080qkvkmfw4004cl721l5bvpg001xz8vs6q59dg797kqxfrwk5kw"; + sha256 = "ef7cdf76226344f7cb92c8f81b6c03bbe944a095434f86275f178809c84108ca"; }; # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix index 9d9af3c64475..1f0d10942766 100644 --- a/pkgs/development/python-modules/enum34/default.nix +++ b/pkgs/development/python-modules/enum34/default.nix @@ -7,11 +7,11 @@ if pythonAtLeast "3.4" then null else buildPythonPackage rec { pname = "enum34"; - version = "1.1.6"; + version = "1.1.10"; src = fetchPypi { inherit pname version; - sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"; + sha256 = "cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 87d719a7af39..32fe91cb72d5 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ephem"; - version = "3.7.7.0"; + version = "3.7.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0dj4kk325b01s7q1zkwpm9rrzl7n1jf7fr92wcajjhc5kx14hwb0"; + sha256 = "36b51a8dc7cfdeb456dd6b8ab811accab8341b2d562ee3c6f4c86f6d3dbb984e"; }; patchFlags = [ "-p0" ]; diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index b2ac36582357..6093e16d4b50 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "escapism"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5f1cc1fa04a95f5b85b3da194750f8a71846d493ea332f62e8798949f10c9b86"; + sha256 = "73256bdfb4f22230f0428fc6efecee61cdc4fad531b6f98b849cb9c80711e4ec"; }; # No tests distributed diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index cef6c27e59cf..305ada89552c 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -1,12 +1,12 @@ -{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }: +{ lib, buildPythonPackage, fetchPypi, linuxHeaders }: buildPythonPackage rec { pname = "evdev"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166"; + sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi"; }; buildInputs = [ linuxHeaders ]; @@ -17,8 +17,6 @@ buildPythonPackage rec { doCheck = false; - disabled = isPy34; # see http://bugs.python.org/issue21121 - meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; homepage = "https://pythonhosted.org/evdev"; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index a8ac610855d5..062d6e3bedb8 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,13 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask, events -, pymongo, simplejson, cerberus, werkzeug }: +{ stdenv +, buildPythonPackage +, fetchPypi +, flask +, events +, pymongo +, simplejson +, cerberus +, setuptools +}: buildPythonPackage rec { pname = "Eve"; - version = "1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "ebde455e631b8eb9d38783eedfbd7e416b4477cce3d9988880eb3e477256a11e"; + sha256 = "dbb409c481ffd5100a5ab13177f6ef6284257e33ac8e5090cd50e42533607ebd"; }; propagatedBuildInputs = [ @@ -16,13 +24,10 @@ buildPythonPackage rec { flask pymongo simplejson - werkzeug + setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "werkzeug==0.15.4" "werkzeug" - ''; + pythonImportsCheck = [ "eve" ]; # tests call a running mongodb instance doCheck = false; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 9a006c08772f..14c5cfcb390b 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.25.1"; + version = "0.25.2"; src = fetchPypi { inherit pname version; - sha256 = "6c9c625af48424c4680d89314dbe45a76cc990cf002489f9469ff214b044ffc1"; + sha256 = "4c8ab42c51bff55204fef43cff32616558bedbc7538d876bb6a96ce820c7f9ed"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 0184ae9ffd77..a745566a6451 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { - version = "0.11"; + version = "0.12"; pname = "ezdxf"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "mozman"; repo = "ezdxf"; rev = "v${version}"; - sha256 = "167iw1j1c6195bwv6i8z1m7s0i27r0y0acxd2w76hvnq3a72jbsd"; + sha256 = "1flcq96ljk5wqrmgsb4acflqzkg7rhlaxz0j5jxky9za0mj1x6dq"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix new file mode 100644 index 000000000000..fb85408dd3d2 --- /dev/null +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, six, pytest }: + +buildPythonPackage rec { + pname = "fake-useragent"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Up to date simple useragent faker with real world database"; + homepage = "https://github.com/hellysmile/fake-useragent"; + license = licenses.asl20; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 89415237714e..5691c9764db0 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "92c84a10bec81217d9cb554ee12b3838c8986ce0b5d45f72f769da22e4bb5432"; + sha256 = "c7f7466cb9ba58d582f713494acdb5ebcc462336c5e38c5230b0cdab37069985"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 0ed9d42c3b0d..3513f57cdbe5 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.54.0"; + version = "0.54.1"; format = "flit"; disabled = !isPy3k; @@ -24,9 +24,14 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "17bicrpr801z71wrn9iimvh7qk6iwyxvr89ialf0s2rxxa2s0yb5"; + sha256 = "0k0lss8x6lzf0szcli48v28r269fsx1jdkr9q78liz47dz5x03d8"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "starlette ==0.13.2" "starlette" + ''; + propagatedBuildInputs = [ uvicorn starlette diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index e8ad6e136448..46c6cfb06caf 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner, -thrift, pytest, python-snappy, lz4 }: +thrift, pytest, python-snappy, lz4, zstd }: buildPythonPackage rec { pname = "fastparquet"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "1vnxr4r0bia2zi9csjw342l507nic6an4hr5xb3a36ggqlbaa0g5"; + sha256 = "0y89gmcfylxqm8rs1fbirwjzmhcvlfx8fhvkm3ssbj1ivfd5mdlr"; }; postPatch = '' @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ numba numpy pandas thrift ]; - checkInputs = [ pytest python-snappy lz4 ]; + checkInputs = [ pytest python-snappy lz4 zstd ]; meta = with lib; { description = "A python implementation of the parquet format"; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index ead11aa38bef..c0ccb7d345a9 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "feedgenerator"; - version = "1.9"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "01mirwkm7xfx539hmvj7g9da1j51gw5lsx74dr0glizskjm5vq2s"; + sha256 = "0m6fjnrx3sd0bm6pnbhxxx5ywlwqh8bx0lka386kj28mg3fmm2m2"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index ae7dc43020b5..51b0060cb2d6 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , substituteAll -, ffmpeg +, ffmpeg_3 , future , pytest , pytestrunner @@ -24,7 +24,7 @@ buildPythonPackage rec { ( substituteAll { src = ./ffmpeg-location.patch; - inherit ffmpeg; + ffmpeg = ffmpeg_3; } ) ]; diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index 40bbc688e205..4bbb6c41f543 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "10985zfx90m527binx3fxvm4nsqmlwf0jj8j8mpbxb8wj8ivkllr"; + sha256 = "19vav4w8vvcnrps1mirjkrv4pr1khwn5ma6m5pgpxd4qip73wffs"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/pkgs/development/python-modules/flammkuchen/default.nix index 3a3d82cd8bbf..a5525d97f604 100644 --- a/pkgs/development/python-modules/flammkuchen/default.nix +++ b/pkgs/development/python-modules/flammkuchen/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "flammkuchen"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "e9aab9b229ace70d879b85618a9ce0e88dd6ce35d4dbcdfd60c6b61c33a1b4fb"; + sha256 = "f249fe5bf85f717d3836e0db6fa9443a8a43101ce07704715b42251c44fc968e"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index ae1be1ae54c2..26b6977116fd 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -1,27 +1,31 @@ -{ stdenv +{ lib , buildPythonPackage +, pythonOlder , fetchPypi , flask , flask-silk , future +, pathlib }: buildPythonPackage rec { pname = "Flask-AutoIndex"; - version = "0.6.2"; + version = "0.6.6"; src = fetchPypi { inherit pname version; - sha256 = "af2cdb34eefe6edbf43ce19200880829e8c2df3598000e75dc63c9b7e3478706"; + sha256 = "ea319f7ccadf68ddf98d940002066278c779323644f9944b300066d50e2effc7"; }; propagatedBuildInputs = [ flask flask-silk future + ] ++ lib.optionals (pythonOlder "3.4") [ + pathlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The mod_autoindex for Flask"; longDescription = '' Flask-AutoIndex generates an index page for your Flask application automatically. diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index 051b83d1c3d0..d2e6cf3e47bf 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-HTTPAuth"; - version = "3.3.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1fb1kr1iw6inkwfv160rpjx54vv1q9b90psdyyghyy1f6dhvgy3f"; + sha256 = "1z3ad8sm24xl2lazdia92br1a2nigqwaf1lfsa77j5pz6gf2xmj7"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index ef2b3a40705b..24ed04437a03 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.5.2"; + version = "2.5.3"; src = fetchPypi { inherit pname version; - sha256 = "00nm76w4xymsiih6hq8y46wp026v7zkzq15cx39hp929ba3z2vx9"; + sha256 = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee"; }; checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 2453bb50766d..594af9f74bf4 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.4.1"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d"; + sha256 = "0b656fbf87c5f24109d859bafa791d29751fabbda2302b606881ae5485b557a5"; }; propagatedBuildInputs = [ flask sqlalchemy ]; diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix new file mode 100644 index 000000000000..3bd5ef98b322 --- /dev/null +++ b/pkgs/development/python-modules/flask-versioned/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, flask }: + +buildPythonPackage rec { + pname = "Flask-Versioned"; + version = "0.9.4-20101221"; + + src = fetchFromGitHub { + owner = "pilt"; + repo = "flask-versioned"; + rev = "38046fb53a09060de437c90a5f7370a6b94ffc31"; # no tags + sha256 = "1wim9hvx7lxzfg35c0nc7p34j4vw9mzisgijlz4ibgykah4g1y37"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with stdenv.lib; { + description = "Flask plugin to rewrite file paths to add version info"; + homepage = "https://github.com/pilt/flask-versioned"; + license = licenses.bsd3; + maintainers = with maintainers; [ globin ]; + }; +} + diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 962555d492dd..060f592b2cff 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-WTF"; - version = "0.14.2"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x"; + sha256 = "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl"; }; propagatedBuildInputs = [ flask wtforms nose ]; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index ffbebf96ee9f..bbac89406fc3 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -2,12 +2,12 @@ , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { - version = "1.1.1"; + version = "1.1.2"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52"; + sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix new file mode 100644 index 000000000000..441084da97fa --- /dev/null +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit +, isPy3k +, pytoml +}: + +buildPythonPackage rec { + pname = "flit-core"; + version = "2.3.0"; + disabled = !isPy3k; + + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "flit_core"; + sha256 = "a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80"; + }; + + propagatedBuildInputs = [ + pytoml + ]; + + passthru.tests = { + inherit flit; + }; + + meta = { + description = "Distribution-building parts of Flit. See flit package for more information"; + homepage = "https://github.com/takluyver/flit"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.fridh ]; + }; +} diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 72957a94afa5..88a4028aa6d2 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -11,6 +11,7 @@ , testpath , responses , pytoml +, flit-core }: # Flit is actually an application to build universal wheels. @@ -20,16 +21,23 @@ buildPythonPackage rec { pname = "flit"; - version = "1.3"; + version = "2.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36"; + sha256 = "017012b809ec489918afd68af7a70bd7c8c770c87b60159d875c126866e97a4b"; }; - propagatedBuildInputs = [ docutils requests requests_download pytoml ] - ++ lib.optional (pythonOlder "3.6") zipfile36; + propagatedBuildInputs = [ + docutils + requests + requests_download + pytoml + flit-core + ] ++ lib.optionals (pythonOlder "3.6") [ + zipfile36 + ]; checkInputs = [ pytest_4 testpath responses ]; diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index 74273e629454..3a2f987ed510 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -1,22 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, Babel, celery, importlib-metadata, pytz, tornado, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, Babel +, celery +, future +, humanize +, importlib-metadata +, mock +, pytz +, tornado +}: buildPythonPackage rec { pname = "flower"; - version = "0.9.3"; - + version = "0.9.4"; + src = fetchPypi { inherit pname version; - sha256 = "7f45acb297ab7cf3dd40140816143a2588f6938dbd70b8c46b59c7d8d1e93d55"; + sha256 = "25782840f7ffc25dcf478d94535a2d815448de4aa6c71426be6abfa9ca417448"; }; - propagatedBuildInputs = [ Babel celery importlib-metadata pytz tornado ]; - + # flower and humanize aren't listed in setup.py but imported + propagatedBuildInputs = [ + Babel + celery + future + importlib-metadata + pytz + tornado + humanize + ]; + checkInputs = [ mock ]; - + meta = with lib; { description = "Celery Flower"; homepage = "https://github.com/mher/flower"; - license = licenses.bsdOriginal; + license = licenses.bsdOriginal; maintainers = [ maintainers.arnoldfarkas ]; }; } diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index a1202b5586d4..d47465c97234 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fluent-logger"; - version = "0.9.4"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "814cb51892c620a00c5a6129fffaa09eeeb0c8822c9bcb4f96232ae3cbc4d8b3"; + sha256 = "a7d47eae4d2a11c8cb0df10ae3d034d95b0b8cef9d060e59e7519ad1f82ffa73"; }; propagatedBuildInputs = [ msgpack ]; diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix deleted file mode 100644 index 13e6f14d9d0f..000000000000 --- a/pkgs/development/python-modules/fluidasserts/default.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, isPy37 -, lib - -# pythonPackages -, aiohttp -, androguard -, azure-identity -, azure-keyvault -, azure-mgmt-compute -, azure-mgmt-keyvault -, azure-mgmt-network -, azure-mgmt-resource -, azure-mgmt-security -, azure-mgmt-storage -, azure-mgmt-sql -, azure-mgmt-web -, azure-storage -, bandit -, bcrypt -, beautifulsoup4 -, boto3 -, cfn-flip -, cython -, dnspython -, colorama -, configobj -, defusedxml -, GitPython -, google_api_python_client -, kubernetes -, ldap3 -, mixpanel -, mysql-connector -, names -, ntplib -, oyaml -, paramiko -, pillow -, psycopg2 -, pycrypto -, pygments -, pyhcl -, pyjks -, pynacl -, pyodbc -, pyopenssl -, pypdf2 -, pysmb -, pytesseract -, python_magic -, pytz -, pywinrm -, requirements-detector -, selenium -, tlslite-ng -, viewstate - -# pythonPackages to test the derivation -, pytest -, flask -, flask-httpauth -, docker -}: - -buildPythonPackage rec { - pname = "fluidasserts"; - version = "20.2.30165"; - disabled = !isPy37; - - src = fetchPypi { - inherit pname version; - sha256 = "0wcplzfx89d3c6hvdgag860sl3infqmymy6ly6y6ah77pkc98x15"; - }; - - patchPhase = '' - # Release packages from their hard pinned versions - sed -i -E "s/(.*)==.*/\1/g" requirements.txt - - # Functionality that will be not present for the momment - # but that we'll work to add in the future - # Just a minimal portion of fluidasserts use this - substituteInPlace ./requirements.txt \ - --replace "mitmproxy" "" \ - - ''; - - propagatedBuildInputs = [ - # pythonPackages - aiohttp - androguard - azure-identity - azure-keyvault - azure-mgmt-compute - azure-mgmt-keyvault - azure-mgmt-network - azure-mgmt-resource - azure-mgmt-security - azure-mgmt-storage - azure-mgmt-sql - azure-mgmt-web - azure-storage - bandit - bcrypt - beautifulsoup4 - boto3 - cfn-flip - cython - dnspython - colorama - configobj - defusedxml - GitPython - google_api_python_client - kubernetes - ldap3 - mixpanel - mysql-connector - names - ntplib - oyaml - paramiko - pillow - psycopg2 - pycrypto - pygments - pyhcl - pyjks - pynacl - pyodbc - pyopenssl - pypdf2 - pysmb - pytesseract - python_magic - pytz - pywinrm - requirements-detector - selenium - tlslite-ng - viewstate - ]; - - configurePhase = '' - mkdir -p build/config - touch build/config/README.rst - ''; - - checkInputs = [ - docker - flask - flask-httpauth - pytest - ]; - - checkPhase = '' - # This tests require BWAPP Docker Container - sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_open.py - sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_close.py - - # This tests require network connectivity - sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_open.py - sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_close.py - - # Remove impurities - substituteInPlace ./test/conftest.py \ - --replace "import wait" "" \ - --replace "if not os.path.exists(name):" "if os.path.exists(name):" \ - --replace "from test.mock import graphql_server" "" \ - --replace "(graphql_server.start, 'MockGraphQLServer', ['proto_graphql'])," "" \ - - pytest --asserts-module 'iot' \ - test/test_iot_phone.py - - pytest --asserts-module 'ot' \ - test/test_ot_powerlogic.py - - pytest --asserts-module 'proto_http' \ - test/test_proto_{http_close,http_open}.py - - pytest --asserts-module 'proto_rest' \ - test/test_proto_rest.py - - # This file launches mock docker containers and servers - # let's remove it to create a custom test environment - rm test/conftest.py - - pytest \ - test/test_cloud_aws_terraform_{cloudfront,dynamodb,ebs,ec2,elb}.py \ - test/test_cloud_aws_terraform_{fsx,iam,kms,rds,s3}.py \ - test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \ - test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \ - test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \ - test/test_helper_{asynchronous,crypto}.py \ - test/test_lang_{javascript,java}.py \ - test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \ - test/test_utils_generic.py - ''; - - meta = with lib; { - description = "Assertion Library for Security Assumptions"; - homepage = "https://gitlab.com/fluidattacks/asserts"; - license = licenses.mpl20; - maintainers = with maintainers; [ - kamadorueda - ]; - broken = true; # dependency tree is too fragile for nixpkgs - }; -} diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 9a89c9a8e009..800ece5261da 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.10.1"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0gcc267wxwxr57ry86pqpbiyfvl0g48hfvgy0f2mz9s58g87kgzd"; + sha256 = "540789abc21872469e52c59ac3962c61259a8df557feadd6514eb23eb0a64ca7"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 45d394101371..ddcf2878334c 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.2.2"; + version = "4.2.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "66bb3dfe7efe5972b0145339c063ffaf9539e973f7ff8791df84366eafc65804"; + sha256 = "f05bff703e31d5f28e713afe89aed0e6649b02c09d8df958e8a02df9c9b2fc0e"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index d1374ca71bf5..0c5a0fff79d2 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "foolscap"; - version = "0.13.2"; + version = "20.4.0"; src = fetchPypi { inherit pname version; - sha256 = "8498c7e9eaecb5b19be74b18d55c2086440be08de29f2bb507f9b505757467ff"; + sha256 = "0rbw9makjmawkcxnkkngybj3n14s0dnzn9gkqqq2krcm514kmlb9"; }; propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index dc59fb6db3e2..bbf8395190f8 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.7"; + version = "0.8.8"; src = fetchPypi { inherit pname version; - sha256 = "0c5iqdn17ip6lkf26xb1cwjvcly0448gvqmkbkvhnqy4birc8cf5"; + sha256 = "06y626kgaz1wn1qajlngihpvd4qz8m6lx6sknmjqhhrznyji58wi"; }; propagatedBuildInputs = [ tkinter supercollider ]; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 3f0fd31d8a15..3a45e0942f83 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "freezegun"; - version = "0.3.12"; + version = "0.3.15"; src = fetchPypi { inherit pname version; - sha256 = "2a4d9c8cd3c04a201e20c313caf8b6338f1cfa4cda43f46a94cc4a9fd13ea5e7"; + sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; propagatedBuildInputs = [ dateutil six ]; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index d8f1a52d465a..d55941bd5b47 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = version; - hash = "sha256:17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x"; + sha256 = "17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index b0f90f7ce176..3d073df843d4 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "gast"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "5c7617f1f6c8b8b426819642b16b9016727ddaecd16af9a07753e537eba8a3a5"; + sha256 = "b881ef288a49aa81440d2c5eb8aeefd4c2bb8993d5f50edae7413a85bfdb3b57"; }; checkInputs = [ astunparse ] ; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index d335020a1a8a..be6321f86ca7 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.8.2"; + version = "3.8.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1x9gvz954h10wgq02wybi21llwwjj9r1gal2qr82q7g1h9g0dqs6"; + sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index ae2df2ce6070..892b373f065c 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.7.0"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0lnmj9jky9pz227scmjxgvd8243higl24ndc0cc668mm36cnwapc"; + sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix index 484c049da358..2863d30f4684 100644 --- a/pkgs/development/python-modules/geopy/2.nix +++ b/pkgs/development/python-modules/geopy/2.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "geopy"; - version = "1.21.0"; + version = "1.22.0"; disabled = !isPy27; # only Python 2.7 doCheck = false; # Needs network access @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1p1sgy2p59j0297bp7c82b45bx4d3i1p4kvbgf89c9i0llyb80nw"; + sha256 = "0jypkaqlbyr8icqypwm23lzsvq7flakp3a3nqr8ib5fmd0fzsq7q"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 634d7c2ddc04..a9214cf49f70 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -11,22 +11,26 @@ , tornado , aiohttp , uritemplate +, pyjwt }: buildPythonPackage rec { pname = "gidgethub"; - version = "3.2.0"; + version = "4.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f4b69063a256994d38243cc0eba4e1453017b5b8b04a173216d02d47ffc3989"; + sha256 = "13nzc40c71kxvjxahgnc6c974xp5fpm02gqymwgfjbj2dmlzmayg"; }; nativeBuildInputs = [ setuptools pytestrunner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; - propagatedBuildInputs = [ uritemplate ]; + propagatedBuildInputs = [ + uritemplate + pyjwt + ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index b76ee4394c6e..5c3bd4ac43fc 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "gitdb"; - version = "4.0.2"; + version = "4.0.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0l113fphn6msjl3cl3kyf332b6lal7daxdd0nfma0x9ipfb013jr"; + sha256 = "c9e1f2d0db7ddb9a704c2a0217be31214e91a4fe1dea1efad19ae42ba0c285c9"; }; propagatedBuildInputs = [ smmap ]; diff --git a/pkgs/development/python-modules/github-webhook/default.nix b/pkgs/development/python-modules/github-webhook/default.nix index c9814b94d824..32b86896fdd1 100644 --- a/pkgs/development/python-modules/github-webhook/default.nix +++ b/pkgs/development/python-modules/github-webhook/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "github-webhook"; - version = "1.0.2"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "04jdf595gv97s4br0ym8izca3i6d1nfwcrpi4s26hkvn3czz84sv"; + sha256 = "b2444dbfd03deda35792bd00ebd1692597c2605c61445da79da6322afaca7a8d"; }; propagatedBuildInputs = [ flask six ]; diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix index 9b5cb905666b..f26791fdbe96 100644 --- a/pkgs/development/python-modules/gnutls/default.nix +++ b/pkgs/development/python-modules/gnutls/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-gnutls"; - version = "3.1.2"; + version = "3.1.3"; # https://github.com/AGProjects/python-gnutls/issues/2 disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "28748e02a8035c31826152944e41217ebcc58ab7793ae5a22850cd23d3cfbbbe"; + sha256 = "79f94017e6472ac665c85bc16d68aa2e6681f53b6a9e74516557b49b6fc6a651"; }; propagatedBuildInputs = [ pkgs.gnutls ]; diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index e9b33f330813..441fdc85bac2 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -14,13 +14,13 @@ with stdenv.lib; buildPythonPackage rec { pname = "GooCalendar"; - version = "0.7.0"; + version = "0.7.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "14m05pi1vwl7i8iv1wvc0r3450dlivsh85f4cyny08l869cr9lf1"; + sha256 = "1ccvw1w7xinl574h16hqs6dh3fkpm5n1jrqwjqz3ignxvli5sr38"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index ac7bcb5cd524..c70496b2b9fa 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.8.2"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "09g7v6yrf8p0kgmjnzy9d0fx9p1zngk2pmprf0bx19j1zc9jqj5z"; + sha256 = "0nfqf62g3l7ij779ind41p800ahdjijkhqx8nq6y029p98672c52"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index 2b6394ae6ba0..608ab9ccd1bc 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "google-pasta"; - version = "0.1.8"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "713813a9f7d6589e5defdaf21e80e4392eb124662f8bd829acd51a4f8735c0cb"; + sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9"; }; propagatedBuildInputs = [ @@ -20,6 +20,8 @@ buildPythonPackage rec { meta = { description = "An AST-based Python refactoring library"; homepage = "https://github.com/google/pasta"; + # Usually the tag message contains a one-line summary of the changes. + changelog = "https://github.com/google/pasta/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index f3209c2d5203..1efec99d8f72 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,14 +1,16 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 -, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, mock }: +, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio +, mock +}: buildPythonPackage rec { pname = "google-api-core"; - version = "1.16.0"; + version = "1.17.0"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "1qh30ji399gngv2j1czzvi3h0mgx3lfdx2n8qp8vii7ihyh65scj"; + sha256 = "12fn05x2fdhqmcaspjkkny2lh66hnnl0xf6pz3idxhlx8w5jl274"; }; propagatedBuildInputs = [ @@ -27,8 +29,13 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients."; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + description = "Core Library for Google Client Libraries"; + longDescription = '' + This library is not meant to stand-alone. Instead it defines common + helpers used by all Google API clients. + ''; + homepage = "https://github.com/googleapis/python-api-core"; + changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index d8c6a12aeaaf..92369abec6d3 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.11.3"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "05av4clwv7kdk1v55ibcv8aim6dwfg1mi4wy0vv91fr6wq3205zc"; + sha256 = "1xd7fi7vhqbbkvwjg5fgj8bkbfjwxx4f2bb0zsnj8wci46qk4dqv"; }; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; @@ -43,8 +43,14 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "This library simplifies using Google’s various server-to-server authentication mechanisms to access Google APIs."; - homepage = "https://google-auth.readthedocs.io/en/latest/"; + description = "Google Auth Python Library"; + longDescription = '' + This library simplifies using Google’s various server-to-server + authentication mechanisms to access Google APIs. + ''; + homepage = "https://github.com/googleapis/google-auth-library-python"; + changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; + # Documentation: https://googleapis.dev/python/google-auth/latest/index.html license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index 5d8f4b535393..04b767eaf025 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.6.0"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "7fec7b523ab5e1f87721ca61181114818579bb4d17de768a3993811c9d2aacfe"; + sha256 = "5ad4835c3a0f6350bcbbc42fd70e90f7568fca289fdb5e851888df394c4ebf80"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix index fb2d2bf4a68c..e474207634e1 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google_cloud_iot/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "6ead560b0701cf1fe11fe15fae68f09460f0d04fbafa0965fb6bd9e60775437c"; + sha256 = "ab1070003027e28c6956cee3f11228277830d191a1c38a809c96eb0baf8be670"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index d1d4217b3ccc..84fac88bcfa9 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.30.1"; + version = "0.30.2"; src = fetchPypi { inherit pname version; - sha256 = "03n9ahf4qiyamblh217m5bjc8n57gh09xz87l2iw84c81xxdfcpg"; + sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index f6c54be1279a..a0c5a10d86c4 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.15.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "1ra1cim9kcs680yrhvfn5hjx8y1sccp3lw7id5j5pj53sshdng8h"; + sha256 = "76f98f2614b503c8808f37b979602aca4d772b356f85c1f4b2a00b0d0d548472"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index bdf8031970f6..5ffaafdbd6f7 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "21b597b18ee2b9b9a5e2e05a7a1d47173f8f3adeada36b5bdf6cb816114430bf"; + sha256 = "2e5adbc0e88f296b1bc8667f1dcf26ca4ea2db6596f07cb0a39e7b1b8ef14656"; }; propagatedBuildInputs = [ google_api_core ]; diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index e9c7eecbc3a7..40c8f2596bb1 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "2a8fd188afe1cbfd5998bf20602f76b0336aa892de88fe842a806b9a3ed78d2a"; + sha256 = "97155236971970382b738921f978a6f86a7b5a0b0311703d991e065d3cb55773"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 9499a9a6fe2c..16341e718084 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "graphite-web"; - version = "1.1.6"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "f4c293008ad588456397cd125cdad7f47f4bab5b6dd82b5fb69f5467e7346a2a"; + sha256 = "b3cb3b9affe1b9e3777aab046416b3d545390ceea4d35d55c753b1e4732eaad0"; }; patches = [ diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index f6cff7411d21..c325c9652491 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "0.4.15"; + version = "0.4.16"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc"; + sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 9534e4165504..34e8c7ff16ff 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "grequests"; - version = "0.4.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8aeccc15e60ec65c7e67ee32e9c596ab2196979815497f85cf863465a1626490"; + sha256 = "0rpnim3ppxjdsaa869h1jdimcyc66mamcs593rd7brk8cq68kv3x"; }; # No tests in archive diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index f3eb93cd0605..4b28e07a6cee 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.28.1"; + version = "1.29.0"; src = fetchPypi { inherit pname version; - sha256 = "adf089aaf6e21358b12e39d9fa7c28611340d8399a918c0b72ff122ce9b7e0af"; + sha256 = "0f681c1ebd5472b804baa391b16dc59d92b065903999566f4776bfbd010bcec9"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 11080d3fbc84..00d05e189126 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - sha256 = "II3zFI1z2fQW0BZWRzdYXY6nY9kSAXMtRLX+aIxiiKg="; + sha256 = "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390"; }; nativeBuildInputs = [ @@ -45,6 +45,13 @@ buildPythonPackage rec { url = "https://github.com/GStreamer/gst-python/commit/f98c206bdf01529f8ea395a719b10baf2bdf717f.patch"; sha256 = "04n4zrnfivgr7iaqw4sjlbd882s8halc2bbbhfxqf0sg2lqwmrxg"; }) + ] ++ [ + # Fix linking against Python 3.8 + # https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/30 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-python/commit/22f28155d86e27c4134de4ed2861264003fcfd23.patch"; + sha256 = "Y70qVguHUBmmRVMFBKAP0d6anBQw5W0TKyu2bAwxbQg="; + }) ]; mesonFlags = [ diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 0a6a6c50e07c..d0c1e74ee290 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "2dcd3f2acaf6c1a864f903f084ddd6a6b753f3107ae864355d7c8c1e9cb205b2"; + sha256 = "1c530pb0h34z0ziym256qps21b8mh533ia1lcnx9wqwx9rnqriki"; }; # Tests require more packages. diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index c267b6d47267..6d432fed0e4e 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "h2"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1d1svhixk3hr78ph3nx8wi7sagx1xrvm712mmk028i2rhb92p8xq"; + sha256 = "051gg30aca26rdxsmr9svwqm06pdz9bv21ch4n0lgi7jsvml2pw7"; }; propagatedBuildInputs = [ enum34 hpack hyperframe ]; diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix new file mode 100644 index 000000000000..b80a91037179 --- /dev/null +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, h5py +, pytestCheckHook +, netcdf4 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "h5netcdf"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0df12f4692817cf6d8e2fca95f689e61aa68f2f39aea90fd1790fe5ac8d2cbb"; + }; + + propagatedBuildInputs = [ + h5py + ]; + + checkInputs = [ + pytestCheckHook + netcdf4 + ]; + + disabled = pythonOlder "3.6"; + + dontUseSetuptoolsCheck = true; + + meta = { + description = "netCDF4 via h5py"; + homepage = https://github.com/shoyer/h5netcdf; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index d6438c6a5b8b..cf119c1dec56 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, ffmpeg, async-timeout }: +, ffmpeg_3, async-timeout }: buildPythonPackage rec { pname = "ha-ffmpeg"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42"; }; - buildInputs = [ ffmpeg ]; + buildInputs = [ ffmpeg_3 ]; propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 9f2614178848..6ee76e5271a7 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.25"; + version = "0.8.26"; src = fetchPypi { inherit pname version; - sha256 = "17mi4nlifaygfw3n5ark5mfzx71pjxz3h6l455sh0i5mzh6czk4j"; + sha256 = "0zlj2y42f0hrklviv21j9m895259ad8273dxgh7b44702781r9l1"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/helpdev/default.nix b/pkgs/development/python-modules/helpdev/default.nix index 5977ec3aee23..c4caf0e46add 100644 --- a/pkgs/development/python-modules/helpdev/default.nix +++ b/pkgs/development/python-modules/helpdev/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "helpdev"; - version = "0.6.10"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "9e61d24458b7506809670222ca656b139e67d46c530cd227a899780152d7b44e"; + sha256 = "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix new file mode 100644 index 000000000000..29a29a3b6522 --- /dev/null +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, pytest +, mock +, dcm2niix +, nibabel +, pydicom +, nipype +, dcmstack +, etelemetry +, filelock +}: + +buildPythonPackage rec { + version = "0.8.0"; + pname = "heudiconv"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + #sha256 = "0gzqqa4pzhywdbvks2qjniwhr89sgipl5k7h9hcjs7cagmy9gb05"; + sha256 = "1r6y93125mc84c09970ifps5xysp8ffp62rwlzili3q2k1m3fh4v"; + }; + + postPatch = '' + # doesn't exist as a separate package with Python 3: + substituteInPlace heudiconv/info.py --replace "'pathlib'," "" + ''; + + propagatedBuildInputs = [ + dcm2niix nibabel pydicom nipype dcmstack etelemetry filelock + ]; + + checkInputs = [ dcm2niix pytest mock ]; + + # test_monitor and test_dlad require 'inotify' and 'datalad' respectively, + # and these aren't in Nixpkgs + checkPhase = "pytest -k 'not test_dlad and not test_monitor' heudiconv/tests"; + + meta = with stdenv.lib; { + homepage = "https://heudiconv.readthedocs.io"; + description = "Flexible DICOM converter for organizing imaging data"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 5aabc20ebd96..ba70a25a68de 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "9.3.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1jqlckibf7wwrg7syx6mzqz6zsipmsl474rfpmin6j6axh4cdpn7"; + sha256 = "03kn1c62y6rb851wjhsaxkrwq223hkc4ij59i85999byyb2hyqad"; }; doCheck = false; diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix new file mode 100644 index 000000000000..f443c58723e8 --- /dev/null +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyyaml +, jinja2 +}: + +buildPythonPackage rec { + pname = "HiYaPyCo"; + version = "0.4.16"; + + src = fetchFromGitHub { + owner = "zerwes"; + repo = pname; + rev = "release-${version}"; + sha256 = "1ams9dp05yhgbg6255wrjgchl2mqg0s34d8b8prvql9lsh59s1fj"; + }; + + propagatedBuildInputs = [ pyyaml jinja2 ]; + + checkPhase = '' + set -e + find test -name 'test_*.py' -exec python {} \; + ''; + + meta = with lib; { + description = "A simple python lib allowing hierarchical overlay of config files in YAML syntax, offering different merge methods and variable interpolation based on jinja2."; + homepage = "https://github.com/zerwes/hiyapyco"; + license = licenses.gpl3; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index eeaf449971b8..1620109e82d3 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.10.1"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "1dx39krafb6cdnd7h5vgwmw4y075s6k3d31a6vhwvqhmdig3294h"; + sha256 = "5a91324fcaa4c72a0fe9a13601436f65ee33b2ef033686f4e2228d58a7631970"; }; propagatedBuildInputs = [ six dateutil convertdate ]; diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix index e8aec6781fa3..a4ecb0d7ba3b 100644 --- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix +++ b/pkgs/development/python-modules/homeassistant-pyozw/default.nix @@ -2,12 +2,12 @@ python_openzwave.overridePythonAttrs (oldAttrs: rec { pname = "homeassistant_pyozw"; - version = "0.1.7"; + version = "0.1.10"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2d500638270ee4f0e7e9e114d9b4402c94c232f314116cdcf88d7c1dc9a44427"; + sha256 = "47c1abd8f3dc287760471c6c7b5fad222ead64763c4cb25e37d0599ea3b26952"; }; patches = []; diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix index 28fa42b70f04..d12d3bc8c832 100644 --- a/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "hsaudiotag3k"; - version = "1.1.3"; + version = "1.1.3.post1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0bv5k5594byr2bmhh77xv10fkdpckcmxg3w380yp30aqf83rcsx3"; + sha256 = "ef60e9210d4727e82f0095a686cb07b676d055918f0c59c5bfa8598da03e59d1"; }; # no tests diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 6f2bf5d511d5..635ad7a283ee 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.3.31"; + version = "2020.5.19"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "12hncxzawvdsrssl350xxn1byfm1firgd3ziqfll4xhhw403jaa9"; + sha256 = "09a5vajzw3f2kpdq9ydzx1f840xmdmzb6br3ns79mnqnsw6nfs6z"; }; # tests require network connection diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index ee8a83a098c9..ccbc157837c3 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { description = "A configurable HTML Minifier with safety features"; homepage = "https://pypi.python.org/pypi/htmlmin"; license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.ahmedtd]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 719a6a966c64..5495c806dc0f 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.17.0"; + version = "0.17.4"; src = fetchPypi { inherit pname version; - sha256 = "0qc2vn98a4icp3h04pdhiykddz5q6wfi905f19zfxl26kyjd15ny"; + sha256 = "1e9340ecf0187a621bdcfb407c32e04e8e09fc6ab28b050efa38f20eae0e975f"; }; # Needs setting up diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix new file mode 100644 index 000000000000..28a801de71a6 --- /dev/null +++ b/pkgs/development/python-modules/huey/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, redis }: + +buildPythonPackage rec { + pname = "huey"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "coleifer"; + repo = pname; + rev = version; + sha256 = "1hgic7qrmb1kxvfgf2qqiw39nqyknf17pjvli8jfzvd9mv7cb7hh"; + }; + + propagatedBuildInputs = [ redis ]; + + # connects to redis + doCheck = false; + + meta = with lib; { + description = "A little task queue for python"; + homepage = "https://github.com/coleifer/huey"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 08867aa67086..d68e12b37732 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.0"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "0s0705lk3i1srsjxqhqv9sc2m54fj8lbflxz9gyxf4igxaa6vj1f"; + sha256 = "391b558a465d1919a2862926ab9a7c6bef1f2ac2c46daf8dd5115080c42978e4"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 0bf09419c0cb..d787b6113355 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -13,17 +13,22 @@ , networkx , streamz , colorcet +, pythonImportsCheckHook }: buildPythonPackage rec { pname = "hvplot"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "408a7756b980df148d1f2fd59cd690ad4870d7e3c3c5e46c6b5c2e71fc6a097c"; + sha256 = "8fcf2f251bd9d4b0390d9c272c992aa75e11174829e416a22de8fba38acc1ce9"; }; + nativeBuildInputs = [ + pythonImportsCheckHook + ]; + checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ]; propagatedBuildInputs = [ bokeh @@ -39,6 +44,10 @@ buildPythonPackage rec { # many tests require a network connection doCheck = false; + pythonImportsCheck = [ + "hvplot.pandas" + ]; + meta = with lib; { description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; homepage = "https://hvplot.pyviz.org"; diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix new file mode 100644 index 000000000000..5b086d5f1a7f --- /dev/null +++ b/pkgs/development/python-modules/hypothesis/2.nix @@ -0,0 +1,45 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, isPy3k, attrs, coverage, enum34, pexpect +, doCheck ? true, pytest, pytest_xdist, flaky, mock +, sortedcontainers +}: +buildPythonPackage rec { + # https://hypothesis.readthedocs.org/en/latest/packaging.html + + # Hypothesis has optional dependencies on the following libraries + # pytz fake_factory django numpy pytest + # If you need these, you can just add them to your environment. + + version = "4.57.1"; + pname = "hypothesis"; + + # Use github tarballs that includes tests + src = fetchFromGitHub { + owner = "HypothesisWorks"; + repo = "hypothesis-python"; + rev = "hypothesis-python-${version}"; + sha256 = "1qcpcrk6892hzyjsdr581pw6i4fj9035nv89mcjrcrzcmycdlfds"; + }; + + postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; + + propagatedBuildInputs = [ + attrs + coverage + sortedcontainers + ] ++ lib.optional (!isPy3k) enum34; + + checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; + inherit doCheck; + + checkPhase = '' + rm tox.ini # This file changes how py.test runs and breaks it + py.test tests/cover + ''; + + meta = with lib; { + description = "A Python library for property based testing"; + homepage = "https://github.com/HypothesisWorks/hypothesis"; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 834f1039fd74..f79fe028203e 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub , isPy3k, attrs, coverage, enum34, pexpect , doCheck ? true, pytest, pytest_xdist, flaky, mock +, sortedcontainers }: buildPythonPackage rec { # https://hypothesis.readthedocs.org/en/latest/packaging.html @@ -9,7 +10,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "4.41.0"; + version = "5.11.0"; pname = "hypothesis"; # Use github tarballs that includes tests @@ -17,12 +18,16 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "09bpwp4kdywkmzci969m57w0yy8c31kzwg60vg4mvrmmgyi2cfzv"; + sha256 = "1ca2dwih65s4r8vazwqm963ywngdr3v854ldnfyny7bvx1v28m8k"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = [ + attrs + coverage + sortedcontainers + ] ++ lib.optional (!isPy3k) enum34; checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; inherit doCheck; diff --git a/pkgs/development/python-modules/iapws/default.nix b/pkgs/development/python-modules/iapws/default.nix index 3bffcfb914b6..3605e88edd34 100644 --- a/pkgs/development/python-modules/iapws/default.nix +++ b/pkgs/development/python-modules/iapws/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "iapws"; - version = "1.4"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "3d7a7a17343157dacd3f654b7f82d1974492209756c4de99332d4f6b375227e6"; + sha256 = "d65c813bb6b100a8d1ed79e00148832a0321b3063e9632a990344890acb02493"; }; propagatedBuildInputs = [ scipy ]; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 1418c925ebf8..81c97a0ee48e 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.5"; + version = "4.0.6"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "14ynjj65kfmlcvpb7k097w789wvxncd3cr3xz5m1jz9yl9v6vv5q"; + sha256 = "17wpvngxv9q333ng3hm4k1qhiafmzipr7l2liwny7ar24qiyfvvy"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index c0858605bd72..9f78298a3f3a 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.13"; + version = "1.4.19"; src = fetchPypi { inherit pname version; - sha256 = "12adarxndb9f5kgbfch9644h86jhbf6vc1d5c5iiqnjqws9n495b"; + sha256 = "249ebc7e2066d6393d27c1b1be3b70433f824a120b1d8274d362f1eb419e3b52"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index cd682072707d..785ec5814918 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest +, matplotlib , mock , pytorch , pynvml @@ -11,23 +12,23 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "15k6dd11yxn4923llcpmw4srl1by5ljhh7aw5pnkn4n4qpywh6cm"; + sha256 = "0i863kxi1r1hspj19lhn6r8256vdazjcyvis0s33fgzrf7kxi08x"; }; - checkInputs = [ pytest mock ]; + checkInputs = [ pytest matplotlib mock ]; + propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + # Some packages are not in NixPkgs; other tests try to build distributed + # models, which doesn't work in the sandbox. checkPhase = '' - pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon' tests/ + pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon and not conftest and not engines and not distrib_' tests/ ''; - # these packages are not currently in nixpkgs - - propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; meta = with lib; { description = "High-level training library for PyTorch"; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 5433e1ea9e41..ebb7f86f5afb 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -8,7 +8,7 @@ , pytest , numpy , isPy3k -, ffmpeg +, ffmpeg_3 , futures , enum34 }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ - imageio-ffmpeg ffmpeg + imageio-ffmpeg ffmpeg_3 ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index b2d15d5faa58..49a98d675e5f 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.6.1"; + version = "0.6.2"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "94f846ff8d19ee9ea42ba6feddfbc85d5b42098bd3b62318f8d3bc5c7133b274"; + sha256 = "942b9a7f2e1df831097fbee587c5c90a4cc6afa6105b23d3e30d8798f1a9b17d"; }; propagatedBuildInputs = [ scikitlearn ]; diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index c3b6b9c9e7e3..41dcc6b2c11e 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.11"; + version = "0.14"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d6850578a0dc6530ac19113cfe4ddc13903df635212d498f176fe601a8a5a4a3"; + sha256 = "0y0aqw29g525frdnmv9paljzacpp4s21sadfbca5b137iciwr8d0"; }; meta = { diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 1d71b15137c7..e973175b26a0 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.9.20"; + version = "0.9.21"; src = fetchPypi { inherit pname version; - sha256 = "43ebdb62e179113a55ccd4297316532582be71857b85d85ba187cd6146757397"; + sha256 = "912f812564e87c31a162cfe0626f3a6cbc5b6864deedbfefc31f6d321859ade3"; }; disabled = isPy3k; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 76545edcbeba..5a3137922475 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86"; + sha256 = "07icyggasn38yv2swdrd8z6i0plazmc9adavsdkbqqj91j53ll9l"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zipp ] ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; - checkInputs = [ importlib-resources packaging ]; + doCheck = false; # Cyclic dependencies. # removing test_main.py - it requires 'pyflakefs' # and adding `pyflakefs` to `checkInputs` causes infinite recursion. diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 6fba0a703e16..7faefd4c0e1e 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, pathlib2 +, setuptools_scm +, toml +, importlib-metadata , typing -, isPy3k +, singledispatch , pythonOlder , python }: buildPythonPackage rec { pname = "importlib_resources"; - version = "1.0.2"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078"; + sha256 = "1jilyxyb2z7hzcjhx1ddni52mq00i728wqh8f5k4469yhdkdz1vg"; }; + nativeBuildInputs = [ setuptools_scm toml ]; propagatedBuildInputs = [ - ] ++ lib.optional (!isPy3k) pathlib2 + importlib-metadata + ] ++ lib.optional (pythonOlder "3.4") singledispatch ++ lib.optional (pythonOlder "3.5") typing ; diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix index ce265d013785..4a1543083432 100644 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ html5lib ]; - propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg pkgs.swftools pkgs.rtmpdump ]; + propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; meta = with stdenv.lib; { description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 6cbf694955cb..ca22dc4a9f97 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -11,6 +11,7 @@ , numpy , pandas , panel +, pyarrow , python-snappy , requests , ruamel_yaml @@ -22,16 +23,16 @@ buildPythonPackage rec { pname = "intake"; - version = "0.5.4"; + version = "0.5.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "81c3bdadbb81ec10c923b89e118c229d977a584ccbe27466f8fde41c0c274c3f"; + sha256 = "0ypgf0046hln27gjcy7gjh4diblgmivkf7kxbcy1mjvwka55bdmw"; }; - checkInputs = [ pytest ]; + checkInputs = [ pyarrow pytest ]; propagatedBuildInputs = [ appdirs dask diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index f9caaa058cb0..d862e3d2abbc 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -1,22 +1,37 @@ -{ buildPythonPackage, fetchFromGitHub, pytest, six, clint, pyyaml, docopt -, requests, jsonpatch, args, schema, responses, backports_csv, isPy3k -, lib, glibcLocales, setuptools }: +{ buildPythonPackage +, fetchFromGitHub +, pytest +, six +, tqdm +, pyyaml +, docopt +, requests +, jsonpatch +, args +, schema +, responses +, backports_csv +, isPy3k +, lib +, glibcLocales +, setuptools +}: buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.0"; + version = "1.9.3"; # Can't use pypi, data files for tests missing src = fetchFromGitHub { owner = "jjjake"; repo = "internetarchive"; rev = "v${version}"; - sha256 = "1h344c04ipzld4s7xk8d84f80samjjlgzvv3y8zsv0n1c895gymb"; + sha256 = "19av6cpps2qldfl3wb9mcirs1a48a4466m1v9k9yhdznqi4zb0ji"; }; propagatedBuildInputs = [ six - clint + tqdm pyyaml docopt requests @@ -24,8 +39,7 @@ buildPythonPackage rec { args schema setuptools - backports_csv - ]; + ] ++ lib.optionals (!isPy3k) [ backports_csv ]; checkInputs = [ pytest responses glibcLocales ]; @@ -37,8 +51,9 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "A python wrapper for the various Internet Archive APIs"; + description = "A Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; license = licenses.agpl3; + maintainers = [ maintainers.marsam ]; }; } diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index a07dd9e727cf..8c1ca760df84 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1nn7gad0rvy492acpyhkrp01zsk86acf34qhsvq4xmm6x39788n5"; + sha256 = "dae041ff458e1ef05448aae3b76e8c2a176c4b7c6a9d5e8ce880f16251803661"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix new file mode 100644 index 000000000000..5134ffb2d6d2 --- /dev/null +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, pytest +, pytestcov +, nbval +, ipywidgets +, numpy +, six +, traittypes +}: + +buildPythonPackage rec { + pname = "ipydatawidgets"; + version = "4.0.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1h7cppy959q6x5rvkdjhzxhqh57s37i2xsish5rfavcqbp2xgk4g"; + }; + + propagatedBuildInputs = [ + ipywidgets + numpy + six + traittypes + ]; + + checkInputs = [ pytest pytestcov nbval ]; + + checkPhase = "pytest ipydatawidgets/tests"; + + meta = { + description = "Widgets to help facilitate reuse of large datasets across different widgets"; + homepage = "https://github.com/vidartf/ipydatawidgets"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 1e71e35de168..edf9d0863a19 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.1.4"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7f1f01df22f1229c8879501057877ccaf92a3b01c1d00db708aad5003e5f9238"; + sha256 = "1a3hr7wx3ywwskr99hgp120dw9ab1vmcaxdixlsbd9bg6ly3fdr9"; }; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; @@ -42,6 +42,9 @@ buildPythonPackage rec { "test_subprocess_print" "test_subprocess_error" "test_ipython_start_kernel_no_userns" + + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" ] ++ lib.optionals (pythonOlder "3.8") [ # flaky test https://github.com/ipython/ipykernel/issues/485 "test_shutdown" diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 578dfd306b1f..297b87d5745b 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.2.4"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0rf0dbpxf5z82bw8lsjj45r3wdd4wc74anz4wiiaf2rbjqlb1ivn"; + sha256 = "0a97b276c62db633e9e97a816282bdd166f9df74e28204f0c8fa54b71944cfdc"; }; buildInputs = [ nose ]; @@ -31,6 +31,8 @@ buildPythonPackage rec { # Requires access to cluster doCheck = false; + disabled = !isPy3k; + meta = { description = "Interactive Parallel Computing with IPython"; homepage = "http://ipython.org/"; diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix index 4c8086def330..9953868df5f3 100644 --- a/pkgs/development/python-modules/ipython/7.9.nix +++ b/pkgs/development/python-modules/ipython/7.9.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor fridh ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index fe89691431cb..692daa7b2f38 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.12.0"; + version = "7.15.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6"; + sha256 = "0ef1433879816a960cd3ae1ae1dc82c64732ca75cec8dab5a4e29783fb571d0e"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 2b03fd368d92..83e3ca14e586 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.3.1"; + version = "1.3.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "01kp7d8iyz04d0m4njhv8rg72daqmgd93bdljwyffzxg71pwq92a"; + sha256 = "24ed221dcc3878e70daebdbdffdf7fd2b2111164008ba4b5de6785b72eabf91f"; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 6b238163cb55..2c454fd9ce0c 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.0"; + version = "3.10.3"; src = fetchPypi { inherit pname version; - sha256 = "1p7iaa6ykvhalpv09svxs50hnp25j5nv1zzp42n5r7a7rw70wlf8"; + sha256 = "2295c01465fe19776b1f9432fd99fd24e61230d146ded2752e0d980ef6f4101f"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix new file mode 100644 index 000000000000..33504323802a --- /dev/null +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, protobuf +, websockets +}: + +buildPythonPackage rec { + pname = "iterm2"; + version = "1.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "089pln3c41n6dyh91hw9gy6mpm9s663lpmdc4gamig3g6pfmbsk4"; + }; + + propagatedBuildInputs = [ protobuf websockets ]; + + # The tests require pyobjc. We can't use pyobjc because at + # time of writing the pyobjc derivation is disabled on python 3. + # iterm2 won't build on python 2 because it depends on websockets + # which is disabled below python 3.3. + doCheck = false; + + pythonImportsCheck = [ "iterm2" ]; + + meta = with lib; { + description = "Python interface to iTerm2's scripting API"; + homepage = "http://github.com/gnachman/iTerm2"; + license = licenses.gpl2; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index efbec0fb8fa2..17ba3a2183a3 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "itypes"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { repo = pname; owner = "tomchristie"; rev = version; - sha256 = "0zkhn16wpslkxkq77dqw5rxa28nrchcb6nd3vgnxv91p4skyfm62"; + sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index a03aa9ec18bb..a9acf380da10 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "0.5.2"; + version = "0.7.0"; pname = "javaproperties"; src = fetchFromGitHub { owner = "jwodder"; repo = pname; rev = "v${version}"; - sha256 = "14hrp94cjj44yldf3k71wbq88cmlf01dfadi53gcirnsa56ddz5d"; + sha256 = "14dlzwr4gxlbgjy012i4pqs2rn2rmp21w8n1k1wwjkf26mcvrq5s"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 9ade29bece1b..e7942760b72c 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,23 +1,25 @@ { stdenv , buildPythonPackage -, fetchPypi, - ruamel_yaml -, ifconfig-parser +, fetchFromGitHub +, ruamel_yaml , xmltodict +, pygments , isPy27 }: buildPythonPackage rec { pname = "jc"; - version = "1.9.3"; + version = "1.11.2"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "1hg6h3ag4pbilpmqylnj7dflz7avk3w8ngmk6psfqrizizwx0hnj"; + src = fetchFromGitHub { + owner = "kellyjonbrazil"; + repo = "jc"; + rev = "v${version}"; + sha256 = "1gsvjgypjgw5a0k85kdvbbf7q6wspmv6z76acrgnidhav8sdn4dm"; }; - propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ]; + propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; meta = with stdenv.lib; { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output."; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index f937b2b12527..1813ce8cac17 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.4.1"; + version = "0.4.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "13806f91a96e9b2623fd2a81b950d763ee471454aafd9eb6d75dbe7afce428fb"; + sha256 = "3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 45f427017fc8..9f4b57ba8979 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.7.2"; + version = "0.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11jja4wlzcr2pwvp3blj1jg6570zr0mpcm3nzhkbkdrbgq6wa2fb"; + sha256 = "02q3d9b933hf8lyvg7w7lgmhij8bjs748vjmsfxhabai04a796d4"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 87c44d11a8c8..42e45d162bab 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "2.11.1"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250"; + sha256 = "89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 27de988b3bd4..a53c7abee72f 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1pimyq95w99ik5av96j0n9i6n12mr9kk0y28jnrq0555d7hmii8r"; + sha256 = "006yvxw6xv6qzcqpxm8jcf21gmdn0z4vp8njdbvk023mmq05k3h4"; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix new file mode 100644 index 000000000000..9f2143e2f20d --- /dev/null +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nbformat +, sphinx +, ipywidgets +, pythonOlder +}: + +buildPythonPackage rec { + pname = "jupyter-sphinx"; + version = "0.2.4"; + + src = fetchPypi { + inherit version; + pname = "jupyter_sphinx"; + sha256 = "b5ba1efdd1488b385de0068036a665932ed93998e40ce3a342c60f0926781fd9"; + }; + + propagatedBuildInputs = [ nbformat sphinx ipywidgets ]; + + doCheck = false; + + disabled = pythonOlder "3.5"; + + meta = with lib; { + description = "Jupyter Sphinx Extensions"; + homepage = "https://github.com/jupyter/jupyter-sphinx/"; + license = licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix new file mode 100644 index 000000000000..8ce8150cbd47 --- /dev/null +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, traitlets +, jupyter_core +, pyzmq +, dateutil +, isPyPy +, py +, tornado +}: + +buildPythonPackage rec { + pname = "jupyter_client"; + version = "5.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; + }; + + propagatedBuildInputs = [ + traitlets + jupyter_core + pyzmq + dateutil + tornado + ] ++ lib.optional isPyPy py; + + # Circular dependency with ipykernel + doCheck = false; + + meta = { + description = "Jupyter protocol implementation and client libraries"; + homepage = "https://jupyter.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 4855663ebc7d..008a74dfb3ed 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.3.4"; + version = "6.1.3"; src = fetchPypi { inherit pname version; - sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; + sha256 = "3a32fa4d0b16d1c626b30c3002a62dfd86d6863ed39eaba3f537fade197bb756"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index c10f30268763..fe40a3f09c48 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.6.1"; + version = "4.6.3"; src = fetchPypi { inherit pname version; - sha256 = "a183e0ec2e8f6adddf62b0a3fc6a2237e3e0056d381e536d3e7c7ecc3067e244"; + sha256 = "394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e"; }; checkInputs = [ pytest mock glibcLocales nose ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index d3b67ba87bc0..8d08fec6f5d9 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.1.0"; + version = "2.1.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "10fwpgsi996nk2hcva14k8x6znczxgfmydvfsfrs1fpmmfmrl8wc"; + sha256 = "7b5bd4a05330a01c8522ee7f1cda5cb2e0d96412d9e1e879a19b3afb63d4ac69"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index db9fd195ae52..9185c2940060 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.1.0"; + version = "1.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0cqpyy4jr3023c47ij08djkpx526gmz8fab45mcnws0glhp7xhms"; + sha256 = "3398e401b95da868bc96bdaa44fa61252bf3e68fc9dd1645bd93293cce095f6c"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 8b2d56277cef..cee21edd2438 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "126lmz702hbk7gyr4i6gkicmycx7zgsgjf47a6izq2d17bs0a9ji"; + sha256 = "58b4c6bf48ba2e18bfc2d8358e852b6e3538ff664843398be09157c184ee1a27"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 953a58950349..1c85fbd29af4 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.7"; + version = "2.0.1"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "2f29baad4b3efe05a2bb81ac268855aa01cbc68397f15bac77b494ffd7e2cada"; + sha256 = "1y7ny81rihnhc8lj921d76ir4kf4aj5iy35szgim8zccxhnx96p5"; }; checkInputs = [ pytest six mock ]; diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index cb4b6d249b60..d62a179136f4 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1r98nm4k1svsqjyaqkfk23i31bl1kcfcyp7094yyj3c43phfp3as"; + sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 6fcb31a94589..27d225c6f7cf 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -5,15 +5,17 @@ , pytest , pytz , sqlalchemy +, importlib-metadata +, pythonOlder }: buildPythonPackage rec { pname = "kombu"; - version = "4.6.8"; + version = "4.6.10"; src = fetchPypi { inherit pname version; - sha256 = "0xlv1rsfc3vn22l35csaj939zygd15nzmxbz3bcl981685vxl71d"; + sha256 = "437b9cdea193cc2ed0b8044c85fd0f126bb3615ca2f4d4a35b39de7cacfa3c1a"; }; postPatch = '' @@ -23,7 +25,11 @@ buildPythonPackage rec { --replace "amqp==2.5.1" "amqp~=2.5" ''; - propagatedBuildInputs = [ amqp ]; + propagatedBuildInputs = [ + amqp + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = [ pytest case pytz Pyro4 sqlalchemy ]; # test_redis requires fakeredis, which isn't trivial to package diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 4426e9cb9a88..f5686c1afb40 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -8,17 +8,16 @@ buildPythonPackage rec { pname = "langcodes"; - version = "1.4.1"; + version = "2.0.0"; + disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "1axdiva2qglsjmnx2ak7i6hm0yhp6kbc4lcsgn8ckwy0nq1z3kr2"; + sha256 = "0xszgmydymzhb0dhx5qvdn3x5z477ld0paw17lwwhlrxffkq5jxz"; }; propagatedBuildInputs = [ marisa-trie ]; - disabled = pythonOlder "3.3"; - checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 2873c8f96220..3514d5da9a23 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -1,16 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ stdenv, buildPythonPackage, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "latexcodec"; - version = "1.0.7"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0wnp3yqcgx0rpy8dz51vh75lbp2qif67da19zi7m3ca98n887hgb"; + sha256 = "0pyzhidpnc3q3rh9d5hxhzv99rl5limyyrll7xcyssci92fn8gyd"; }; propagatedBuildInputs = [ six ]; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + meta = { homepage = "https://github.com/mcmtroffaes/latexcodec"; description = "Lexer and codec to work with LaTeX code in Python"; diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index 72e3c7f1cf77..6c5112312bb3 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "launchpadlib"; - version = "1.10.10"; + version = "1.10.13"; src = fetchPypi { inherit pname version; - sha256 = "740580d72611452804ad7735c9af6944ed4a14fc1a2fcbcddba3fc719b5317f3"; + sha256 = "5804d68ec93247194449d17d187e949086da0a4d044f12155fad269ef8515435"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix new file mode 100644 index 000000000000..743604d539ba --- /dev/null +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest +, pytest_xdist +, six }: + +buildPythonPackage rec { + pname = "lazy_import"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gca9xj60qr3aprj9qdc66crr4r7hl8wzv6gc9y40nclazwawj91"; + }; + + checkInputs = [ + pytest + pytest_xdist + ]; + + propagatedBuildInputs = [ + six + ]; + + checkPhase = '' + cd lazy_import + pytest --boxed + ''; + + meta = with stdenv.lib; { + description = "lazy_import provides a set of functions that load modules, and related attributes, in a lazy fashion."; + homepage = https://github.com/mnmelo/lazy_import; + license = licenses.gpl3; + maintainers = [ maintainers.marenz ]; + }; +} diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index d96946337049..eb2d09d8d264 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.6.1"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "0ag5xqlki6pjk3f50b8ar8vynx2fmkna7rfampv3kdgwg8z6gjr7"; + sha256 = "1h1q8g1c2nkhx8p5n91bzkvjx5js5didi9xqbnmfrxqbnyc45w0p"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index a3f795f254e8..cd5f0aef648c 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.5.0"; + version = "4.6.1"; format = "other"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix new file mode 100644 index 000000000000..ab00340cfe19 --- /dev/null +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, isPy27, fetchPypi }: + +buildPythonPackage rec { + pname = "libevdev"; + version = "0.7"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python wrapper around the libevdev C library"; + homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev"; + license = licenses.mit; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 6bd917a69e37..ade83d6721ae 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "cca58a2d9a47e35be63a3ce36482d241453bfe9b14bde2005430f969bd7d013a"; + sha256 = "656bbda80e98e6330db1ead79cd084b13a762284834d7603fcf7cf7c0dc65f3c"; }; propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile ]; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index c7b12e3daf56..32717e127fb8 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.5.0"; + version = "4.6.1"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1l3l8cgaxzqdk93880p2ijrabshdj5sq05cwj1i6jpmhlqc5b9rx"; + sha256 = "0nk8zl5b0b36wrrkj271ck4phzxsigkjsazndscjslc9nkldmnpq"; }; postPatch = '' diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index a60b023acd7e..8ff0f391f208 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -5,22 +5,21 @@ , isPyPy , ipython , python +, scikit-build }: buildPythonPackage rec { pname = "line_profiler"; - version = "2.1.2"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c"; + sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141"; }; - patches = [ ./python37.patch ]; + nativeBuildInputs = [ cython ]; - buildInputs = [ cython ]; - - propagatedBuildInputs = [ ipython ]; + propagatedBuildInputs = [ ipython scikit-build ]; disabled = isPyPy; @@ -37,5 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/rkern/line_profiler"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/line_profiler/python37.patch b/pkgs/development/python-modules/line_profiler/python37.patch deleted file mode 100644 index 0b6e93732c44..000000000000 --- a/pkgs/development/python-modules/line_profiler/python37.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 542baf59f3b2eada13bde48e8a89e484c2cfeeef Mon Sep 17 00:00:00 2001 -From: Hanaasagi <ambiguous404@gmail.com> -Date: Wed, 17 Apr 2019 06:46:03 +0000 -Subject: [PATCH] Support Python 3.7 Generator (PEP 479) - ---- - kernprof.py | 2 ++ - line_profiler.py | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/kernprof.py b/kernprof.py -index 108d36e..6461cf6 100755 ---- a/kernprof.py -+++ b/kernprof.py -@@ -102,6 +102,8 @@ def wrapper(*args, **kwds): - self.enable_by_count() - try: - item = g.send(input) -+ except StopIteration: -+ return - finally: - self.disable_by_count() - input = (yield item) -diff --git a/line_profiler.py b/line_profiler.py -index a481dd2..5744d05 100755 ---- a/line_profiler.py -+++ b/line_profiler.py -@@ -100,6 +100,8 @@ def wrapper(*args, **kwds): - self.enable_by_count() - try: - item = g.send(input) -+ except StopIteration: -+ return - finally: - self.disable_by_count() - input = (yield item) diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix new file mode 100644 index 000000000000..c58a18dffe8e --- /dev/null +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytest +, bokeh +, ipython +, matplotlib +, numpy +, nbconvert +, nbformat +}: + +buildPythonPackage rec { + pname = "livelossplot"; + version = "0.5.0"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "stared"; + repo = pname; + rev = "v${version}"; + sha256 = "164v65qglgyg38q9ajnas99rp14mvrk5hn8x76b8iy81vszmx1c0"; + }; + + propagatedBuildInputs = [ bokeh ipython matplotlib numpy ]; + + checkInputs = [ pytest nbconvert nbformat ]; + checkPhase = '' + pytest tests tests/external_test_examples.py + ''; + + meta = with stdenv.lib; { + description = "Live training loss plot in Jupyter for Keras, PyTorch, and others"; + homepage = "https://github.com/stared/livelossplot"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index da789c0f6a66..83bd4bcfb72c 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -7,7 +7,6 @@ , singledispatch , futures , isPy27 -, isPy33 }: buildPythonPackage rec { @@ -23,8 +22,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.makeWrapper ]; propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] - ++ stdenv.lib.optionals isPy27 [ singledispatch futures ] - ++ stdenv.lib.optionals isPy33 [ singledispatch ]; + ++ stdenv.lib.optionals isPy27 [ singledispatch futures ]; postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 0878424abb63..3a7f381e51c5 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -6,17 +6,18 @@ , pythonOlder , isPyPy , enum34 +, isPy3k }: buildPythonPackage rec { pname = "llvmlite"; - version = "0.31.0"; + version = "0.32.1"; - disabled = isPyPy; + disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "22ab2b9d7ec79fab66ac8b3d2133347de86addc2e2df1b3793e523ac84baa3c8"; + sha256 = "41262a47b8cbba5a09203b15b65fbdf11192f92aa226c81e99115acdee8f3b8d"; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 5763f3beb65d..01ff1458c0fa 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "m3u8"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "globocom"; repo = pname; rev = version; - sha256 = "1a2c7vqcysxkaffk40zg8d60l9hpjk0dw221fy9cg72i8jxq1gmm"; + sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p"; }; checkInputs = [ bottle pytest pytestcov ]; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index fe68b507ecf4..94b575f3f468 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,20 +2,24 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.9.3"; + version = "3.12.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0v6hgsz6yvp6csgx4y440ksqj24rdsd06vyfqcihiy3dfvp9229y"; + sha256 = "0p851jlly6bzcs70kd1lcjwmg4scwh1icymfc0f2y6rkh4kfsdhk"; }; LC_ALL = "en_US.utf-8"; + # remove version bounds + prePatch = '' + sed -i -e 's/==.*//g' requirements.txt + '' # ipaddress is part of the standard library of Python 3.3+ - prePatch = lib.optionalString (!pythonOlder "3.3") '' + + lib.optionalString (!pythonOlder "3.3") '' substituteInPlace requirements.txt \ --replace "ipaddress" "" ''; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 247a7ed1b004..45dfc55ae9a8 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -2,20 +2,16 @@ buildPythonPackage rec { pname = "mailmanclient"; - version = "3.3.0"; + version = "3.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c8736cbe152ae1bd58b46ccfbcafb6a1e301513530772e7fda89f91d1e5c1ae9"; + sha256 = "0pjgzpvhdb6ql8asb20xr8d01m646zpghmcp9fmscks0n1k4di4g"; }; propagatedBuildInputs = [ six httplib2 requests ]; - # no tests with Pypi tar ball, checkPhase removes setup.py which invalidates import check - doCheck = false; - pythonImportsCheck = [ "mailmanclient" ]; - meta = with stdenv.lib; { homepage = "https://www.gnu.org/software/mailman/"; description = "REST client for driving Mailman 3"; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index a9310af1432f..362e34157676 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.4.2"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "0f8pzi7ip82p7hn6d9xrgp5wsl4s3w6gmjsgb8gjy2606f7czqyg"; + sha256 = "0csvk3y0y2r9gnfqj91fiqprgp8dxiv4n80b6myraab5s7zn1mvv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 6556ade818a2..beddba84fbc6 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.2"; + version = "1.5.4"; pname = "maxminddb"; src = fetchPypi { inherit pname version; - sha256 = "d0ce131d901eb11669996b49a59f410efd3da2c6dbe2c0094fe2fef8d85b6336"; + sha256 = "f4d28823d9ca23323d113dc7af8db2087aa4f657fafc64ff8f7a8afda871425b"; }; propagatedBuildInputs = [ ipaddress ]; diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 893dfb0251d2..cbc8084c232d 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "0.996.3"; + version = "0.996.5"; src = fetchPypi { inherit pname version; - sha256 = "1cedc968ef5bcbb2a6ece3bb4eb26e9569d89f3277dc2066ea0ce1341ab7d3b9"; + sha256 = "e7f09caf136903ce908b8b001ffc178d6caa129c1550d47d8f7f733a213749a8"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 247523a9a830..2941505184de 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "meinheld"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "447de7189e4dc9c1f425aa1b9c8210aab492fda4d86f73a24059264e7d8b0134"; + sha256 = "008c76937ac2117cc69e032dc69cea9f85fc605de9bac1417f447c41c16a56d6"; }; propagatedBuildInputs = [ greenlet ]; diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix index 013bd56aa3d8..b2f514623315 100644 --- a/pkgs/development/python-modules/meld3/default.nix +++ b/pkgs/development/python-modules/meld3/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "meld3"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1fbyafwi0d54394hkmp65nf6vk0qm4kipf5z60pdp4244rvadz8y"; + sha256 = "3ea266994f1aa83507679a67b493b852c232a7905e29440a6b868558cad5e775"; }; doCheck = false; diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index a324c8d7d08f..dbe9597ea0cc 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "minidb"; - version = "2.0.3"; + version = "2.0.4"; disabled = !isPy3k; src = fetchFromGitHub { owner = "thp"; repo = "minidb"; rev = version; - sha256 = "0c6y3x957pc5sxkl34lymhkwpn4nlsfw07fcv4y9p2zdb7kjd1gc"; + sha256 = "0i607rkfx0rkyllcx4vf3w2z0wxzs1gqigfw87q90pjrbbh2q4sb"; }; # module imports are incompatible with python2 diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index a3d6cb8879ea..6fdc962cdb46 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -1,19 +1,34 @@ { lib, buildPythonPackage, isPy3k, fetchPypi -, urllib3, future, python-dateutil , pytz, faker, mock, nose }: +, configparser +, faker +, future +, mock +, nose +, python-dateutil +, pytz +, pytestCheckHook +, urllib3 +}: buildPythonPackage rec { pname = "minio"; - version = "5.0.6"; + version = "5.0.10"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1p6gnbapwzpg7h0wv52fn4dd3dlhxl5qziadkiqjl8xaz8yp3vys"; + sha256 = "6ecb7637a35f806733e9d112eacfa599a58d7c3d4698fda2b5c86fff5d34b417"; }; - disabled = !isPy3k; + propagatedBuildInputs = [ + configparser + future + python-dateutil + pytz + urllib3 + ]; - checkInputs = [ faker mock nose ]; - propagatedBuildInputs = [ urllib3 python-dateutil pytz future ]; + checkInputs = [ faker mock nose pytestCheckHook ]; meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; diff --git a/pkgs/development/python-modules/mock/2.nix b/pkgs/development/python-modules/mock/2.nix new file mode 100644 index 000000000000..9ab8de1ba503 --- /dev/null +++ b/pkgs/development/python-modules/mock/2.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, funcsigs +, six +, pbr +, python +, pytest +}: + +buildPythonPackage rec { + pname = "mock"; + version = "3.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"; + }; + + propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; + + # On PyPy for Python 2.7 in particular, Mock's tests have a known failure. + # Mock upstream has a decoration to disable the failing test and make + # everything pass, but it is not yet released. The commit: + # https://github.com/testing-cabal/mock/commit/73bfd51b7185#diff-354f30a63fb0907d4ad57269548329e3L12 + #doCheck = !(python.isPyPy && python.isPy27); + doCheck = false; # Infinite recursion pytest + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + checkInputs = [ + pytest + ]; + + meta = with lib; { + description = "Mock objects for Python"; + homepage = "http://python-mock.sourceforge.net/"; + license = licenses.bsd2; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index de1ff58243e6..e905add00f5f 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -6,15 +6,16 @@ , six , pbr , python +, pytest }: buildPythonPackage rec { pname = "mock"; - version = "3.0.5"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"; + sha256 = "dd33eb70232b6118298d516bbcecd26704689c386594f0f3c4f13867b2c56f72"; }; propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; @@ -23,12 +24,17 @@ buildPythonPackage rec { # Mock upstream has a decoration to disable the failing test and make # everything pass, but it is not yet released. The commit: # https://github.com/testing-cabal/mock/commit/73bfd51b7185#diff-354f30a63fb0907d4ad57269548329e3L12 - doCheck = !(python.isPyPy && python.isPy27); + #doCheck = !(python.isPyPy && python.isPy27); + doCheck = false; # Infinite recursion pytest checkPhase = '' ${python.interpreter} -m unittest discover ''; + checkInputs = [ + pytest + ]; + meta = with lib; { description = "Mock objects for Python"; homepage = "http://python-mock.sourceforge.net/"; diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix new file mode 100644 index 000000000000..dc395a87a560 --- /dev/null +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mortgage"; + version = "1.0.5"; + + src = fetchPypi { + inherit version pname; + sha256 = "18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + doCheck = false; # No tests in sdist + + disabled = pythonOlder "3.5"; + + meta = { + description = "Mortgage calculator"; + license = lib.licenses.mit; + }; + +} diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 2daabf22d9e7..1e08d5dc3af2 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -25,13 +25,13 @@ assert advancedProcessing -> ( buildPythonPackage rec { pname = "moviepy"; - version = "1.0.2"; + version = "1.0.3"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "0ajw2xmcd962qw2kxxnbp08l5vgk5k78sls9bb227lw8aa51ln80"; + sha256 = "2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5"; }; # No tests, require network connection diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index a74150f971b0..e79f16b1c3b7 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mpv"; - version = "0.4.5"; + version = "0.4.6"; disabled = isPy27; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "1y80c2k4s42lzvm5dz8wi186i7rsn1vs1wn30hp6v6vs62fb91fi"; + sha256 = "1fh0fdv0k2yz7l6a62hf2svpgz34dzn84sh8fnv2x7wrkwd6r8qn"; }; buildInputs = [ mpv ]; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 10e62f5cc58f..705ae9b61ccb 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "16l2bmmm5pdlb61av5748mhy0lg9r965lmyn69is6mhsyr9zi38s"; + sha256 = "0pqprfgcsns89gmlm284zcvqnlsn3a5c46n1p33kdk53gyyym66y"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 354498836a97..9be30fff5383 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.4.3"; + version = "0.4.6.post0"; src = fetchPypi { inherit pname version; - sha256 = "a02c0069fb580c6a2dda9b98d40d34fda3840863112a5465ba9b54fa2ee005a5"; + sha256 = "dfcb0c9cb5850e656344ac464a260e7b8b9b1c62d77c2e1d3d9ef15a88f1df6b"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 16fea2898dd3..d818a63cd5d0 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multidict"; - version = "4.7.4"; + version = "4.7.6"; src = fetchPypi { inherit pname version; - sha256 = "d7d428488c67b09b26928950a395e41cc72bb9c3d5abfe9f0521940ee4f796d4"; + sha256 = "fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430"; }; checkInputs = [ pytest pytestrunner pytestcov ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 918d491083d6..3df8ce7c5ba6 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "6.2.0"; + version = "6.2.1"; checkInputs = [ pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "58c6fb2f355117e88a19808394ec1ed30a2ff881bdd2c81c436952caebd30668"; + sha256 = "c5944ffd2343141fa5679b17991c398e15105f3b35bb11beefe66c67e08289d5"; }; # testing based on project's tox.ini diff --git a/pkgs/development/python-modules/nbformat/2.nix b/pkgs/development/python-modules/nbformat/2.nix index faf2cee2b008..06d02520b20d 100644 --- a/pkgs/development/python-modules/nbformat/2.nix +++ b/pkgs/development/python-modules/nbformat/2.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "The Jupyter Notebook format"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh globin ]; + maintainers = with lib.maintainers; [ globin ]; }; } diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 35ee52b11ec6..2f8c57e00338 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.4"; + version = "5.0.6"; src = fetchPypi { inherit pname version; - sha256 = "562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a"; + sha256 = "049af048ed76b95c3c44043620c17e56bc001329e07f83fec4f177f0e3d7b757"; }; LC_ALL="en_US.utf8"; diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index 46d47fd1679c..8f263246893b 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.3.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "070e999db3902a0c62a94d76de8fb98da21eaee22d9e90eb42f1636c87e1b805"; + sha256 = "06as8vh17m0nkp3fpkp42m990a5zjfl2iaa17da99ksh7886mjpc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix new file mode 100644 index 000000000000..631beabea8a2 --- /dev/null +++ b/pkgs/development/python-modules/neo/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, numpy +, quantities +}: + +buildPythonPackage rec { + pname = "neo"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n74miad4dadavnzi1hqlyzyk795x7qq2adp71i011534ixs70ik"; + }; + + propagatedBuildInputs = [ numpy quantities ]; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests --exclude=iotest + ''; + + meta = with lib; { + homepage = "https://neuralensemble.org/neo/"; + description = "Package for representing electrophysiology data in Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 1934317a1120..27c959cee0fb 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.3.2"; + version = "1.3.3"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "0l43k0lx7r6izancfhhg68x82mvws2di1a9w2y12l1a446vr9q8l"; + sha256 = "75dad56eaa7078e2e29c6630f114077fc5060069658d74545b0409e63ca8a028"; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 751cc1395483..7ea6978b1cb5 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "3.0.1"; + version = "3.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "08nlny8vzkpjpyb0q943cq57m2s4wndm86chvd3d5qvar9z6b36k"; + sha256 = "40cc615801c8876306af1009a312f9c90752f1d79610fc1146917585b6f374dd"; }; propagatedBuildInputs = [ numpy scipy h5py pydicom ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 1e58aee503b2..c01715470f60 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "07eb764f2b7b39b487f806a067e394d8ebffff21f57cd1ecdb5c4030b7210210"; + sha256 = "cfc6cfda59a6f4247189f8ccf92e364de450460a15c0ec21bdb857c420dd198c"; }; postPatch = '' diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 436c9fe63794..06c6f9cb0c1f 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -31,6 +31,7 @@ , xvfbwrapper , pytestcov , codecov +, sphinx # other dependencies , which , bash @@ -49,11 +50,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.3.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71"; + sha256 = "1nr0z0k4xx1vswkp03g1lf8141mr4j2fbwd7wmpay4vz46qcp786"; }; postPatch = '' @@ -61,6 +62,10 @@ buildPythonPackage rec { --replace "/usr/bin/env bash" "${bash}/bin/bash" ''; + nativeBuildInputs = [ + sphinx + ]; + propagatedBuildInputs = [ click dateutil @@ -102,15 +107,14 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display' + LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display' ''; + pythonImportsCheck = [ "nipype" ]; meta = with stdenv.lib; { homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; - # tests hang, blocking reviews of other packages - broken = isPy38; }; } diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 17e4669b6bed..56387835cc6e 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,13 +9,17 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "2.3.2"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "18xj618zjs13ib7f996fnl0xiqig0w48yns45nvy3xab55wximdx"; + sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E="; }; + # The tests for this package require nix and network access. That's + # why we cannot execute them inside the building process. + doCheck = false; + propagatedBuildInputs = [ attrs click diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index f3f1c2b86c1b..14a67fe54ae5 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "nodeenv"; @@ -9,6 +9,10 @@ buildPythonPackage rec { sha256 = "ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a"; }; + propagatedBuildInputs = [ + setuptools + ]; + # Tests not included in PyPI tarball doCheck = false; diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index 8b8cce2f8245..37f39c44967c 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 5eef92a2879e..f65f5079b2c8 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -12,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.7"; + version = "0.6.8.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "09mrm7iz2wdrd7y2csbcidg6bkskjignx2pnifh4i8zlh0vm61bg"; + sha256 = "1rn6i2mcljhb9nmh8qj3slcmqzs9jx8s7j8r2b7685n7751h5ipj"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 8fbbdb677fd5..909a37c78295 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -4,7 +4,6 @@ , python , buildPythonPackage , isPy27 -, isPy33 , isPy3k , numpy , llvmlite @@ -14,19 +13,20 @@ }: buildPythonPackage rec { - version = "0.48.0"; + version = "0.49.1"; pname = "numba"; # uses f-strings disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9d21bc77e67006b5723052840c88cc59248e079a907cc68f1a1a264e1eaba017"; + sha256 = "89e1ad8215918036b0ffc53501888d44ed44c1f2cb09a9e047d06af5cd7e7a5a"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + propagatedBuildInputs = [numpy llvmlite] + ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch]; # Copy test script into $out and run the test suite. checkPhase = '' diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 5acdfd6f8c6d..b862319d9477 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.11.0"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1z6b740fpkr8fbbhw79l29hmwf76xcda6ni804sqz0jghm7883yy"; + sha256 = "1dil1rklb41m3v6a0i93ymimv453whsg1m9z6g0z17jbg7gmc98r"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 4a062ca7b97d..0c9bac973203 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -23,17 +23,25 @@ let library_dirs = "${blas}/lib:${lapack}/lib"; libraries = "lapack,lapacke,blas,cblas"; }; + lapack = { + include_dirs = "${lib.getDev lapack}/include"; + library_dirs = "${lapack}/lib"; + }; + blas = { + include_dirs = "${lib.getDev blas}/include"; + library_dirs = "${blas}/lib"; + }; }); }; in buildPythonPackage rec { pname = "numpy"; - version = "1.18.1"; + version = "1.18.5"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b6ff59cee96b454516e47e7721098e6ceebef435e3e21ac2d6c3b8b02628eb77"; + sha256 = "34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; diff --git a/pkgs/development/python-modules/oauthlib/3.1.nix b/pkgs/development/python-modules/oauthlib/3.1.nix new file mode 100644 index 000000000000..185ef9748637 --- /dev/null +++ b/pkgs/development/python-modules/oauthlib/3.1.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, mock +, pytest +, cryptography +, blinker +, pyjwt +}: + +buildPythonPackage rec { + pname = "oauthlib"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889"; + }; + + checkInputs = [ mock pytest ]; + propagatedBuildInputs = [ cryptography blinker pyjwt ]; + + checkPhase = '' + py.test tests/ + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/idan/oauthlib"; + description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; + maintainers = with maintainers; [ prikhi ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 6c6ddc29de98..bc2c8c1094c0 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , mock , pytest , cryptography @@ -9,12 +9,15 @@ }: buildPythonPackage rec { - version = "3.1.0"; pname = "oauthlib"; + version = "unstable-2020-05-08"; - src = fetchPypi { - inherit pname version; - sha256 = "bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889"; + # master supports pyjwt==1.7.1 + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "46647402896db5f0d979eba9594623e889739060"; + sha256 = "1wrdjdvlfcd74lckcgascnasrffg8sip0z673si4ag5kv4afiz3l"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 3e2c8bd499d1..6c0560bbaffc 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -18,29 +18,18 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.6.0"; + version = "1.7.0"; # Due to Protobuf packaging issues this build of Onnx with Python 2 gives - # errors on import + # errors on import. + # Also support for Python 2 will be deprecated from Onnx v1.8. disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0ig33jl3591041lyylxp52yi20rfrcqx3i030hd6al8iabzc721v"; + sha256 = "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy"; }; - # Remove the unqualified requirement for the typing package for running the - # tests. typing is already required for the installation, where it is - # correctly qualified so as to only be required for sufficiently old Python - # versions. - # This patch should be in the next release (>1.6). - patches = [ - (fetchpatch { - url = "https://github.com/onnx/onnx/commit/c963586d0f8dd5740777b2fd06f04ec60816de9f.patch"; - sha256 = "1hl26cw5zckc91gmh0bdah87jyprccxiw0f4i5h1gwkq28hm6wbj"; - }) - ]; - nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ @@ -61,13 +50,17 @@ buildPythonPackage rec { patchShebangs tools/protoc-gen-mypy.py ''; + preBuild = '' + export MAX_JOBS=$NIX_BUILD_CORES + ''; + # The executables are just utility scripts that aren't too important postInstall = '' rm -r $out/bin ''; - # The setup.py does all the configuration (running CMake) - dontConfigure = true; + # The setup.py does all the configuration + dontUseCmakeConfigure = true; meta = { homepage = "http://onnx.ai"; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index ce6a909a5bfc..d858d8ad4281 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.0.2"; + version = "3.0.3"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "eb68c08a72ac6d9812df181e88ebece3a68436364353eb6eda3bed863e3d73a6"; + sha256 = "547a9fc6aafcf44abe358b89ed4438d077e9d92e4f182c87e2dc294186dc4b64"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index 85753ffa0714..6bf0e451f040 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.1"; pname = "opt_einsum"; src = fetchPypi { inherit version pname; - sha256 = "edfada4b1d0b3b782ace8bc14e80618ff629abf53143e1e6bbf9bd00b11ece77"; + sha256 = "165r7rsl5j94kna4q3vsaq71z23lgxd9b20dgb6abrlas6c6mdw3"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 93adf7645978..b19e41116f02 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,15 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } : +{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.19.0"; + version = "0.19.2"; src = fetchPypi { inherit pname version; - sha256 = "0rdhymayyc6w1izlv1bf2wgx2dfxbp4k1vll5s1364isw60rjj8x"; + sha256 = "605a742d088f1ed9c946e824d0b3be94b5256931f8b230dae63e27a52c781b6d"; }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ dateutil pyproj pytz requests ]; + propagatedBuildInputs = [ dateutil pyproj pytz requests pyyaml ]; # 'tests' dir not included in pypy distribution archive. doCheck = false; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index ce6836f9f2bd..6a144478e94a 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "packaging"; - version = "20.1"; + version = "20.3"; src = fetchPypi { inherit pname version; - sha256 = "e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334"; + sha256 = "3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3"; }; propagatedBuildInputs = [ pyparsing six ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 0f4a35420865..5d7bb4a6d696 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "11j5s6hz29yh3rwa2rjgric0knbhp9shphd4i7hx00xr5wr2xx1j"; + sha256 = "b35d625282baa7b51e82e52622c300a1ca9f786711b2af7cbe64f1e6831f4126"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index 5b87593e0c67..f688d97c91d1 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -3,7 +3,7 @@ , fetchPypi }: -buildPythonPackage rec{ +buildPythonPackage rec { version = "1.4.2"; pname = "pandocfilters"; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index fe401d9483e2..27c2134f4f3e 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "panel"; - version = "0.8.3"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "0iz20k7mqn0560r4358yrzvrrfn00h8s6dim7p7y4icpgjw2mjnb"; + sha256 = "53340615f30f67f3182793695ebe52bf25e7bbb0751aba6f29763244350d0f42"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 39b324dd55c3..fbfb72bb8a09 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "kzA8nlglbjHDPEB7HRAY2dza1Umn/OYUu+ydbA1OJ5Y="; + sha256 = "15i79q6nr7gcpcafdz5797axmp6r3081sys07k1k2vi5b2g3qc4k"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index fb921bb2938a..77529c059afd 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "parameterized"; - version = "0.7.1"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "6a94dbea30c6abde99fd4c2f2042c1bf7f980e48908bf92ead62394f93cf57ed"; + sha256 = "190f8cc7230eee0b56b30d7f074fd4d165f7c45e6077582d0813c8557e738490"; }; # Tests require some python3-isms but code works without. diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 225ee12e51ac..790c7ef5cdbf 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "parfive"; - version = "1.0.0"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "15dc8466922c8fb1f814d3f7c3f3656191ac17b38fd7cc3350b9bf726e144ebb"; + sha256 = "90dfb05d0a65d00669f5245371a4b33cbebcb5cfba86f4aad7f956984394eefd"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 08af6dc2720e..bb09646b6b46 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.12.1"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "a5fca7000c6588d77bc65c28f3f21bfce03b5e44daa8f9f07c17fe364990d717"; + sha256 = "1h4m5df5grjpaf087g8ciishz5ajl28s3140s8bngppvy71f5m56"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index daaf845cdf0b..319f83f72755 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -8,19 +8,20 @@ , w3lib , lxml , cssselect +, isPy27 }: buildPythonPackage rec { pname = "parsel"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "08v76s6s4li7asnyz8a7gbp9vz522rv5apranyv76mb0lhmjd92d"; + sha256 = "0yawf9r3r863lwxj0n89i7h3n8xjbsl5b7n6xg76r68scl5yzvvh"; }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ]; + propagatedBuildInputs = [ six w3lib lxml cssselect ] ++ lib.optionals isPy27 [ functools32 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index 156da0885473..ab4aeba84b69 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-parsy/parsy"; description = "Easy-to-use parser combinators, for parsing in pure Python"; license = [ licenses.mit ]; - maintainers = with maintainers; [ aepsil0n ]; + maintainers = with maintainers; [ edibopp ]; }; } diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index c71e39ca111a..a51f1c003274 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "parver"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0jzyylcmjxb0agc4fpdnzdnv2ajvp99rs9pz7qcklnhlmy8scdqv"; + sha256 = "0a6jp17c1ag6b9yp5xgy9wvznk3g0v2f8gpwkcwxpyc9ygk98zdm"; }; propagatedBuildInputs = [ six attrs arpeggio ]; diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index a9c86513fe80..9d45f35d3657 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "paste"; - version = "3.2.2"; + version = "3.4.0"; src = fetchPypi { pname = "Paste"; inherit version; - sha256 = "15p95br9x7zjy0cckdy6xmhfg61cg49rhi75jd00svrnz234s7qb"; + sha256 = "16sichvhyci1gaarkjs35mai8vphh7b244qm14hj1isw38nx4c03"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 4180d1069e49..5e0be5fb62b0 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.4.4"; + version = "5.4.5"; src = fetchPypi { inherit pname version; - sha256 = "139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b"; + sha256 = "07f558fece33b05caf857474a366dfcc00562bca13dd8b47b2b3e22d9f9bf55c"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index def036d271c9..5fc61f644238 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.10.0"; + version = "1.13.1"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "0bpprn5wcz414pqpvwjpd5cc0838shkw2cfvrwfiilhr09bhxbhb"; + sha256 = "1l3jic687vnji952f4dp66jwiprpxskja9v4ffw3bpr6gxgq4syz"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index ace2b618ef22..979b116b7137 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200402"; + version = "20200517"; disabled = !isPy3k; @@ -11,18 +11,9 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26"; + sha256 = "00272pxkh6djm37yvlvgd06w7ycf35srwk6n3p58ppw5hgmpkhc2"; }; - patches = [ - # Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408 - (fetchpatch { - url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch"; - sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21"; - excludes = [ "CHANGELOG.md" ]; - }) - ]; - propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ]; checkInputs = [ nose ]; @@ -37,4 +28,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy marsam ]; }; } - diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index e35362326805..acbfc06850e4 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -1,6 +1,6 @@ {lib, fetchPypi, buildPythonPackage, numpy, pyparsing}: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "periodictable"; version = "1.5.2"; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 1165157feccf..1668cd94ade9 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPy3k , pythonOlder +, setuptools , aenum , pytest , pytestcov @@ -10,16 +11,16 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.10"; + version = "1.11"; src = fetchPypi { inherit pname version; - sha256 = "a26ba77127b363446955e8a5317b3194defb1c1bb9d2ed5e7d4830fd4f066d97"; + sha256 = "8463d60b9065daf26e3c0fa6e7515d2a4594847ab417be018858832a475105f1"; }; disabled = !isPy3k; - propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ]; + propagatedBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.6") [ aenum ]; checkInputs = [ pytest pytestcov ]; diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 03db8916d442..61ab5532ca9d 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.11.9"; + version = "1.11.10"; src = fetchPypi { inherit pname version; - sha256 = "77f8651450ccbde7d3036cfe93486a4eeeb5ade28d1ebc4b2ba186fea0023c56"; + sha256 = "1jrq6bhzwvz6db8ays8zff15hbk1iazs2qxrzvrnlkgxxjkp8p7n"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index ecfaf3c90780..ca1b5ba65da7 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "phik"; - version = "0.9.8"; + version = "0.9.12"; format = "wheel"; disabled = !isPy3k; src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "c398452c5c1eea153905666b289c6a153712cf3d58811fa41e2bbbd27a65d678"; + sha256 = "c4f86e5587e5b456e69bf69d95d07fe7aafc341c40f8f3a21dd5b52272e9ae7b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index f16bf3f014ce..2ba64faad31e 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.0"; + version = "8.12.5"; src = fetchPypi { inherit pname version; - sha256 = "0mnicas0c5av322d7k6m14j3c10axh9mcvn3vx99vhngdnb9j6hn"; + sha256 = "3586f19abeb92aa6b539d7a4757cb507cf54efcd78224e895caf20fbdde07c26"; }; meta = { diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index f1cfb362a80c..bbb4fcf19934 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -1,16 +1,22 @@ -{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }: +{ buildPythonPackage, isPy27, fetchFromGitHub, lib, ipaddress }: buildPythonPackage rec { pname = "piccata"; - version = "1.0.1"; - disabled = isPy3k; + version = "2.0.0"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "45f6c98c2ea809d445040888117f99bc3ee843490d86fecc5805ff5ea41508f7"; + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = pname; + rev = version; + sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; }; - propagatedBuildInputs = [ ipaddress ]; + propagatedBuildInputs = [ + ipaddress + ]; + + pythonImportsCheck = [ "piccata" ]; meta = { description = "Simple CoAP (RFC7252) toolkit"; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 2fb95cde9e95..86aef0d6adf9 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.11.0"; + version = "1.13.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0v9sraihad0vz8dv3zc5xm5f2ixwbpr2kfpya5s0mgnrn6l19nds"; + sha256 = "0fpsjrppka0mrmkbzysi1s072d18ilsnch4lhd21k2qmvxp2hpmk"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix new file mode 100644 index 000000000000..ad69f4f23450 --- /dev/null +++ b/pkgs/development/python-modules/pillow/6.nix @@ -0,0 +1,82 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy +, olefile +, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, openjpeg, libimagequant +, pytest, pytestrunner, pyroma, numpy +}: + +buildPythonPackage rec { + pname = "Pillow"; + version = "6.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; + }; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + checkPhase = '' + runHook preCheck + python -m pytest -v -x -W always + runHook postCheck + ''; + + propagatedBuildInputs = [ olefile ]; + + checkInputs = [ pytest pytestrunner pyroma numpy ]; + + buildInputs = [ + freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] + ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + # NOTE: The Pillow install script will, by default, add paths like /usr/lib + # and /usr/include to the search paths. This can break things when building + # on a non-NixOS system that has some libraries installed that are not + # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't + # build Pillow with this support). We patch the `disable_platform_guessing` + # setting here, instead of passing the `--disable-platform-guessing` + # command-line option, since the command-line option doesn't work when we run + # tests. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; + s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' + export LDFLAGS="-L${libwebp}/lib" + export CFLAGS="-I${libwebp}/include" + '' + # Remove impurities + + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; + + meta = with stdenv.lib; { + homepage = "https://python-pillow.github.io/"; + description = "Fork of The Python Imaging Library (PIL)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + maintainers = with maintainers; [ goibhniu prikhi ]; + }; +} diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index bdc1351be93e..cc9a77be7827 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,32 +1,37 @@ { stdenv, buildPythonPackage, fetchPypi, isPyPy , olefile , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, pytestrunner -, pytest +, openjpeg, libimagequant +, pyroma, numpy, pytestCheckHook +, isPy3k }: + buildPythonPackage rec { pname = "Pillow"; - version = "6.2.1"; + version = "7.1.2"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1"; + sha256 = "1pdh1zzdwxilvsjg6rnl4q810pc2p2y16q6lx9gzzihb25h9kd50"; }; - doCheck = !stdenv.isDarwin && !isPyPy; - # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 postPatch = '' rm Tests/test_imagefont.py ''; + # Disable darwin tests which require executables: `iconutil` and `screencapture` + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ]; + propagatedBuildInputs = [ olefile ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytestCheckHook pyroma numpy ]; buildInputs = [ - freetype libjpeg zlib libtiff libwebp tcl lcms2 ] + freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. @@ -45,6 +50,8 @@ buildPythonPackage rec { sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; @@ -61,8 +68,8 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; + homepage = "https://python-pillow.org/"; + description = "The friendly PIL fork (Python Imaging Library)"; longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index f4107dba8f36..8c2247c24aa6 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "20.0.2"; + version = "20.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "1jj0qa47d7pqn2r379p434hxk14ij2qgmr83x65w9ib9l8092fhg"; + sha256 = "0s9z72cpa15p2bp7zq1lid8k2ykrznfzjwpq5f41v3f30faraxg7"; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 2e6fb7c47058..05f13e8878a3 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -4,7 +4,13 @@ buildPythonPackage rec { pname = "pkgconfig"; version = "1.5.1"; - setupHook = pkgconfig.setupHook; + inherit (pkgconfig) + setupHooks + wrapperName + suffixSalt + targetPrefix + baseBinName + ; src = fetchPypi { inherit pname version; @@ -21,7 +27,7 @@ buildPythonPackage rec { patches = [ ./executable.patch ]; postPatch = '' - substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/pkg-config"' + substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index ed95de9ffde6..c41aaf6b4d32 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "3.2.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf"; + sha256 = "1lzp3367hmcpqwbkp4ckdv6hv37knwnwya88jicwl1smznpmjdfv"; }; propagatedBuildInputs = [ requests tqdm websocket_client ]; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index ecb5f7cc3add..eff9e5d8629a 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.4.1"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "acc94f17452471ca3446c2ce491c4d1affb99b9ddd9eac4e05614ac4318f8780"; + sha256 = "1s0hg91dvsklgdk3bi483f8in7vr51lx49smvr2ngvrws7nwsj3s"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 08a562c0133e..b0936a50baa7 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "b119705dec157314cf504e9d2d6f7d5a76606495a778b673c2864ac92895dced"; + sha256 = "59a25845d00a51098e6c9147c3c96ce89ad97395e256a4fabb4aed7cf7db5541"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index 127cf47251ba..48504c8a3ee2 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -22,6 +22,5 @@ buildPythonPackage rec { description = "Application that generates RSS feeds for podcast episodes from local audio files"; homepage = "https://github.com/jakubroztocil/podcats"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 481fd2c5feb7..46be9bc92a28 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, callPackage -, isPy27, isPy34, pythonOlder +, isPy27 +, pythonOlder , cleo , requests , cachy @@ -66,8 +67,7 @@ in buildPythonPackage rec { pexpect keyring lockfile - ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ] - ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ] + ] ++ lib.optionals isPy27 [ typing pathlib2 glob2 virtualenv functools32 subprocess32 ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; postInstall = '' diff --git a/pkgs/development/python-modules/ponywhoosh/default.nix b/pkgs/development/python-modules/ponywhoosh/default.nix new file mode 100644 index 000000000000..589be17b0163 --- /dev/null +++ b/pkgs/development/python-modules/ponywhoosh/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pony, whoosh }: + +buildPythonPackage rec { + pname = "ponywhoosh"; + version = "1.7.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mggj9d265hra4z67qyla686qvl0cf79655cszi136gh9hqlibv9"; + }; + + propagatedBuildInputs = [ + pony + whoosh + ]; + + meta = with lib; { + homepage = "https://pythonhosted.org/ponywhoosh/"; + description = "Make your database over PonyORM searchable"; + license = licenses.mit; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 82ac16e4027a..d79f6201b6fd 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -1,31 +1,34 @@ -{ buildPythonPackage -, fetchPypi -, lib -, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , sphinx -, flake8 , pytest , pytestcov -, pytest-flakes -, pytestpep8 +, pytest-flake8 }: buildPythonPackage rec { - version = "1.5.2"; + version = "1.7.0"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "17rfgmgwyxyng8q7bvn369cncadqws2wgkg45q6v8337wm9jxins"; + sha256 = "1p32v16va780mjjdbyp3v702aqg5s618khlila7bdyynis1n84q9"; }; + patches = [ + # remove pytest-flakes from test dependencies + # merged into master, remove > 1.7.0 release + (fetchpatch { + url = "https://github.com/WoLpH/portalocker/commit/42e4c0a16bbc987c7e33b5cbc7676a63a164ceb5.patch"; + sha256 = "01mlr41nhh7mh3qhqy5fhp3br4nps745iy4ns9fjcnm5xhabg5rr"; + excludes = [ "pytest.ini" ]; + }) + ]; + checkInputs = [ sphinx - flake8 pytest pytestcov - pytest-flakes - pytestpep8 + pytest-flake8 ]; meta = with lib; { diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 098ad5300848..3c4c6ae4ec7d 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { install -dm755 "$out/share/tmux" install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" + + install -dm755 "$out/share/fish/vendor_functions.d" + install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish" + ''; meta = { diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 27673b151116..a933093bef42 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonApplication, pythonOlder +{ lib, fetchPypi, buildPythonPackage, pythonOlder , aspy-yaml , cached-property , cfgv @@ -6,6 +6,7 @@ , identify , importlib-metadata , importlib-resources +, isPy27 , nodeenv , python , six @@ -13,18 +14,20 @@ , virtualenv }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pre-commit"; - version = "1.21.0"; + version = "2.4.0"; + disabled = isPy27; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "0l5qg1cw4a0670m96s0ryy5mqz5aslfrrnwpriqgmrnsgdixhj4g"; + sha256 = "1l0lcl3l2544m2k8jlmblfsjn0p2hdxrzzwy646xpvp0rcs2wgkh"; }; patches = [ ./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch + ./languages-use-the-hardcoded-path-to-python-binaries.patch ]; propagatedBuildInputs = [ @@ -36,9 +39,8 @@ buildPythonApplication rec { six toml virtualenv - importlib-metadata - ] ++ lib.optional (pythonOlder "3.7") importlib-resources - ++ lib.optional (pythonOlder "3.2") futures; + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata + ++ lib.optional (pythonOlder "3.7") importlib-resources; # slow and impure doCheck = false; @@ -46,6 +48,10 @@ buildPythonApplication rec { preFixup = '' substituteInPlace $out/${python.sitePackages}/pre_commit/resources/hook-tmpl \ --subst-var-by pre-commit $out + substituteInPlace $out/${python.sitePackages}/pre_commit/languages/python.py \ + --subst-var-by virtualenv ${virtualenv} + substituteInPlace $out/${python.sitePackages}/pre_commit/languages/node.py \ + --subst-var-by nodeenv ${nodeenv} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch index 23115bbbd20f..4c1b6421e090 100644 --- a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch +++ b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch @@ -1,25 +1,15 @@ -From d9e6999e32112602ec276634cb004eda3ca64ec3 Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> -Date: Mon, 13 Jan 2020 11:04:58 -0800 -Subject: [PATCH] hook-tmpl: use the hardcoded path to pre-commit, if found - ---- - pre_commit/resources/hook-tmpl | 2 ++ - 1 file changed, 2 insertions(+) - diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl -index 213d16e..3a99211 100755 +index 299144e..6d12543 100755 --- a/pre_commit/resources/hook-tmpl +++ b/pre_commit/resources/hook-tmpl -@@ -107,6 +107,8 @@ def _exe() -> Tuple[str, ...]: - except OSError: - pass - -+ if os.path.isfile('@pre-commit@/bin/pre-commit') and os.access('@pre-commit@/bin/pre-commit', os.X_OK): -+ return ('@pre-commit@/bin/pre-commit', 'run') - if distutils.spawn.find_executable('pre-commit'): - return ('pre-commit', 'run') - --- -2.23.1 +@@ -25,8 +25,8 @@ ARGS.append('--') + ARGS.extend(sys.argv[1:]) + DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?' +-if os.access(INSTALL_PYTHON, os.X_OK): +- CMD = [INSTALL_PYTHON, '-mpre_commit'] ++if os.access('@pre-commit@/bin/pre-commit', os.X_OK): ++ CMD = ['@pre-commit@/bin/pre-commit'] + elif which('pre-commit'): + CMD = ['pre-commit'] + else: diff --git a/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch new file mode 100644 index 000000000000..c1bead48b345 --- /dev/null +++ b/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch @@ -0,0 +1,26 @@ +diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py +index 26f4919..4885ec1 100644 +--- a/pre_commit/languages/node.py ++++ b/pre_commit/languages/node.py +@@ -82,7 +82,7 @@ def install_environment( + envdir = fr'\\?\{os.path.normpath(envdir)}' + with clean_path_on_failure(envdir): + cmd = [ +- sys.executable, '-mnodeenv', '--prebuilt', '--clean-src', envdir, ++ '@nodeenv@/bin/nodeenv', '--prebuilt', '--clean-src', envdir, + ] + if version != C.DEFAULT: + cmd.extend(['-n', version]) +diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py +index e17376e..0c1d2ab 100644 +--- a/pre_commit/languages/python.py ++++ b/pre_commit/languages/python.py +@@ -204,7 +204,7 @@ def install_environment( + ) -> None: + envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version)) + python = norm_version(version) +- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python) ++ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python) + install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies) + + with clean_path_on_failure(envdir): diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 184f01c4592f..bbe350b03c2a 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "premailer"; - version = "3.6.1"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "08pshx7a110k4ll20x0xhpvyn3kkipkrbgxjjn7ncdxs54ihdhgw"; + sha256 = "8240bfb8ff94db3ae581d8434b7eea5005872d5779394ed8f4223dfb0f58afd2"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/privacyidea/default.nix b/pkgs/development/python-modules/privacyidea/default.nix new file mode 100644 index 000000000000..84cc4530b34e --- /dev/null +++ b/pkgs/development/python-modules/privacyidea/default.nix @@ -0,0 +1,51 @@ +{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python + +, cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script +, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow +, python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel +, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2 + +, mock, pytest, responses, testfixtures +}: + +buildPythonPackage rec { + pname = "privacyIDEA"; + version = "3.3"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "188ki924dig899wlih45xfsm0s7mjkya56vii26bg02h91izrb4b"; + }; + + propagatedBuildInputs = [ + cryptography pyrad pymysql python-dateutil flask-versioned flask_script + defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow + python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel + ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 + ]; + + checkInputs = [ openssl mock pytest responses testfixtures ]; + # issues with hardware token tests + doCheck = false; + + pythonImportsCheck = [ "privacyidea" ]; + + postPatch = '' + substituteInPlace privacyidea/lib/resolvers/LDAPIdResolver.py --replace \ + "/etc/privacyidea/ldap-ca.crt" \ + "${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/tests + ''; + + meta = with lib; { + description = "Multi factor authentication system (2FA, MFA, OTP Server)"; + license = licenses.agpl3Plus; + homepage = "http://www.privacyidea.org"; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix new file mode 100644 index 000000000000..ec87186a4fdd --- /dev/null +++ b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }: + +buildPythonPackage rec { + pname = "privacyidea-ldap-proxy"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "privacyidea"; + repo = pname; + rev = "v${version}"; + sha256 = "1kc1n9wr1a66xd5zvl6dq78xnkqkn5574jpzashc99pvm62dr24j"; + }; + + propagatedBuildInputs = [ twisted ldaptor configobj ]; + + # python 2 zope.interface test import path issues + doCheck = false; + + pythonImportsCheck = [ "pi_ldapproxy" ]; + + meta = with lib; { + description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA"; + homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy"; + license = licenses.agpl3; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 6932cd515c72..9d969b5d3416 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "3.0.4"; + version = "3.0.5"; src = fetchPypi { inherit pname version; - sha256 = "10wpsbl1mmnvm8q63zs40633kbq93bidx4vz1p2q92w8ijqb3rpb"; + sha256 = "563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index c66e1e2b40e6..4cdf528193f3 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.8.35"; + version = "1.8.38"; src = fetchPypi { inherit pname version; - sha256 = "379211cf98ebafbe129088a5c92f575e1ccd7987c40bad9520c209e51008df00"; + sha256 = "7fa81ba38388ac1760ae61229681f46a7fc2ed96cb2d435b616873a73e668b64"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 2c78a66d86a3..5e1f578d901b 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.8.4"; + version = "2.8.5"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "f898e5cc0a662a9e12bde6f931263a1bbd350cfb18e1d5336a12927851825bb6"; + sha256 = "f7d46240f7a1ae1dd95aab38bd74f7428d46531f69219954266d669da60c0818"; }; buildInputs = lib.optional stdenv.isDarwin openssl; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index f5a37dda630d..cad7291994ea 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.1"; + version = "3.0.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a69cce0aa04f0075e2e65287a0ee2f3a928c0591b301ce22aa2e498af1ebcb4b"; + sha256 = "556e5367d4d58231b575dc619493dc0d8ef4c2d15ee85c727a88beb60fa5c52b"; }; propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ]; diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 049d8720f455..ab6fda9d3d45 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchPypi, buildPythonPackage, pyparsing }: +{ stdenv +, fetchPypi +, buildPythonPackage +, pyparsing +}: buildPythonPackage rec { pname = "PuLP"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "fb0b0e8073aa82f3459c4241b9625e0ccd26c0838ad8253c6bc67e041901b765"; + sha256 = "06swbi7wygh7y0kxc85q1pdhzk662375d9a5jnahgr76hkwwkybn"; }; propagatedBuildInputs = [ pyparsing ]; # only one test that requires an extra doCheck = false; + pythonImportsCheck = [ "pulp" ]; meta = with stdenv.lib; { homepage = "https://github.com/coin-or/pulp"; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index e03543fb5206..e308ecca6767 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.7.1"; + version = "0.7.2"; # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019. disabled = pythonOlder "3.5"; src = fetchPypi{ inherit pname version; - sha256 = "1kqwnkbkdv4m3r68pd39va6wqvhr34a6hx4d6q5lfkibclg35c3d"; + sha256 = "40708492ed0a41e900d36933b9b9ab7b575c72ebf3eee81293c626e301aa7ea1"; }; checkInputs = [ pytest mock pytest-mock ]; diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 3724687463cf..db117e04d128 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,12 +3,11 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.8.1"; + version = "0.10.9"; src = fetchPypi { inherit pname version; - extension= "zip"; - sha256 = "0x52rjn2s44mbpk9p497p3yba9xnpl6hcaiacklppwqcd8avnac3"; + sha256 = "36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f"; }; # No tests in archive diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 2102554faceb..c82f18d377d3 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.47"; + version = "1.51"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "0zvp1gib2lryw698vxkbdv40n3lsmdlhwp7vdcg41dqqa5nfryhn"; + sha256 = "1hz5fc3rkryl4vzxmmwx75p25wk0ida54lf6bz7261rm5hb05r7j"; }; checkInputs = [ httpretty parameterized pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 056a0299670d..31e56e6c0ae8 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.13"; + version = "0.8.15"; src = fetchPypi { inherit pname version; - sha256 = "1377b1adc98c4152694bf5d7e93b41a9d2e9060af69b747cfad8c93ac426f9ea"; + sha256 = "0643fwj8vl96bsl30jx091zicmwyi0gglza66xqhqizqyqjq0ag6"; }; buildInputs = [ openssl ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bindings for scrypt key derivation function library"; homepage = "https://pypi.python.org/pypi/scrypt"; - maintainers = with maintainers; [ asymmetric ]; + maintainers = []; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 29cdfbc65990..75b0964e259d 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyacoustid"; - version = "1.1.7"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "07394a8ae84625a0a6fef2d891d19687ff59cd955caaf48097da2826043356fd"; + sha256 = "0c3dsnfyldnsmyzczp5s5aqvbzcn360s0h4l3gm3k53lg57f762z"; }; propagatedBuildInputs = [ requests audioread ]; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index e24ca0fa78e6..82f8f5da3d9c 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,28 +1,19 @@ -{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: let - _arrow-cpp = arrow-cpp.override { inherit python; }; + _arrow-cpp = arrow-cpp.override { python3 = python; }; in buildPythonPackage rec { pname = "pyarrow"; + disabled = !isPy3k; inherit (_arrow-cpp) version src; - patches = [ - # Remove when updating pkgs.arrow-cpp to 0.17 - (fetchpatch { - name = "ARROW-8106-fix-conversion-test"; - url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch"; - sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd"; - stripLen = 1; - }) - ]; - sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; - propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; + propagatedBuildInputs = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 83cb8f654e2c..87e72e1ae5bd 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "0c35a52e00b672f832e5846826f1fb7507907f7d52fba6faa9e3c4cbe874fe4b"; + sha256 = "905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index b704e54321b9..74b9f7dfdebe 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "UTbBv5GeEB1OyQGiduhupg5Ygaj/d2PjVvGYQOX/4d0="; + sha256 = "1pg1zzjl167iavin6xzzm20mh3m6dvl7d8h1r571s44yj6zw2dji"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 19aa73bec598..b8a607f4d455 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -1,19 +1,49 @@ -{ stdenv, buildPythonPackage, fetchPypi, srptools, aiohttp, zeroconf -, ed25519, cryptography, curve25519-donna, pytest, pytestrunner -, netifaces, asynctest, virtualenv, toml, filelock, tox }: +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp +, aiozeroconf +, asynctest +, cryptography +, deepdiff +, netifaces +, protobuf +, pytest +, pytest-aiohttp +, pytest-asyncio +, pytestrunner +, srptools +}: buildPythonPackage rec { pname = "pyatv"; - version = "0.3.13"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "8fc1a903a9d666e4109127410d35a83458559a86bc0de3fe1ffb3f15d2d653b3"; + sha256 = "0f9wj1ggllwpjd9nh6nsrck7m4gbz29q6vqbrhbkc2kz6waqkgwc"; }; - propagatedBuildInputs = [ srptools aiohttp zeroconf ed25519 cryptography curve25519-donna tox ]; + nativeBuildInputs = [ pytestrunner]; - checkInputs = [ pytest pytestrunner netifaces asynctest virtualenv toml filelock ]; + propagatedBuildInputs = [ + aiozeroconf + srptools + aiohttp + protobuf + cryptography + netifaces + ]; + + checkInputs = [ + deepdiff + pytest + pytest-aiohttp + pytest-asyncio + ]; + + # just run vanilla pytest to avoid inclusion of coverage reports and xdist + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { description = "A python client library for the Apple TV"; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 1a06a699c32f..01c0368662c4 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "0.10.2"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "b37ba89eb7407bbfdf8e26e1230b6ef452da3d986df5eed21aab96be61b6e844"; + sha256 = "6571ef82e03a958e56aa61cf5b15392f0b2d5dbca92f872061d81524e8da8525"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index dfd29ce8bd5f..3c5d28c40d6c 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.6.6"; + version = "2.6.9"; src = fetchPypi { inherit pname version; - sha256 = "1lsvjqij1vb9w8j6lvnq7lppflc7svz4cj37n74q67mb46gq3dxr"; + sha256 = "5924371a47625252d8566bbc662befc55e1d35c6c1375c8236e6f8a626293fa6"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index fbefd7efefa6..d61279e38d5d 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy33, isPy3k }: +{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }: buildPythonPackage rec { pname = "pycairo"; @@ -6,8 +6,6 @@ buildPythonPackage rec { format = "other"; - disabled = isPy33; - src = fetchFromGitHub { owner = "pygobject"; repo = "pycairo"; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index f44aa2e8f8e2..e233d8d70884 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycares"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "663c000625725d3a63466a674df4ee7f62bf8ca1ae8a0b87a6411eb811e0e794"; + sha256 = "18dfd4fd300f570d6c4536c1d987b7b7673b2a9d14346592c5d6ed716df0d104"; }; buildInputs = [ c-ares ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index cc69bbc9ee70..c291e6e47fdd 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "4.2.3"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1nqy9zvzxzncfmmbsj4ccb36gymh4pp1n1l9fdhv8fi0ai9b7dyp"; + sha256 = "052q25k3v5fwa02hf5zdpjpfb94ml9g67cqwjjvf6vdana8w3gwh"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 55354a17c72b..330acab3e1d0 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.12"; + version = "1.8.14"; src = fetchPypi { inherit pname version; - sha256 = "e76adbd832deec28b2045a6094c5bb779a0b2cb1105a23b3efafe723e2c9937a"; + sha256 = "03q5m595ysjrc9h57m7prrca6b9l4yrzvdijnzxnhd61p7jzbh49"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index cf88c6722a64..63db40dba163 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.9.4"; + version = "3.9.7"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "a168e73879619b467072509a223282a02c8047d932a48b74fbd498f27224aa04"; + sha256 = "f1add21b6d179179b3c177c33d18a2186a09cc0d3af41ff5ed3f377360b869f2"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 5cc4446c5a3d..92da3e722f09 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.9.4"; + version = "3.9.7"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"; + sha256 = "50163324834edd0c9ce3e4512ded3e221c969086e10fdd5d3fdcaadac5e24a78"; }; } diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index a03662aa961d..b9a75734b8e4 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -13,7 +13,6 @@ , python , mkDerivation , stdenv -, isPy3k }: let compyte = import ./compyte.nix { @@ -29,11 +28,12 @@ buildPythonPackage rec { sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; - preConfigure = '' + preConfigure = with stdenv.lib.versions; '' ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} + --boost-python-libname=boost_python${major python.version}${minor python.version} \ + --cuda-root=${cudatoolkit} ''; postInstall = '' diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 44ff6b7f0841..6b6aad2b2342 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.43.0.3"; + version = "7.43.0.5"; disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "13nsvqhvnmnvfk75s8iynqsgszyv06cjp4drd3psi7zpbh63623g"; + sha256 = "ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3"; }; buildInputs = [ @@ -36,6 +36,8 @@ buildPythonPackage rec { ]; # skip impure or flakey tests + # See also: + # * https://github.com/NixOS/nixpkgs/issues/77304 checkPhase = '' HOME=$TMPDIR pytest tests -k "not test_ssl_in_static_libs \ and not test_keyfunction \ @@ -44,7 +46,8 @@ buildPythonPackage rec { and not test_libcurl_ssl_nss \ and not test_libcurl_ssl_openssl" \ --ignore=tests/getinfo_test.py \ - --ignore=tests/memory_mgmt_test.py + --ignore=tests/memory_mgmt_test.py \ + --ignore=tests/multi_memory_mgmt_test.py ''; preConfigure = '' diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 4e0623e5cc1e..ef33b6fb2bd5 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.4"; + version = "1.5.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "1zmnwyvvrj6nb2r1wh63yb6dzqaxw8m4njzqycjdq9911c5gwg6z"; + sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 339775c2f54f..6f4e4c97fd1c 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "pydicom"; src = fetchPypi { inherit pname version; - sha256 = "0ki4736h6mp77733rsrwicl8pyig39idywzcmwvw3nzi2r1yc7w8"; + sha256 = "1483hv74fhfk4q18r4rda7yixqqdxrd1djzp3492s81ykxd4k24l"; }; propagatedBuildInputs = [ numpy pillow ]; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index eb85c690d81f..1825c690f30c 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pydocstyle"; - version = "4.0.1"; + version = "5.0.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "1sr8d2fsfpam4f14v4als6g2v6s3n9h138vxlwhd6slb3ll14y4l"; + sha256 = "03z8miyppm2xncrc9yjilwl7z5c5cpv51zha580v64p8sb2l0j7j"; }; propagatedBuildInputs = [ snowballstemmer ]; diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 669d798312b4..8499db31e02c 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydub"; - version = "0.23.1"; + version = "0.24.0"; # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; repo = pname; rev = "v${version}"; - sha256 = "1v0bghy4j2nnkgf1r8rbz4s7war872asyy08pc0x1iy1qs275i7s"; + sha256 = "0cnhkk44cn3wa4fmd1rwzdx2zgrn87qg25pbcp9wsisdlpn4bj6d"; }; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 472cdc7118d9..1c82f7c9d630 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -1,16 +1,18 @@ { stdenv , buildPythonPackage +, isPy27 , fetchPypi , enchant2 }: buildPythonPackage rec { pname = "pyenchant"; - version = "2.0.0"; + version = "3.1.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; + sha256 = "ce0915d7acd771fde6e8c2dce8ad0cb0e6f7c4fa8430cc96e3e7134e99aeb12f"; }; propagatedBuildInputs = [ enchant2 ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index d5e093ce8668..16d9abe812b6 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales, isPy37 }: buildPythonPackage rec { - version = "3.7.1"; + version = "3.7.2"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "1eb68bb250cc14310a6e33c197cbe2c8d93832b543f534e29b58286712f7e2b2"; + sha256 = "735ce6a71f26ead335df8a1f2c1cc8355ef091d98ffdc3bf73a5a3b0214e055e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index d73ee24f5847..4cb6138d5ebb 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.49.0"; + version = "0.51.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "063kwvgw7g4nn09pyqwqy72vnhzw0aajg23bi32vr0k49g8fx27s"; + sha256 = "14mkwk44bgm6s4kqagz7nm6p6gsygmksl2628jaqh7ppblxca9as"; }; propagatedBuildInputs = [ pyusb pyserial ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index ff14c78a7b70..4e0c294de019 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw="; + sha256 = "11q3a0p4mvzdskla0c6ffcrddldfbh7dc4p5l6xrriwri88j356y"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix new file mode 100644 index 000000000000..962803402e6e --- /dev/null +++ b/pkgs/development/python-modules/pygls/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub +, mock, pytest, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "pygls"; + version = "0.8.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "openlawlibrary"; + repo = pname; + rev = "v${version}"; + sha256 = "1853rfdks5n8nw6ig96j7his5kqd75hrvzvd0win4niycaqsag6m"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest==4.5.0" "pytest" + ''; + + checkInputs = [ mock pytest pytest-asyncio ]; + checkPhase = "pytest"; + + meta = with stdenv.lib; { + homepage = "https://github.com/openlawlibrary/pygls"; + description = "Pythonic generic implementation of the Language Server Protocol"; + license = licenses.asl20; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix new file mode 100644 index 000000000000..87b8e0b3ffb7 --- /dev/null +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pygments +, isPy3k +}: + +buildPythonPackage rec { + pname = "pygments_better_html"; + version = "0.1.4"; + disabled = ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "028szd3k295yhz943bj19i4kx6f0pfh1fd2q14id0g84dl4i49dm"; + }; + + propagatedBuildInputs = [ pygments ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "pygments_better_html" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/Kwpolska/pygments_better_html"; + description = "Improved line numbering for Pygments’ HTML formatter."; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 2a1b8bcb4105..74606902722a 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hoPS37W6qeUBqaZO66XCwRF+rbeBqxzXqdJVg0r22u8="; + sha256 = "1vysyr586mfjm7biraw1nynpw4f1qajynkm6m40ybadsnpgx50w6"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index d3e0da07868b..62d40e368efc 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyhcl"; - version = "0.4.2"; + version = "0.4.4"; disabled = !isPy3k; src = fetchFromGitHub { owner = "virtuald"; repo = pname; rev = version; - sha256 = "01y5fn3pis43i0w0858wmrc8azfinp07a16ixglmg28gg07c0zkd"; + sha256 = "0rcpx4vvj2c6wxp31vay7a2xa5p62kabi91vps9plj6710yz29nc"; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 7d8fa826b0e7..14bf1cfe7be0 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.65"; + version = "0.1.67"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0a562dqxs2j9q0xyywrh43dlbpdqr3mhvrrk8abdpmgj6gl33zac"; + sha256 = "2d18e0059367e9e32d6472023322113fce431bcc72187b4a6eb7402fe5d2794b"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index d579d3e96fbe..2725aca5a826 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.5"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "1c8sdlqcmpajcpf6jfpi6amncibm9c3zrl1860r0vfimps50m34h"; + sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index d4f14f3be014..02a0f8758369 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pylatexenc"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "phfaist"; repo = "pylatexenc"; rev = "v${version}"; - sha256 = "0icwd7iipz3sv4jdh9iam7h4xslvdqg16rwsmczrna3mmjbwccdk"; + sha256 = "0i4frypbv90mjir8bkp03cwkvwhgvc9p3fw6q2jz1dn7fw94v2rv"; }; pythonImportsCheck = [ "pylatexenc" ]; diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index 9e8f96665d0b..54058ae1982d 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, httpserver , libftdi1 , libusb1 }: @@ -16,14 +15,13 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - httpserver libftdi1 libusb1 ]; postPatch = '' substituteInPlace pylibftdi/driver.py \ - --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb1.so')" \ + --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \ --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" ''; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 8530e6f8543d..af4b0177eb26 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.0.14"; + version = "2.0.15"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "07fkwb4phfr71dpajnq6l64phjxvljx2nf8ibs12n9gwjdvm9i52"; + sha256 = "0wpzd3j01njxfclbhxz31s5clc7il67nhm4lz89q2aaj19c0xzsa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index a7bdfeea90a8..a0575bbfede7 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "4.1"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0mhpxs7vlqx8w75z93dy7nnvx89kwfdjkla03l19an15rlyqyspd"; + sha256 = "0vg2icmsc44k1ra898rjfp912xijsn96s0zplax6w13lpzb9jb9r"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 35fb4673ef51..b7da796d3bb5 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.10.0"; + version = "3.10.1"; src = fetchPypi { inherit pname version; - sha256 = "c43879fe427ea6aa6e84dae9fbdc5aa14428a4cfe613fe0fee2cc004bf3f307c"; + sha256 = "993257f6ca3cde55332af1f62af3e04ca89ce63c08b56a387cdd46136c72f2fa"; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix deleted file mode 100644 index 5c013efc2d1b..000000000000 --- a/pkgs/development/python-modules/pymssql/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, freetds, cython, setuptools-git }: - -buildPythonPackage rec { - pname = "pymssql"; - version = "3.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "4d0ed31c76983d723c0c979b18e2273623621e630ca4901f17a86128aca13f84"; - }; - - buildInputs = [cython setuptools-git]; - propagatedBuildInputs = [freetds]; - - # The tests require a running instance of SQLServer, so we skip them - doCheck = false; - - meta = with lib; { - homepage = "http://pymssql.org/en/stable/"; - description = "A simple database interface for Python that builds on top - of FreeTDS to provide a Python DB-API (PEP-249) interface to Microsoft - SQL Server"; - license = licenses.lgpl21; - maintainers = with maintainers; [ mredaelli ]; - }; -} diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 2ab33fb18381..c91892585d60 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.16"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1rw4wjbsp8pnkkqcn097psjd6qinv70pjzvrbns04maybhn4ni6v"; + sha256 = "0de92a8fb65db6e661594cc5865a340a2daac3cb9bb58e030820769ece1343c1"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index be24815ba13e..78fe9672a8b4 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -5,7 +5,7 @@ , libsodium , cffi , six -, hypothesis +, hypothesis_4 }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c"; }; - checkInputs = [ pytest hypothesis ]; + checkInputs = [ pytest hypothesis_4 ]; buildInputs = [ libsodium ]; propagatedBuildInputs = [ cffi six ]; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix new file mode 100644 index 000000000000..2b83f4c1223b --- /dev/null +++ b/pkgs/development/python-modules/pynput/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }: + +buildPythonPackage rec { + pname = "pynput"; + version = "1.6.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8"; + }; + + nativeBuildInputs = [ sphinx ]; + + propagatedBuildInputs = [ setuptools-lint xlib ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A library to control and monitor input devices"; + homepage = "https://github.com/moses-palmer/pynput"; + license = licenses.lgpl3; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index ed8c4c4a090a..e1b6abb7527d 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2019.1.2"; + version = "2020.1"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7803f3128dbd28ae6f5b851a80ef586a35b9575406ea7bb068b8e1516f8043f0"; + sha256 = "7513f7054f4eeb5361de1f5113883145fc67dbabde73a2148f221ae05af4d22c"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4305487b6564..33fd3c6e10d4 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { }) ]; - # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 + # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 4b14e2e5cc67..430181cb574e 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0d214aa65e085d3e4108a36152cb12f7cd0f4e7fda93b5134b43a9687c975786"; + sha256 = "c37690e810116a83a244dfeec47885e2f0475b4c450313904be3bc2cdaf6d50a"; }; checkInputs = [ nose psutil ] ++ diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 52b27638ac72..ece9ad5b4a3f 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages, pkgconfig +{ lib, pythonPackages, pkgconfig , dbus , qmake, lndir , qtbase @@ -29,13 +29,13 @@ let }); in buildPythonPackage rec { - pname = "pyqt"; - version = "5.13.0"; + pname = "PyQt5"; + version = "5.14.2"; format = "other"; - src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "1ydgdz28f1v17qqz3skyv26k5l0w63fr4dncc5xm49jr2gjzznqc"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 22e7f0769102..3c0ae904557a 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages, pkgconfig +{ lib, pythonPackages, pkgconfig , qmake, qtbase, qtsvg, qtwebengine , wrapQtAppsHook }: @@ -9,13 +9,13 @@ let inherit (pyqt5) sip; in buildPythonPackage rec { - pname = "pyqtwebengine"; - version = "5.12.1"; + pname = "PyQtWebEngine"; + version = "5.14.0"; format = "other"; - src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine_gpl-${version}.tar.gz"; - sha256 = "0wylkd7fh2g27y3710rpxmj9wx0wpi3z7qbv6khiddm15rkh81w6"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "14hw49akb35n9pgiw564x8ykmsifihn9p2ax2x4zmywb3w2ra5g1"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix new file mode 100644 index 000000000000..31cbf77d94e0 --- /dev/null +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, fetchFromGitHub, lib, netaddr, six, nose }: + +buildPythonPackage rec { + pname = "pyrad"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "pyradius"; + repo = pname; + rev = version; + sha256 = "0hy7999av47s8100afbhxfjb8phbmrqcv530xlvskndby4a8w94k"; + }; + + propagatedBuildInputs = [ netaddr six ]; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -e testBind + ''; + + meta = with lib; { + description = "Python RADIUS Implementation"; + homepage = "https://bitbucket.org/zzzeek/sqlsoup"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 5a49fa10fbf4..0a28ef6369bc 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.11"; + version = "0.5.12"; src = fetchPypi { inherit pname version; - sha256 = "1wjamijkg2pp9mgj5k4qw3jl2i3ajikkps0zp5c52wcxm3qmks85"; + sha256 = "1lry042qsamdzyw6zpmdld0v14g6cl05jsr9qdb7h5wnahf80mq1"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 28b804470ffe..da255645f443 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -3,22 +3,22 @@ , fetchPypi , six , pytest_4 -, hypothesis +, hypothesis_4 , pytestrunner }: buildPythonPackage rec { pname = "pyrsistent"; - version = "0.15.6"; + version = "0.15.7"; src = fetchPypi { inherit pname version; - sha256 = "f3b280d030afb652f79d67c5586157c5c1355c9a58dfc7940566e28d28f3df1b"; + sha256 = "cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280"; }; propagatedBuildInputs = [ six ]; - checkInputs = [ pytestrunner pytest_4 hypothesis ]; + checkInputs = [ pytestrunner pytest_4 hypothesis_4 ]; postPatch = '' substituteInPlace setup.py --replace 'pytest<5' 'pytest' diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index acc27811b284..b22da8b83ac6 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.6"; + version = "0.9.7"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "08r1v9wdq8pzds4g3sng2xgh1hlzfs2z7qgy5a6b0xrs96swlamm"; + sha256 = "e4fcc8aa1108e4917cb56794575ee08c2a3d9c2c52620474e3ecc8538dadf209"; }; # Deliberately not in propagated build inputs; users can decide diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 07de522f7962..605c13c0c9c3 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.1.28"; + version = "1.2.1"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "0x44yq440c1j3xnl7qigz2fpfzhx68n9mbj7ps7rd0kj0plcmr2q"; + sha256 = "1gkh28m74rf0ic51cxahiyw4sfz3sp3dz0iggsksi917ryyinwmb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index 99a9f01d4b09..e242dbe5e96e 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -3,13 +3,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.0.19"; + version = "1.0.21"; pname = "pysmbc"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "0dwffbfp3ay8y35hhc37ip61xdh522f5rfs097f3ia121h9x1mvj"; + sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index 347daa6cec0c..61e1de20acf9 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -1,26 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, python-toolbox , pytest , isPy27 }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.1"; pname = "pysnooper"; src = fetchPypi { inherit version; pname = "PySnooper"; - sha256 = "14vcxrzfmfhsmdck1cb56a6lbfga15qfhlkap9mh47fgspcq8xkx"; + sha256 = "1xngly13x3ylwwcdml2ns8skpxip2myzavp3b9ff2dpqaalf0hdl"; }; # test dependency python-toolbox fails with py27 doCheck = !isPy27; checkInputs = [ - python-toolbox pytest ]; diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index db02f0f390e3..ef7fcd20e78e 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pysnow"; - version = "0.7.14"; + version = "0.7.16"; src = fetchPypi { inherit pname version; - sha256 = "0a6ce8b5f247fbfe5a53829c2f22391161e88646742283f861bce32bfe1626f1"; + sha256 = "5df61091470e48b5b3a6ea75637f69d3aacae20041487ea457a9a0e3093fba8c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index 0544b84e532f..bf56d7ca56e6 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pysolr"; - version = "3.8.1"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "88ecb176627db6bcf9aeb94a3570bfa0363cb68be4b2a6d89a957d4a87c0a81b"; + sha256 = "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 83d1a6066582..427c42545c5a 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.24"; + version = "0.0.31"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "294ffce5394a3e0da6a6f4e23f84031f06d9eb76eaa362507c0b1033ffbf69b4"; + sha256 = "03f21d2fb27cd938bd2c47f8582c0737eb7426a0cd59e5a60171fabe5e963e62"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 8de0bd02b51c..50c2bafb7aef 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.4.4"; + version = "2.4.5"; src = fetchPypi { inherit pname version; - sha256 = "13655eb113b8cf5f3f85b24fd92f86c4668a723723bd68949d028fa0df2cf694"; + sha256 = "0deed5687828efdaf4091e748f0ba1ae8aad6e4c3a5f07aa07e19487397e0e07"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix index 990e2b28bd89..d841a4162186 100644 --- a/pkgs/development/python-modules/pyspinel/default.nix +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspinel"; - version = "1.0.0a3"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0914a662d57a14bce9df21f22711b5c9b2fef37cf461be54ed35c6e229060fd4"; + sha256 = "5cbfd0f6e9ef3b5cd3a4e72a9a0cee1fe50d518b43746be07a1fd17e883328c2"; }; propagatedBuildInputs = [ pyserial ipaddress future ]; diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index a4a293ec1b07..478595c1bfc5 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pysptk"; - version = "0.1.17"; + version = "0.1.18"; src = fetchPypi { inherit pname version; - sha256 = "aa8bd2ae84bfe72e9015ccb69eb3b687bc64fad6139ae0b327fe07918e1e28ff"; + sha256 = "34c5ccc40c9e177cfd764daa9f7635c4c1e648e14ce78ba975537dae5a14c4e4"; }; PYSPTK_BUILD_VERSION = 0; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 1484432c045a..c4a9b6fdd1e4 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.10.0"; + version = "0.12.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf"; + sha256 = "1lpb1q297rly685yl23mni3mmv6vmyx3qsv5ccj1vh8bvkrx4ns7"; }; buildInputs = [ pytest ] diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index 1f01e7fb65fd..5f391668b93a 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-black"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "04lppqydxm0f3f3x0l8hj7v0j6d8syj34jc37yzqwqcyqsnaga81"; + sha256 = "c743dfeffe6b2cb25c0ed1a84cc306dff4b504b713b5a6d1bc3824fa73a7d693"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix new file mode 100644 index 000000000000..6ce784419206 --- /dev/null +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, setuptools_scm, pytest, cmake +}: + +buildPythonPackage rec { + pname = "pytest-datadir"; + version = "1.3.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "gabrielcnr"; + repo = pname; + rev = version; + sha256 = "0kwgp6sqnqnmww5r0dkmyfpi0lmw0iwxz3fnwn2fs8w6bvixzznf"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + checkInputs = [ pytest ]; + checkPhase = "pytest"; + + meta = with stdenv.lib; { + homepage = "https://github.com/gabrielcnr/pytest-datadir"; + description = "pytest plugin for manipulating test data directories and files"; + license = licenses.mit; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 13806781125e..9e570a801f99 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,23 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.1"; pname = "pytest-dependency"; src = fetchPypi { inherit pname version; - sha256 = "bda0ef48e6a44c091399b12ab4a7e580d2dd8294c222b301f88d7d57f47ba142"; + sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"; }; - patches = [ - # Fix tests for pytest>=4.2.0. Remove with the next release - (fetchpatch { - url = "https://github.com/RKrahl/pytest-dependency/commit/089395bf77e629ee789666361ee12395d840252c.patch"; - sha256 = "1nkha2gndrr3mx11kx2ipxhphqd6wr25hvkrfwzyrispqfhgl0wm"; - excludes = [ "doc/src/changelog.rst" ]; - }) - ]; - propagatedBuildInputs = [ pytest ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix new file mode 100644 index 000000000000..44a59730146c --- /dev/null +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytest +, inflection +, factory_boy +, pytestcache +, pytestcov +, pytestpep8 +, mock +}: + +buildPythonPackage rec { + pname = "pytest-factoryboy"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-factoryboy"; + rev = version; + sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn"; + }; + + propagatedBuildInputs = [ factory_boy inflection pytest ]; + + # The project uses tox, which we can't. So we simply run pytest manually. + checkInputs = [ + mock + pytestCheckHook + pytestcache + pytestcov + pytestpep8 + ]; + pytestFlagsArray = [ "--ignore=docs" ]; + + meta = with stdenv.lib; { + description = "Integration of factory_boy into the pytest runner."; + homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/"; + maintainers = with maintainers; [ winpat ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 88f5cc0e1888..a5ed447aceac 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.4"; + version = "1.0.6"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4d225c13e787471502ff94409dcf6f7927049b2ec251c63b764a4b17447b60c0"; + sha256 = "1b82bb58c88eb1db40524018d3fcfd0424575029703b4e2d8e3ee873f2b17027"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index d1f06b03a8d3..bae42301982c 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -2,6 +2,8 @@ , pytestpep8, pytest, pyflakes }: buildPythonPackage rec { + # upstream has abandoned project in favor of pytest-flake8 + # retaining package to not break other packages pname = "pytest-flakes"; version = "4.0.0"; @@ -11,9 +13,11 @@ buildPythonPackage rec { }; checkInputs = [ pytestpep8 pytest ]; - nativeBuildInputs = [ pytest ]; - propagatedBuildInputs = [ pyflakes ]; + propagatedBuildInputs = [ pytest pyflakes ]; + # no longer passes + doCheck = false; + pythonImportsCheck = [ "pytest_flakes" ]; # disable one test case that looks broken checkPhase = '' py.test test_flakes.py -k 'not test_syntax_error' diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 369ddf2c4767..9b25e2045e9d 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-metadata"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1fk6icip2x1nh4kzhbc8cnqrs77avpqvj7ny3xadfh6yhn9aaw90"; + sha256 = "1711gippwsl7c1wi8pc2y75xqq5sn1sscpqvrxjvpjm8pcx2138n"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 1e8a49f90be7..0748da14d939 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; - version = "0.8.3"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "17vly6fg0s95lbg620g9dp9jjf12sj4hpbi7cg579kswabl6304g"; + sha256 = "e368390c9e3fd48eb3edec0c4eef08d7332f1143ad7b7190d32376b2fd2e62ff"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 2ff6f40e3448..cb5b7bf099f1 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-sugar"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "fcd87a74b2bce5386d244b49ad60549bfbc4602527797fac167da147983f58ab"; + sha256 = "1630b5b7ea3624919b73fde37cffb87965c5087a4afab8a43074ff44e0d810c4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index b8535da4c7ac..3b649bea57dd 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "b823b03faf5778d1e15fb9f52e104df4da9c1021daeb313b339fccbbfb8dbd5f"; + sha256 = "fdb016d953036051d1ef0e36569b7168cefa4914014789a65a4ffefc87f85ac5"; }; propagatedBuildInputs = [ coverage ]; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index d77e52ab7f6d..4fe588f6456d 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -3,12 +3,12 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.8"; + version = "4.6.9"; pname = "pytest"; src = fetchPypi { inherit pname version; - sha256 = "6192875be8af57b694b7c4904e909680102befcb99e610ef3d9f786952f795aa"; + sha256 = "0fgkmpc31nzy97fxfrkqbzycigdwxwwmninx3qhkzp81migggs0r"; }; checkInputs = [ hypothesis mock ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 8f86e41be3b7..daf43961ea67 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,9 +1,25 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py -, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +, atomicwrites +, attrs +, funcsigs +, hypothesis +, mock +, more-itertools +, packaging +, pathlib2 +, pluggy +, py +, pygments +, python +, setuptools +, setuptools_scm +, six +, wcwidth +, writeText }: + buildPythonPackage rec { - version = "5.3.5"; + version = "5.4.3"; pname = "pytest"; disabled = !isPy3k; @@ -15,10 +31,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0d5fe9189a148acc3c3eb2ac8e1ac0742cb7618c084f3d228baaec0c254b318d"; + sha256 = "7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"; }; - checkInputs = [ hypothesis mock ]; + checkInputs = [ hypothesis pygments ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index b4857d7abefb..1ad3a5128be6 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -3,12 +3,12 @@ , autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: buildPythonPackage rec { - version = "0.7.4"; + version = "0.7.5"; pname = "python-binance"; src = fetchPypi { inherit pname version; - sha256 = "7d0b81a9d395fd071581d275af09a31f0c5ae3ecb25a3f47faaaf1eff779de3f"; + sha256 = "d6a96c0e55fc78d45279944515d385b3971300f35c2380ddb82689d676712053"; }; doCheck = false; # Tries to test multiple interpreters with tox diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index e33aee6c1c91..d8b501d62e5a 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,7 +2,7 @@ , docutils , lockfile , mock -, pytest +, pytest_4 , testscenarios , twine }: @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ twine ]; propagatedBuildInputs = [ docutils lockfile ]; - checkInputs = [ pytest mock testscenarios ]; + checkInputs = [ pytest_4 mock testscenarios ]; checkPhase = '' pytest -k 'not detaches_process_context \ and not standard_stream_file_descriptors' diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 0657c6277700..419b49064873 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,29 +1,40 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }: +{ stdenv +, fetchurl +, buildPythonPackage +, pkgconfig +, python +, dbus-python +, enlightenment +}: # Should be bumped along with EFL! buildPythonPackage rec { pname = "python-efl"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib"; + sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ python.pkgs.dbus-python ]; + propagatedBuildInputs = [ dbus-python ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" ''; - preBuild = "${python.interpreter} setup.py build_ext"; + preBuild = '' + ${python.interpreter} setup.py build_ext + ''; - installPhase= "${python.interpreter} setup.py install --prefix=$out"; + installPhase = '' + ${python.interpreter} setup.py install --prefix=$out + ''; doCheck = false; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index d2b1a6570b12..0c1f7c67e3df 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,22 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }: +{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder }: buildPythonPackage rec { - pname = "python-gitlab"; - version = "1.15.0"; + pname = "python-gitlab"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "45125a0ed4d0027d4317bdbd71ca02fc52b0ac160b9d2c3c5be131b4d19f867e"; + sha256 = "4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2"; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ requests ]; checkInputs = [ mock httmock ]; + disabled = pythonOlder "3.6"; + meta = with stdenv.lib; { description = "Interact with GitLab API"; - homepage = "https://github.com/python-gitlab/python-gitlab"; - license = licenses.lgpl3; + homepage = "https://github.com/python-gitlab/python-gitlab"; + license = licenses.lgpl3; maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 17deff412cb7..3dd44a72ea46 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.4.5"; + version = "0.4.6"; src = fetchPypi { inherit pname version; - sha256 = "01gckjhvsmr6kfwfk4qdxm5jz8nq8zilbjhzpzpiab6d96cyalrk"; + sha256 = "3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a"; }; # Let's make the library default to our gpg binary diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 16c53cd7caba..587f27fd51be 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "sha256:027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd"; + sha256 = "027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd"; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 4c66ed02cfca..e9317d3f7c67 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr"; }; - buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; + nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ]; checkInputs = [ pytest pytestcov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 7ba794716bfe..61a7dd315dfc 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.15"; + version = "0.4.18"; src = fetchPypi { inherit pname version; - sha256 = "f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5"; + sha256 = "b757db2a5289ea3f1ced9e60f072965243ea43a2221430048fd8cacab17be0ce"; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 20393d40ccea..a18645697089 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.4.8"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "19423b3386b23d2e0fc94a8f6a358bcfbb44eed05376e33fd434d26d168bd18c"; + sha256 = "8d23caf4906f2112dc88b9a6d5e1767877744cae016cd71c2bf75592a4be3b79"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix new file mode 100644 index 000000000000..4065cd7c0145 --- /dev/null +++ b/pkgs/development/python-modules/python-pam/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pam }: + +buildPythonPackage rec { + pname = "python-pam"; + version = "1.8.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8"; + }; + + postPatch = '' + substituteInPlace pam.py --replace 'find_library("pam")' \ + '"${pam}/lib/libpam${stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; + + meta = with stdenv.lib; { + description = "Python PAM module using ctypes"; + homepage = "https://github.com/FirefighterBlu3/python-pam"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 9ca1affed887..f116ec556de8 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-ptrace"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "9885e9003e4a99c90b3bca1be9306181c9b40a33fc6e17b81027709be5e5cb87"; + sha256 = "c46287ae611e3041bbd0572221cd1f121100dfc98d1d6c9ad6dd97e35f62501a"; }; # requires distorm, which is optionally diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 5b921e326678..f36f82395685 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -2,38 +2,36 @@ , fetchPypi , buildPythonPackage , certifi +, decorator , future , urllib3 , tornado , pytest +, isPy3k }: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "12.3.0"; + version = "12.7"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0yrg5342zz0hpf2pc85ffwx57msa6jpcmvvjfkzh8nh2lc98aq21"; + sha256 = "1vwf4pgjrg9a6w51ds9wmzq31bmi3f7xs79gdzzfxfmqmy1hb2r1"; }; - prePatch = '' - rm -rf telegram/vendor - substituteInPlace telegram/utils/request.py \ - --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \ - --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField" + checkInputs = [ pytest ]; + propagatedBuildInputs = [ certifi future urllib3 tornado decorator ]; - touch LICENSE.dual + # --with-upstream-urllib3 is not working properly + postPatch = '' + rm -rf telegram/vendor ''; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ certifi future urllib3 tornado ]; + setupPyGlobalFlags = "--with-upstream-urllib3"; # tests not included with release doCheck = false; + pythonImportsCheck = [ "telegram" ]; meta = with stdenv.lib; { description = "This library provides a pure Python interface for the Telegram Bot API."; diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix index 57085b04cf92..bdf09fdf2c79 100644 --- a/pkgs/development/python-modules/python-toolbox/default.nix +++ b/pkgs/development/python-modules/python-toolbox/default.nix @@ -4,10 +4,11 @@ , fetchFromGitHub , isPy27 , nose +, pytest }: buildPythonPackage rec { - version = "0.9.4"; + version = "1.0.10"; pname = "python_toolbox"; disabled = isPy27; @@ -15,12 +16,12 @@ buildPythonPackage rec { owner = "cool-RR"; repo = pname; rev = version; - sha256 = "1qy2sfqfrkgxixmd22v5lkrdykdfiymsd2s3xa7ndlvg084cgj6r"; + sha256 = "1hpls1hwisdjx1g15cq052bdn9fvh43r120llws8bvgvj9ivnaha"; }; checkInputs = [ docutils - nose + pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 67fbd4e24ebe..936a1eb2e3ed 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-utils"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3"; + sha256 = "12c0glzkm81ljgf6pwh0d4rmdm1r7vvgg3ifzp8yp9cfyngw07zj"; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index 2bf59a633411..821ad8c7baaa 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.7110"; + version = "3.0.9113"; src = fetchPypi { inherit pname version; - sha256 = "0ydnqwwgpwq1kz1pjrc7629ljzdd30izymjylsbzzyq8pq6wl6w2"; + sha256 = "5422b79d347b6419008ee91cfd9663edc37eaf2a0bd8fb9017d4cc2e5f249dda"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pythonmagick/default.nix b/pkgs/development/python-modules/pythonmagick/default.nix new file mode 100644 index 000000000000..a647fa1005bc --- /dev/null +++ b/pkgs/development/python-modules/pythonmagick/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchurl +, python +, pkg-config +, imagemagick +, autoreconfHook +, boost +, isPy3k +, pythonImportsCheckHook +}: + +buildPythonPackage rec { + pname = "pythonmagick"; + version = "0.9.16"; + format = "other"; + + src = fetchurl { + url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; + sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn"; + }; + + postPatch = '' + rm configure + ''; + + configureFlags = [ "--with-boost=${boost}" ]; + + nativeBuildInputs = [ pkg-config autoreconfHook pythonImportsCheckHook ]; + buildInputs = [ python boost imagemagick ]; + + pythonImportsCheck = [ + "PythonMagick" + ]; + + disabled = isPy3k; + + meta = with lib; { + homepage = "http://www.imagemagick.org/script/api.php"; + license = licenses.imagemagick; + description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; + }; +} diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix new file mode 100644 index 000000000000..daf6accb8935 --- /dev/null +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, numpy +, scikitlearn +, pytorch +, torchvision +, tqdm +}: + +buildPythonPackage rec { + pname = "pytorch-metric-learning"; + version = "0.9.81"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "KevinMusgrave"; + repo = pname; + rev = "cb23328aba64f7f4658374cc2920ef5d56cda5c8"; # no version tag + sha256 = "0c2dyi4qi7clln43481xq66f6r4fadrz84jphjc5phz97bp33ds8"; + }; + + propagatedBuildInputs = [ + numpy + pytorch + scikitlearn + torchvision + tqdm + ]; + + meta = { + description = "Metric learning library for PyTorch"; + homepage = "https://github.com/KevinMusgrave/pytorch-metric-learning"; + changelog = "https://github.com/KevinMusgrave/pytorch-metric-learning/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a0a4aadfe58b..80c3c6d72931 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, fetchgit, buildPythonPackage, python, pythonOlder, +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null, - mklSupport ? false, mkl ? null, + mklDnnSupport ? true, useSystemNccl ? true, openMPISupport ? false, openmpi ? null, - buildNamedTensor ? false, - buildBinaries ? false, + buildDocs ? false, cudaArchList ? null, - fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, + numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil, linkFarm, symlinkJoin, + # virtual pkg that consistently instantiates blas across nixpkgs + # See https://github.com/NixOS/nixpkgs/pull/83888 + blas, + # ninja (https://ninja-build.org) must be available to run C++ extensions tests, ninja, # dependencies for torch.utils.tensorboard - tensorboardSupport ? true, pillow, six, future, tensorflow-tensorboard, + pillow, six, future, tensorflow-tensorboard, protobuf, utillinux, which, isPy3k }: assert !openMPISupport || openmpi != null; -assert !tensorboardSupport || tensorflow-tensorboard != null; # assert that everything needed for cuda is present and that the correct cuda versions are used assert !cudaSupport || cudatoolkit != null; @@ -28,17 +30,11 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; let hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs; matchesCudatoolkit = hasDependency cudatoolkit; - matchesMkl = hasDependency mkl; in # confirm that cudatoolkits are sync'd across dependencies assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi; assert !cudaSupport || matchesCudatoolkit magma; -# confirm that mkl is sync'd across dependencies -assert !mklSupport || mkl != null; -assert !(mklSupport && cudaSupport) || matchesMkl magma; -assert !mklSupport || (numpy.blasImplementation == "mkl" && numpy.blas == mkl); - let cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -108,7 +104,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.2.0"; + version = "1.5.0"; pname = "pytorch"; disabled = !isPy3k; @@ -122,11 +118,9 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1biyq2p48chakf2xw7hazzqmr5ps1nx475ql8vkmxjg5zaa071cz"; + sha256 = "19qyrjd72mc0llcfn50av8ym05f2iwa38gv068wykji4ph7qjlv2"; }; - dontUseCmakeConfigure = true; - preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ @@ -134,6 +128,26 @@ in buildPythonPackage rec { export CUDNN_INCLUDE_DIR=${cudnn}/include ''; + # Use pytorch's custom configurations + dontUseCmakeConfigure = true; + + BUILD_NAMEDTENSOR = true; + BUILD_DOCS = buildDocs; + + USE_MKL = blas.implementation == "mkl"; + + # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note + # that this was renamed to dnnl and then renamed again to oneDNN upstream, but + # pytorch still calls it by the old name mkldnn. + USE_MKLDNN = mklDnnSupport; + USE_MKLDNN_CBLAS = mklDnnSupport; + + preBuild = '' + export MAX_JOBS=$NIX_BUILD_CORES + ${python.interpreter} setup.py build --cmake-only + ${cmake}/bin/cmake build + ''; + preFixup = '' function join_by { local IFS="$1"; shift; echo "$*"; } function strip2 { @@ -155,8 +169,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; - BUILD_NAMEDTENSOR = buildNamedTensor; # experimental feature - USE_SYSTEM_NCCL=true; # don't build pytorch's third_party NCCL + USE_SYSTEM_NCCL=useSystemNccl; # don't build pytorch's third_party NCCL # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) @@ -165,7 +178,7 @@ in buildPythonPackage rec { # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17 - NIX_CFLAGS_COMPILE = lib.optionals (numpy.blas == mkl) [ "-Wno-error=array-bounds" ]; + NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; nativeBuildInputs = [ cmake @@ -174,9 +187,8 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ - numpy.blas - ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] + buildInputs = [ blas blas.provider oneDNN ] + ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; propagatedBuildInputs = [ @@ -184,23 +196,37 @@ in buildPythonPackage rec { click numpy pyyaml - ] ++ lib.optionals openMPISupport [ openmpi ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optionals tensorboardSupport [pillow six future tensorflow-tensorboard]; + # the following are required for tensorboard support + pillow six future tensorflow-tensorboard protobuf + ] ++ lib.optionals openMPISupport [ openmpi ]; - checkInputs = [ hypothesis ninja ]; + checkInputs = [ hypothesis ninja psutil ]; - doCheck = false; # tests take a long time for channel release, so doCheck should be overridden only when developing - checkPhase = "${cudaStubEnv}python test/run_test.py" - + " --exclude utils" # utils requires git, which is not allowed in the check phase + # Tests take a long time and may be flaky, so just sanity-check imports + doCheck = false; + pythonImportsCheck = [ + "torch" + ]; - # Other tests which have been disabled in previous nix derivations of pytorch. - # --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions - ; + checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ + cudaStubEnv + "${python.interpreter} test/run_test.py" + "--exclude" + (concatStringsSep " " [ + "utils" # utils requires git, which is not allowed in the check phase + + # "dataloader" # psutils correctly finds and triggers multiprocessing, but is too sandboxed to run -- resulting in numerous errors + # ^^^^^^^^^^^^ NOTE: while test_dataloader does return errors, these are acceptable errors and do not interfere with the build + + # tensorboard has acceptable failures for pytorch 1.3.x due to dependencies on tensorboard-plugins + (optionalString (majorMinor version == "1.3" ) "tensorboard") + ]) + ]; postInstall = '' mkdir $dev cp -r $out/${python.sitePackages}/torch/lib $dev/lib cp -r $out/${python.sitePackages}/torch/include $dev/include + cp -r $out/${python.sitePackages}/torch/share $dev/share ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' @@ -233,6 +259,6 @@ in buildPythonPackage rec { homepage = "https://pytorch.org/"; license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; - maintainers = with lib.maintainers; [ teh thoughtpolice stites tscholak ]; # tscholak esp. for darwin-related builds + maintainers = with lib.maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds }; } diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index db7f781c5bf4..0b0bad801e12 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytrends"; - version = "4.7.2"; + version = "4.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1cf80573276b3a93c4fb2ff296c260fa86e7ab43709473ce34f3bad3841f06df"; + sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index dedec796e651..c26f9bcabe6e 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.21.0"; + version = "0.22.0"; src = fetchPypi { inherit pname version; - sha256 = "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9"; + sha256 = "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index a7fbf3012951..25845c9847a3 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "6.7.1.2018.12"; + version = "7.0"; src = fetchFromGitHub { owner = "vmware"; repo = pname; rev = "v${version}"; - sha256 = "1pgl95rbghidbyr8hndjzfzgb1yjchfcknlqgg3qbqvljnz9hfja"; + sha256 = "1qqljrlc9h7kddx3xxc6479gk75fvaxspfikzjn6zj5mznsvfwj5"; }; # requires old version of vcrpy diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index b8a453e99ed0..bf8a23f3baae 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "e80ae0ea978b2e3b7860d2a9ae836528f5fa2e13936673e0b6613589965937ee"; + sha256 = "61e6b92ee23ea3f7afbb427508e51c789a0c10cbc962fab9de582ad48b5792e4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix index a5cb694b4c15..65cb4389583c 100644 --- a/pkgs/development/python-modules/pyxdg/default.nix +++ b/pkgs/development/python-modules/pyxdg/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchpatch }: buildPythonPackage rec { @@ -15,6 +16,14 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; + patches = [ + # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xdg/pyxdg/-/commit/78405aaa34463db2c6f33ca28ae2293dd3bb1e91.patch"; + sha256 = "17cjax546rkqv5kvwczjqjdd6vmlvcxjanz0296dlfq23j2wbx63"; + }) + ]; + meta = with stdenv.lib; { homepage = "http://freedesktop.org/wiki/Software/pyxdg"; description = "Contains implementations of freedesktop.org standards"; diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 646d326fede3..a7c0fa3ff4a4 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "qimage2ndarray"; - version = "1.8.2"; + version = "1.8.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0f792693a0f1cd5f93fbf73bc3fb2d511fb9cceed3c9308bfb200f38c19a5545"; + sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 70c5ba38fea5..7c74ddab2b16 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, fetchpatch , cmake , cvxpy , cython @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.5.0"; + version = "0.5.1"; disabled = pythonOlder "3.5"; @@ -27,7 +28,7 @@ buildPythonPackage rec { repo = "qiskit-aer"; rev = version; fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "05lsirrdnnr5yqhwkgv08d9aib8xq4xpd6aq2pfqsi9qkii2fff1"; + sha256 = "0pbi8ldz8f1zm7pf2n5229g6kccriq21f24q9cb7bd4j5gdky5sk"; }; nativeBuildInputs = [ @@ -47,7 +48,15 @@ buildPythonPackage rec { pybind11 ]; - prePatch = '' + patches = [ + (fetchpatch{ + name = "qiskit-aer-pr-727-fix-random-unitary-test.patch"; + url = "https://github.com/Qiskit/qiskit-aer/commit/09afb3b6b0710042ab65d88e863363f2c843dcb0.patch"; + sha256 = "0521b7i4fpc5brqs08w381g3c655f9cbn6my1740jnk7dv5lhsv9"; + }) + ]; + + postPatch = '' # remove dependency on PyPi cmake package, which isn't in Nixpkgs substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" ''; @@ -81,7 +90,7 @@ buildPythonPackage rec { # Tests include a compiled "circuit" which is auto-built in $HOME export HOME=$(mktemp -d) # move tests b/c by default try to find (missing) cython-ized code in /build/source dir - cp -r test $HOME + cp -r $TMP/$sourceRoot/test $HOME # Add qiskit-aer compiled files to cython include search pushd $HOME diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index 9ff6404f2fcf..8037d28f82cf 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +# , cplex , cvxopt , dlx , docplex @@ -10,19 +11,20 @@ , networkx , numpy , psutil +, python , qiskit-ignis , qiskit-terra , quandl , scikitlearn # Check Inputs -, parameterized +, ddt , pytestCheckHook , qiskit-aer }: buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.6.6"; + version = "0.7.0"; disabled = pythonOlder "3.5"; @@ -31,11 +33,12 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "080m5nsy3ia6bcdypq5d3ijb7762yl1l9llygmxsi6si449zl2cp"; + sha256 = "0yykw6k1rb3f2ihcp0y9pb0695mcmy29nyqlj89qs4da0503vxvh"; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ + # cplex cvxopt docplex dlx # Python Dancing Links package @@ -57,19 +60,33 @@ buildPythonPackage rec { # It can also be installed at runtime from the pip wheel. # We disable appropriate tests below to allow building without pyscf installed + # NOTE: we remove cplex b/c we can't build pythonPackages.cplex. + # cplex is only distributed in manylinux1 wheel (no source), and Nix python is not manylinux1 compatible + postPatch = '' substituteInPlace setup.py \ - --replace "pyscf; sys_platform == 'linux' or (python_version < '3.8' and sys_platform != 'win32')" "" + --replace "pyscf; sys_platform != 'win32'" "" \ + --replace "cplex; python_version >= '3.6' and python_version < '3.8'" "" # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included - echo -e "\nimport warnings\ntry: import pyscf;\nexcept:\n " \ + echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \ "warnings.warn('pyscf is not supported on Nixpkgs so some qiskit features will fail." \ "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ "See https://github.com/NixOS/nixpkgs/pull/83447 for details', ImportWarning)\n" \ >> qiskit/chemistry/__init__.py + + # Add ImportWarning when running qiskit.optimization that cplex (optimization package) is not included + echo -e "\nimport warnings\ntry: import cplex;\nexcept ImportError:\n " \ + "warnings.warn('cplex is not supported on Nixpkgs so some qiskit features will fail." \ + "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ + "', ImportWarning)\n" \ + >> qiskit/optimization/__init__.py + ''; - checkInputs = [ parameterized qiskit-aer pytestCheckHook ]; + postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts. + + checkInputs = [ ddt qiskit-aer pytestCheckHook ]; dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "qiskit.aqua" @@ -84,42 +101,35 @@ buildPythonPackage rec { "--ignore=test/chemistry/test_qeom_ee.py" "--ignore=test/chemistry/test_qeom_vqe.py" "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" - - # Following tend to be slow tests, all pass - "--ignore=test/aqua/test_vqc.py" - "--ignore=test/aqua/test_hhl.py" - "--ignore=test/aqua/test_qgan.py" - "--ignore=test/aqua/test_mcr.py" - "--ignore=test/aqua/test_mcu1.py" - "--ignore=test/aqua/test_vqe.py" ]; disabledTests = [ # Disabled due to missing pyscf "test_validate" # test/chemistry/test_inputparser.py # Disabling slow tests > 10 seconds - "test_clique_vqe" - "test_delta_3_qasm" - "test_evaluate_qasm_mode" - "test_evolve_1_suzuki" - "test_exact_cover_vqe" - "test_exchangedata" - "test_expected_value_0_statevector" - "test_expected_value_1_qasm" - "test_expected_value_2_statevector" + "TestVQE" + "TestVQC" + "TestQSVM" "test_graph_partition_vqe" - "test_lookup_rotation" - "test_mct_with_dirty_ancillae_15" - "test_mcrz_11" + "TestLookupRotation" + "_vqe" + "TestHHL" + "TestQGAN" + "test_evaluate_qasm_mode" "test_measurement_error_mitigation_auto_refresh" - "test_qgan_training" - "test_qsvm_multiclass" - "test_shor_factoring_0" - "test_vertex_cover_vqe" - "test_vqc_with_raw_feature_vector_on_wine" - "test_vqe_2_iqpe" - "test_vqe_qasm" + "test_exchangedata" "test_wikipedia" + "test_shor_factoring_1__15___qasm_simulator____3__5__" + "test_readme_sample" + "test_ecev" + "test_expected_value" + "test_qubo_gas_int_paper_example" + "test_shor_no_factors_1_5" + "test_shor_no_factors_2_7" + "test_evolve_2___suzuki___1__3_" + "test_delta_4" + "test_swaprz" + "test_deprecated_algo_result" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index ea14bef2b9e4..5f8f0d94e4ff 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.6.1"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "16c73m9gp1wcrygr6mnc0a9ps0i872bgc7v1zbqyh50kxbcrnpnz"; + sha256 = "1n13jjx1cx5gswwk8rpxfjqyk97cwx1n2hwsabkcbi7fksw3c5jk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index a421b5f84adc..79998a843257 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, python , numpy , qiskit-terra , scikitlearn @@ -38,11 +39,12 @@ buildPythonPackage rec { scikitlearn scipy ]; + postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts # Tests pythonImportsCheck = [ "qiskit.ignis" ]; dontUseSetuptoolsCheck = true; - preCheck = ''export HOME=$TMPDIR''; + preCheck = "export HOME=$TMPDIR"; checkInputs = [ ddt pytestCheckHook diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 14497b20b0d0..78c28a282cb9 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.13.0"; + version = "0.14.1"; disabled = pythonOlder "3.5"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "03fgqmyahgmkf5dbw19n9c1v8p4kmpk50wxhhc8435cclvs26x9j"; + sha256 = "0pd7x2jrqy7q1s38ychqw9bayjn2rvi6rq7c2c0kd160rwj1l2sc"; }; nativeBuildInputs = [ cython ]; @@ -94,10 +94,6 @@ buildPythonPackage rec { "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; - disabledTests = [ - "test_jupyter_jobs_pbars" # needs IBMQ provider package (qiskit-ibmq-provider), circular dependency - ]; - pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency ]; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index ca0988955d52..ded9c68e6fe5 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.18.2"; + version = "0.19.1"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "05pwpcps1ksqx6m6hwq90l8sbak64fsz76yv4q3jplfjf6597k6p"; + sha256 = "0p1sahgf6qgbkvxb067mnyj6ya8nv7y57yyiiaadhjw242sjkjy5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 2cf88805b792..7175986bd761 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.7.0"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "1k9nn6z8lhaznas509h9cjy434haggz2n1mhs29bycmds716k7j8"; + sha256 = "ca9719c82d41707f62c340811b23bcab95336e73edd88b7eab7fd951d2e27fab"; }; propagatedBuildInputs = [ qtpy six ]; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index abf5509056d4..4cadba28a8a6 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -10,19 +10,20 @@ , pygments , ipykernel , pyqt5 +, qtpy }: buildPythonPackage rec { pname = "qtconsole"; - version = "4.6.0"; + version = "4.7.4"; src = fetchPypi { inherit pname version; - sha256 = "654f423662e7dfe6a9b26fac8ec76aedcf742c339909ac49f1f0c1a1b744bcd1"; + sha256 = "1zgm57011kpbh6388p8cqwkcgqwlmb7rc9cy3zn9rrnna48byj7x"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; - propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; + propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5 qtpy]; # : cannot connect to X server doCheck = false; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 0916695ed43a..f5e418d925ad 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.1.3"; + version = "1.1.4"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "0i081bkmv7qw24ivmdh92ma6x0hnjlf8jgj6rp2c3rb8hjzmi452"; + sha256 = "1a1ik66b7n6h9gxlr5yb16hhf5h9117av2ggykpfaw699xxhnz30"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 87d996230574..261ba794e70a 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rdflib"; - version = "4.2.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0398c714znnhaa2x7v51b269hk20iz073knq2mvmqp2ma92z27fs"; + sha256 = "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q"; }; propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index e9245d426f05..68ccf676f292 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "1.0.1"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "c920d8129752ee3f339c8cf3dfeba800a25730249d6ab43dc9b3c384312d1d32"; + sha256 = "33dbb135373d539233f7fbdb5e8dcfa07d41254300ee23719eb9caa8c68a40ae"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 2d3d3cd23fdd..f1591e4df741 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1b0d526859ef3e8647f37c606d7ae7c32259e370b3f1519e4219a3ba72740aec"; + sha256 = "320ded3cc456347d828f95e9aa5f8bab77ac01943cad024c06012069fe19690a"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 611bdd669015..ebe3dc772d72 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "52bbce24fa1fd7bb950d38ce9b60f497dd00ac6b26688d80ab9bce709f063e71"; + sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; }; checkInputs = [ sphinx pytestcov pytest ]; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 7769adf22194..3240c524d3bd 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, isPy33 , fetchgit , cython }: @@ -8,7 +7,6 @@ buildPythonPackage { pname = "rencode"; version = "git20150810"; - disabled = isPy33; src = fetchgit { url = "https://github.com/aresch/rencode"; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index e37a8f57e9e2..9cd3d131e906 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.34"; + version = "3.5.42"; src = fetchPypi { inherit pname version; - sha256 = "9675a26d01ec141cb717091bb139b6227bfb3794f521943101da50327bff4825"; + sha256 = "9c21f202697a6cea57b9d716288fc919d99cbabeb30222eebfc7ff77eac32744"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 3d216e4bc44f..9b443df4be4c 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.22.0"; + version = "2.23.0"; src = fetchPypi { inherit pname version; - sha256 = "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4"; + sha256 = "1rhpg0jb08v0gd7f19jjiwlcdnxpmqi1fhvw7r4s9avddi4kvx5k"; }; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index e98aad824b64..0bf8b47fd6d5 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.9"; + version = "0.10.14"; src = fetchPypi { inherit pname version; - sha256 = "8ce8cb4e7e1ad89336f8865af152e0563d2e7f0e0b86d2cf75f015f819409243"; + sha256 = "1a78bc010b20a5022a2c0cb76b8ee6dc1e34d887972615ebd725ab9a166a4960"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 4f62d232ab5e..17bf5fbf2974 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "97b3da356d5b3a8514d8f1f9098febd8b41463bed6a1d9f126cf0a048b6fd908"; + sha256 = "470e53b64817211a42805c3a104d2216f6f5834b22fe7adb637d1de4d6501fb8"; }; checkInputs = [ nose testtools ]; diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index 7eea5d2c39fc..f1239b75d481 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "rethinkdb"; - version = "2.4.4.post1"; + version = "2.4.7"; src = fetchPypi { inherit pname version; - sha256 = "e1c1f8ad93bc1c6f2aaa73afc333c57d505d8cc08c437d78a5c1eb8dc4b7e8c2"; + sha256 = "945b5efdc10f468fc056bd53a4e4224ec4c2fe1a7e83ae47443bbb6e7c7a1f7d"; }; doCheck = false; diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix index ea6a214691e8..c1e495f56a99 100644 --- a/pkgs/development/python-modules/retry_decorator/default.nix +++ b/pkgs/development/python-modules/retry_decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "retry_decorator"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "b7723b83730a09a5a884f2d1c422c9556d20324b7a0f5b129ad94fd07baba36d"; + sha256 = "e1e8ad02e518fe11073f2ea7d80b6b8be19daa27a60a1838aff7c731ddcf2ebe"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 7d8a44365c47..3af6d2f022be 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "rfc3986"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0344d0bd428126ce554e7ca2b61787b6a28d2bbd19fc70ed2dd85efe31176405"; + sha256 = "17dvx15m3r49bmif5zlli8kzjd6bys6psixzbp14sd5367d9h8qi"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/rig/default.nix b/pkgs/development/python-modules/rig/default.nix index d83afd7885f0..bc43aac3551a 100644 --- a/pkgs/development/python-modules/rig/default.nix +++ b/pkgs/development/python-modules/rig/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPy34, isPy35, isPy27 +, isPy35, isPy27 , numpy, pytz, six, enum-compat, sentinel }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # This is the list of officially supported versions. Other versions may work # as well. - disabled = !(isPy35 || isPy34 || isPy27); + disabled = !(isPy27 || isPy35); # Test Phase is only supported in development sources. doCheck = false; diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index bee588457ff2..e9efb0c02b4e 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0c4f3a334ff55d534d2fc7f83d5e791f64b780391039e367f6cd9b4381838744"; + sha256 = "0i47hf0l76ydyrky6f8h760bfr0zg5g3vy675x6m6pgm9wrklkqc"; }; propagatedBuildInputs = [ @@ -94,5 +94,7 @@ buildPythonPackage rec { homepage = "https://nervanasystems.github.io/coach/"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; + # pythonPackages.gym is too new + broken = true; # since 2020-04-20 }; } diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix new file mode 100644 index 000000000000..8e42baf8ff74 --- /dev/null +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, rply +}: + +buildPythonPackage rec { + pname = "rnc2rng"; + version = "2.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kmp3iwxxyzjsd47j2sprd47ihhkwhb3yydih3af5bbfq0ibh1w8"; + }; + + propagatedBuildInputs = [ rply ]; + + checkPhase = "${python.interpreter} test.py"; + + meta = with lib; { + homepage = "https://github.com/djc/rnc2rng"; + description = "Compact to regular syntax conversion library for RELAX NG schemata"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index b0cb616dbde9..bd6b884ed7dc 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.6.3"; + version = "0.6.6"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "f29844eee373775fd590b80f80a7d5a4325094a4f0a3c48e972d24712dbd2ce4"; + sha256 = "01b6d02052349663b7faae5e9363877b1e5ea1f181bd52b1a29df3b03a348bcf"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index bdfde326d76f..9e32f9212cfc 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.16.5"; + version = "0.16.10"; src = fetchPypi { inherit pname version; - sha256 = "412a6f5cfdc0525dee6a27c08f5415c7fd832a7afcb7a0ed7319628aed23d408"; + sha256 = "099c644a778bf72ffa00524f78dd0b6476bca94a1da344130f4bf3381ce5b954"; }; # Tests use relative paths diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index c6241e88ef9b..535f8efec916 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "0.4.0"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "504a41ecb9edf0bd7798847b61839954e50508c5235ec7ee48c539ce46b4fa18"; + sha256 = "2ca5de8dc18ad7ad350c0bd01aef0406aa5d0fff78a561f0f710f9d9858abdd0"; }; buildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix new file mode 100644 index 000000000000..c268f2699595 --- /dev/null +++ b/pkgs/development/python-modules/safety/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, requests, dparse, click, setuptools, pytestCheckHook }: + +buildPythonPackage rec { + pname = "safety"; + version = "1.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "23bf20690d4400edc795836b0c983c2b4cbbb922233108ff925b7dd7750f00c9"; + }; + + propagatedBuildInputs = [ requests dparse click setuptools ]; + + # Disable tests depending on online services + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + disabledTests = [ + "test_check_live" + "test_check_live_cached" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = + "Safety checks your installed dependencies for known security vulnerabilities"; + homepage = "https://github.com/pyupio/safety"; + license = licenses.mit; + maintainers = with maintainers; [ thomasdesr ]; + }; +} diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index d4d45e8bd3bf..2214bc2da528 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "schema"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "c9dc8f4624e287c7d1435f8fd758f6a0aabbb7eff442db9192cd46f0e2b6d959"; + sha256 = "b536f2375b49fdf56f36279addae98bd86a8afbd58b3c32ce363c464bed5fc1c"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 6391e833114a..650a67709913 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -19,13 +19,13 @@ }: buildPythonPackage rec { - version = "0.5.5"; + version = "0.5.6"; pname = "scikit-bio"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9fa813be66e88a994f7b7a68b8ba2216e205c525caa8585386ebdeebed6428df"; + sha256 = "48b73ec53ce0ff2c2e3e05f3cfcf93527c1525a8d3e9dd4ae317b4219c37f0ea"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index c7519ee39624..454e631634bf 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.21.3"; + version = "0.22.2.post1"; # 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 = "eb9b8ebf59eddd8b96366428238ab27d05a19e89c5516ce294abc35cea75d003"; + sha256 = "0z81n13dxvd6qwq5lsnzw2machmxbirhdhr73v90fi55ic9qslsp"; }; buildInputs = [ @@ -41,15 +41,6 @@ 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; @@ -61,6 +52,12 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; + changelog = let + major = versions.major version; + minor = versions.minor version; + dashVer = replaceChars ["."] ["-"] version; + in + "https://scikit-learn.org/stable/whats_new/v${major}.${minor}.html#version-${dashVer}"; homepage = "https://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix new file mode 100644 index 000000000000..cf6f8a010714 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }: + +buildPythonPackage rec { + pname = "scrapy-deltafetch"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m511psddvlapg492ny36l8rzy7z4i39yx6a1agxzfz6s9b83fq8"; + }; + + propagatedBuildInputs = [ bsddb3 scrapy ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls"; + homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch"; + license = licenses.bsd3; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix new file mode 100644 index 000000000000..26e142434c59 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, fake-useragent, scrapy }: + +buildPythonPackage rec { + pname = "scrapy-fake-useragent"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02mayk804vdl15wjpx7jcjkc4zgrra4izf6iv00mcxq4fd4ck03l"; + }; + + propagatedBuildInputs = [ fake-useragent ]; + + checkInputs = [ pytest scrapy ]; + + meta = with stdenv.lib; { + description = "Random User-Agent middleware based on fake-useragent"; + homepage = "https://github.com/alecxe/scrapy-fake-useragent"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix new file mode 100644 index 000000000000..7799186d6216 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }: + +buildPythonPackage rec { + pname = "scrapy-splash"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488"; + }; + + checkInputs = [ pytest hypothesis scrapy ]; + + meta = with stdenv.lib; { + description = "Scrapy+Splash for JavaScript integration"; + homepage = "https://github.com/scrapy-plugins/scrapy-splash"; + license = licenses.bsd3; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix new file mode 100644 index 000000000000..9ee04cb50a82 --- /dev/null +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }: + +buildPythonApplication rec { + pname = "screeninfo"; + version = "0.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz"; + }; + + # dataclasses is a compatibility shim for python 3.6 ONLY + patchPhase = if isPy36 then "" else '' + substituteInPlace setup.py \ + --replace "\"dataclasses\"," "" + '' + '' + substituteInPlace screeninfo/enumerators/xinerama.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" + substituteInPlace screeninfo/enumerators/xrandr.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" + ''; + + propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses; + + buildInputs = [ libX11 libXinerama libXrandr]; + + meta = with stdenv.lib; { + description = "Fetch location and size of physical screens"; + homepage = "https://github.com/rr-/screeninfo"; + license = licenses.mit; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 5532a8afa9b1..c68224c401da 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "59fe414e138d7d5ea08b0feb01b86caf4682e36fa748e3987730523a89aecbb9"; + sha256 = "2d1a0c9d6bd1bc3cadb0364b8f06540f51322a670cf8438d0fde1c1c7317adc0"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 2cd7590b83d1..3cd6b2fe3ccd 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { ''; postPatch = '' + sed -i '38,45d' setup.py substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" "" ''; diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 6d2f2871ec2d..49fcb52a154f 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , maya , requests }: @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.2.1"; pname = "secure"; + disabled = isPy27; src = fetchFromGitHub { owner = "typeerror"; diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index fc2763be1f01..61668bd6a0a6 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "seekpath"; - version = "1.9.3"; + version = "1.9.7"; src = fetchPypi { inherit pname version; - sha256 = "abc806479f11e7f71c4475a292d849baf15dfa1cbc89ecc602d78415de322c83"; + sha256 = "b83ea23b54209b7f34f3fcabe7248cebbcc3cc164c394f1659b35942edaedb1c"; }; LC_ALL = "en_US.utf-8"; diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index f2df3c99b2a5..e939142fd82f 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "semantic_version"; - version = "2.8.4"; + version = "2.8.5"; src = fetchPypi { inherit pname version; - sha256 = "352459f640f3db86551d8054d1288608b29a96e880c7746f0a59c92879d412a3"; + sha256 = "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; }; # ModuleNotFoundError: No module named 'tests' diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 353ea1cbe26b..701de5200461 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -4,7 +4,6 @@ , lib , python , isPy27 -, isPy33 , enum34 , attrs , pytz @@ -19,7 +18,7 @@ buildPythonPackage rec { sha256 = "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk"; }; - propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ]; + propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; checkInputs = [ attrs pytz ]; checkPhase = '' diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix new file mode 100644 index 000000000000..fbe1528c4c3b --- /dev/null +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pylint }: + +buildPythonPackage rec { + pname = "setuptools-lint"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577"; + }; + + propagatedBuildInputs = [ pylint ]; + + meta = with stdenv.lib; { + description = "Package to expose pylint as a lint command into setup.py"; + homepage = "https://github.com/johnnoone/setuptools-pylint"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index c4ff18697e56..69b89a376fc2 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ let pname = "setuptools"; - version = "45.2.0"; + version = "46.1.3"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "003iflm3ifjab3g1bnmhpwx1v3vpl4w90vwcvn8jf9449302d0md"; + sha256 = "1f6bp3qy5zvykimadk8k11k3629hmnwlw2cfw4vwcsvdarhig673"; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 8bf73209ad8f..238d394ee11e 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -3,11 +3,12 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.3.1"; + version = "1.3.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1q7kws7w4x2hji3g7y0ni9ddk4sd676ylrb3db54gbpys6xj6nwq"; + sha256 = "576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index 348dd51599fa..bcf853e999ce 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "simpy"; - version = "3.0.11"; + version = "3.0.13"; src = fetchPypi { inherit pname version; - sha256 = "0hqgxk3lggf21jq9lh8838cdl24mdkdnpzh0w4m28d0zn2wjb5nh"; + sha256 = "dd8c16ca3cff1574c99fe9f5ea4019c631c327f2bdc842e8b1a5c55f5e3e9d27"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index cb1575f9349d..2bc8b70e4ca5 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.18"; + version = "4.19.22"; format = "other"; disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "07kyd56xgbb40ljb022rq82shgxprlbl0z27mpf1b6zd00w8dgf0"; + sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1"; }; configurePhase = '' diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 76820b6ebc6a..d7791fcf96cb 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; + buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix new file mode 100644 index 000000000000..8e3fcc12f552 --- /dev/null +++ b/pkgs/development/python-modules/skorch/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest +, pytestcov +, flaky +, numpy +, pandas +, pytorch +, scikitlearn +, scipy +, tabulate +, tqdm +}: + +buildPythonPackage rec { + pname = "skorch"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l576dws9drjakfsn0pfpbr48b21vpxv3vd3dz8lkbn8q71zs22r"; + }; + + propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; + checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; + + # on CPU, these expect artifacts from previous GPU run + disabledTests = [ + "test_load_cuda_params_to_cpu" + "test_pickle_load" + ]; + + meta = with lib; { + description = "Scikit-learn compatible neural net library using Pytorch"; + homepage = "https://skorch.readthedocs.io"; + changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 379a7e1b01c1..d4f332b44750 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.6.9"; + version = "0.6.12"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fb057eb7f5416ac76b6ab03bb5c20c39cb7b97c7689ce1e7244c9088bd28f513"; + sha256 = "9773cf48754341d03bb2e65c07897fc9c00a8727487ab2820ed89eb85f546506"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index b5315549119e..2fd7d92e3d7c 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.4.2"; + version = "1.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0rqpmscxjznxyz3dyxpc56gib319k01vl837r8g8w57dinz4y863"; + sha256 = "0c5g4r5c6zm5fgvk6dd0dbx9gl3ws2swajc5knlacnpfykwzp5b4"; }; patches = [ diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 6244ea62333e..fadeb93f0a13 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.11.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "1692h0j6jbxmm0acy1lbbbf4j34l0idi1vpzk6b5ixm0akzcfgl1"; + sha256 = "221cc08ae926af6ad72d141f208d228e1e801b1ee9b15f3e466eecf89d931002"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 469c892a9034..04b86ad5f6f7 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "smmap"; - version = "3.0.1"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "0ijlnv60y8f41py1wnn5n1a1i81cxd9dfpdhr0k3cgkrcbz8850p"; + sha256 = "9c98bbd1f9786d22f14b3d4126894d56befb835ec90cef151af566c7e19b5d24"; }; checkInputs = [ nosexcover ]; diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix new file mode 100644 index 000000000000..fe22f121efb7 --- /dev/null +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, fetchPypi, lib, python, six, tox, mock, pytest }: + +buildPythonPackage rec { + pname = "smpplib"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jzxlfwf0861ilh4xyd70hmkdbvdki52aalglm1bnpxkg6i3jhfz"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ tox mock pytest ]; + + checkPhase = '' + pytest + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/tests + ''; + + meta = with lib; { + description = "SMPP library for Python"; + homepage = "https://github.com/python-smpplib/python-smpplib"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index efb0a23a7c6d..a34996b8734c 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snakeviz"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "11a8cd4g98vq2x61i99ncl5w83clnndwg909ya4y1cdf0k1ckb40"; + sha256 = "0s6byw23hr2khqx2az36hpi52fk4v6bfm1bb7biaf0d2nrpqgbcj"; }; # Upstream doesn't run tests from setup.py diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 6e319a183418..93d7d1d9d9cf 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.1.0"; + version = "2.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1z3c9p22pm3823jzh917c3rryv02mhigrjkjf9wlhzmjwx5vmjqf"; + sha256 = "c3ecd63d997fbcf6e5322dc47c1f02615f1d9611cba01ec18e9c9f8c14ed824b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 1d83edbc7229..1d8389d80640 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.2.2"; + version = "2.2.7"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1qqlqypxj3j5qz8jjzil7250alf0w4bx8k8ndyj2ymp8kq2z1v0j"; + sha256 = "84974778dd8d1efd4ff87d8404d71241f90e02044b1b94a52eea567080f93ac4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index d8c557eddc73..9e4bab5284c0 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.1.17"; + version = "1.1.18"; src = fetchPypi { inherit pname version; - sha256 = "1pmmwkw29944zh044azwbc1gf4s04fm55920d9if2a3zpjm6c5d7"; + sha256 = "5c19890d94bc4e5b76e7ac1a3e4c9e2b49b4d95214156d140a781042b8389725"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 9f0b805a19da..4370388959d0 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.3.1"; + version = "0.3.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11jv5mv3l11qjlsjihd74gc1jafq0i7360cksqjkx1wv2hcc32rf"; + sha256 = "ea038827afe439577eb109ebd1b5c481d516d489c624fc3fe6e92ec71ef42be9"; }; # There are no tests; make sure the executable works. diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index a74c40486fc1..c7235468370f 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sockjs-tornado"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "ec12b0c37723b0aac56610fb9b6aa68390720d0c9c2a10461df030c3a1d9af95"; + sha256 = "02ff25466b3a46b1a7dbe477340b042770ac078de7ea475a6285a28a75eb1fab"; }; propagatedBuildInputs = [ tornado ]; diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 93b0e309b7c4..3c2a5e2a356d 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy27 , ptable , click , requests @@ -17,6 +18,7 @@ buildPythonPackage rec { pname = "softlayer-python"; version = "5.8.4"; + disabled = isPy27; propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 306737c40028..958c9ab82662 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.5"; + version = "2.0.6"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs"; + sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s"; }; propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 614f0881ff85..9a6baf80f04a 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.3.14"; + version = "0.3.15"; src = fetchPypi { inherit pname version; - sha256 = "c7b0f7ad86550668da55404eabcb63d4212ec622fcce86510092306b77d2e80a"; + sha256 = "028f6e5df83027f4bfba5d6d61e6d46eb8689f9e647825e09f539920dee17d2c"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index b8cdd63cbde5..bb5ecbc839c2 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "1.9.5"; + version = "1.9.6"; src = fetchPypi { inherit pname version; - sha256 = "e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda"; + sha256 = "7985bacc98c34923a439967c1a602dc4f1e15f923b6fcf02344184f86cc7efaa"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 0c9909622681..6a54cc1ec715 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -53,6 +53,10 @@ buildPythonPackage rec { # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow # ''; + postPatch = '' + substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8" + ''; + meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = "https://github.com/explosion/spaCy"; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 483fc12915f0..355453ed26e6 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.8.0"; + version = "0.9.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a3dc14ee5314caa2e64331b0b50c8f92e8999d7d275179a804a114e6cb1f8b81"; + sha256 = "04gfwm1y9knryx992biniqa3978n3chr38iy3y4i2b8wy52fzy3d"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 02155483b209..2044e3799375 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.14.1.post0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "0kmllcch5p20ylxirqiqzls567jr2808rbld9i8f1kf0205al8qq"; + sha256 = "0c1nbpd5wy361xga8lw36xwc9yyz7rylsjr0z7aw7bn3s35bnkbx"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index b10552bf0934..79f7aa0739cd 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sphfile"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz"; - sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8"; + sha256 = "1596d801facc2b03a40a1bc67a839701f068a41597059feb82fc9378420c52c0"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 9c7d699d20f0..b4cbd3bff9a1 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -32,11 +32,11 @@ buildPythonPackage rec { pname = "sphinx"; - version = "2.3.1"; + version = "3.0.3"; src = fetchPypi { pname = "Sphinx"; inherit version; - sha256 = "19a28nsb0w4bs6k8rdfyk6vzrcwdpvhs2wq77rgpmww59yvndrz6"; + sha256 = "0wpmqfx4mxv5kv9xxd6wyfsm8vcnp8p99h14q7b6if2mv69gvvb2"; }; LC_ALL = "en_US.UTF-8"; @@ -70,12 +70,6 @@ buildPythonPackage rec { # Lots of tests. Needs network as well at some point. doCheck = false; - # https://github.com/NixOS/nixpkgs/issues/22501 - # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. - postPatch = '' - substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" - ''; - meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = "http://sphinx.pocoo.org/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 5644834b2816..f90ed55ee342 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897"; + sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 36fb29fde595..bc9a90efcf23 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , oset, pybtex, pybtex-docutils, sphinx }: @@ -6,6 +6,8 @@ buildPythonPackage rec { version = "1.0.0"; pname = "sphinxcontrib-bibtex"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0"; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index fca1856863b7..01d34dd0ae62 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-devhelp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "6c64b077937330a9128a4da74586e8c2130262f014689b4b89e2d08ee7294a34"; + sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 42a6046a1fb5..859181d675fc 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "4670f99f8951bd78cd4ad2ab962f798f5618b17675c35c5ac3b2132a14ea8422"; + sha256 = "e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index d3c9fe152806..95bd4b592010 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.6.0"; + version = "0.6.1"; # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple # directories). But python2 is EOL, so not supporting it should be ok. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1692q3f3z1rsd3nyxd8wrv0vscwcq2gqjbv79c8ws402y3m7y5ni"; + sha256 = "88320b2780f350d67f84a5424973ce24aee65701e8e163a7f5856c5df3353188"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 358ad771c5d5..60b8a06510ff 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "79465ce11ae5694ff165becda529a600c754f4bc459778778c7017374d4d406f"; + sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 04b19aef8bf6..5a5c0e3df6fd 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; - version = "1.1.3"; + version = "1.1.4"; src = fetchPypi { inherit pname version; - sha256 = "c0efb33f8052c04fd7a26c0a07f1678e8512e0faec19f4aa8f2473a8b81d5227"; + sha256 = "eaa0eccc86e982a9b939b2b82d12cc5d013385ba5eadcc7e4fed23f4405f77bc"; }; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 1f9455c8087d..9a6d51e48307 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1sqjagabqccrc73a423smfjmiph7lfjzj26r6hn3j3vf3drm3rpj"; + sha256 = "48f71252d0a7c7a91242e70d47618a432ee5f9f6666e651473a54bc55513571c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index 7987775cee1d..e5c5683f5dc4 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -1,62 +1,38 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, - psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, +{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, + psutil, pyflakes, rope, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels_0_5, qtpy, pyzmq, chardet -, pyqtwebengine + spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine }: buildPythonPackage rec { pname = "spyder"; version = "3.3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1"; + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = "spyder"; + rev = "v3.3.6"; + sha256 = "1sk9xajhzpklk5bcbdhpfhx3gxhyrahsmj9bv2m6kvbqxdlx6bq6"; }; - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - propagatedBuildInputs = [ - jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 + jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc + qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 pygments qtpy pyzmq chardet pyqtwebengine ]; - # There is no test for spyder + # tests fail with a segfault doCheck = false; - desktopItem = makeDesktopItem { - name = "Spyder"; - exec = "spyder"; - icon = "spyder"; - comment = "Scientific Python Development Environment"; - desktopName = "Spyder"; - genericName = "Python IDE"; - categories = "Application;Development;Editor;IDE;"; - }; - postPatch = '' # remove dependency on pyqtwebengine - # this is still part of the pyqt 5.11 version we have in nixpkgs + # this is still part of the pyqt 5.13 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; - # Create desktop item - postInstall = '' - mkdir -p $out/share/icons - cp spyder/images/spyder.svg $out/share/icons - cp -r $desktopItem/share/applications/ $out/share - ''; - - dontWrapQtApps = true; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - meta = with stdenv.lib; { - description = "Scientific python development environment"; + description = "Library providing a scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive @@ -65,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/spyder-ide/spyder/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner marcus7070 ]; }; } diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 82c45f3cb649..47da1d9c0d2c 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.1.2"; + version = "4.1.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0qyisrs9xkzx4hbyin9nasvl10qk7jlxrmyasxycz4zwnvzfvxzf"; + sha256 = "c88d973c6423fe0017818482a98163bb72e7f6a8c3127ff464930109df0958d9"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index db23e2ab7db2..67242a991659 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.36.3"; + version = "0.36.5"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "0fj9qiz5hq8gf9pnir077sl58chry7jz63fnj1vgx5rmq1dsys7j"; + sha256 = "0d3lrhqdw3lhkj79wpfxi6cmlxnw99prpq8m70c5q8kinv26h038"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index b536059bed19..cd2b00021e7b 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.3.13"; + version = "1.3.17"; src = fetchPypi { inherit pname version; - sha256 = "64a7b71846db6423807e96820993fa12a03b89127d278290ca25c0b11ed7b4fb"; + sha256 = "156a27548ba4e1fed944ff9fcdc150633e61d350d673ae7baaf6c25c04ac1f71"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index e6227e4ced3e..81aede240eeb 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.4"; + version = "1.4.6"; src = fetchPypi { inherit pname version; - sha256 = "0chnb421g4bsshbkx6d1xnhsda4250jsn8zyklg5p1vqyr12mhik"; + sha256 = "0da3a6700a370fcd671265502c7c4aca39a1d055de9a1dcc8b9b751c9ad3efa8"; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 4e1ced22beb1..b6aee633e0ea 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0wxqrm9fpn4phz6rqm7kfd1wwkwzx376gs27nnalwx12q0lwlgbw"; + sha256 = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/sqlsoup/default.nix b/pkgs/development/python-modules/sqlsoup/default.nix new file mode 100644 index 000000000000..a6ffd3227cd4 --- /dev/null +++ b/pkgs/development/python-modules/sqlsoup/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, lib, sqlalchemy, nose }: + +buildPythonPackage rec { + pname = "sqlsoup"; + version = "0.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mj00fhxj75ac3i8xk9jmm7hvcjz9p4x2r3yndcwsgb659rvgbrg"; + }; + + propagatedBuildInputs = [ sqlalchemy ]; + checkInputs = [ nose ]; + + meta = with lib; { + description = "A one step database access tool, built on the SQLAlchemy ORM"; + homepage = "https://bitbucket.org/zzzeek/sqlsoup"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 77644f6aa698..2afbb22d64e5 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "srp"; - version = "1.0.15"; + version = "1.0.16"; src = fetchPypi { inherit pname version; - sha256 = "d5b8ed6dc7d3ae2845a16590ef37763bbf15d6049848b85a8c96dfb8a83c984a"; + sha256 = "c943b7181322a2bdd50d20e1244536c404916e546131dc1fae10a7cb99a013e9"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index fb0c013ef08f..559b3fff178a 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "sseclient"; - version = "0.0.24"; + version = "0.0.26"; src = fetchPypi { inherit pname version; - sha256 = "1b4c5119b9381cb6ddaf3236f3f7e1437a14e488d1ed61336873a839788481b0"; + sha256 = "33f45ab71bb6369025d6a1014e15f12774f7ea25b7e80eeb00bd73668d5fefad"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index cad0aa79705f..842622e56f86 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { # https://github.com/tiangolo/fastapi/issues/683. Please update when # possible. FastAPI is currently Starlette's only dependent. - version = "0.13.2"; + version = "0.13.4"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "1ls8d121zyyhry5ji7gf7vjvhyqdpr4za3qx1llq48943fmaxxpq"; + sha256 = "1rk20rj62iigkkikb80bmalriyg1j3g28s25l8z2gijagv1v5c7l"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index e2c7142c979d..c65fb0990f0f 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.11.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0wcc7xbwlf8r2diw9fnzf4bg9h5cg406w7phd3dz37hx17yfi3ha"; + sha256 = "5bde3fa0a35a91b45dba7cbc28270b5b649ff1d721c89290883f6e831672d5f0"; }; checkInputs = with self; [ nose ]; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index d6ec10579f9b..0f73f8e8163b 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.31.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "054apq55yg7058pmbnyc8jhrcpi9clmi0sm7znhwg0d676brywz0"; + sha256 = "02shnm8r8c0bv494m8sjnrrlqy0pz5q5xrzpq069bx9sc8fszbqq"; }; doCheck = false; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index ff520c5ffe39..d675a1fd350d 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.44.0"; + version = "2.48.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0aaaf8dp989im2n0cdmslq0ys4ia970yl1irhxiwwqarmh6fap5i"; + sha256 = "1w9ns4jjj0p50im9vbjn084zph1g2sfa6l01ydl98qsyj76f4psi"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index a564798c58a5..9fba92ca12f7 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -8,7 +8,7 @@ , pandas , tables , git -, ffmpeg +, ffmpeg_3 , scikitimage , matplotlib , qdarkstyle @@ -30,12 +30,12 @@ buildPythonPackage rec { pname = "stytra"; - version = "0.8.26"; + version = "0.8.33"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "81842a957e3114230c2d628f64325cd89d166913b68c3f802c89282f40918587"; + sha256 = "b0aacc8e2c1bba33c337ebc76c0d8f2971c113d298aea2a375d84a5eeff5d83e"; }; doCheck = false; checkInputs = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { pandas tables git - ffmpeg + ffmpeg_3 scikitimage matplotlib qdarkstyle diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 4c8bf7f6ba64..25e20a44118c 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "subliminal"; - version = "2.0.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl"; + sha256 = "12v2clnbic8320fjsvkg3xfxfa7x8inhjk61z00pzwx46g3rqhy6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 08c3f6e52cae..7799583f8dcf 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -1,24 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub -, pyparsing +, isPy3k +, pythonOlder , pytest }: buildPythonPackage rec { pname = "svgwrite"; - version = "1.3.1"; + version = "1.4"; src = fetchFromGitHub { owner = "mozman"; repo = "svgwrite"; rev = "v${version}"; - sha256 = "14wz0y118a5wwfzin6cirr9254p4y825lnrnackihdbpw22gcw11"; + sha256 = "15xjz5b4dw1sg3a5k4wmzky4h5v1n937id8vl6hha1a2xj42z2s5"; }; - propagatedBuildInputs = [ - pyparsing - ]; + # svgwrite requires Python 3.6 or newer + disabled = pythonOlder "3.6"; checkInputs = [ pytest diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index a4933f1b206d..b1427a813312 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "1.1.0"; + version = "2.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "19wvx40lgm1d1zqscznwjklchczcmv07cqfigalmpj7i7ym0j6ad"; + sha256 = "1rvvdchdva7j9b29ay0sg8y33pjhpmzynl38wz2rl89pph8gmhlc"; }; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index c482c517989d..4686d02486fc 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.6"; + version = "0.8.7"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8"; + sha256 = "db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index 5c63121812a6..f3199f7e5d11 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tbm-utils"; - version = "2.5.0"; + version = "2.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "02bmra9f0p1irhbrklxk9nhkvgwkn8042hx7z6c00qlhac1wlba2"; + sha256 = "5909852f8ce350631cdaaecaf0aee45569148d22bd429360a1c92a203ba5706b"; }; propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index a125cfd9bff3..f8c0661f0cd8 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.10.10"; + version = "1.14.0"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "0zm3577f1l5g0i0gcxr3s0nrqy0i81ppr6vp31p550vvnlnkjsqj"; + sha256 = "1fg12gcg6ca7rjh7m3g48m30cx4aaw5g09855nlyz2sa1kw3gfyq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 17ce469dc1c5..18570c90c00f 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -1,22 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, pbr, six, futures, monotonic, setuptools_scm -, pytest, sphinx, tornado +{ lib, buildPythonPackage, fetchPypi, isPy27, isPy3k +, pbr, six, futures, monotonic, typing, setuptools_scm +, pytest, sphinx, tornado, typeguard }: buildPythonPackage rec { pname = "tenacity"; - version = "6.0.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "72f397c2bb1887e048726603f3f629ea16f88cb3e61e4ed3c57e98582b8e3571"; + sha256 = "16ikf6n6dw1kzncs6vjc4iccl76f9arln59jhiiai27lzbkr1bi9"; }; nativeBuildInputs = [ pbr setuptools_scm ]; propagatedBuildInputs = [ six ] - ++ lib.optionals isPy27 [ futures monotonic ]; + ++ lib.optionals isPy27 [ futures monotonic typing ]; - checkInputs = [ pytest sphinx tornado ]; + checkInputs = [ pytest sphinx tornado ] + ++ lib.optionals isPy3k [ typeguard ]; checkPhase = if isPy27 then '' pytest --ignore='tenacity/tests/test_asyncio.py' '' else '' diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 3a5ee229b432..21ce440c630a 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -61,7 +61,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx"; + sha256 = "1snj7fxfxzvrqv9cpir1daxcg3fip6cvbk94y3mi2h50k3ni826i"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index aae812e8ebeb..4dc5c57070d1 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -300,9 +300,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1qygfcvvn9vysap9nk6xccxi9mgmzyxiywz6k456f811l1v70p2c" + "09j57w6kc0vkfcdwr0qggy3qgrgq82kfa2jrwvvcnij4bl3wj40j" else - "0kfjanw0mfbh30vi1ms2xlg8yp429cbyfriik6yxd5cla2pncg2j"; + "14g8z49qz7d8n1c2mcsfhr7yqpcy7mhmpm6hgmqvpgb8vm7yvwrc"; }; buildAttrs = { @@ -430,7 +430,10 @@ in buildPythonPackage { EOF ''; - passthru.libtensorflow = bazel-build.out; + passthru = { + deps = bazel-build.deps; + libtensorflow = bazel-build.out; + }; inherit (bazel-build) meta; } diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index d32305ff5133..acb5f473ec9d 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -19,7 +19,7 @@ , opt-einsum , backports_weakref , tensorflow-estimator_2 -, tensorflow-tensorboard +, tensorflow-tensorboard_2 , cudaSupport ? false , cudatoolkit ? null , cudnn ? null @@ -77,7 +77,7 @@ in buildPythonPackage { google-pasta wrapt tensorflow-estimator_2 - tensorflow-tensorboard + tensorflow-tensorboard_2 keras-applications keras-preprocessing ] ++ lib.optional (!isPy3k) mock @@ -159,6 +159,14 @@ in buildPythonPackage { done ''; + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # Another possibility would be to have tensorboard only in the buildInputs + # See https://github.com/NixOS/nixpkgs/pull/44381 for more information. + postInstall = '' + rm $out/bin/tensorboard + ''; + pythonImportsCheck = [ "tensorflow" "tensorflow.keras" diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index 089d377ec241..4dd378d1410b 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -294,9 +294,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "0hg3ysy644950a34j28hrb317cz8gcbb9n84d36wdailvnlshghb" + "1kqk1gx5g63kb2zdj392x6mnpbrmgqghrdv597aipn7s23xzj8pd" else - "1gy4pz9kn30wb9c4a9584fibb88c3h38y3dqa99yw1lbsbyyi28c"; + "1plpcm2ydpajsrxdvmmpfy7l0gfdir78hap72w4k7ddm6d3rm2fv"; }; buildAttrs = { @@ -421,7 +421,10 @@ in buildPythonPackage { ''; # Regression test for #77626 removed because not more `tensorflow.contrib`. - passthru.libtensorflow = bazel-build.out; + passthru = { + deps = bazel-build.deps; + libtensorflow = bazel-build.out; + }; inherit (bazel-build) meta; } diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 0c0db60f2c0a..b3db882c82b2 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.10.3"; + version = "6.14.1"; src = fetchPypi { inherit pname version; - sha256 = "8f22100d4fb841b958f64e71c8820a32dc46f57d4d7e077777b932acd87b7327"; + sha256 = "0rh38zj8wywgqlsi5j75c7drpqhkrg50qknj1kdmvg4kdlab7ljq"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 6f1eaa804958..e47e17094af3 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.4.0"; + version = "7.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1f2qpjb8nfdklqp3vf6m36bklydlnr8y8v207p8d2gmapzhrngjj"; + sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index ee805ce6300f..86a2dd200110 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { gifsicle = "${pkgs.gifsicle}/bin/gifsicle"; exiftool = "${pkgs.exiftool}/bin/exiftool"; jpegtran = "${pkgs.libjpeg}/bin/jpegtran"; - ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + ffmpeg = "${pkgs.ffmpeg_3}/bin/ffmpeg"; }) ]; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index dff50c78cf6c..1256ee7ff963 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonPackage rec { pname = "tld"; - version = "0.11.9"; + version = "0.11.11"; src = fetchPypi { inherit pname version; - sha256 = "c5fe79df74b68ebc33406dfadc69f6484dee8005035a129fdb40b8fabfd06e9f"; + sha256 = "72c7170f68ade92a07be43b363afc8e42a98ffa3700d899a984fdbeedb339bac"; }; propagatedBuildInputs = with python.pkgs; [ six ]; diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index ecf9aa91b417..f420cbaee974 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -16,6 +16,5 @@ buildPythonPackage rec { description = "The official Todoist Python API library"; homepage = "https://todoist-python.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 6834876d8f81..29715dd2f53f 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,13 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi, twine, pbr, click, click-completion, validate-email, -pendulum, ptable, requests, inquirer, pythonOlder, pytest, pytestcov, pytest-mock, faker, factory_boy, -setuptools }: +{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder +, click +, click-completion +, factory_boy +, faker +, inquirer +, pbr +, pendulum +, ptable +, pytest +, pytestcov +, pytest-mock +, requests +, setuptools +, twine +, validate-email +}: buildPythonPackage rec { pname = "toggl-cli"; version = "2.1.0"; - - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; src = fetchPypi { pname = "togglCli"; @@ -19,6 +32,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "pendulum==2.0.4" "pendulum>=2.0.4" \ --replace "click-completion==0.5.0" "click-completion>=0.5.0" \ + --replace "click==7.0" "click>=7.0" \ --replace "pbr==5.1.2" "pbr>=5.1.2" \ --replace "inquirer==2.5.1" "inquirer>=2.5.1" ''; diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix index 29d0a4c692f3..8e96efcdf444 100644 --- a/pkgs/development/python-modules/toml/default.nix +++ b/pkgs/development/python-modules/toml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "toml"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0p1xww2mzkhqvxkfvmfzm58bbfj812zhdz4rwdjiv94ifz2q37r2"; + sha256 = "926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"; }; # This package has a test script (built for Travis) that involves a) diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index de48b3736cfc..deff7769dfb4 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, isPy34 +{ lib, buildPythonPackage, fetchPypi, isPy27 , enum34, functools32, typing }: @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals isPy27 [ enum34 functools32 ] - ++ lib.optional (isPy27 || isPy34) typing; + ++ lib.optional isPy27 typing; # The Pypi tarball doesn't include tests, and the GitHub source isn't # buildable until we bootstrap poetry, see diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index cb635d227f7c..e0039057d828 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -4,7 +4,7 @@ , nose }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index d6bc9ea7f39a..7300597c56e1 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.14.3"; + version = "3.14.6"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "06ba73b149bf838d5cd25dc30c2dd2671ae5b2757cf98e5c41a35fe449f131b3"; + sha256 = "a4a6689045d93c208d77230853b28058b7513f5123647b67bf012f82fa168303"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index a6549ee07c95..138c24ebbe3c 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.42.1"; + version = "4.46.1"; src = fetchPypi { inherit pname version; - sha256 = "251ee8440dbda126b8dfa8a7c028eb3f13704898caaef7caa699b35e119301e2"; + sha256 = "cd140979c2bebd2311dfb14781d8f19bd5a9debb92dcab9f6ef899c987fcf71f"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 47bbbee04e7e..5bd849908356 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -4,7 +4,6 @@ , python , pytest , numpy -, isPy33 }: buildPythonPackage rec { @@ -28,7 +27,7 @@ buildPythonPackage rec { # https://github.com/enthought/traits/issues/187 # https://github.com/enthought/traits/pull/188 # Furthermore, some tests fail due to being in a chroot - doCheck = isPy33; + doCheck = false; meta = with stdenv.lib; { description = "Explicitly typed attributes for Python"; diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix new file mode 100644 index 000000000000..2c8f6dd80312 --- /dev/null +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, isPy27 +, pytest +, nose +, numpy +, scipy +, pandas +, xarray +, traitlets +}: + +buildPythonPackage rec { + pname = "traittypes"; + version = "unstable-2019-06-23"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jupyter-widgets"; + repo = pname; + rev = "0a030b928991dec732c17a7a1cb13acbcd7650a2"; + sha256 = "0rlm5krmq6n8yi47dgdsjyrkz3m079pndpbzkz2gx98pb3jd9pjs"; + }; + + patches = [ + (fetchpatch { + name = "fix-intarray-test.patch"; + url = "https://github.com/minrk/traittypes/commit/a02441e5b259e5858453a853207260c9bd4efbb5.patch"; + sha256 = "120dsvr5nksizw75z1ah3h38mi399fxbvz5anakica557jahi0aw"; + }) + ]; + + propagatedBuildInputs = [ traitlets ]; + + checkInputs = [ numpy pandas xarray nose pytest ]; + + meta = with lib; { + description = "Trait types for NumPy, SciPy, XArray, and Pandas"; + homepage = "https://github.com/jupyter-widgets/traittypes"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; + +} diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 4ab3e11acb13..e292c77c8c86 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "b73015080833b753cbb4a10f51f8234924ddfbdbaf33539fee4e4f3abfff454d"; + sha256 = "5566c9d32e438ee9eb1f046e3ac1a0b2689f32807b47859210162084d4c84ab7"; }; postPatch = '' diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 31b2a3ef2091..1ec88ff1b771 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "18.6.0"; + version = "20.4.1"; src = fetchPypi { inherit pname version; - sha256 = "91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48"; + sha256 = "115wwb3sripl3xvwpygwyrxrapyis0i7w1yq591z3dwl9k9fgzk8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index ad4a30d97c50..2c254aa25bbf 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -13,7 +13,7 @@ , pinentry }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "trezor_agent"; version = "0.10.0"; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix new file mode 100644 index 000000000000..c6d1ba00a850 --- /dev/null +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, numpy }: + +buildPythonPackage rec { + pname = "trimesh"; + version = "3.6.43"; + + src = fetchPypi { + inherit pname version; + sha256 = "f62dbaf4739858148fe4889f3b4dff93da281982b6592f211c4d33c2e00678eb"; + }; + + propagatedBuildInputs = [ numpy ]; + + # tests are not included in pypi distributions and would require lots of + # optional dependencies + doCheck = false; + + meta = with lib; { + description = "Python library for loading and using triangular meshes."; + homepage = "https://trimsh.org/"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 75c9a19491cf..18e28c358b49 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.35.1"; + version = "6.39.0"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "10a1hqvxn0w6z696ay1bbxra6qn8bxg87d6g9iryd2hjnn8sfh4b"; + sha256 = "1l2j54kjd1lrf072a3i5037qxpm8n378dddzd3m711ylz6vp638f"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix new file mode 100644 index 000000000000..8ef694d34ff2 --- /dev/null +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, twisted }: + +buildPythonPackage rec { + pname = "txdbus"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217"; + }; + + propagatedBuildInputs = [ six twisted ]; + pythonImportsCheck = [ "txdbus" ]; + + meta = with stdenv.lib; { + description = "Native Python implementation of DBus for Twisted"; + homepage = "https://github.com/cocagne/txdbus"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 1d8929e3d7ea..d6ae7cefc392 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.7.4.1"; + version = "3.7.4.2"; src = fetchPypi { inherit pname version; - sha256 = "091ecc894d5e908ac75209f10d5b4f118fbdb2eb1ede6a63544054bb1edb41f2"; + sha256 = "79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index e11088048c34..e1527ea27e69 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.6"; + version = "1.2.8"; src = fetchPypi { inherit pname version; - sha256 = "1pzgj85c6g8vr3dq215cd1y2pn8pxc6wa7mjd9m0zrglr1qwwhdz"; + sha256 = "12yq435h27iv1kzgq3gl7c7hxdivvc2sl0l1kslgf2wxw53n7jgj"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index a598591b0f08..fd76813ea712 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.6.2"; + version = "3.6.7"; src = fetchPypi { inherit pname version; - sha256 = "aac071daef4b6cf95143ef08cd35d762a2bf2ea8249119a9371a91149c9996e7"; + sha256 = "6f5ae93cfb0ccf22b6b10b608c982bc0fa9bed2481ead57242c02ac64a573db7"; }; checkInputs = [ nose pytest hypothesis six ]; diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 25ea689e9a2f..d1e18111db31 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.5.5"; + version = "0.6.0"; # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "matiasb"; repo = "python-unidiff"; rev = "v${version}"; - sha256 = "1nvi7s1nn5p7j6aql1nkn2kiadnfby98yla5m3jq8xwsx0aplwdm"; + sha256 = "0farwkw0nbb5h4369pq3i6pp4047hav0h88ba55rzz5k7mr25rgi"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix new file mode 100644 index 000000000000..aad23c6fdf9f --- /dev/null +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, uncompyle6, isPy27 }: + +buildPythonPackage rec { + pname = "unrpa"; + version = "2.3.0"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; + }; + + propagatedBuildInputs = [ uncompyle6 ]; + + pythonImportsCheck = [ "unrpa" ]; + + meta = with lib; { + homepage = "https://github.com/Lattyware/unrpa"; + description = "A program to extract files from the RPA archive format"; + license = licenses.gpl3; + maintainers = with maintainers; [ leo60228 ]; + }; +} diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index 913c8903e9ea..e319422ce7b3 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "update_checker"; - version = "0.16"; + version = "0.17"; src = fetchPypi { inherit pname version; - sha256 = "1f38l40d32dm0avcidf3dmikma8z0la84yngj88v4xygzi399qvh"; + sha256 = "0qhfn5fjjab50gbnj2053wdfppzkydqgapfz35ymrm1vysvqvvrd"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 47fc285a5463..298f6c96d58d 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.7.3"; + version = "0.7.4"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "01x7raa2l75g96y6fsi6h2fjpjm0swlnw0j9vn8mlahridycrjss"; + sha256 = "7f110208a3a2aa9b4d6da11233fd0f206ea039b52bca4bfe312f1b9dcf788476"; }; propagatedBuildInputs = [ numpy awkward ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index b7322b0f179e..3d472a604d64 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.11.3"; + version = "3.11.7"; src = fetchPypi { inherit pname version; - sha256 = "19rvkxv015lkx0g01sb54y6agdbqbmkpxlyka4z1zf9dx2lx1iq5"; + sha256 = "3fbf9dfe5ce996ffda3a49d16eba804b95fb05bc041fc4e7bc05317a03bf6cba"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 1ab67be5bdc1..af13fa8d17af 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.5.0"; + version = "4.6.1"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1l8fwj521irla42bdbw298d3c5rjpn1nm9xhjnx7hidbqixr5d27"; + sha256 = "07pksjbgxs1ks2i6pgxkwfg9c56pcql7f9p89dnwaf2rcn7yhx6r"; }; disabled = pythonOlder "3.5.0"; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 5abf99670c19..0c54f8f2518c 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.25.8"; + version = "1.25.9"; src = fetchPypi { inherit pname version; - sha256 = "87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc"; + sha256 = "3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527"; }; NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index c6dee84da306..b9be035135fb 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "validators"; - version = "0.14.1"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "0bfe836a1af37bb266d71ec1e98b530c38ce11bc7fbe0c4c96ef7b1532d019e5"; + sha256 = "6a0d9502219aee486f1ee12d8a9635e4a56f3dbcfa204b4e0de3a038ae35f34f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix new file mode 100644 index 000000000000..1a5494634bb0 --- /dev/null +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -0,0 +1,109 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, fetchpatch +, rustPlatform +, pkg-config +, openssl +, CoreServices +, Security +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: + +# Packaging documentation at: +# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst +buildPythonPackage rec { + version = "unstable-2018-08-05"; + pname = "vdirsyncer"; + name = "${pname}-${version}"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "spk"; + repo = pname; + # fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798 + rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9"; + sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28"; + }; + + native = rustPlatform.buildRustPackage { + name = "${name}-native"; + inherit src; + sourceRoot = "source/rust"; + cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + }; + + propagatedBuildInputs = [ + click click-log click-threading + requests_toolbelt + requests + requests_oauthlib # required for google oauth sync + atomicwrites + milksnake + shippai + ]; + + nativeBuildInputs = [ + setuptools_scm + ]; + + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; + + patches = [ + (fetchpatch { + url = "https://github.com/pimutils/vdirsyncer/commit/7b636e8e40d69c495901f965b9c0686513659e44.patch"; + sha256 = "0vl942ii5iad47y63v0ngmhfp37n30nxyk4j7h64b95fk38vfwx9"; + }) + ]; + + postPatch = '' + # see https://github.com/pimutils/vdirsyncer/pull/805 + substituteInPlace setup.cfg --replace --duration --durations + + # for setuptools_scm: + echo 'Version: ${version}' >PKG-INFO + + sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py + + # fixing test + sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py + ''; + + preBuild = '' + mkdir -p rust/target/release + ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ + ''; + + checkPhase = '' + rm -rf vdirsyncer + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/pimutils/vdirsyncer"; + description = "Synchronize calendars and contacts"; + maintainers = with maintainers; [ matthiasbeyer gebner ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/vdirsyncer/stable.nix b/pkgs/development/python-modules/vdirsyncer/stable.nix new file mode 100644 index 000000000000..cb90bfbc5988 --- /dev/null +++ b/pkgs/development/python-modules/vdirsyncer/stable.nix @@ -0,0 +1,88 @@ +{ stdenv +, pythonAtLeast +, buildPythonPackage +, fetchPypi +, isPy27 +, fetchpatch +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: + +# Packaging documentation at: +# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst +buildPythonPackage rec { + version = "0.16.7"; + pname = "vdirsyncer"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; + }; + + propagatedBuildInputs = [ + click click-log click-threading + requests_toolbelt + requests + requests_oauthlib # required for google oauth sync + atomicwrites + ]; + + nativeBuildInputs = [ + setuptools_scm + ]; + + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; + + patches = [ + # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 + (fetchpatch { + url = "https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch"; + sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; + }) + ]; + + postPatch = '' + # Invalid argument: 'perform_health_check' is not a valid setting + substituteInPlace tests/conftest.py \ + --replace "perform_health_check=False" "" + substituteInPlace tests/unit/test_repair.py \ + --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + ''; + + checkPhase = '' + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test + ''; + # Tests started to fail lately, for any python version even as low as 3.5 but + # if you enable the check, you'll see even severer errors with a higher then + # 3.5 python version. Hence it's marked as broken for higher then 3.5 and the + # checks are disabled unconditionally. As a general end user advice, use the + # normal "unstable" `vdirsyncer` derivation, not this one. + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/pimutils/vdirsyncer"; + description = "Synchronize calendars and contacts"; + license = licenses.mit; + # vdirsyncer (unstable) works with mainline python versions + broken = (pythonAtLeast "3.6"); + maintainers = with maintainers; [ loewenheim ]; + }; +} diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 24af3599869b..8beb39b26d9e 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "0.10.2"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "c35d0e7ac8da2af47a65efc72d5d8351caa93e4829e549f229aa7e375593f896"; + sha256 = "570525d0371806993874bd2ee0f47cc5d68994abb5aa382e964e53e0b81160b2"; }; propagatedBuildInputs = [ future dateutil six ]; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 895699df9549..f43fe542677b 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "1.7.2"; + version = "1.7.3"; pname = "vidstab"; src = fetchPypi { inherit pname version; - sha256 = "24cb7a25a6ed9a474f4d23c9deecf9163691fcde2559de10897f593ba849266b"; + sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch b/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch new file mode 100644 index 000000000000..2b34da289e2d --- /dev/null +++ b/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch @@ -0,0 +1,37 @@ +From 21563405d6e2348ee457187f7fb61beb102bb367 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Sun, 24 May 2020 09:33:13 +0200 +Subject: [PATCH] Check base_prefix and base_exec_prefix for Python 2 + +This is a Nixpkgs-specific change so it can support virtualenvs from Nix envs. +--- + src/virtualenv/discovery/py_info.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/virtualenv/discovery/py_info.py b/src/virtualenv/discovery/py_info.py +index 6f12128..74e9218 100644 +--- a/src/virtualenv/discovery/py_info.py ++++ b/src/virtualenv/discovery/py_info.py +@@ -51,13 +51,17 @@ class PythonInfo(object): + self.version = u(sys.version) + self.os = u(os.name) + ++ config_vars = {} if sys.version_info.major is not 2 else sysconfig._CONFIG_VARS ++ base_prefix = config_vars.get("prefix") ++ base_exec_prefix = config_vars.get("exec_prefix") ++ + # information about the prefix - determines python home + self.prefix = u(abs_path(getattr(sys, "prefix", None))) # prefix we think +- self.base_prefix = u(abs_path(getattr(sys, "base_prefix", None))) # venv ++ self.base_prefix = u(abs_path(getattr(sys, "base_prefix", base_prefix))) # venv + self.real_prefix = u(abs_path(getattr(sys, "real_prefix", None))) # old virtualenv + + # information about the exec prefix - dynamic stdlib modules +- self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", None))) ++ self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", base_exec_prefix))) + self.exec_prefix = u(abs_path(getattr(sys, "exec_prefix", None))) + + self.executable = u(abs_path(sys.executable)) # the executable we were invoked via +-- +2.25.1 + diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 70be4a05f694..5ca27330103d 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,25 +1,51 @@ { buildPythonPackage , fetchPypi , lib -, recursivePthLoader +, stdenv +, pythonOlder +, isPy27 +, appdirs +, contextlib2 +, distlib +, filelock +, importlib-metadata +, importlib-resources +, pathlib2 +, setuptools_scm +, six }: buildPythonPackage rec { pname = "virtualenv"; - version = "16.7.9"; + version = "20.0.21"; src = fetchPypi { inherit pname version; - sha256 = "0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3"; + sha256 = "1kxnxxwa25ghlkpyrxa8pi49v87b7ps2gyla7d1h6kbz9sfn45m1"; }; - # Doubt this is needed - FRidh 2017-07-07 - pythonPath = [ recursivePthLoader ]; + nativeBuildInputs = [ + setuptools_scm + ]; - patches = [ ./virtualenv-change-prefix.patch ]; + propagatedBuildInputs = [ + appdirs + distlib + filelock + six + ] ++ lib.optionals isPy27 [ + contextlib2 + ] ++ lib.optionals (isPy27 && !stdenv.hostPlatform.isWindows) [ + pathlib2 + ] ++ lib.optionals (pythonOlder "3.7") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; - # Tarball doesn't contain tests - doCheck = false; + patches = lib.optionals (isPy27) [ + ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch + ]; meta = { description = "A tool to create isolated Python environments"; diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch deleted file mode 100644 index f3e8ea854f6a..000000000000 --- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch +++ /dev/null @@ -1,62 +0,0 @@ -Without this patch `virtualenv --python=python2.7 .` fails with an -error because it notices that the python readline.so is not in the -same path as python2.7. I assume this is to avoid copying the wrong -file on systems where it is possible to find incompatible libraries by -accident. Adding "/nix/store" to the prefix fixes this problem. - -A sitecustomize.py is created in the virtualenv which makes libraries -from the python specified by the --python argument available to the -virtualenv. For example, this makes readline and sqlite3 available -when a wrapped python is specified. If no --python argument is passed, -it will only add the path to the python used when building -`virtualenv`, which is the unwrapped python, so sqlite3 won't be -available. - - -diff --git a/virtualenv.py b/virtualenv.py -index bcf3225..3530997 100755 ---- a/virtualenv.py -+++ b/virtualenv.py -@@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False): - - - def change_prefix(filename, dst_prefix): -- prefixes = [sys.prefix] -- -- if IS_DARWIN: -- prefixes.extend( -- ( -- os.path.join("/Library/Python", VERSION, "site-packages"), -- os.path.join(sys.prefix, "Extras", "lib", "python"), -- os.path.join("~", "Library", "Python", VERSION, "site-packages"), -- # Python 2.6 no-frameworks -- os.path.join("~", ".local", "lib", "python", VERSION, "site-packages"), -- # System Python 2.7 on OSX Mountain Lion -- os.path.join("~", "Library", "Python", VERSION, "lib", "python", "site-packages"), -- ) -- ) -+ prefixes = ["/nix/store", sys.prefix] - - if hasattr(sys, "real_prefix"): - prefixes.append(sys.real_prefix) -@@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix): - if src_prefix != os.sep: # sys.prefix == "/" - assert relative_path[0] == os.sep - relative_path = relative_path[1:] -+ if src_prefix == "/nix/store": -+ relative_path = "/".join(relative_path.split("/")[1:]) - return join(dst_prefix, relative_path) - assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes) - -@@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy - site_filename_dst = change_prefix(site_filename, home_dir) - site_dir = os.path.dirname(site_filename_dst) - writefile(site_filename_dst, SITE_PY) -+ wrapper_path = join(prefix, "lib", PY_VERSION, "site-packages") -+ writefile( -+ join(site_dir, 'sitecustomize.py',), -+ "import sys; sys.path.append('%s')" % wrapper_path -+ ) - writefile(join(site_dir, "orig-prefix.txt"), prefix) - site_packages_filename = join(site_dir, "no-global-site-packages.txt") - if not site_packages: diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index c0d2d744f096..a37f786c018d 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "w3lib"; - version = "1.21.0"; + version = "1.22.0"; src = fetchPypi { inherit pname version; - sha256 = "05a3fxi4f43n0dc87lizsy2h84dxvqjy0q6rhkyabdbhypz5864b"; + sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha"; }; buildInputs = [ six pytest ]; diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index 87555fe774b7..45b5a4734569 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "wadllib"; - version = "1.3.3"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "1234cfe81e2cf223e56816f86df3aa18801d1770261865d93337b8b603be366e"; + sha256 = "e995691713d3c795d2b36278de8e212241870f46bec6ecba91794ea3cc5bd67d"; }; propagatedBuildInputs = [ setuptools lazr-uri ]; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 1e5ab9a9f2f4..5347c696cc22 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "0.9.0"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"; + sha256 = "0ss58k33l5vah894lykid6ar6kw7z1f29cl4hzr5xvgs8fvfyq65"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 4b604bd2c6ac..30b966cdf8c8 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wcwidth"; - version = "0.1.7"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; + sha256 = "ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 77e91feebac6..17b20ecd34dd 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "WebOb"; - version = "1.8.5"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "05aaab7975e0ee8af2026325d656e5ce14a71f1883c52276181821d6d5bf7086"; + sha256 = "aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108"; }; propagatedBuildInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 706ee7324027..77cea74f6691 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "word2vec"; - version = "0.10.2"; + version = "0.10.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "40f6f30a5f113ffbfc24c5ad5de23bfac897f4c1210fb93685b7fca5c4dee7db"; + sha256 = "95aa222ff2d5c2559192414b794870d14a022016ba83f1bef0cf8cc185e41483"; }; propagatedBuildInputs = [ cython numpy scikitlearn six ]; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 0dab52348604..d687ffd2d0b9 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -11,34 +11,33 @@ , fetchFromGitHub }: -buildPythonPackage { +buildPythonPackage rec { pname = "wordfreq"; - version = "2.2.0"; + version = "2.3.2"; + disabled = pythonOlder "3"; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; # upstream don't tag by version - rev = "bc12599010c8181a725ec97d0b3990758a48da36"; - sha256 = "195794vkzq5wsq3mg1dgfhlnz2f7vi1xajlifq6wkg4lzwyq262m"; + rev = "v${version}"; + sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - # These languages require additional dictionaries - pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' - ''; - propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; - + # patch to relax version requirements for regex # dependency to prevent break in upgrade postPatch = '' substituteInPlace setup.py --replace "regex ==" "regex >=" ''; - - disabled = pythonOlder "3"; + + checkInputs = [ pytest ]; + + checkPhase = '' + # These languages require additional dictionaries + pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' + ''; meta = with lib; { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 98c3b1be93b5..410abbbb622b 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -1,29 +1,29 @@ { stdenv , buildPythonPackage , fetchPypi -, Babel +, markupsafe }: buildPythonPackage rec { - version = "2.1"; - pname = "wtforms"; + version = "2.3.1"; + pname = "WTForms"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz"; + sha256 = "0whrd9cqhlibm31yqhvhp9illddxf0cpgcn3v806f7ajmsri66l6"; }; + propagatedBuildInputs = [ markupsafe ]; + # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet." - # This is fixed in master I believe but not yet in 2.1; doCheck = false; - propagatedBuildInputs = [ Babel ]; - meta = with stdenv.lib; { - homepage = "https://github.com/wtforms/wtforms"; description = "A flexible forms validation and rendering library for Python"; + homepage = "https://github.com/wtforms/wtforms"; + changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = [ maintainers.bhipple ]; }; } diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix index 7cc921047ac1..22ce5917e2a6 100644 --- a/pkgs/development/python-modules/x11_hash/default.nix +++ b/pkgs/development/python-modules/x11_hash/default.nix @@ -3,7 +3,7 @@ , fetchPypi }: -buildPythonPackage rec{ +buildPythonPackage rec { version = "1.4"; pname = "x11_hash"; diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 440db3430253..de779fc2c00b 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "xapp"; - version = "1.8.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - sha256 = "0vw3cn09nx75lv4d9idp5fdhd81xs279zhbyyilynq29cxxs2zil"; + sha256 = "1pp3z4q6ryxcc26kaq222j53ji110n2v7rx29c7vy1fbb8mq64im"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index a950076a2615..abce8ac12fe7 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.15.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "c72d160c970725201f769e80fb91cbad68d6ebf21d68fcc371385a6c950459c3"; + sha256 = "64e3138d87b641e22fe7a003c94abc685896b247b63e434505c1e6b38c91a8fb"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 466b72696f32..e10c8e93ab5c 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.3"; + version = "0.2.4"; propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six]; src = fetchPypi { inherit pname version; - sha256 = "10kg8cmn7zgql2lb6cfmqj94sa0jkraksv3lc4kvpn58sxw7x8w6"; + sha256 = "6793fbbdcb6bb8a4a70132966d8d95e95ea3498cdf0e82252d2b8e9aae34fcb5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b883a3d2bc8f..c01c862e2f45 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.21.0"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "14yijcnmanyd3s2ir38sxl07rzpxgpgw9s6b8sy68jrl7n5nj7ky"; + sha256 = "1agl80csxhiqglm0idwhw98iqfpp61c9inzcdaz4czsfyivzzwsr"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 6ab776d23072..5bb1abd98cef 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.2.3"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "b8db9bc607610d6da4e27e87ec828ebddec4bdaac89ca07ebfe9a153b0641580"; + sha256 = "ad5fa4caf2859e480ffc4ec3e85615a6f7dea852c8f035f2db723f824ed4ba11"; }; patches = [ ./tests.patch ]; diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix index 13c8d53f19b3..453f3113853b 100644 --- a/pkgs/development/python-modules/yenc/default.nix +++ b/pkgs/development/python-modules/yenc/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "yenc"; version = "0.4.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index ccc34b42afb4..16bf5b7855c5 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.3"; + version = "3.7.4"; src = fetchPypi { inherit version pname; - sha256 = "1adec3b54c77c46acfc8a99d6336ce9a0223a7016852666358133cbe37d99744"; + sha256 = "dc79a1eaad1d1cd1cf8cfe636e1bc413c60645e3e87a5a8e9b97ce882690e0e4"; }; buildInputs = [ openssl bzip2 ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a1246485cd84..e9d3c6e038ea 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.24.5"; + version = "0.26.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; + sha256 = "43ad5006c00be2040cdca1fe768206f4a25356d3cc87eff8b66bd7ead2a82440"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index d819a881f9f1..3e05dc1bfad4 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.30"; + version = "0.0.39"; nativeBuildInputs = [ pytest ]; buildInputs = [ aiohttp zigpy ]; src = fetchPypi { inherit pname version; - sha256 = "00731a9b9c58c4e59f6765ac0cec5e2301bdda28ef19e00e2ba752be457a61b9"; + sha256 = "99d4b20a933b97b323c558f4057036ebe349bf603e97826c498d17d9cc80ff0b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index c9e6311cf321..6c19ffbec029 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "4.2.0"; + version = "5.0.1"; src = fetchPypi { pname = "zope.hookable"; inherit version; - sha256 = "c1df3929a3666fc5a0c80d60a0c1e6f6ef97c7f6ed2f1b7cf49f3e6f3d4dde15"; + sha256 = "0hc82lfr7bk53nvbxvjkibkarngyrzgfk2i6bg8wshl0ly0pdl19"; }; checkInputs = [ zope_testing ]; diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index fc63f3d1ebfd..a658f9896874 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "4.6"; + version = "4.6.1"; src = fetchPypi { inherit pname version; - sha256 = "ec2afc5bbe611dcace98bb39822c122d44743d635dafc7315b9aef25097db9e6"; + sha256 = "d9c7c27673d787faff8a83797ce34d6ebcae26a370e25bddb465ac2182766aca"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index bf1dc7e0b6b0..ca5f818cd620 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -2,19 +2,23 @@ , buildPythonPackage , fetchPypi , six +, coverage +, zope_testrunner }: buildPythonPackage rec { pname = "zope.i18nmessageid"; - version = "5.0.0"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "03318270df5320c57b3416744f9cb2a85160a8d00345c07ac35d2b7ac01ff50c"; + sha256 = "9534142b684c986f5303f469573978e5a340f05ba2eee4f872933f1c38b1b059"; }; propagatedBuildInputs = [ six ]; + checkInputs = [ coverage zope_testrunner ]; + meta = with stdenv.lib; { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; description = "Message Identifiers for internationalization"; diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 0388c1041ed2..5e7086191cce 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,15 +6,17 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "4.7.1"; - + version = "5.1.0"; + src = fetchPypi { inherit pname version; - sha256 = "4bb937e998be9d5e345f486693e477ba79e4344674484001a0b646be1d530487"; + sha256 = "03nrl6b8cb600dnnh46y149awvrm0gxyqgwq5hdw3lvys8mw9r20"; }; propagatedBuildInputs = [ zope_event ]; + doCheck = false; # Circular deps. + meta = with stdenv.lib; { description = "Zope.Interface"; homepage = "http://zope.org/Products/ZopeInterface"; diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 2beabc8a61c7..6494aa7a71af 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -1,8 +1,10 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy3k , zope_event , zope_component +, zope_interface }: buildPythonPackage rec { @@ -16,6 +18,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_event zope_component ]; + # namespace colides with local directory + doCheck = false; + + # zope uses pep 420 namespaces for python3, doesn't work with nix + python2 + pythonImportsCheck = stdenv.lib.optionals isPy3k [ + "zope.lifecycleevent" + "zope.interface" + ]; + meta = with stdenv.lib; { homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; description = "Object life-cycle events"; diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 361095bf1805..7092f7508708 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.3.3"; + version = "4.3.5"; src = fetchPypi { inherit pname version; - sha256 = "dac4279aa05055d3897ab5e5ee5a7b39db121f91df65a530f8b1ac7f9bd93119"; + sha256 = "a66a0d94e5b081d5d695e66d6667e91e74d79e273eee95c1747717ba9cb70792"; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 75856a88b7e0..8f61f2ffc66e 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -3,16 +3,16 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.4.4.0"; + version = "1.4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "33f2c1fd8d3f9ac8e35fb3e199896afc54cceb68878570c6d4b72985dc6584a5"; + sha256 = "2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6"; }; postPatch = '' substituteInPlace setup.py \ - --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/pkg-config" + --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" ''; nativeBuildInputs = [ pkgconfig ]; |