diff options
author | Divam Narula <dfordivam@gmail.com> | 2020-08-16 10:13:57 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-16 10:13:57 +0530 |
commit | 818d24c9db757764e03e4ec94617d6585f44ea2d (patch) | |
tree | 3854dc5a049d1820fbc60dd324cce5e0b5d9077b /pkgs/development/python-modules | |
parent | fee55e2bb1e9f471bc8342a13ca062c710d39f41 (diff) | |
parent | dfbda2135c3f8f7b158b7621d9745b94c8a56cf8 (diff) | |
download | nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.gz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.bz2 nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.lz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.xz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.zst nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.zip |
Merge branch 'staging' into upstream-wasm-cross-nixpkgs-4
Diffstat (limited to 'pkgs/development/python-modules')
278 files changed, 2193 insertions, 811 deletions
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 3d5afd52abd..84f54fd7af6 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.19"; + version = "0.29.21"; src = fetchPypi { inherit pname version; - sha256 = "0n2j87nka8cs772qc60d0c7lrpvsw0y8p3qzvhrsi3nmq1yqmycp"; + sha256 = "1bcwpra7c6k30yvic3sw2v3rq2dr40ypc4zqif6kr52mpn4wnyp5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 7b39ebb7a39..67ec5c2e4d1 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.3"; + version = "3.1.7"; pname = "GitPython"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "e107af4d873daed64648b4f4beb89f89f0cfbe3ef558fc7821ed2331c2f8da1a"; + sha256 = "2db287d71a284e22e5c2846042d0602465c7434d910406990d5b74df4afb0858"; }; patches = [ diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix index 55b05d431e8..0263b4b752d 100644 --- a/pkgs/development/python-modules/JayDeBeApi/default.nix +++ b/pkgs/development/python-modules/JayDeBeApi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "JayDeBeApi"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "e9847e437ad293ee3cc47767b74c387068cd21607842de8470d5d3f13d613083"; + sha256 = "f25e9307fbb5960cb035394c26e37731b64cc465b197c4344cee85ec450ab92f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 66edb53655e..f8d56159cc5 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "accupy"; - version = "0.3.1"; + version = "0.3.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b568de740e1cd137a96af1801b4d3d5f795e0f97be25c29957f39f004fbcdf9a"; + sha256 = "be5c8c9ef2f83c9eeddac85463879957c87a93b257a6202a76ad6b43080b32f9"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index bfb5300a82b..09556ea891b 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "agate-dbf"; - version = "0.2.1"; + version = "0.2.2"; propagatedBuildInputs = [ agate dbf dbfread ]; src = fetchPypi { inherit pname version; - sha256 = "0brprva3vjypb5r9lk6zy10jazp681rxsqxzhz2lr869ir4krj80"; + sha256 = "589682b78c5c03f2dc8511e6e3edb659fb7336cd118e248896bb0b44c2f1917b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index a458f78f262..cd7a9cd526b 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "9277490ba8b8e7c747a9ae3671f52fe486784b48d4a14e78ca197fb0e36f281b"; + sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index c0be6bf1455..0b6c68de8b4 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.5"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "11mv52dwyccza09nbh2l7r9l3k06c5rzml3zinqbyznfxg3gaxi0"; + sha256 = "90f4d1220d44b48b21a57e0273aa3c4a51599d0097af88e8be26df151e599344"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 24804464fae..84195d5545e 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-aiohttp ]; checkPhase = '' - py.test + pytest -W ignore::DeprecationWarning ''; meta = with lib; { diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index f603de71855..b9fb265f252 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.5.5"; + version = "7.5.6"; src = fetchPypi { inherit pname version; - sha256 = "f6d80654f063af45167c6b4f5f25a9015e728f3f600c5565ddb85964b8c9874b"; + sha256 = "507abdb64c8b83c8ff0c21e39b03a21ccd7884ca3ce31afacea2d97e4d39f2e8"; }; 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 ae984bbd38b..cdfea1f4c30 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.5.1"; + version = "7.5.7"; src = fetchPypi { inherit pname version; - sha256 = "e903d4b097d4650983faecedc4e2dffd27a962b671643098f8425f9a19884d0f"; + sha256 = "849966c05e9899ac72af23991e9f17271c42bba89035c49d257a9dd96b54695b"; }; 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 04b2d898e66..c3b624a7bce 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"; }; + postPatch = '' + substituteInPlace alot/settings/manager.py --replace /usr/share "$out/share" + ''; + nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 79723c866d8..245375c26be 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.11"; + version = "2.9.12"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "0a9wgd1ri1av6rcwld36sa48v42003pdf1fx9hhkmhz4icyij0kx"; + sha256 = "0c794k0cyl54807sh9in0l942ah6g6wlz5kf3qvy5lhd581zlgyb"; }; prePatch = '' diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 7128f9a96d0..222f2efdd62 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "3.3.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "419d0564b899e182c2af50483ea074db8cb05fee60838be58bb4542095d5c08d"; + sha256 = "f5244ccca33f7a81309f6b3c9d458e33e869050c2d861b9f8cee24b3ad739d2b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index d6da2610f8c..313383f4261 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.5"; + version = "0.8.6"; src = fetchPypi { inherit pname version; - sha256 = "aacdd54640a9c66d1c84c8f4390f63feb5a7a8741867a6b451f82ff74c8c792c"; + sha256 = "695f9b98b7eb273901d9d28a026a69a028a57ab7d666bdf146ecc215c80b5041"; }; nativeBuildInputs = [ Babel ]; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 60a9572f1c8..bc3de37526a 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.15.6"; + version = "0.15.8"; src = fetchPypi { inherit pname version; - sha256 = "eb5d339f00072cc297d7de252a2e75f272085d1231a3723f1026d1fa91367118"; + sha256 = "edc31dc051db12c95da9bac0271cd1027b8e36912daf6d4580af53b23e62721a"; }; propagatedBuildInputs = [ python-dateutil ] diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index c11de9c9419..927e6a6d5a6 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.4.1"; + version = "2.4.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "4c17cea3e592c21b6e222f673868961bad77e1f985cb1694ed077475a89229c1"; + sha256 = "2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703"; }; postPatch = '' diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index d36328d7225..dda3d35f6ad 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; # https://github.com/Martiusweb/asynctest/issues/132 - doCheck = pythonOlder "3.8"; + doCheck = pythonOlder "3.7"; checkPhase = '' ${python.interpreter} -m unittest test diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 91c14756f48..60fa12d4a66 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atom"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "ce0c600e4b26b7553c926b3b8253df7ae19bbf2678bdc2d46eb29b5f9149f172"; + sha256 = "99b4c94b833aafffc0b34ab8f98b697f575be3230bff38ebf863d065403333e0"; }; buildInputs = [ cppy ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 10e8355297c..bff57f554d7 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.21"; + version = "0.12.22"; src = fetchPypi { inherit pname version; - sha256 = "1253f1d85bda79a45d209ea467e4ba6fcaa5354c317c194945dc354a259f5aa8"; + sha256 = "185d93588c4cc150b2426b2764cdf2370f1807c607c1b4b057c66b2a08720c43"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 3b53dd0eeb7..635ffac2638 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.24"; + version = "0.2.27"; src = fetchPypi { inherit pname version; - sha256 = "d2f4c9e3153ba18e3ef867c4804e3f17aefd0cc32b5174b38718d06ada4503e9"; + sha256 = "c868437aabb2e95efbc522c43d47cac42e1c61904c7ddbebf2f41c6b63bb9c6f"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 20ed59f9e5b..cb014896d29 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "1.24.3"; + version = "1.24.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0bcjlf5dkg2q0db0ra1ssa3hy98spflkd3ykhmlyv65rkgx8w1wv"; + sha256 = "601b056fa8ba4b615289def3b1aa49aa58f1f4aa6b89f3cf7cf1e0aee9f2291c"; }; # Relax version constraint diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index a2b33942826..aaa8afabd60 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -4,6 +4,8 @@ , mock , msrest , pytest +, pytest-asyncio +, pytest-trio , pytestCheckHook , requests , six @@ -33,13 +35,16 @@ buildPythonPackage rec { mock msrest pytest + pytest-trio + pytest-asyncio pytestCheckHook trio typing-extensions ]; pytestFlagsArray = [ "tests/" ]; - disabledTests = [ "response" "request" "timeout" ]; + # disable tests which touch network + disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ]; meta = with lib; { description = "Microsoft Azure Core Library for Python"; diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index edd7abd11a7..038ed52d768 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0r3l55mhd00zx8sw13d7i9l7r214946s1y3wxcswxad7q5660zfm"; + sha256 = "c6e1fe83dd2ddffa7f6d90c7aa63b3128042396a3893c14dc4816ad28cb15016"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index 53f5f0599e8..42f848aa846 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "base58"; - version = "2.0.0"; + version = "2.0.1"; disabled = isPy27; # python 2 abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "c83584a8b917dc52dd634307137f2ad2721a9efb4f1de32fc7eaaaf87844177e"; + sha256 = "365c9561d9babac1b5f18ee797508cd54937a724b6e419a130abad69cec5ca79"; }; checkInputs = [ pytest pyhamcrest ]; diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index 191f0342674..9ac72a21fa7 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -6,6 +6,7 @@ , isPy27 , python , pexpect +, bash }: buildPythonPackage rec { @@ -26,6 +27,12 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace bash_kernel/kernel.py \ + --replace "'bash'" "'${bash}/bin/bash'" \ + --replace "\"bash\"" "'${bash}/bin/bash'" + ''; + propagatedBuildInputs = [ ipykernel pexpect ]; # no tests diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix new file mode 100644 index 00000000000..ebf24fb9d7b --- /dev/null +++ b/pkgs/development/python-modules/batchspawner/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jupyterhub +, isPy27 +}: + +buildPythonPackage rec { + pname = "batchspawner"; + version = "1.0.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jupyterhub"; + repo = "batchspawner"; + rev = "v${version}"; + sha256 = "0yn312sjfjpjjfciagbczfmqprk2fj4lbb3vsbzj17p948acq5w2"; + }; + + propagatedBuildInputs = [ + jupyterhub + ]; + + # tests require a job scheduler e.g. slurm, pbs, etc. + doCheck = false; + + pythonImportCheck = [ "batchspawner" ]; + + meta = with lib; { + description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers"; + homepage = "https://jupyter.org"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 9709037792d..adbf9a46ab4 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.3.0"; + version = "2.3.1"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "04i788glp2cslwi67dixy1pi5l0izcl078i9mrd1j1sh8f99cvcs"; + sha256 = "e12abfe0a6b38ce3525adb471ca5b8e3fa4056ff712108de48da53405c518a11"; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 036f5434614..bcf45aff832 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,15 +4,18 @@ }: buildPythonPackage rec { - version = "1.5.2"; + version = "1.5.4"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "6f3bd0402d41ee9be03637d74f34a7db279d00cb9c6386b0597cbbac16ee8f4e"; + sha256 = "b8292f4efb3617532f93c60acfec242150406bfd9e298d7f01187d67c311aa91"; }; - propagatedBuildInputs = [ ]; + # needs packages which are not available in nixpkgs + doCheck = false; + + pythonImportsCheck = [ "bids_validator" ]; meta = with lib; { description = "Validator for the Brain Imaging Data Structure"; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 97c6b957a43..d31113b9214 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -9,6 +9,8 @@ , gnutar , p7zip , cabextract +, cramfsprogs +, cramfsswap , lzma , nose , pycrypto @@ -29,7 +31,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 68c44da8197..0b57a8a737c 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.3.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1pz3yd9rhz3cb0yf7dbjhd1awm0w7vsbj73k4v95484j2kdxk3d4"; + sha256 = "e1823b33d2caa7fc54ab5507eff316e74abfdc30434db8f3be908ab52a330021"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 505d3ffe149..270e1617448 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.13"; + version = "1.1.14"; src = fetchPypi { inherit pname version; - sha256 = "a45e31361d17ce272a0d563a689d6b87b65cc16e9348f8cd3a6460c93359b1bd"; + sha256 = "b87b753fe8d2812c3534be025f85ed97d1a00e8fe49c03fe9ad09d71860d672d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 4e95946127d..59fc878b2c0 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.14.16"; # N.B: if you change this, change botocore too + version = "1.14.32"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "1yywn4wbzn37b5gbkmksqpxnabw1yjvbp710chc3v6cymyv4lnnf"; + sha256 = "d494a23295b2db9920e85391dc8106dc08d91dd40eeba5c05002771fe10f8853"; }; 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 3a35ed0c4cc..e8f0684456f 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.17.16"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.17.32"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "0k4bx4anj0xjjfj4jx3v1fhzrmk5k9qgdpxqghxzyzmnsry4y37y"; + sha256 = "52a80cb721160b687179bd7077e63d775130455a678bf4280fb37c524c2bd67d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 3722a294b20..1965d256fdf 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.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0aw5n1hqrg5pb5xmcr1b8y9i7v8zj23q9k2p4b6bwnq2c2fqi8wr"; + sha256 = "d2b5ead45dbfe98b6099d387c7f12b7d2994ae0efb60679e6bb0929a06027e16"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index 9efcd660c0d..685ca57b7ef 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "broadlink"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "f771456ed990187f170d1561e2fd3d490ef646a2570a0286fe709a7115abcb49"; + sha256 = "5c443d4639b737069e5e27df451b6e89c5ed50be81899e4ea02adb355bf3d724"; }; postPatch = '' diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix new file mode 100644 index 00000000000..b560c9ec083 --- /dev/null +++ b/pkgs/development/python-modules/brother/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, pysnmp +, asynctest, pytestcov, pytestrunner, pytest-asyncio, pytest-trio, pytest-tornasync }: + +buildPythonPackage rec { + pname = "brother"; + version = "0.1.14"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "11pkr30bxrzgbz6bi42dyhav6qhr7rz9fb6a13297g7wa77jn4r4"; + }; + + propagatedBuildInputs = [ + pysnmp + ]; + + checkInputs = [ + asynctest + pytestcov + pytestrunner + pytest-asyncio + pytest-trio + pytest-tornasync + ]; + + meta = with lib; { + description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP."; + homepage = "https://github.com/bieniu/brother"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix new file mode 100644 index 00000000000..aabcd4de934 --- /dev/null +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, aflplusplus +}: + +buildPythonPackage rec { + pname = "bsdiff4"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17fc0dd4204x5gqapvbrc4kv83jdajs00jxm739586pl0iapybrw"; + }; + + checkPhase = '' + mv bsdiff4 _bsdiff4 + python -c 'import bsdiff4; bsdiff4.test()' + ''; + + meta = with stdenv.lib; { + description = "binary diff and patch using the BSDIFF4-format"; + homepage = "https://github.com/ilanschnell/bsdiff4"; + license = licenses.bsdProtection; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index c22b03f4fa1..af1d2cde1cd 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.7.14"; + version = "0.7.16"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0l0ljm7n19522m6mb0jnbcwdyqya15vfj3li3mvfsyv4rkxvy18b"; + sha256 = "3594452487b8404f1efaace9b70aefaeb345fa44dd74349f7829a61161d2f69a"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix new file mode 100644 index 00000000000..24ff14f6255 --- /dev/null +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, aenum +}: + +buildPythonPackage rec { + pname = "bytecode"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "vstinner"; + repo = pname; + rev = version; + sha256 = "097k83zr0z71pha7bafzhs4ink174wk9ls2883bic274rihsnc5r"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ]; + + meta = with lib; { + homepage = "https://github.com/vstinner/bytecode"; + description = "Python module to generate and modify bytecode"; + license = licenses.mit; + maintainers = with maintainers; [ raboof ]; + }; +} diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 703f3797d1b..e73bbaa28a6 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.1"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "13dfv0a4ahgx0wmpqv8jqhshim4229p9c1c7gcsra81pkm89p24b"; + sha256 = "47e95a67d68c729cbad63285a790a06f0e0d27d71624c6e44c1ec3456bb4476f"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index f22d4fc0885..6cc6c45137f 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cachetools"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1d057645db16ca7fe1f3bd953558897603d6f0b9c51ed9d11eb4d071ec4e2aab"; + sha256 = "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix deleted file mode 100644 index 2d882967493..00000000000 --- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchgit -, isPy3k -}: - -buildPythonPackage { - version = "asynkdev"; - pname = "caldavclientlibrary-asynk"; - - src = fetchgit { - url = "https://github.com/skarra/CalDAVClientLibrary.git"; - rev = "06699b08190d50cc2636b921a654d67db0a967d1"; - sha256 = "157q32251ac9x3gdshgrjwsy48nq74vrzviswvph56h9wa8ksnnk"; - }; - - disabled = isPy3k; - - meta = with stdenv.lib; { - description = "A Python library and tool for CalDAV"; - - longDescription = '' - CalDAVCLientLibrary is a Python library and tool for CalDAV. - - This package is the unofficial CalDAVCLientLibrary Python - library maintained by the author of Asynk and is needed for - that package. - ''; - - homepage = "https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/"; - maintainers = with maintainers; [ pjones ]; - broken = true; # 2018-04-11 - }; - -} diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 3bf660bd098..4ee4b8ecb60 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.1.0"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1ai1i0wydxfbdakqnrlpgdk4l2ps7gw0r9nihv9p2jgyqbl13kj3"; + sha256 = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 94619956cff..9e2bbc5c88d 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2020.4.5.1"; + version = "2020.4.5.2"; src = fetchPypi { inherit pname version; - sha256 = "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i"; + sha256 = "5ad7e9a056d25ffa5082862e36f119f7f7cec6457fa07ee2f8c339814b80c9b1"; }; pythonImportsCheck = [ "certifi" ]; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 85dcd72a934..a8862010c47 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.0"; + version = "1.14.1"; src = fetchPypi { inherit pname version; - sha256 = "1dn279gw5ql8i5n3s5v4rnv96rhhjjfn7xq729qbl5bs2954yf1d"; + sha256 = "b2a2b0d276a136146e012154baefaea2758ef1f56ae9f4e01c612b0831e0bd2f"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index e1b3dfc8e2b..ab9a97729a1 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cfgv"; - version = "3.1.0"; + version = "3.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c8e8f552ffcc6194f4e18dd4f68d9aef0c0d58ae7e7be8c82bee3c5e9edfa513"; + sha256 = "cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 56cbae2befa..96bd1aa8aaa 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "3.7.2"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "7adc331eb039d5c458cd78e42a76f8e470953f004ddf297bd57aa1501392aec9"; + sha256 = "37c01c9af720bc80a0097ebc07eb41e802917ad0006c9a77dc158479c087664b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 1ea6b87fa00..6ea7c8dd8ca 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -8,6 +8,7 @@ , pytest-mock , pytest-testmon , requests +, requests-toolbelt , requests-unixsocket , setuptools_scm , setuptools-scm-git-archive @@ -17,13 +18,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.3.0"; + version = "8.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a0577e1f28661727d472671a7cc4e0c12ea0cbc5220265e70f00a8b8cb628931"; + sha256 = "7076d5845f64d729e4155ec2650ad24ee70209340d11b9e619a82e9210a579b8"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; @@ -39,10 +40,15 @@ buildPythonPackage rec { pytest-mock pytest-testmon requests + requests-toolbelt requests-unixsocket trustme ]; + # avoid attempting to use 3 packages not available on nixpkgs + # (jaraco.apt, jaraco.context, yg.lockfile) + pytestFlagsArray = [ "--ignore=cheroot/test/test_wsgi.py" ]; + # Disable doctest plugin because times out # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 778f57e0f9b..99d21c130da 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,36 +1,27 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes +, jaraco_collections , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services , fetchpatch }: buildPythonPackage rec { pname = "cherrypy"; - version = "18.3.0"; + version = "18.6.0"; disabled = !isPy3k; src = fetchPypi { pname = "CherryPy"; inherit version; - sha256 = "0q6cs4vrv0rwim4byxfizrlp4h6hmwg3n4baz0ga66vvgiz6hgk8"; + sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n"; }; - # Remove patches once 88d2163 and 713f672 - # become part of a release - they're currently only present in master. - # ref: https://github.com/cherrypy/cherrypy/pull/1820 - patches = [ - (fetchpatch { - name = "test_HTTP11_Timeout.patch"; - url = "https://github.com/cherrypy/cherrypy/commit/88d21630f68090c56d07000cabb6df4f1b612a71.patch"; - sha256 = "1i6a3qs3ijyd9rgsxb8axigkzdlmr5sl3ljif9rvn0d90211bzwh"; - }) - ]; - propagatedBuildInputs = [ # required cheroot portend more-itertools zc_lockfile + jaraco_collections # optional routes ]; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 98fc3b9ff05..83fc0d371c1 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -10,7 +10,7 @@ , networkx , numpy , pandas -, pythonProtobuf # pythonPackages.protobuf +, protobuf , requests , scipy , sortedcontainers @@ -28,15 +28,15 @@ buildPythonPackage rec { pname = "cirq"; - version = "0.8.0"; + version = "0.8.2"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "01nnv7r595sp60wvp7750lfdjwdsi4q0r4lmaj6li09zsdw0r4b3"; + sha256 = "0xs46s19idh8smf80zhgraxwh3lphcdbljdrhxwhi5xcc41dfsmf"; }; patches = [ @@ -48,14 +48,6 @@ buildPythonPackage rec { }) ]; - # 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.4" "networkx" \ - --replace "protobuf==3.8.0" "protobuf" \ - --replace "freezegun~=0.3.15" "freezegun" - ''; - propagatedBuildInputs = [ freezegun google_api_core @@ -63,7 +55,7 @@ buildPythonPackage rec { matplotlib networkx pandas - pythonProtobuf + protobuf requests scipy sortedcontainers diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 5fff93b5bc6..1dc04d70788 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cli_helpers"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "18f7d8c5a22d85fc685d56a9f301d8b9f7f0d7d4e9033a27563b066c2ab41833"; + sha256 = "dd6f164310f7d86fa3da1f82043a9c784e44a02ad49be932a80624261e56979b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/click-datetime/default.nix b/pkgs/development/python-modules/click-datetime/default.nix new file mode 100644 index 00000000000..ba710d74355 --- /dev/null +++ b/pkgs/development/python-modules/click-datetime/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, click }: + +buildPythonPackage rec { + pname = "click-datetime"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "click-contrib"; + repo = pname; + rev = version; + sha256 = "1yxagk4wd2h77nxml19bn2y26fv2xw2n9g981ls8mjy0g51ms3gh"; + }; + + propagatedBuildInputs = [ click ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "click_datetime" ]; + + meta = with lib; { + description = "Datetime type support for click."; + homepage = "https://github.com/click-contrib/click-datetime"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 1151e395c69..ad753c18942 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.1.4"; + version = "2.1.8"; src = fetchPypi { inherit pname version; - sha256 = "bf30a41f65e747b159e2a749d1f9c92042d358bba0905fd94d3def3a368e592c"; + sha256 = "0be9cd6358cc6a3c01a1586134b0fb524dfa65ccbec3a40e9f28d5f976676ba2"; }; checkInputs = [ unittest2 ]; # Tests only diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 59b3eb38afd..cf9ab42f325 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,27 +1,26 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, six, pytest, arrow +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml }: buildPythonPackage rec { pname = "construct"; - version = "2.9.45"; + version = "2.10.56"; + disabled = pythonOlder "3.6"; + + # no tests in PyPI tarball src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ig66xrzswpkhhmw123p2nvr15a9lxz54a1fmycfdh09327c1d3y"; + sha256 = "1j4mqwyxkbdcsnnk5bbdcljv855w4fglaqc94q1xdzm8kgjxk4mr"; }; - propagatedBuildInputs = [ six ]; + checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ]; - checkInputs = [ pytest arrow ]; + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; - # TODO: figure out missing dependencies - doCheck = false; - checkPhase = '' - py.test -k 'not test_numpy and not test_gallery' tests - ''; + pytestFlagsArray = [ "--benchmark-disable" ]; meta = with stdenv.lib; { description = "Powerful declarative parser (and builder) for binary data"; diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix new file mode 100644 index 00000000000..8952d79634d --- /dev/null +++ b/pkgs/development/python-modules/cot/default.nix @@ -0,0 +1,56 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k +, argcomplete, colorlog, pyvmomi, requests, verboselogs +, psutil, pyopenssl, setuptools +, mock, pytest, pytest-mock, pytestCheckHook, qemu +}: + +buildPythonPackage rec { + pname = "cot"; + version = "2.2.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "f4b3553415f90daac656f89d3e82e79b3d751793239bb173a683b4cc0ceb2635"; + }; + + propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ] + ++ stdenv.lib.optional (pythonOlder "3.3") psutil; + + checkInputs = [ mock pytestCheckHook pytest-mock qemu ]; + + # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf) + # try enabling these tests with ovftool once/if it is added to nixpkgs + disabledTests = [ + "HelperGenericTest" + "TestCOTAddDisk" + "TestCOTAddFile" + "TestCOTEditHardware" + "TestCOTEditProduct" + "TestCOTEditProperties" + "TestCOTInjectConfig" + "TestISO" + "TestOVFAPI" + "TestQCOW2" + "TestRAW" + "TestVMDKConversion" + ]; + + + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py --replace "'argparse'," "" + ''; + + meta = with stdenv.lib; { + description = "Common OVF Tool"; + longDescription = '' + COT (the Common OVF Tool) is a tool for editing Open Virtualization Format (.ovf, .ova) virtual appliances, + with a focus on virtualized network appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. + ''; + homepage = "https://github.com/glennmatthews/cot"; + license = licenses.mit; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index 1810f790719..4cd9e90606b 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "crayons"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "50e5fa729d313e2c607ae8bf7b53bb487652e10bd8e7a1e08c4bc8bf62755ffc"; + sha256 = "dcb85b87aa03bb65bd3a073d012796b024cabeb086033e616759e2abb769440b"; }; propagatedBuildInputs = [ colorama ]; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 42964fc797c..05e855b12dc 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "0.3.32"; + version = "0.3.34"; src = fetchPypi { inherit pname version; - sha256 = "0d5bf45f12861c1b718c51bd6e2ab056da94e651bf22900658421cdde0ff7088"; + sha256 = "7186b9b464f45cf3d3c83a18bc2344cc101d7b9fd35a05f2878437b14967e964"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptography/2.9.nix b/pkgs/development/python-modules/cryptography/2.9.nix new file mode 100644 index 00000000000..6a6187e5693 --- /dev/null +++ b/pkgs/development/python-modules/cryptography/2.9.nix @@ -0,0 +1,74 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, fetchpatch +, isPy27 +, ipaddress +, openssl +, cryptography_vectors +, darwin +, packaging +, six +, pythonOlder +, isPyPy +, cffi +, pytest +, pretend +, iso8601 +, pytz +, hypothesis +, enum34 +}: + +buildPythonPackage rec { + pname = "cryptography"; + version = "2.9.2"; # Also update the hash in vectors.nix + + src = fetchPypi { + inherit pname version; + sha256 = "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + propagatedBuildInputs = [ + packaging + six + ] ++ stdenv.lib.optional (!isPyPy) cffi + ++ stdenv.lib.optionals isPy27 [ ipaddress enum34 ]; + + checkInputs = [ + cryptography_vectors + hypothesis + iso8601 + pretend + pytest + pytz + ]; + + checkPhase = '' + py.test --disable-pytest-warnings tests + ''; + + # IOKit's dependencies are inconsistent between OSX versions, so this is the best we + # can do until nix 1.11's release + __impureHostDeps = [ "/usr/lib" ]; + + meta = with stdenv.lib; { + description = "A package which provides cryptographic recipes and primitives"; + longDescription = '' + Cryptography includes both high level recipes and low level interfaces to + common cryptographic algorithms such as symmetric ciphers, message + digests, and key derivation functions. + Our goal is for it to be your "cryptographic standard library". It + supports Python 2.7, Python 3.5+, and PyPy 5.4+. + ''; + homepage = "https://github.com/pyca/cryptography"; + changelog = "https://cryptography.io/en/latest/changelog/#v" + + replaceStrings [ "." ] [ "-" ] version; + license = with licenses; [ asl20 bsd3 psfl ]; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 7219f48e6f9..9f7bb3f1adb 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.2"; # Also update the hash in vectors.nix + version = "3.0"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229"; + sha256 = "0lr06a9317n2iwfqwz9mpalqm99acqwk1478arvyj1jj0ay4v4lf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors-2.9.nix b/pkgs/development/python-modules/cryptography/vectors-2.9.nix new file mode 100644 index 00000000000..096eab77bec --- /dev/null +++ b/pkgs/development/python-modules/cryptography/vectors-2.9.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage, fetchPypi, lib, cryptography }: + +buildPythonPackage rec { + pname = "cryptography_vectors"; + # The test vectors must have the same version as the cryptography package: + version = cryptography.version; + + src = fetchPypi { + inherit pname version; + sha256 = "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r"; + }; + + # No tests included + doCheck = false; + + meta = with lib; { + description = "Test vectors for the cryptography package"; + homepage = "https://cryptography.io/en/latest/development/test-vectors/"; + # Source: https://github.com/pyca/cryptography/tree/master/vectors; + license = with licenses; [ asl20 bsd3 ]; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 096eab77bec..02a3f44bb09 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 = "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r"; + sha256 = "0fa26ggksyhknb43cja1g0jwp35qkdbavivdq6yynj1igd2z1vsj"; }; # No tests included diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix index 3c4bfa0bff7..19d0fa4f7bb 100644 --- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "csvs-to-sqlite"; - version = "1.0"; + version = "1.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm"; + sha256 = "1xi9d8l1sf9vixzvqpz8lvhl6yqmz9x5659nvpsxinl317qzmc8m"; }; postPatch = '' diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 2d8fc384cc9..e0224c744ab 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.1"; + version = "1.1.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b8e90af9c0046394a73144ef1b93f1f69df1ba00779bb3d607add006179ba9d9"; + sha256 = "6ce061bd431b05b8c47faa5044cdd5ad5654da4a4bd5c4360bd3c786ee4c64eb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index a0dec64906e..b3f2ed0629f 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.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "02115plwhvyrmal01xp2964w8psysr2kf4ink8mh9z7kmda98l68"; + sha256 = "6152346ff2ac8a7fcdb76c8b8acbf3ee4e72f3822cd2a02a9f3a963db66f94a3"; }; # 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 8cb9250f34d..7221d47e375 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.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "14fp66vasfag1bss09qyjnqa000g56q7vcap3ig57xycflks4c3y"; + sha256 = "8e9c0c0c2efb8ea562489c37665417cd608c30bca20425ac4d847420b5bbc128"; }; # 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 8cdf0408dee..bcf0a8f4e43 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.8.1"; + version = "4.9.0"; src = fetchPypi { inherit pname version; - sha256 = "16q0d9fidllxm7p51i5p4vzknnc09d114zqw3f4a2spr7llga7xj"; + sha256 = "2f19000051730291100cd3a79b13fa62c478aea7908f2e4323c13b90f09e3320"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 3757ff47408..eed9864d5c8 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.13.3"; + version = "1.14.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "131p725rc731ynksp12h9j1faq3vl51d5p64ln22r7zx4pvahss5"; + sha256 = "1f7gal9x0bjsmwxlbvlkwfwz1cyyg5d0n6jh4399wkjilpd966d5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix new file mode 100644 index 00000000000..9d28d267191 --- /dev/null +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, colorlog +, cryptography +, traitlets +, go +, isPy27 +}: + +buildPythonPackage rec { + pname = "dask-gateway-server"; + # update dask-gateway-server lock step with dask-gateway + version = "0.8.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "272134933b7e2068cd89a17a5012c76a29fbd9e40a78164345a2b15353d4b40a"; + }; + + nativeBuildInputs = [ + go + ]; + + propagatedBuildInputs = [ + aiohttp + colorlog + cryptography + traitlets + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + # tests requires cluster for testing + doCheck = false; + + pythonImportsCheck = [ "dask_gateway_server" ]; + + meta = with lib; { + description = "A multi-tenant server for securely deploying and managing multiple Dask clusters"; + homepage = "https://gateway.dask.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix new file mode 100644 index 00000000000..8a4fe9e263a --- /dev/null +++ b/pkgs/development/python-modules/dask-gateway/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, dask +, distributed +}: + +buildPythonPackage rec { + pname = "dask-gateway"; + # update dask-gateway lock step with dask-gateway-server + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "519818f3598ddd726882c5a6bf7053941613d8517b80e8a2c28467e30d57da9b"; + }; + + propagatedBuildInputs = [ + aiohttp + dask + distributed + ]; + + # tests requires cluster for testing + doCheck = false; + + pythonImportsCheck = [ "dask_gateway" ]; + + meta = with lib; { + description = "A client library for interacting with a dask-gateway server"; + homepage = "https://gateway.dask.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 48a6a73af67..f119cf2b0b8 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,25 +1,43 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchpatch , dask , numpy, toolz # dask[array] , scipy , pims , pytest +, pytest-flake8 , scikitimage }: buildPythonPackage rec { - version = "0.2.0"; + version = "0.3.0"; pname = "dask-image"; src = fetchPypi { inherit pname version; - sha256 = "bece2ea347f963dc0168c7d5fdfd11e51b47d9c857d3bc56144d7c146964a23f"; + sha256 = "15svy8y57i30878pijyd0pxn10bnk7ffmmgwva5rpip4b7grsgv0"; }; - checkInputs = [ pytest scikitimage ]; + nativeBuildInputs = [ pytest-flake8 ]; propagatedBuildInputs = [ dask numpy toolz scipy pims ]; + checkInputs = [ + pytest + scikitimage + ]; + + # ignore errors from newer versions of flake8 + prePatch = '' + substituteInPlace setup.cfg \ + --replace "docs/conf.py,versioneer.py" \ + "docs/conf.py,versioneer.py,dask_image/ndfilters/_utils.py" + ''; + + # scikit.external is not exported + checkPhase = '' + pytest --ignore=tests/test_dask_image/ + ''; meta = with stdenv.lib; { homepage = "https://github.com/dask/dask-image"; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 1b3a08aa997..9c03f6d7165 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -11,11 +11,12 @@ , dill , pandas , partd +, pytest_xdist }: buildPythonPackage rec { pname = "dask"; - version = "2.14.0"; + version = "2.22.0"; disabled = pythonOlder "3.5"; @@ -23,13 +24,16 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "0kj46pwzvdw8ii1h45y48wxvjid89yp4cfak2h4b8z8xic73fqgj"; + sha256 = "08nvxj81cz9x92dh2gbmm4imkr8cfljfi2hxkballv2ygwcbzg8g"; }; checkInputs = [ pytestCheckHook + pytest_xdist # takes >10mins to run single-threaded ]; + pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + dontUseSetuptoolsCheck = true; propagatedBuildInputs = [ @@ -55,6 +59,7 @@ buildPythonPackage rec { disabledTests = [ "test_argwhere_str" "test_count_nonzero_str" + "rolling_methods" # floating percision error ~0.1*10^8 small ]; meta = { diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 76de351d05c..36430a29ef0 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0nkgp4pd7j7ydrciiix4x0w56l5w6qvj2vgxpwj42h4f2wdv2f3f"; + sha256 = "56ec931959ede74b5dedf65cf20772e6a79764d20c404794cce0111c88c085ff"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index aa3d5b3e119..729827317c1 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "dateparser"; - version = "0.7.4"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "fb5bfde4795fa4b179fe05c2c25b3981f785de26bec37e247dee1079c63d5689"; + sha256 = "e875efd8c57c85c2d02b238239878db59ff1971f5a823457fcc69e493bf6ebfa"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 855ee930b77..5d1fd9ef0be 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "dbus-python"; - version = "1.2.12"; + version = "1.2.16"; format = "other"; outputs = [ "out" "dev" ]; src = fetchPypi { inherit pname version; - sha256 = "0q7jmldv0bxxqnbj63cd7i81vs6y85xys4r0n63z4n2y9wndxm6d"; + sha256 = "196m5rk3qzw5nkmgzjl7wmq0v7vpwfhh8bz2sapdi5f9hqfqy8qi"; }; patches = [ diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index b9e8e25ac43..8e8fd28f0b5 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -1,25 +1,17 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi }: buildPythonPackage rec { pname = "decorator"; - version = "4.4.1"; + version = "4.4.2"; src = fetchPypi { inherit pname version; - sha256 = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce"; + sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; }; - patches = [ - (fetchpatch { - url = "https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch"; - sha256 = "1q5nmff30vccqq5swf2ivm8cn7x3lhz8c9qpj0zddgs2y7fw8syz"; - }) - ]; - meta = with lib; { homepage = "https://pypi.python.org/pypi/decorator"; description = "Better living through Python with decorators"; diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index 8ede226d38b..a3fd0f2b8f5 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "deform"; - version = "2.0.8"; + version = "2.0.10"; src = fetchPypi { inherit pname version; - sha256 = "8936b70c622406eb8c8259c88841f19eb2996dffcf2bac123126ada851da7271"; + sha256 = "2f4e98a5b5bdcdfff9a62f88bd17c7ee378b7c8be61738797442eed5b961d3d2"; }; postPatch = '' diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index b9a92fb2cdb..af9b82e42dc 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "08fyi2r246733vharl2yckw20rilci28r91mzrnnvcr638inw5if"; + sha256 = "edf6116872c863e1aa9d5bb7cb5e05a022c519a4594dc703843343a9ddd9bff1"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 37b0959b6b7..1f5e313c39c 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "django-cleanup"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "195hkany3iwg4wb4cbdrdmanxcahjl87n8v03dbamanx2ya3yb21"; + sha256 = "4d0fd9ad3117a219e4cb3e35dd32f39c764a860ce56b820abb88ad3ec063ffd7"; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index cf5a518c6d0..9c19903a3f5 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "aa17950a75dc1fe4636b24ddba37ad3a7b660ce279b2f70f2a301135364fbe58"; + sha256 = "6838e6dda377ab6bd31f5721a66aa6d19ad9a88ca9c03cbb464b2321d3c4c979"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dockerspawner/default.nix b/pkgs/development/python-modules/dockerspawner/default.nix new file mode 100644 index 00000000000..6dba529ef99 --- /dev/null +++ b/pkgs/development/python-modules/dockerspawner/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jupyterhub +, escapism +, docker +}: + +buildPythonPackage rec { + pname = "dockerspawner"; + version = "0.11.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "83fd8ee012bb32432cb57bd408ff65534749aed8696648e6ac029a87fc474928"; + }; + + propagatedBuildInputs = [ + jupyterhub + escapism + docker + ]; + + # tests require docker + doCheck = false; + + pythonImportCheck = [ "dockerspawner" ]; + + meta = with lib; { + description = "Dockerspawner: A custom spawner for Jupyterhub"; + homepage = "https://jupyter.org"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 9a0f275cff7..de0d6f4c3e2 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.20.2"; + version = "0.20.5"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "273fa401e11c215ed81a4a0c8474ed06aeae31900974fdd4a87af5df0e458115"; + sha256 = "98484ede022da663c96b54bc8dcdb4407072cb50efd5d20d58ca4e7779931305"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 59541cbb3d2..e060b819a55 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.8.0"; + version = "7.8.1"; src = fetchPypi { inherit pname version; - sha256 = "14m7lfn36y0bjlpqxd7j9ggvbx46q30fva4czyspkqi79v7xhdz6"; + sha256 = "92b534931865a186906873f75ae0b91808ff5036b0f2b9269eb5f6dc09644b55"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix new file mode 100644 index 00000000000..557be014f86 --- /dev/null +++ b/pkgs/development/python-modules/eliot/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, aiocontextvars +, boltons +, hypothesis +, pyrsistent +, pytest +, setuptools +, six +, testtools +, zope_interface +}: + +buildPythonPackage rec { + pname = "eliot"; + version = "1.12.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wabv7hk63l12881f4zw02mmj06583qsx2im0yywdjlj8f56vqdn"; + }; + + checkInputs = [ + hypothesis + testtools + pytest + ]; + + propagatedBuildInputs = [ + aiocontextvars + boltons + pyrsistent + setuptools + six + zope_interface + ]; + + pythonImportsCheck = [ "eliot" ]; + + # Tests run eliot-prettyprint in out/bin. + # test_parse_stream is broken, skip it. + checkPhase = '' + export PATH=$out/bin:$PATH + pytest -k 'not test_parse_stream' + ''; + + meta = with stdenv.lib; { + homepage = "https://eliot.readthedocs.io"; + description = "Logging library that tells you why it happened"; + license = licenses.asl20; + maintainers = [ maintainers.dpausp ]; + }; +} diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix new file mode 100644 index 00000000000..1102443884f --- /dev/null +++ b/pkgs/development/python-modules/enaml/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, atom +, ply +, kiwisolver +, qtpy +, sip +, cppy +, bytecode +}: + +buildPythonPackage rec { + pname = "enaml"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "nucleic"; + repo = pname; + rev = version; + sha256 = "1in5qa5j96qs3gsv8yaxs1l6dbm69xhzvc0pbzg0dd9kpqxfdy1j"; + }; + + # qt bindings cannot be found during tests + doCheck = false; + + pythonImportsCheck = [ + "enaml" + "enaml.applib" + "enaml.core" + "enaml.core.parser" + "enaml.layout" + # qt bindings cannot be found during checking + #"enaml.qt" + #"enaml.qt.docking" + "enaml.scintilla" + "enaml.stdlib" + "enaml.widgets" + "enaml.workbench" + ]; + + propagatedBuildInputs = [ + atom + ply + kiwisolver + qtpy + sip + cppy + bytecode + ]; + + meta = with lib; { + homepage = "https://github.com/nucleic/enaml"; + description = "Declarative User Interfaces for Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ raboof ]; + }; +} diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix new file mode 100644 index 00000000000..dbf54aac40e --- /dev/null +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, enaml +, pyqtgraph +, pythonocc-core +}: + +buildPythonPackage rec { + pname = "enamlx"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "frmdstryr"; + repo = pname; + rev = "v${version}"; + sha256 = "0yh7bw9ibk758bym5w2wk7sifghf1hkxa8sd719q8nsz279cpfc0"; + }; + + propagatedBuildInputs = [ + enaml + # Until https://github.com/inkcut/inkcut/issues/105 perhaps + pyqtgraph + pythonocc-core + ]; + + # qt_occ_viewer test requires enaml.qt.QtOpenGL which got dropped somewhere + # between enaml 0.9.0 and 0.10.0 + doCheck = false; + + pythonImportsCheck = [ + "enamlx.core" + "enamlx.qt" + "enamlx.widgets" + ]; + + meta = with lib; { + homepage = "https://github.com/frmdstryr/enamlx"; + description = "Additional Qt Widgets for Enaml"; + license = licenses.mit; + maintainers = with maintainers; [ raboof ]; + }; +} diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index eb7a9d984ff..2f0f80bcf7a 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.13"; + version = "1.1.14"; src = fetchPypi { inherit pname version; - sha256 = "1vmyfhlpcz9fip89z7bl9va3bybz4p3clifn6x3329v1ms9bm1gc"; + sha256 = "d1fc9d128ce05837d7e149413fbec71bcf84d9ca510accea56761d3f4bd0a021"; }; # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 062d6e3bedb..9f1fd621b8f 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "dbb409c481ffd5100a5ab13177f6ef6284257e33ac8e5090cd50e42533607ebd"; + sha256 = "a8a1216ef1d3f1a4c4fc5a7bd315eca5a3ef7dfc6b78807cdf19ddfeecafcc3e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index ed2a7d69da8..0635f8f027c 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -1,33 +1,38 @@ { stdenv, fetchFromGitHub, buildPythonPackage, - lxml, tzlocal, python-dateutil, pygments, future, requests-kerberos, + pythonOlder, + lxml, tzlocal, python-dateutil, pygments, requests-kerberos, defusedxml, cached-property, isodate, requests_ntlm, dnspython, - psutil, requests-mock, pyyaml + psutil, requests-mock, pyyaml, + oauthlib, requests_oauthlib, + flake8, }: buildPythonPackage rec { pname = "exchangelib"; - version = "1.12.2"; + version = "3.2.1"; + disabled = pythonOlder "3.5"; # tests are not present in the PyPI version src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1p24fq6f46j0qd0ccb64mncxbnm2n9w0sqpl4zk113caaaxkpjil"; + sha256 = "1sh780q2iwdm3bnlnfdacracf0n7jhbv0g39cdx65v3d510zp4jv"; }; - # one test is failing due to it trying to send a request to example.com - patches = [ ./skip_failing_test.patch ]; - checkInputs = [ psutil requests-mock pyyaml ]; + checkInputs = [ psutil requests-mock pyyaml + flake8 + ]; propagatedBuildInputs = [ lxml tzlocal python-dateutil pygments requests-kerberos - future defusedxml cached-property isodate requests_ntlm dnspython ]; + defusedxml cached-property isodate requests_ntlm dnspython + oauthlib requests_oauthlib + ]; meta = with stdenv.lib; { description = "Client for Microsoft Exchange Web Services (EWS)"; homepage = "https://github.com/ecederstrand/exchangelib"; license = licenses.bsd2; maintainers = with maintainers; [ catern ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index df05d5cc40a..ced4744d93f 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 = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "103c46b9701a151299c5bffe6fefcd4fb5fb04c3b5d06bee4952d36255d44ea2"; + sha256 = "c006b3664c270a2cfd4785c5e41ff263d48101c4e920b5961cf9c237131d8418"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 12a295ca65a..390657e9c82 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace tests/test_integration.py --replace 'static_path=' 'static_url_path=' + substituteInPlace tests/test_integration.py --replace "static_folder = '/'" "static_folder = '/x'" + substituteInPlace tests/test_integration.py --replace "'/foo'" "'/x/foo'" ''; propagatedBuildInputs = [ flask webassets flask_script nose ]; diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix new file mode 100644 index 00000000000..9a13ebac647 --- /dev/null +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aniso8601 +, jsonschema +, flask +, werkzeug +, pytz +, faker +, six +, enum34 +, isPy27 +, mock +, blinker +, pytest-flask +, pytest-mock +, pytest-benchmark +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flask-restx"; + version = "0.2.0"; + + # Tests not included in PyPI tarball + src = fetchFromGitHub { + owner = "python-restx"; + repo = pname; + rev = version; + sha256 = "0xf2vkmdngp9cv9klznizai4byxjcf0iqh1pr4b83nann0jxqwy7"; + }; + + propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ] + ++ lib.optionals isPy27 [ enum34 ]; + + checkInputs = [ pytestCheckHook faker mock pytest-flask pytest-mock pytest-benchmark blinker ]; + + pytestFlagsArray = [ + "--benchmark-disable" + "--deselect=tests/test_inputs.py::URLTest::test_check" + "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check" + ]; + + meta = with lib; { + homepage = "https://flask-restx.readthedocs.io/en/${version}/"; + description = "Fully featured framework for fast, easy and documented API development with Flask"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 41c828eefe9..b7bd0fe7f3a 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "4.3.0"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "7f9b54ac9cd92e28a657c58f51943d97e76b988840c8795784e7b2bafb13103f"; + sha256 = "36c1d5765010d1f4e4f05b4cc9c20c289d9dc70698c88d1addd0afcfedc5b062"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 2bcccbec8e4..55ef8c39981 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.4.2"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "967b11c4a37032f98c08f58176e4ac8de10473ab0c1f617acb8202d44b97fe21"; + sha256 = "f59e5153f22e4a0be27b48aece8e45e19c1da294f8c49442b1c9e4d152c5c4c3"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index 2d6a9a3e405..ff5aa3b2bac 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-auth-httplib2"; - version = "0.0.3"; + version = "0.0.4"; src = fetchPypi { inherit pname version; - sha256 = "098fade613c25b4527b2c08fa42d11f3c2037dda8995d86de0745228e965d445"; + sha256 = "8d092cc60fb16517b12057ec0bba9185a96e3b7169d86ae12eae98e645b7bc39"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 233ba6ff0cb..9033f320425 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.20.0"; + version = "1.20.1"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "eec2c302b50e6db0c713fb84b71b8d75cfad5dc6d4dffc78e9f69ba0008f5ede"; + sha256 = "6b757736bbc699db858794e9b71e2bbf17996075773a40551ef5e6b0fad2a2f9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 240804e8080..43c2ff8aa48 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.17.0"; + version = "1.17.2"; src = fetchPypi { inherit pname version; - sha256 = "2f35b33801a41e4115cd93ff0aeb152f383edc0e27277ae28be2dccf238611b9"; + sha256 = "e634b649967d83c02dd386ecae9ce4a571528d59d51a4228757e45f5404a060b"; }; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index 79d24694bc6..9c6067b50ed 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "f37327079f6bc59fafcfb7ba4855137d26190a8d31fe8ee5180460a5eebd645f"; + sha256 = "1ff15c9a06fd7b0402a2549142146f951ca92ebcf5f70f4c96dc9b9397d5279d"; }; 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 e0158dfbaad..ce03add44e4 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.17.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "299e08faf2402d9c6a8e2f2b62f6eade729cecb3d27b1b635bb1f126e0ddc77e"; + sha256 = "3240a04eaa6496e9d8bf4929f4ff04de1652621fd49555eb83b743c48ed9ca04"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 4b28e07a6ce..37ffc8beca5 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.29.0"; + version = "1.31.0"; src = fetchPypi { inherit pname version; - sha256 = "0f681c1ebd5472b804baa391b16dc59d92b065903999566f4776bfbd010bcec9"; + sha256 = "3b08cbd3f4d5b60e3bff8f859e6e03db739967a684268164abc940415e23ca51"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index 8bb20fafe76..c951c97b20f 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -14,10 +14,6 @@ buildPythonPackage { sha256 = "0r9phq5yrmj968vdvy9vivli35wn1j9a6iwshp69wl7q4p0x8q2b"; }; - prePatch = stdenv.lib.optionals stdenv.isDarwin '' - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' pylib/gyp/xcode_emulation.py - ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-darwin-cflags.patch ./no-xcode.patch diff --git a/pkgs/development/python-modules/gyp/no-xcode.patch b/pkgs/development/python-modules/gyp/no-xcode.patch index d202b722474..0e46865846a 100644 --- a/pkgs/development/python-modules/gyp/no-xcode.patch +++ b/pkgs/development/python-modules/gyp/no-xcode.patch @@ -1,12 +1,25 @@ ---- a/pylib/gyp/xcode_emulation.py -+++ b/pylib/gyp/xcode_emulation.py -@@ -1470,7 +1470,8 @@ +--- gyp-old/pylib/gyp/xcode_emulation.py 1980-01-02 00:00:00.000000000 -0600 ++++ gyp/pylib/gyp/xcode_emulation.py 2020-08-02 20:24:24.871322520 -0500 +@@ -1407,10 +1407,10 @@ + raise GypError("xcodebuild returned unexpected results") + except: + version = CLTVersion() +- if version: ++ if version and re.match(r'(\d\.\d\.?\d*)', version): + version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] + else: +- raise GypError("No Xcode or CLT version detected!") ++ version = '7.0.0' + # The CLT has no build information, so we return an empty string. + version_list = [version, ''] + version = version_list[0] +@@ -1667,7 +1667,8 @@ sdk_root = xcode_settings._SdkRoot(configuration) if not sdk_root: sdk_root = xcode_settings._XcodeSdkPath('') - env['SDKROOT'] = sdk_root -+ if sdk_root: -+ env['SDKROOT'] = sdk_root ++ if not sdk_root: ++ env['SDKROOT'] = '' if not additional_settings: additional_settings = {} diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index bad2e9260a4..a9a0944459a 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "h3"; - version = "3.6.3"; + version = "3.6.4"; src = fetchPypi { inherit pname version; - sha256 = "7928303e39eb962cfbca38b35e289ddc5e04b0d3ef56532e1747a19450e13263"; + sha256 = "416e35d736ef6ec9c1f73b9d4a9d5c696cc2a7561811f8bcfa08c8c4912f2289"; }; patches = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 2826056abcb..61c63b28ab6 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { postPatch = '' sed -i 's/"acme.*"/"acme"/' setup.py + sed -i 's/"cryptography.*"/"cryptography"/' setup.py ''; patches = [ diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index d1369b83179..7886746e31e 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1xkds49z4hjyvz170913dz6886lhq4hb2n6dqqpv6q5p1znsx2gj"; + sha256 = "0dk30ga59lhqba1facram6ls52z45sld6b81gy5cl63q67smy08f"; }; propagatedBuildInputs = [ future requests python-dateutil ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { platforms = platforms.all; maintainers = with maintainers; [ liff ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/hdlparse/default.nix b/pkgs/development/python-modules/hdlparse/default.nix new file mode 100644 index 00000000000..4257f9b2e9a --- /dev/null +++ b/pkgs/development/python-modules/hdlparse/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "hdlparse"; + version = "1.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "fb6230ed1e7a04a8f82f8d3fb59791d0751ae35e5b8e58dbbf2cbcf100d0d0f2"; + }; + + #This module does not contain any tests. + doCheck = false; + + meta = with lib; { + homepage = "https://kevinpt.github.io/hdlparse/"; + description = "Rudimentary parser for VHDL and Verilog"; + license = licenses.mit; + maintainers = with maintainers; [ elliottvillars ]; + }; +} + diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index ba70a25a68d..c40d9672f65 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 = "10.0.0"; + version = "10.0.1"; src = fetchPypi { inherit pname version; - sha256 = "03kn1c62y6rb851wjhsaxkrwq223hkc4ij59i85999byyb2hyqad"; + sha256 = "9468b3e2721744b077413c3d4a6b321b61370d4c87b90afa40dc2b48ad877d4b"; }; doCheck = false; diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index bc8c741ec2b..179830f8b5f 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "hickle"; - version = "3.4.6"; + version = "3.4.8"; src = fetchPypi { inherit pname version; - sha256 = "026r6yg3amsi8k8plzsbw5rnifym6sc17y011daqyvcpb7mfs94b"; + sha256 = "09e73029dc6c122f483fca4313a27cc483534145961e4786e65d60895054d940"; }; postPatch = '' diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 4b23ec0b74c..b1c21b106b5 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.9.0.post2"; + version = "0.9.0.post3"; src = fetchPypi { inherit pname version; - sha256 = "a71dd3c153cb6bb2b73d2612b5ab262830d78c6428f33f0c06818749e64c9320"; + sha256 = "5a2442928f17ba742d9c53073f48b152051c5747d758d2fefd937543da5ab2e5"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 1620109e82d..79d49e654f9 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.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "5a91324fcaa4c72a0fe9a13601436f65ee33b2ef033686f4e2228d58a7631970"; + sha256 = "839281f2b1ae7ac576da7951472482f6e714818296853107ea861fa60f5013cc"; }; propagatedBuildInputs = [ six dateutil convertdate ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 418a8e203e4..70489cc3bfc 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.4.0"; + version = "2.4.1"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "42ae7d54b398c01bd100847f6cb0fc9e381c21be8ad3f8e2929135e48dbff026"; + sha256 = "4b4ce2fc1c9d79c63f68009ddf5a12ad238aa78e2fceb256b5aa921763551422"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 864a1300c3e..a3cd4d5ec4d 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.4"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "0yhywm8f86pc4f7ivvbwicwhzf0khjqp9jj77pqy6nha6znvpvnh"; + sha256 = "87dc2a3183c1d4595990203e752b430155d7582a60850dfe0756189a233d4b57"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix new file mode 100644 index 00000000000..de9c7995bde --- /dev/null +++ b/pkgs/development/python-modules/hwi/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mnemonic +, ecdsa +, typing-extensions +, hidapi +, libusb1 +, pyaes +, trezor +, btchip +, ckcc-protocol +}: + +buildPythonPackage rec { + pname = "hwi"; + version = "1.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "eec460a51eb556500c1eca92015be246d5714cd53171407a76da71e4346048ae"; + }; + + propagatedBuildInputs = [ + mnemonic + ecdsa + typing-extensions + hidapi + libusb1 + pyaes + trezor + btchip + ckcc-protocol + ]; + + patches = [ ./relax-deps.patch ]; + + # tests are not packaged in the released tarball + doCheck = false; + + pythonImportsCheck = [ + "hwilib" + ]; + + meta = { + description = "Bitcoin Hardware Wallet Interface"; + homepage = "https://github.com/bitcoin-core/hwi"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/hwi/relax-deps.patch b/pkgs/development/python-modules/hwi/relax-deps.patch new file mode 100644 index 00000000000..ff6c6b9768f --- /dev/null +++ b/pkgs/development/python-modules/hwi/relax-deps.patch @@ -0,0 +1,16 @@ +--- a/setup.py ++++ b/setup.py +@@ -98,10 +98,10 @@ package_data = \ + modules = \ + ['hwi', 'hwi-qt'] + install_requires = \ +-['ecdsa>=0.13.0,<0.14.0', +- 'hidapi>=0.7.99,<0.8.0', ++['ecdsa', ++ 'hidapi', + 'libusb1>=1.7,<2.0', ++ 'mnemonic', +- 'mnemonic>=0.18.0,<0.19.0', + 'pyaes>=1.6,<2.0', + 'typing-extensions>=3.7,<4.0'] + diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index e1e69158254..6aba70d3a50 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.21"; + version = "1.4.25"; src = fetchPypi { inherit pname version; - sha256 = "105n1prgmzkzdwr8q0bdx82nj7i8p3af1abh864k2fcyjwmpzl64"; + sha256 = "110ed090fec6bce1aabe3c72d9258a9de82207adeaa5a05cd75c635880312f9a"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index e9f5fed49a3..b4a9b20f08d 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.1.6"; + version = "0.1.7"; pname = "ifaddr"; src = fetchPypi { inherit pname version; - sha256 = "c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93"; + sha256 = "1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94"; }; propagatedBuildInputs = [ ipaddress ]; diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix deleted file mode 100644 index 9953868df5f..00000000000 --- a/pkgs/development/python-modules/ipython/7.9.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, pythonOlder -# Build dependencies -, glibcLocales -# Test dependencies -, nose -, pygments -# Runtime dependencies -, jedi -, decorator -, pickleshare -, traitlets -, prompt_toolkit -, pexpect -, appnope -, backcall -, fetchpatch -}: - -buildPythonPackage rec { - pname = "ipython"; - version = "7.9.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "103jkw18z7fnwdal1mdbijjxi1fndzn31g887lmj7ddpf2r07lyz"; - }; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = [ glibcLocales ]; - - checkInputs = [ nose pygments ]; - - propagatedBuildInputs = [ - jedi - decorator - pickleshare - traitlets - prompt_toolkit - pygments - pexpect - backcall - ] ++ lib.optionals stdenv.isDarwin [appnope]; - - LC_ALL="en_US.UTF-8"; - - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - - pythonImportsCheck = [ - "IPython" - ]; - - meta = with lib; { - description = "IPython: Productive Interactive Computing"; - homepage = "http://ipython.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 83e3ca14e58..8507dfc7e60 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.2"; + version = "1.3.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "24ed221dcc3878e70daebdbdffdf7fd2b2111164008ba4b5de6785b72eabf91f"; + sha256 = "009815638f33e67f0fd9cc4fa2087b2faa438e32703877ca14ecf9826508b724"; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index b1ccc22ac6d..45d18085cc4 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.4.0"; + version = "1.4.1"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "663ad97a30cd449117639e4af37d535d7383b2014b88338d12392ac7f62bdb2b"; + sha256 = "eb940d89fb7c877a3d42e08e7ae1d5cf8a501e059db165007687fdf648598b06"; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix new file mode 100644 index 00000000000..0c891a86134 --- /dev/null +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, w3lib +, parsel +, jmespath +, itemadapter +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "itemloaders"; + version = "1.0.1"; + + disabled = isPy27; + + # Tests not included in PyPI tarball + src = fetchFromGitHub { + owner = "scrapy"; + repo = pname; + rev = "v${version}"; + sha256 = "0frs0s876ddha844vhnhhiggyk3qbhhngrwkvgg3c0mrnn282f6k"; + }; + + propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Base library for scrapy's ItemLoader"; + homepage = "https://github.com/scrapy/itemloaders"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index e82f4c2511f..fae3c2f3958 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -1,11 +1,13 @@ { buildPythonPackage , fetchPypi +, isPy27 , lib }: buildPythonPackage rec { pname = "javaobj-py3"; version = "0.4.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index ae1cc51eab1..e37f5bc7e62 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.13.1"; + version = "1.13.4"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1q5s81izfvxlifa0kzj2qih03d4d0gf7jxkilrcv40rsag5jfb16"; + sha256 = "0rwvyyrdnw43pixp8h51rncq2inc9pbbj1j2191y5si00pjw34zr"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 8976e90b5f4..59c22caf314 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.17.1"; + version = "0.17.2"; src = fetchPypi { inherit pname version; - sha256 = "0qrgyn0znpib485hk0mi68wab6nhwqd3pyjxvp7jn6kijr7mszc0"; + sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; }; checkInputs = [ pytest glibcLocales tox pytestcov ]; diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 79a711d07d0..33c14dbaeb2 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "jellyfin-apiclient-python"; - version = "1.5.1"; + version = "1.6.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "iwalton3"; repo = "jellyfin-apiclient-python"; rev = "v${version}"; - sha256 = "1mzs4i9c4cf7pmymsyzs8x17hvjs8g9wr046l4f85rkzmz23v1rp"; + sha256 = "0f7czq83ic22fz1vnf0cavb7l3grcxxd5yyw9wcjz3g1j2d76735"; }; propagatedBuildInputs = [ requests websocket_client ]; diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index adcdd2b9d82..3f1941b2a2b 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "jq"; version = "0.1.6"; - srcs = fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "34bdf9f9e49e522e1790afc03f3584c6b57329215ea0567fb2157867d6d6f602"; }; diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index e96950c496c..9b71a1515ad 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "Jug"; - version = "2.0.0"; + version = "2.0.2"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1am73pis8qrbgmpwrkja2qr0n9an6qha1k1yp87nx6iq28w5h7cv"; + sha256 = "859a4b4cb26a0010299b189c92cfba626852c97a38e22f3d1b56e4e1d8ad8620"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jupyter-c-kernel/default.nix b/pkgs/development/python-modules/jupyter-c-kernel/default.nix new file mode 100644 index 00000000000..0cc232bd706 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-c-kernel/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ipykernel +, gcc +}: + +buildPythonPackage rec { + pname = "jupyter-c-kernel"; + version = "1.2.2"; + + src = fetchPypi { + pname = "jupyter_c_kernel"; + inherit version; + sha256 = "e4b34235b42761cfc3ff08386675b2362e5a97fb926c135eee782661db08a140"; + }; + + postPatch = '' + substituteInPlace jupyter_c_kernel/kernel.py \ + --replace "'gcc'" "'${gcc}/bin/gcc'" + ''; + + propagatedBuildInputs = [ ipykernel ]; + + # no tests in repository + doCheck = false; + + meta = with lib; { + description = "Minimalistic C kernel for Jupyter"; + homepage = "https://github.com/brendanrius/jupyter-c-kernel/"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter-telemetry/default.nix b/pkgs/development/python-modules/jupyter-telemetry/default.nix new file mode 100644 index 00000000000..4b3093cf6ce --- /dev/null +++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, python-json-logger +, jsonschema +, ruamel_yaml +, traitlets +}: + +buildPythonPackage rec { + pname = "jupyter_telemetry"; + version = "0.1.0"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "052khyn6h97jxl3k5i2m81xvga5v6vwh5qixzrax4w6zwcx62p24"; + }; + + propagatedBuildInputs = [ + python-json-logger jsonschema ruamel_yaml traitlets + ]; + + meta = with stdenv.lib; { + description = "Telemetry for Jupyter Applications and extensions"; + homepage = "https://jupyter-telemetry.readthedocs.io/"; + license = licenses.bsd3; + maintainers = with lib.maintainers; [ chiroptical ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 24d7ee4f71c..39f8c71a4df 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 = "6.1.5"; + version = "6.1.6"; src = fetchPypi { inherit pname version; - sha256 = "5099cda1ac86b27b655a715c51e15bdc8bd9595b2b17adb41a2bd446bbbafc4a"; + sha256 = "b360f8d4638bc577a4656e93f86298db755f915098dc763f6fc05da0c5d7a595"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix new file mode 100644 index 00000000000..dc38acc66f7 --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jupyterhub +, tornado +, bash +}: + +buildPythonPackage rec { + pname = "jupyterhub-systemdspawner"; + version = "0.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "080dd9cd9292266dad35d1efc7aa1af0ed6993d15eadc79bd959d1ee273d1923"; + }; + + propagatedBuildInputs = [ + jupyterhub + tornado + ]; + + postPatch = '' + substituteInPlace systemdspawner/systemd.py \ + --replace "/bin/bash" "${bash}/bin/bash" + + substituteInPlace systemdspawner/systemdspawner.py \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + meta = with lib; { + description = "JupyterHub Spawner using systemd for resource isolation"; + homepage = "https://github.com/jupyterhub/systemdspawner"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index fa63af115f2..704d9174ebd 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -18,6 +18,7 @@ , nodePackages , oauthlib , certipy +, jupyter-telemetry }: let @@ -53,12 +54,12 @@ in buildPythonPackage rec { pname = "jupyterhub"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0zx6gw9yhgki05j21p6x1x2sf5a2mg2c2mx0ii8rl6q4b98ilm1k"; + sha256 = "1mqknz0rxqzx4nc57vscvfh2d4znzlzpy83ancqxdaq3b8i70al5"; }; # Most of this only applies when building from source (e.g. js/css assets are @@ -110,6 +111,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado traitlets prometheus_client async_generator notebook certipy oauthlib + jupyter-telemetry ]; # Disable tests because they take an excessive amount of time to complete. diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix new file mode 100644 index 00000000000..7d6437f41a8 --- /dev/null +++ b/pkgs/development/python-modules/kinparse/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, future +, pyparsing +}: + +buildPythonPackage { + pname = "kinparse"; + version = "unstable-2019-12-18"; + + src = fetchFromGitHub { + owner = "xesscorp"; + repo = "kinparse"; + rev = "eeb3f346d57a67a471bdf111f39bef8932644481"; + sha256 = "1nrjnybwzy93c79yylcwmb4lvkx7hixavnjwffslz0zwn32l0kx3"; + }; + + doCheck = true; + pythonImportsCheck = [ "kinparse" ]; + + checkInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + future + pyparsing + ]; + + meta = with lib; { + description = "A Parser for KiCad EESCHEMA netlists"; + homepage = "https://github.com/xesscorp/kinparse"; + license = licenses.mit; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 083d810f696..dd45e967231 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "fcef6040164ebe7d69629e4e089b398c9b980791446496301befcf8381dba0fc"; + sha256 = "dfc6aef6760ea9a9620577e01540617678d78cab3111a0f03e8b9f987d0f08ca"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 5c70fb5eee0..560cd4383b1 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.6.10"; + version = "4.6.11"; src = fetchPypi { inherit pname version; - sha256 = "437b9cdea193cc2ed0b8044c85fd0f126bb3615ca2f4d4a35b39de7cacfa3c1a"; + sha256 = "ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74"; }; postPatch = '' diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index d42ca3d8f1c..ffc393ab452 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cb1c5adfbdc76560bed57d44f272f9306987a0865be9017fc520dca1e9649d5b"; + sha256 = "1d7a7304fe6a33c1345ab569e70019f7fa11c97d49948e4fc4bf3bbc1f202703"; }; propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ]; diff --git a/pkgs/development/python-modules/lazr-uri/default.nix b/pkgs/development/python-modules/lazr-uri/default.nix index e9278625383..080eb4cdb0e 100644 --- a/pkgs/development/python-modules/lazr-uri/default.nix +++ b/pkgs/development/python-modules/lazr-uri/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lazr.uri"; - version = "1.0.4"; + version = "1.0.5"; disabled = isPy27; # namespace is broken for python2 src = fetchPypi { inherit pname version; - sha256 = "1griz2r0vhi9k91wfhlx5cx7y3slkfyzyqldaa9i0zp850iqz0q2"; + sha256 = "f36e7e40d5f8f2cf20ff2c81784a14a546e6c19c216d40a6617ebe0c96c92c49"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 02ff59e6c21..fe6a02c3cd7 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "a0aed261060cd0372abf08d16399b1224dbb5b400312e6b00f2b23eabe1d4e96"; + sha256 = "9723364577b79ad9958a68851fe2acb94da6fd25170c595516a8289e6a129043"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix new file mode 100644 index 00000000000..30b52be0b85 --- /dev/null +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, python +, pygobject3 +, xvfb_run +, gobject-introspection +, gtk3 +, pythonOlder +}: + +buildPythonPackage rec { + version = "3.0.1"; + pname = "liblarch"; + disabled = pythonOlder "3.5.0"; + + src = fetchFromGitHub { + owner = "getting-things-gnome"; + repo = "liblarch"; + rev = "v${version}"; + sha256 = "0xv2mfvyzipbny3iz8vll77wsqxfwh28xj6bj1ff0l452waph45m"; + }; + + checkInputs = [ + gobject-introspection # for setup hook + gtk3 + ]; + + propagatedBuildInputs = [ + pygobject3 + ]; + + checkPhase = '' + runHook preCheck + ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + ${python.interpreter} nix_run_setup test + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "A python library built to easily handle data structure such are lists, trees and acyclic graphs"; + homepage = "https://github.com/getting-things-gnome/liblarch"; + downloadPage = "https://github.com/getting-things-gnome/liblarch/releases"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ oyren ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index bb605407de5..fbda4989a24 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -2,16 +2,18 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.5.0"; + version = "0.5.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1e0e6ff59be5e22f863d909ca989e34bb14c21b374f6af45281e603d003dbb96"; + sha256 = "70201d5fce26da89b7a5f168caa2bb674e06b969829f56737db1d6472e53e7c3"; }; checkInputs = [ pytestCheckHook colorama ]; + pytestFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ]; + disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index f39e71ed690..aa009e0a3e7 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , cython , libxml2 , libxslt @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.5.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "1i3bhg8xb502afq4ar3kgvvi1hy83l4af2gznfwqvb5b221fr7ak"; + sha256 = "1d0cpwdjxfzwjzmnz066ibzicyj2vhx15qxmm775l8hxqi65xps4"; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "lxml" "lxml.etree" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index a5dd00971d0..d21d09571ad 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mapsplotlib"; - version = "1.2.0"; + version = "1.2.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e0a18aa0d134407aab6130c314596732d129ff98f9a6084640a07a5b8656f836"; + sha256 = "7650754e3175f13a1cb4406a62e4cfeb424036377992b9c3c2e3f6c2404d06b3"; }; propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 03afcfe75ae..774fbc28793 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection +, pillow , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -19,14 +20,14 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt5 != null; buildPythonPackage rec { - version = "3.2.1"; + version = "3.3.0"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ffe2f9cdcea1086fc414e82f42271ecf1976700b8edd16ca9d376189c6d93aee"; + sha256 = "24e8db94948019d531ce0bcd637ac24b1c8f6744ac86d2aa0eb6dbaeb1386f82"; }; XDG_RUNTIME_DIR = "/tmp"; @@ -39,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cycler dateutil numpy pyparsing tornado freetype kiwisolver - libpng mock pytz ] + libpng mock pytz pillow ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableQt [ pyqt5 ]; diff --git a/pkgs/development/python-modules/matplotlib/setup.cfg b/pkgs/development/python-modules/matplotlib/setup.cfg index 6f81985efa4..6a773862765 100644 --- a/pkgs/development/python-modules/matplotlib/setup.cfg +++ b/pkgs/development/python-modules/matplotlib/setup.cfg @@ -1,2 +1,5 @@ [directories] basedirlist = . + +[libs] +system_freetype = true diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 9be30fff538..d380f18f772 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.6.post0"; + version = "0.4.6.1"; src = fetchPypi { inherit pname version; - sha256 = "dfcb0c9cb5850e656344ac464a260e7b8b9b1c62d77c2e1d3d9ef15a88f1df6b"; + sha256 = "9f9b57abb2b155c2d3e411c2dd5b98f14998bd053a20c6ed0ab64a6ceb8ad51d"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 2e67fbec2c0..14ed57457b2 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.17"; + version = "0.6.18"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "1f1cpl5x7q0f9lpwxc1pl9j5x5yrksfizl9k939iqklf95ssymff"; + sha256 = "0j0dbca47qnxnhpfgj3v5bglg8dpx2cy1psix8kp3ldrkf6rjwdb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 18704eaee08..990854b1098 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1id6m2dllkjpbv2w0yazxhlkhdd9cac6lxv9csf053il9wq322lk"; + sha256 = "31fdb4bd45ebcd98eeda01e2c38fb391eae8a8480bdddbebb6cfd088486948a7"; }; checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 41f5425317d..198f139b112 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.9.5"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "1xh2p7g5s5g06caaraf3dsz69bpj7dgw2h3ss67kci789aspnwp8"; + sha256 = "cfefcd2ef66ee2d337d0b252c6bcec4023384eb32e8b9e5fcc3ac80ab8cd7d40"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 62373ebc42d..874ca53d34f 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.3"; + version = "1.5.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "2a3ca855848f4bbf07fac366da77a681fcead18c0a8813d91d46302f562dc3be"; + sha256 = "941de6f3623b6474ecb4d043be5990690f7af4cf0d593b31be912627fe5aad03"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix new file mode 100644 index 00000000000..81057308e6b --- /dev/null +++ b/pkgs/development/python-modules/nix-kernel/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pexpect +, notebook +, nix +}: + +buildPythonPackage rec { + pname = "nix-kernel"; + version = "unstable-2020-04-26"; + + src = fetchFromGitHub { + owner = "GTrunSec"; + repo = "nix-kernel"; + rev = "dfa42d0812d508ded99f690ee1a83281d900a3ec"; + sha256 = "1lf4rbbxjmq9h6g3wrdzx3v3dn1bndfmiybxiy0sjavgb6lzc8kq"; + }; + + postPatch = '' + substituteInPlace nix-kernel/kernel.py \ + --replace "'nix'" "'${nix}/bin/nix'" \ + --replace "'nix repl'" "'${nix}/bin/nix repl'" + + substituteInPlace setup.py \ + --replace "cmdclass={'install': install_with_kernelspec}," "" + ''; + + propagatedBuildInputs = [ + pexpect + notebook + ]; + + # no tests in repo + doCheck = false; + + pythonImportsCheck = [ "nix-kernel" ]; + + meta = with lib; { + description = "Simple jupyter kernel for nix-repl"; + homepage = "https://github.com/GTrunSec/nix-kernel"; + license = licenses.mit; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 19d25a8e697..f34301a5d70 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -13,14 +13,14 @@ }: buildPythonPackage rec { - version = "0.50.0"; + version = "0.50.1"; pname = "numba"; # uses f-strings disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c9e5752821530694294db41ee19a4b00e5826c689821907f6c2ece9a02756b29"; + sha256 = "89e81b51b880f9b18c82b7095beaccc6856fcf84ba29c4f0ced42e4e5748a3a7"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index ea93fc1f3f3..92d049dbe6c 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -5,7 +5,7 @@ , cython , numpy , msgpack -, pytest +, pytestCheckHook , python , gcc8 }: @@ -31,12 +31,20 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - pytest $out/${python.sitePackages}/numcodecs -k "not test_backwards_compatibility" - ''; + pytestFlagsArray = [ + "$out/${python.sitePackages}/numcodecs" + ]; + + disabledTests = [ + "test_backwards_compatibility" + + "test_encode_decode" + "test_legacy_codec_broken" + "test_bytes" + ]; meta = with lib;{ homepage = "https://github.com/alimanfoo/numcodecs"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 990671f1633..98ba0b5c688 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -3,6 +3,7 @@ , python , buildPythonPackage , gfortran +, hypothesis , pytest , blas , lapack @@ -35,13 +36,13 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.19.0"; + version = "1.19.1"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "76766cc80d6128750075378d3bb7812cf146415bd29b588616f72c943c00d598"; + sha256 = "b8456987b637232602ceb4d663cb34106f7eb780e247d51a260b84760fd8f491"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; @@ -67,6 +68,8 @@ in buildPythonPackage rec { doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) + checkInputs = [ hypothesis ]; + checkPhase = '' runHook preCheck pushd dist diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index d858d8ad428..72205f8727f 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.3"; + version = "3.0.4"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "547a9fc6aafcf44abe358b89ed4438d077e9d92e4f182c87e2dc294186dc4b64"; + sha256 = "d88dd1480668019684c66cfff3e52a5de4ed41e9df5dd52e008cbf27af0dbf87"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 4dc4ffa68fc..cba755020de 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "openwrt-luci-rpc"; version = "1.1.2"; - srcs = fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "144bw7w1xvpdkad5phflpkl15ih5pvi19799wmvfv8mj1dn1yjhp"; }; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index eddf3f74e0f..cebb7c2b938 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -31,11 +31,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.0.5"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "69c5d920a0b2a9838e677f78f4dde506b95ea8e4d30da25859db6469ded84fa8"; + sha256 = "b39508562ad0bb3f384b0db24da7d68a2608b9ddc85b1d931ccaaa92d5e45273"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 73f72bd2897..43c13c2606a 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "5e599992317f761c5e0543430402b24faac89292d7770c3e20b520fa2a25f75a"; + sha256 = "aadc23f0ae2eaa75868e4359f1ea7d75ff46bc8cb1988651f3f3fd5d4ec44679"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index b5c75c31b38..4406524bdaa 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c"; + sha256 = "caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index f7e235f4036..5688090b095 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,16 +1,30 @@ { lib, fetchPypi, buildPythonPackage, pythonOlder -, dateutil, pytzdata, typing }: +, dateutil +, importlib-metadata +, poetry +, poetry-core +, pytzdata +, typing +}: buildPythonPackage rec { pname = "pendulum"; - version = "2.1.0"; + version = "2.1.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "093cab342e10516660e64b935a6da1a043e0286de36cc229fb48471415981ffe"; + sha256 = "b06a0ca1bfe41c990bbf0c029f0b6501a7f2ec4e38bfec730712015e8860f207"; }; - propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing; + preBuild = '' + export HOME=$TMPDIR + ''; + + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ dateutil pytzdata ] + ++ lib.optional (pythonOlder "3.5") typing + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index b59fa303573..0979afa92f4 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "persim"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "0vz6s49ar7mhg4pj4jcbwb79s8acqj6jc70va5w79pjxb5pw8k2n"; + sha256 = "be4ea4bfc2a0c6fcfc28ebd52e23a351ee00b0ef0ddaf527526bd0f919145348"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 9c327555f65..9eb72263302 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.11"; + version = "2.1.15"; src = fetchPypi { inherit pname version; - sha256 = "9fc8f1562676c537b4c7fe4a62ecaaa2803fa43b56aba2f2435d833eb6b6036a"; + sha256 = "e1092ae52cfdef41c22d98fa98f9225ac21936a7d096131777ca3a7940fe1b2d"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 9e7595e64a4..0212e7ea425 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.15.2"; + version = "1.15.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "eb42ba62fbc048c91d5cf1ac729e0ea4ee329cc526bddafed4e7a8aa6b57fbbb"; + sha256 = "af97353076b8e5d271d91c64c8ca806e2157d11b7862c90ff6f0e23be0fc217d"; }; propagatedBuildInputs = [ passlib ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index a14a790059d..e3e23fa8e88 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.6"; + version = "8.12.7"; src = fetchPypi { inherit pname version; - sha256 = "02yfyphrrlx00r7s2j522kjszchq6ql8gb33lasm6q8wwy7hfcnk"; + sha256 = "652c418f8e97c8438f227a524ddf8d7d325c4a47e4924ce865b827c24ec3194d"; }; meta = { diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 2fad490bc42..e934ea4577b 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "3.0.3"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "0z9w99m1vppppj2ypgm0flslgwcjjzlr7x3m62sccavgbg1n2nwj"; + sha256 = "0e33670e83f6a33ebb0822e43a609c3247178d4a375ff50a4689e266d853eb66"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index c49c77ad91e..e9d3159382e 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "be6190405e4206526607aa4813bd6d7a949e4fdc180d0db4f3221f3778846cf7"; + sha256 = "5b4b6e7b6e66357685c73e856296b4792b2d159ff6074729e250e291834bfd9d"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 5cc5789144f..c0a34d1d8a3 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pipdate"; - version = "0.5.1"; + version = "0.5.2"; disabled = isPy27; # abandoned src = fetchPypi { inherit pname version; - sha256 = "d10bd408e4b067a2a699badf87629a12838fa42ec74dc6140e64a09eb0dc28cf"; + sha256 = "507065231f2d50b6319d483432cba82aadad78be21b7a2969b5881ed8dee9ab4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 3556db7ddb8..96e73356047 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,15 +1,16 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "4.0.0"; + version = "6.0.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "2bf91e4c1054c920ec8911038f86efdc76067bf6b55a9787bd846129ce01ff4a"; + sha256 = "0a0ay39k50hbxxaxz09m2azz5c08yqki2gincziv6g381yrlj68s"; }; checkInputs = [ pytest ]; + # Integration tests require API keys and internet access checkPhase = "py.test -rxs ./tests/unit"; @@ -18,6 +19,7 @@ buildPythonPackage rec { meta = { description = "Python client library for the Plaid API and Link"; homepage = "https://github.com/plaid/plaid-python"; + changelog = "https://github.com/plaid/plaid-python/blob/master/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bhipple ]; }; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index c7b4ff350df..825fcc86dc0 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "8.0.0"; + version = "8.0.1"; src = fetchPypi { inherit pname version; - sha256 = "71f22cb8cc169360786ec468a0ab5d403abe5bacc13754c251dd6b9eeedd1d83"; + sha256 = "e079c87f821cf2e411826940e65577a88e08827cf9a2b771070f2917a439b642"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 1b8c2a0af0d..a9a46bfc9e2 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.8.1"; + version = "4.8.2"; src = fetchPypi { inherit pname version; - sha256 = "d3fea527fe3dfdd55d7334318f107b05a8407474a0fffe6cd4726c9b99e624f1"; + sha256 = "ce55e1a9669ea7455574ddbfe2fb52636eb63a6c29387ee0c0a929ed2325f916"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix new file mode 100644 index 00000000000..fb4ff8b2d8a --- /dev/null +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -0,0 +1,63 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +, importlib-metadata +, intreehooks +, isort +, pathlib2 +, pep517 +, pytest-mock +, pytestCheckHook +, tomlkit +, typing +, virtualenv +}: + +buildPythonPackage rec { + pname = "poetry-core"; + version = "1.0.0a9"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = version; + sha256 = "1ln47x1bc1yvhdfwfnkqx4d2j7988a59v8vmcriw14whfgzfki75"; + }; + + # avoid mass-rebuild of python packages + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "^1.7.0" "^1.6.0" + ''; + + nativeBuildInputs = [ + intreehooks + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ] ++ lib.optionals isPy27 [ + pathlib2 + typing + ]; + + checkInputs = [ + isort + pep517 + pytest-mock + pytestCheckHook + tomlkit + virtualenv + ]; + + # requires git history to work correctly + disabledTests = [ "default_with_excluded_data" ]; + + pythonImportsCheck = [ "poetry.core" ]; + + meta = with lib; { + description = "Core utilities for Poetry"; + homepage = "https://github.com/python-poetry/poetry-core/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index c4f043aada5..a4eb552bb7d 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.9.13"; + version = "1.9.15"; src = fetchPypi { inherit pname version; - sha256 = "9b1ca602b63b7bcb9f53e9f3d4b815839926533112bc6e3ecf1d37cb125259f3"; + sha256 = "23b545d91c784fcaf27fbf4c69abe21ac1ea10d25b5b8c61dcd8f0e03ccff786"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 69181af222c..89797c4802c 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -3,22 +3,23 @@ , pytest , mock , ipaddress +, unittest2 }: buildPythonPackage rec { pname = "psutil"; - version = "5.7.0"; + version = "5.7.2"; src = fetchPypi { inherit pname version; - sha256 = "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8"; + sha256 = "90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb"; }; # arch doesn't report frequency is the same way # tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715 doCheck = !stdenv.isDarwin && stdenv.isx86_64; checkInputs = [ pytest ] - ++ lib.optionals isPy27 [ mock ipaddress ]; + ++ lib.optionals isPy27 [ mock ipaddress unittest2 ]; # out must be referenced as test import paths are relative # disable tests which don't work in sandbox # cpu_times is flakey on darwin diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index cad7291994e..496dc2d2aaa 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.2"; + version = "3.0.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "556e5367d4d58231b575dc619493dc0d8ef4c2d15ee85c727a88beb60fa5c52b"; + sha256 = "9ac4e4047ca3a03133702a353a93cf56ca1ec1162bc7ecaff087a91c03e3827b"; }; propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ]; diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index f8531288007..2f4a60b420a 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "py-vapid"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "03057a3270ddc7d53c31e2915083d01ba8a3169f4032cab3dd9f4ebe44e2564a"; + sha256 = "f05cecaa9fc009515086d04b6117324f30eedf1a196f67fb1ec360a9dbdad4ee"; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 5da15bb91f4..edc35bb134e 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "py"; - version = "1.8.1"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa"; + sha256 = "f3b3a4c36512a4c4f024041ab51866f11761cc169670204b235f6b20523d4e6b"; }; # Circular dependency on pytest diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix deleted file mode 100644 index d04d7bfb5af..00000000000 --- a/pkgs/development/python-modules/pybfd/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }: - -buildPythonPackage { - pname = "pybfd"; - version = "-0.1.1.2017-12-31"; - - disabled = isPyPy || isPy3k; - - src = fetchFromGitHub { - owner = "orivej"; - repo = "pybfd"; - rev = "a10ada53f2a79de7f62f209567806ef1e91794c7"; - sha256 = "0sxzhlqjyvvx1zr3qrkb57z6s3g6k3ksyn65fdm9lvl0k4dv2k9w"; - }; - - LIBBFD_INCLUDE_DIR = "${libbfd.dev}/include"; - LIBBFD_LIBRARY = "${libbfd}/lib/libbfd.so"; - LIBOPCODES_INCLUDE_DIR = "${libopcodes.dev}/include"; - LIBOPCODES_LIBRARY = "${libopcodes}/lib/libopcodes.so"; - - meta = { - homepage = "https://github.com/Groundworkstech/pybfd"; - description = "A Python interface to the GNU Binary File Descriptor (BFD) library"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ orivej ]; - broken = true; - }; -} diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 01c0368662c..92c34c7bd4e 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.2"; + version = "0.12.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "6571ef82e03a958e56aa61cf5b15392f0b2d5dbca92f872061d81524e8da8525"; + sha256 = "0flvrb61hfyjjgdz07dlm8m9pqwb8qrx027zfrwa9d5nw1az7g28"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch b/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch deleted file mode 100644 index d5b669dab7a..00000000000 --- a/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a027e2590d5d2d384d23568a8d47b7095054b6b7 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk <fridh@fridh.nl> -Date: Thu, 19 Dec 2019 19:51:07 +0100 -Subject: [PATCH] Find include directory - ---- - pybind11/__init__.py | 33 +-------------------------------- - 1 file changed, 1 insertion(+), 32 deletions(-) - -diff --git a/pybind11/__init__.py b/pybind11/__init__.py -index c625e8c..c8a707b 100644 ---- a/pybind11/__init__.py -+++ b/pybind11/__init__.py -@@ -2,35 +2,4 @@ from ._version import version_info, __version__ # noqa: F401 imported but unuse - - - def get_include(user=False): -- from distutils.dist import Distribution -- import os -- import sys -- -- # Are we running in a virtual environment? -- virtualenv = hasattr(sys, 'real_prefix') or \ -- sys.prefix != getattr(sys, "base_prefix", sys.prefix) -- -- # Are we running in a conda environment? -- conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta')) -- -- if virtualenv: -- return os.path.join(sys.prefix, 'include', 'site', -- 'python' + sys.version[:3]) -- elif conda: -- if os.name == 'nt': -- return os.path.join(sys.prefix, 'Library', 'include') -- else: -- return os.path.join(sys.prefix, 'include') -- else: -- dist = Distribution({'name': 'pybind11'}) -- dist.parse_config_files() -- -- dist_cobj = dist.get_command_obj('install', create=True) -- -- # Search for packages in user's home directory? -- if user: -- dist_cobj.user = user -- dist_cobj.prefix = "" -- dist_cobj.finalize_options() -- -- return os.path.dirname(dist_cobj.install_headers) -+ return "@include@" --- -2.23.0 - diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 3cfdbba31c1..079c93db450 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd"; + sha256 = "13hcj6g7k7yvj7nry2ar6f5mg58ln7frrvq1cg5f8mczxh1ch6zl"; }; nativeBuildInputs = [ cmake ]; @@ -40,14 +40,6 @@ buildPythonPackage rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; - patches = [ - ./0001-Find-include-directory.patch - ]; - - postPatch = '' - substituteInPlace pybind11/__init__.py --subst-var-by include "$out/include" - ''; - preFixup = '' pushd .. export PYBIND11_USE_CMAKE=1 @@ -65,7 +57,7 @@ buildPythonPackage rec { scipy ]; - meta = { + meta = with lib; { homepage = "https://github.com/pybind/pybind11"; description = "Seamless operability between C++11 and Python"; longDescription = '' @@ -73,7 +65,7 @@ buildPythonPackage rec { C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. ''; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.yuriaisaka ]; + license = licenses.bsd3; + maintainers = with maintainers;[ yuriaisaka ]; }; } diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 36b71704a92..588b865a354 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.8.1"; + version = "2.8.4"; src = fetchPypi { inherit pname version; - sha256 = "836d80660920f0696645738367b8c8359878387ba582adb8b37d59d60adedadd"; + sha256 = "39fb2ae8ef99c7096295a368e232224b68bf209059c1977d7189c28ec833d043"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 690b5d717a4..72a527b8073 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 = "7.1.0"; + version = "7.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1wrl2mcsga60ps9fa6mf12c7agshwsvcmlrhwsbj1kmng5yqxq9h"; + sha256 = "adcf478d7fc539e9decde59b2db7b6a4b1d679c4cf78d515d880adb1c4bc1c30"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 63db40dba16..15e93e59542 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.7"; + version = "3.9.8"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "f1add21b6d179179b3c177c33d18a2186a09cc0d3af41ff5ed3f377360b869f2"; + sha256 = "0e24171cf01021bc5dc17d6a9d4f33a048f09d62cc3f62541e95ef104588bda4"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 92da3e722f0..0bef1364617 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.7"; + version = "3.9.8"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "50163324834edd0c9ce3e4512ded3e221c969086e10fdd5d3fdcaadac5e24a78"; + sha256 = "48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9"; }; } diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 6cf96f93a8f..284b8f0837a 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.0.0"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "9e00aba15de9c0e553dfcc7b346c3541c54f35054dd05b72a9e2343e340adf6f"; + sha256 = "43943cc15889153b90191d9e1bd85e7a3709a6d57b6379220cb14017217fb999"; }; propagatedBuildInputs = [ setuptools six traits ]; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 7188ac8ce4a..399d889db2b 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.5.8"; + version = "0.5.9.1"; src = fetchPypi { inherit pname version; - sha256 = "038xi3a6zvrxbyyfpp64ka8pcjgsdq4fgw9cl5lpxbvmm1bzzw2q"; + sha256 = "eda8af04ba4da4fd63fdc35a62e0e41dfc06aa1a511728dfbdd7707e3b382855"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 0f964bfc9f9..5cc83466262 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "PyFxA"; - version = "0.7.3"; + version = "0.7.7"; src = fetchPypi { inherit pname version; - sha256 = "f47f4285629fa6c033c79adc3fb90926c0818a42cfddb04d32818547362f1627"; + sha256 = "6c85cd08cf05f7138dee1cf2a8a1d68fd428b7b5ad488917c70a2a763d651cdb"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 74606902722..9e38d640397 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { pname = "pygobject"; - version = "3.36.0"; + version = "3.36.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vysyr586mfjm7biraw1nynpw4f1qajynkm6m40ybadsnpgx50w6"; + sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyhs100/default.nix b/pkgs/development/python-modules/pyhs100/default.nix new file mode 100644 index 00000000000..2e6d7164b8b --- /dev/null +++ b/pkgs/development/python-modules/pyhs100/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, click, click-datetime, deprecation +, pytest, voluptuous }: + +buildPythonPackage rec { + pname = "pyHS100"; + version = "0.3.5.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "GadgetReactor"; + repo = pname; + rev = version; + sha256 = "1vddr9sjn6337i1vx0mm7pb3qibvl2gx6nx18vm4fajgv9vcjxny"; + }; + + propagatedBuildInputs = [ + click + click-datetime + deprecation + ]; + + checkInputs = [ + pytest + voluptuous + ]; + + checkPhase = '' + py.test pyHS100 + ''; + + meta = with lib; { + description = "Python Library to control TPLink Switch (HS100 / HS110)"; + homepage = "https://github.com/GadgetReactor/pyHS100"; + license = licenses.gpl3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 311417bf0e4..584c98f6cb0 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,19 +1,23 @@ { lib, fetchPypi, buildPythonPackage -, lxml, pycryptodome, construct +, lxml, pycryptodomex, construct , argon2_cffi, dateutil, future }: buildPythonPackage rec { pname = "pykeepass"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1ysjn92bixq8wkwhlbhrjj9z0h80qnlnj7ks5478ndkzdw5gxvm1"; + sha256 = "b3e07eb2dd3aeb1dfa1a2d2d17be77066ee560c1e770f1c72d7ea5608117d284"; }; + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + ''; + propagatedBuildInputs = [ - lxml pycryptodome construct + lxml pycryptodomex construct argon2_cffi dateutil future ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index ccb76439816..6babcb15ba4 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.5.2"; + version = "2.5.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "b95e31850f3af163c2283ed40432f053acbc8fc6eba6a069cb518d9dbf71848c"; + sha256 = "7dd78437f2d8d019717dbf287772d0b2dbdfd13fc016aa7faa08d67bccc46adc"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 51b057e740c..0522e0791fc 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.8"; + version = "2.4.9"; src = fetchPypi { inherit pname version; - sha256 = "1djzr6cg3l19icwplmpii7zzr8gms9qcc2lfr8yc05siqzclk5xk"; + sha256 = "6049f270aa0a1013c7dcd32b9f4756d79b6a2ccf73babeca2c46b9e391e644fe"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 10ca99de7c7..a1fbe4b8dc7 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.17.2"; + version = "1.17.4"; src = fetchPypi { inherit pname version; - sha256 = "1dn4kf6hcwr77pxlxirwmqk9kgpf55122xf48y1nhsmphkkk4ads"; + sha256 = "e04421ac7e9e892ea482d0bbf8b590ae7a4f82858faa6fd24943b037122971c0"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index af0c784bbf5..d66425fa369 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "6.2"; + version = "6.2.2"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6b514136f538fb5c9c80e310641907d0196c8381602395ac2ee407f32f07ba13"; + sha256 = "d5b87e9fa4cc9b51bf37f9a461887e2d8b9ae7e6bb45675f8edbe35ea6770455"; }; meta = { diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index c4e10910db8..ff511103e55 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -18,6 +18,11 @@ in buildPythonPackage rec { sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237"; }; + patches = [ + # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html + ./fix-build-with-qt-514.patch + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch b/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch new file mode 100644 index 00000000000..1ae911c1481 --- /dev/null +++ b/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch @@ -0,0 +1,31 @@ +diff --git a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip +index 5fb508f..7a4654a 100644 +--- a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip ++++ b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip +@@ -48,7 +48,7 @@ public: + %If (QtWebEngine_5_8_0 -) + CertificateTransparencyRequired, + %End +-%If (QtWebEngine_5_14_0 -) ++%If (QtWebEngine_5_15_0 -) + CertificateKnownInterceptionBlocked, + %End + }; +diff --git a/sip/QtWebEngineWidgets/qwebenginepage.sip b/sip/QtWebEngineWidgets/qwebenginepage.sip +index 0dcbed2..9aa3443 100644 +--- a/sip/QtWebEngineWidgets/qwebenginepage.sip ++++ b/sip/QtWebEngineWidgets/qwebenginepage.sip +@@ -663,10 +663,10 @@ signals: + %End + + public: +-%If (QtWebEngine_5_14_0 -) ++%If (QtWebEngine_5_15_0 -) + qint64 renderProcessPid() const; + %End +-%If (QtWebEngine_5_14_0 -) ++%If (QtWebEngine_5_15_0 -) + void renderProcessPidChanged(qint64 pid); + %End + }; + diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 0a28ef6369b..04d66fb87ae 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.12"; + version = "0.5.13"; src = fetchPypi { inherit pname version; - sha256 = "1lry042qsamdzyw6zpmdld0v14g6cl05jsr9qdb7h5wnahf80mq1"; + sha256 = "518365f3313e73b0f024b9fa7a580b29bfa2fe2c5230be0bc69c068bbf6637e9"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index acc27811b28..b22da8b83ac 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/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix index a96ea5d32ff..9f1f94ffecb 100644 --- a/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/pkgs/development/python-modules/pyside2-tools/default.nix @@ -6,6 +6,13 @@ stdenv.mkDerivation { inherit (pyside2) version src; + patches = [ + # Upstream has a crazy build system only geared towards producing binary + # wheels distributed via pypi. For this, they copy the `uic` and `rcc` + # binaries to the wheel. + ./remove_hacky_binary_copying.patch + ]; + postPatch = '' cd sources/pyside2-tools ''; @@ -18,8 +25,16 @@ stdenv.mkDerivation { "-DBUILD_TESTS=OFF" ]; + # The upstream build system consists of a `setup.py` whichs builds three + # different python libraries and calls cmake as a subprocess. We call cmake + # directly because that's easier to get working. However, the `setup.py` + # build also creates a few wrapper scripts, which we replicate here: postInstall = '' rm $out/bin/pyside_tool.py + + for tool in uic rcc; do + makeWrapper "$(command -v $tool)" $out/bin/pyside2-$tool --add-flags "-g python" + done ''; postFixup = '' diff --git a/pkgs/development/python-modules/pyside2-tools/remove_hacky_binary_copying.patch b/pkgs/development/python-modules/pyside2-tools/remove_hacky_binary_copying.patch new file mode 100644 index 00000000000..19dd8aaf101 --- /dev/null +++ b/pkgs/development/python-modules/pyside2-tools/remove_hacky_binary_copying.patch @@ -0,0 +1,50 @@ +--- pyside-setup-opensource-src-5.14.2/sources/pyside2-tools/CMakeLists.txt~ 2020-07-17 10:51:14.498291075 +0200 ++++ pyside-setup-opensource-src-5.14.2/sources/pyside2-tools/CMakeLists.txt 2020-07-17 10:52:20.165336508 +0200 +@@ -46,47 +46,6 @@ + set(EXE_EXT "") + endif() + +-set(TOOLS_PATH "${_qt5Core_install_prefix}/bin") +-set(UIC_PATH "${TOOLS_PATH}/uic${EXE_EXT}") +-set(RCC_PATH "${TOOLS_PATH}/rcc${EXE_EXT}") +-if (APPLE) +- set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app") +-else() +- set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}") +-endif() +- +-install(FILES "${UIC_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- +-install(FILES "${RCC_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- +-if (EXISTS ${DESIGNER_PATH}) +- if (APPLE) +- install(DIRECTORY "${DESIGNER_PATH}" +- DESTINATION bin +- FILE_PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- else() +- install(FILES "${DESIGNER_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- endif() +-endif() +- + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index e12db4d2e88..f9d07be5796 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.12.6"; + version = "5.14.2"; src = fetchurl { - url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; - sha256 = "1n45l6xxyxs6cfp2l4rp8qs1c2fyfwyrdxa4qcpwfsqsi51rydsk"; + url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; + sha256 = "1cwjpv8qmjksi7cj4naw54h2afphw44chrf1pmfjamyyj8vz6ykw"; }; patches = [ diff --git a/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch b/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch index 681e16a2bfd..c9f17bea71b 100644 --- a/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch +++ b/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch @@ -1,6 +1,6 @@ ---- pyside-setup-everywhere-src-5.12.3/sources/pyside2/CMakeLists.txt~ 2019-06-15 19:07:48.368704430 +0200 -+++ pyside-setup-everywhere-src-5.12.3/sources/pyside2/CMakeLists.txt 2019-06-15 19:08:04.429489908 +0200 -@@ -219,7 +219,7 @@ +--- pyside-setup-opensource-src-5.14.2/sources/cmake_helpers/helpers.cmake~ 2020-07-17 10:29:30.555285529 +0200 ++++ pyside-setup-opensource-src-5.14.2/sources/cmake_helpers/helpers.cmake 2020-07-17 10:29:49.817003683 +0200 +@@ -139,7 +139,7 @@ # If the module was found, and also the module path is the same as the # Qt5Core base path, we will generate the list with the modules to be installed set(looked_in_message ". Looked in: ${${_name_dir}}") diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 427c42545c5..cf1f74b9b79 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.31"; + version = "0.0.32"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "03f21d2fb27cd938bd2c47f8582c0737eb7426a0cd59e5a60171fabe5e963e62"; + sha256 = "b739d20807f5fac95f8e02831faaf04023b7a8cb6f371024d89fd16c6bd8a589"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index d48dc5e8cd6..37260404906 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyStemmer"; - version = "2.0.0.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "57d1e353b11c5f90566efec7037deaa0e411b1df1e4e5522ce97d7be34b49478"; + sha256 = "9b81c35302f1d2a5ad9465b85986db246990db93d97d3e8f129269ed7102788e"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 0111695ca73..efb20ac2973 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.4"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "16l9b9f5v0a9j5jfgpd8irk9yhc9byzirrzv1rlkapdbz36sbn5g"; + sha256 = "1xb5ydwgcfcxzs1k7g6frmhxf1mmivi9ay48qdmf5w4ascirm22l"; }; patches = [ diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index bae42301982..39eb56ce76e 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -5,11 +5,11 @@ 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"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "341964bf5760ebbdde9619f68a17d5632c674c3f6903ef66daa0a4f540b3d143"; + sha256 = "37113ac6c7ea5e0b648abf73937955a45f8b9214fe49413297c2ce6ce1808500"; }; checkInputs = [ pytestpep8 pytest ]; diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix index 8809bc143cb..424d8fde232 100644 --- a/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-freezegun"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "060cdf192848e50a4a681a5e73f8b544c4ee5ebc1fab3cb7223a0097bac2f83f"; + sha256 = "19c82d5633751bf3ec92caa481fb5cffaac1787bd485f0df6436fd6242176949"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix new file mode 100644 index 00000000000..be1e76d21e4 --- /dev/null +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +, pytest, tornado }: + +buildPythonPackage rec { + pname = "pytest-tornasync"; + version = "0.6.0.post2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "eukaryote"; + repo = pname; + # upstream does not keep git tags in sync with pypy releases + # https://github.com/eukaryote/pytest-tornasync/issues/9 + rev = "c5f013f1f727f1ca1fcf8cc748bba7f4a2d79e56"; + sha256 = "04cg1cfrr55dbi8nljkpcsc103i5c6p0nr46vjr0bnxgkxx03x36"; + }; + + propagatedBuildInputs = [ + pytest + tornado + ]; + + checkInputs = [ + pytest + tornado + ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "py.test plugin for testing Python 3.5+ Tornado code"; + homepage = "https://github.com/eukaryote/pytest-tornasync"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix new file mode 100644 index 00000000000..53bdbdf1f44 --- /dev/null +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, trio, async_generator, hypothesis, outcome, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "pytest-trio"; + version = "0.6.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "python-trio"; + repo = pname; + rev = "v${version}"; + sha256 = "09v2031yxm8ryhq12205ldcck76n3wwqhjjsgfmn6dxfiqb0vbw9"; + }; + + propagatedBuildInputs = [ + trio + async_generator + outcome + pytest + ]; + + checkInputs = [ + pytest + pytestcov + hypothesis + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pytest plugin for trio"; + homepage = "https://github.com/python-trio/pytest-trio"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index a1864569708..abce18c8841 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.5.1"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "8d23caf4906f2112dc88b9a6d5e1767877744cae016cd71c2bf75592a4be3b79"; + sha256 = "3be5275b569844dfa267c80a1e23dc0957411dd501cae0ed3cccf43467031ceb"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 3538db60793..34b2c1fd74e 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.4.1"; + version = "1.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0b0y3hnjl2fvm3jyfvp1msfikp19vbqqqi7lawgy3azisvdyrgq7"; + sha256 = "3721ed3643f407cd96ad377cff0c2e28f2e8df0abbbe15a8a9668daae0b2b743"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index d83fa3b9ad3..30ce55a12a0 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "a8fc3433821140e8f409a9831d13ae5deccd0b033d4744d94b31fea141bdd84c"; + sha256 = "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270"; }; propagatedBuildInputs = [ text-unidecode ]; diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index 84955058060..a66b4cc522f 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.10114"; + version = "3.0.11115"; src = fetchPypi { inherit pname version; - sha256 = "0fq0w1pk2z7limhiyk8f3bqwa67yfgwcszd0v6ipy9x8psas5a61"; + sha256 = "a4d3bdddfce84a8fb1b2d5447193a0239c55c16ca246e5194d48efd59c4e236b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 4eabaf26f77..0aea3b38b5a 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -135,6 +135,13 @@ in buildPythonPackage rec { url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff"; sha256 = "13spncaqlpsp8qk2850yly7xqwmhhfwznhmzkk8jgpslkbx75vgq"; }) + ] ++ lib.optionals stdenv.isDarwin [ + # pthreadpool added support for Grand Central Dispatch in April + # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) + # that is available starting with macOS 10.13. However, our current + # base is 10.12. Until we upgrade, we can fall back on the older + # pthread support. + ./pthreadpool-disable-gcd.diff ]; preConfigure = lib.optionalString cudaSupport '' @@ -248,27 +255,27 @@ in buildPythonPackage rec { ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' - for f in $(ls $dev/lib/*.dylib); do - install_name_tool -id $dev/lib/$(basename $f) $f || true + for f in $(ls $lib/lib/*.dylib); do + install_name_tool -id $lib/lib/$(basename $f) $f || true done - install_name_tool -change @rpath/libshm.dylib $dev/lib/libshm.dylib $dev/lib/libtorch_python.dylib - install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libtorch_python.dylib - install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libtorch_python.dylib + install_name_tool -change @rpath/libshm.dylib $lib/lib/libshm.dylib $lib/lib/libtorch_python.dylib + install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libtorch_python.dylib + install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libtorch_python.dylib - install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libtorch.dylib + install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libtorch.dylib - install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libshm.dylib - install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libshm.dylib + install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libshm.dylib + install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib ''; diff --git a/pkgs/development/python-modules/pytorch/pthreadpool-disable-gcd.diff b/pkgs/development/python-modules/pytorch/pthreadpool-disable-gcd.diff new file mode 100644 index 00000000000..eddd45723f8 --- /dev/null +++ b/pkgs/development/python-modules/pytorch/pthreadpool-disable-gcd.diff @@ -0,0 +1,45 @@ +diff --git a/third_party/pthreadpool/CMakeLists.txt b/third_party/pthreadpool/CMakeLists.txt +index 0db3264..1ba91c4 100644 +--- a/third_party/pthreadpool/CMakeLists.txt ++++ b/third_party/pthreadpool/CMakeLists.txt +@@ -74,9 +74,7 @@ IF(EMSCRIPTEN) + LIST(APPEND PTHREADPOOL_SRCS src/shim.c) + ELSE() + LIST(APPEND PTHREADPOOL_SRCS src/portable-api.c src/memory.c) +- IF(APPLE AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd")) +- LIST(APPEND PTHREADPOOL_SRCS src/gcd.c) +- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) ++ IF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) + LIST(APPEND PTHREADPOOL_SRCS src/windows.c) + ELSE() + LIST(APPEND PTHREADPOOL_SRCS src/pthreads.c) +@@ -111,10 +109,6 @@ ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "futex") + TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=1) + TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=0) + TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_EVENT=0) +-ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd") +- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=0) +- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=1) +- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_EVENT=0) + ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event") + TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=0) + TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=0) +diff --git a/third_party/pthreadpool/src/threadpool-common.h b/third_party/pthreadpool/src/threadpool-common.h +index ca84744..244d0ca 100644 +--- a/third_party/pthreadpool/src/threadpool-common.h ++++ b/third_party/pthreadpool/src/threadpool-common.h +@@ -14,14 +14,6 @@ + #endif + #endif + +-#ifndef PTHREADPOOL_USE_GCD +- #if defined(__APPLE__) +- #define PTHREADPOOL_USE_GCD 1 +- #else +- #define PTHREADPOOL_USE_GCD 0 +- #endif +-#endif +- + #ifndef PTHREADPOOL_USE_EVENT + #if defined(_WIN32) || defined(__CYGWIN__) + #define PTHREADPOOL_USE_EVENT 1 diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index a4df0bd71e6..5adcbd0d236 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2019.3"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "fac06f7cdfa903188dc4848c655e4adaee67ee0f2fe08e7daf815cf2a761ee5e"; + sha256 = "3efa13b335a00a8de1d345ae41ec78dd11c9f8807f522d39850f2dd828681540"; }; # No tests diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index aa780ad1789..4a11abfcaa4 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.2.1"; + version = "0.2.3"; pname = "pyvcd"; src = fetchPypi { inherit pname version; - sha256 = "fad6b9e2cd68049968a43fd9f465a1f924050c0a654e28cc5aa04c1908f283ab"; + sha256 = "c0fd7321143e821033f59dd41fc6b0350d1533ddccd4c8fc1d1f76e21cd667de"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 4bb0bce52eb..260311a51ad 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.4"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "092nl8pq1jqdylj0xyqwgi5qxvhy6qj2nx2lwwfkbnixlg6g8bbi"; + sha256 = "cd9649a9ea9dfcb9b34d78f9a64e1870aa8b6b94de546e2c99c6bb53d64ab5d1"; }; propagatedBuildInputs = [ param ]; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 603aff8ec4a..74626c38eb1 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "0.17.2"; + version = "0.17.4"; # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release disabled = isPy37; src = fetchPypi { inherit pname version; - sha256 = "84dac33f77d5ff2c3d8eb42fc7de2ffb6d33f5e4954ef89db0dbf3fe646a2809"; + sha256 = "5b54b65a5434bb16432415743c0d154feee0c6d7a8a2fee208719c67d6d24c97"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qreactor/default.nix b/pkgs/development/python-modules/qreactor/default.nix new file mode 100644 index 00000000000..dc2031c7028 --- /dev/null +++ b/pkgs/development/python-modules/qreactor/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, twisted +, qtpy +, pyqt5 +}: + +buildPythonPackage rec { + pname = "qreactor-unstable"; + version = "2018-09-29"; + + src = fetchFromGitHub { + owner = "frmdstryr"; + repo = "qt-reactor"; + rev = "364b3f561fb0d4d3938404d869baa4db7a982bf0"; + sha256 = "1nb5iwg0nfz86shw28a2kj5pyhd4jvvxhf73fhnfbl8scgnvjv9h"; + }; + + disabled = pythonOlder "3.0"; + + propagatedBuildInputs = [ + twisted qtpy + ]; + + checkInputs = [ + pyqt5 + ]; + + pythonImportsCheck = [ + "qreactor" + ]; + + meta = with lib; { + homepage = "https://github.com/frmdstryr/qt-reactor"; + description = "Twisted and PyQt5/qtpy eventloop integration base"; + license = licenses.mit; + maintainers = with maintainers; [ raboof ]; + }; +} diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 472f873e30a..8ad1e6f7dfa 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { "test_integration" ]; - disabled = isPy3k; # Not yet compatible with latest Sphinx. + doCheck = !isPy3k; # Not yet compatible with latest Sphinx. + pythonImportsCheck = [ "recommonmark" ]; meta = { description = "A docutils-compatibility bridge to CommonMark"; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index dc8b6d92aaa..a7c96ef2e6e 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.44"; + version = "3.5.47"; src = fetchPypi { inherit pname version; - sha256 = "0f544p640yz7ivwkl635bpzkx4vy5qccs2rlyr61d9vv1jbm01k7"; + sha256 = "0gw0902yjszwxk0air69in7nk4h2q36r96ga3r4bz0p0cnmagcj5"; }; checkInputs = [ glibcLocales ]; @@ -30,6 +30,7 @@ in buildPythonPackage rec { # Remove the tests that require Vera fonts installed rm tests/test_graphics_render.py + rm tests/test_graphics_charts.py ''; checkPhase = '' diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 0bf8b47fd6d..0b24b7b62fc 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.14"; + version = "0.10.15"; src = fetchPypi { inherit pname version; - sha256 = "1a78bc010b20a5022a2c0cb76b8ee6dc1e34d887972615ebd725ab9a166a4960"; + sha256 = "7bb697a5fedeb41d81e8b87f152d453d5cab42dcd1691b6a7d6097e94d33f373"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index ea377489bf9..c59fac9c48c 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rq"; - version = "1.4.2"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "f680c52c7079266465d5e5c49679fab0d14db11d70fec6f1470423408b6bbcf6"; + sha256 = "60509898c9ebc40e4155fde8bf88a204ed1914cc9e1cde3d19188b1c5bd5efbd"; }; # test require a running redis rerver, which is something we can't do yet diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index cedb852deef..41bb4f17a1d 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.1"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "6fa6a54eb72bfc0abca7f27880b978b14a643ba2a6ad9f4a56a95be82129ca1b"; + sha256 = "1a7245638fa914ed6196b5e88fa5064cd95c7e65df800ec5d4f288e2b19fb4af"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index ef0fcb57dc9..3785ebcf86c 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { homepage = "https://github.com/alvations/sacremoses"; description = "Python port of Moses tokenizer, truecaser and normalizer"; license = licenses.lgpl21Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ pashashocky ]; }; } diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 745723a01bc..6694c3abe4d 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.10.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526"; + sha256 = "0p4smkl2rbpl00m5va5qa8hp2hqb3284p2cs6k8zlmi4kgbdyh6s"; }; propagatedBuildInputs = [ @@ -59,15 +59,6 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - # scikit-build PR #458. Remove in version > 0.10.0 - patches = [ - (fetchpatch { - name = "python38-platform_linux_distribution-fix-458"; - url = "https://github.com/scikit-build/scikit-build/commit/faa7284e5bc4c72bc8744987acdf3297b5d2e7e4.patch"; - sha256 = "1hgl3cnkf266zaw534b64c88waxfz9721wha0m6j3hsnxk76ayjv"; - }) - ]; - disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ "test_hello_develop" # tries setuptools develop install "test_source_distribution" # pip has no way to install missing dependencies @@ -75,6 +66,7 @@ buildPythonPackage rec { "test_fortran_compiler" # passes if gfortran is available "test_install_command" # tries to alter out path "test_test_command" # tries to alter out path + "test_setup" # tries to install using distutils ]); checkPhase = '' diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 1a94aa9659b..8ebb436e288 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -9,11 +9,11 @@ let }); in buildPythonPackage rec { pname = "scipy"; - version = "1.5.0"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "4ff72877d19b295ee7f7727615ea8238f2d59159df0bdd98f91754be4a2767f0"; + sha256 = "066c513d90eb3fd7567a9e150828d39111ebd88d3e924cdfc9f8ce19ab6f90c9"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 177531e64f7..db91528da63 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -24,10 +24,11 @@ , pytest-twisted , botocore , itemadapter +, itemloaders }: buildPythonPackage rec { - version = "2.2.1"; + version = "2.3.0"; pname = "Scrapy"; disabled = isPy27; @@ -57,22 +58,24 @@ buildPythonPackage rec { zope_interface protego itemadapter + itemloaders ]; LC_ALL = "en_US.UTF-8"; # Disable doctest plugin—enabled in the shipped pytest.ini—because it causes pytest to hang # Ignore proxy tests because requires mitmproxy + # Ignore utils_display tests because it requires pygments # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean" # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396 checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" - pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"} + pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --ignore=tests/test_utils_display.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"} ''; src = fetchPypi { inherit pname version; - sha256 = "6a09beb5190bfdee2d72cf261822eae5d92fe8a86ac9ee1f55fc44b4864ca583"; + sha256 = "b4d08cdacb615563c291d053ef1ba2dc08d9d4b6d81578684eaa1cf7b832f90c"; }; postInstall = '' diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index 96917f45be0..c78f1811a06 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -2,12 +2,12 @@ , nose, psutil, mock }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; pname = "selectors2"; src = fetchPypi { inherit pname version; - sha256 = "81b77c4c6f607248b1d6bbdb5935403fef294b224b842a830bbfabb400c81884"; + sha256 = "1f1bbaac203a23fbc851dc1b5a6e92c50698cc8cefa5873eb5b89eef53d1d82b"; }; checkInputs = [ nose psutil mock ]; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 1d8389d8064..08b4f249709 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.7"; + version = "2.2.9"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "84974778dd8d1efd4ff87d8404d71241f90e02044b1b94a52eea567080f93ac4"; + sha256 = "c880f86514008555afa62562def1e975f23c61ff4b3fc1991932ed692ac61a6d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 4370388959d..b7d7f25614d 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.2"; + version = "0.3.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ea038827afe439577eb109ebd1b5c481d516d489c624fc3fe6e92ec71ef42be9"; + sha256 = "36ba7f95c8bf5202749189f760e591952f19c849379c35ff598aafafe5d0cfef"; }; # There are no tests; make sure the executable works. diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index e5720d9620d..a2ea9dc28be 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.0.4"; + version = "7.0.5"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "c8fc7186ff34c5f86ebbf2bff734503e92ce29aaf5a242eaf93875983617c6d0"; + sha256 = "6ebe85aa5441c5ddeb48bfd320d57ed0bc002bbd779c50b1b15883022964284d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 9a6baf80f04..21dd487aafe 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.15"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "028f6e5df83027f4bfba5d6d61e6d46eb8689f9e647825e09f539920dee17d2c"; + sha256 = "007cfef077c447eebbdbca3d510ca4365c211c2c6c4d2912d6eec43c8cbcbc02"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index f9987789ea7..c0efaec4be3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "5.1.0"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "312386e2b622830230611871ae507c5f73ec141d4a28aa97aaefed65fe579905"; + sha256 = "7f220647f1d9270bd90f0a42146b75a03c51a60184ced6584a9e5ef8f385b5a1"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index bcf24413d63..6b03c245ebb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.8"; + version = "0.4.9"; src = fetchPypi { inherit pname version; - sha256 = "1rvm0l40iz1z03d09irkqdwzi9gs6pn0203hylaqbix5c7gabwhy"; + sha256 = "054429a04ed253256a676ecc29f0bae2c644d5bd1150cd95d658990a07ebc8fe"; }; patches = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 2f4c3764a35..1ca4db40263 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "33c0db6c0635b9dc3e72629b7278ca3b9fa24c156eeeaf1674be8f268831d951"; + sha256 = "ee1d43e6e0332558a66fcb4005b9ba7313ad9764d0df0e6703ae869a028e451f"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 9a6d51e4830..7652d2cf4c9 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.1"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "48f71252d0a7c7a91242e70d47618a432ee5f9f6666e651473a54bc55513571c"; + sha256 = "877109d0691376f8ffb380ec1daf9b867958231065660277dbc5ccf0b4bf87d0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index f530d0f0cdd..acaa2e888f8 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.3"; + version = "4.1.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c88d973c6423fe0017818482a98163bb72e7f6a8c3127ff464930109df0958d9"; + sha256 = "6946b2128afaf1b64e878a74d33f9abd60c91f75949b3d05f305b3c3f5fec1e2"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index cd2b00021e7..dac38c55b7d 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.17"; + version = "1.3.18"; src = fetchPypi { inherit pname version; - sha256 = "156a27548ba4e1fed944ff9fcdc150633e61d350d673ae7baaf6c25c04ac1f71"; + sha256 = "da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index 13517aceb22..38f24111174 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "starfish"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "73202fbc560519dc3b61f1f5e4341c598f6bf50b4509bb09dc22a729591a1042"; + sha256 = "d635ef7b412b5781d6f98cd080b45098de6f3c7f7303e929b07c88b49d98ff12"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index be4063c7722..7517be4dd54 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 = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "001e90cd704be6470d46cc9076434e2d0d566c1379187e7013eb296d3a6032d9"; + sha256 = "609912b87df5ad338ff8e44d13eaad4f4170a65b79ae9cb0aa5632598994a1b7"; }; doCheck = false; diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 9bbc312b183..0bdb109ce90 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -1,38 +1,26 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch -, tornado -, toolz -, zict -, six -, pytest -, networkx -, distributed , confluent-kafka +, distributed +, flaky , graphviz +, networkx +, pytest , requests +, six +, toolz +, tornado +, zict }: buildPythonPackage rec { pname = "streamz"; - version = "0.5.2"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "127rpdjgkcyjifmkqbhmqfbzlgi32n54rybrdxja610qr906y40c"; + sha256 = "1vzmwnj12ij0cqhggys2dqv3b0v935yfzhcjwl5jw206vlla22bw"; }; - patches = [ - # fix networkx rename issue of GiGraph.node -> DiGraph.nodes, remove on next bump - ( fetchpatch { - url = "https://github.com/python-streamz/streamz/commit/f8b7bdb6bcb9dd107677e82e755ff4695bf0c4be.patch"; - sha256 = "1b2frp0j369gf55plxk2pigblhsc44m0rm9az01y83cjlcm26x2s"; - }) - # also, fix networkx rename issue of GiGraph.node -> DiGraph.nodes, remove on next bump - ( fetchpatch { - url = "https://github.com/python-streamz/streamz/commit/f7603f4cbea54f1548885881206a3ca9d6e52250.patch"; - sha256 = "1125kqiaz6b3cifz0yk1zrkxj5804lfzl4kc58jhqajv8rsrbs45"; - }) - ]; - propagatedBuildInputs = [ networkx tornado @@ -44,6 +32,7 @@ buildPythonPackage rec { checkInputs = [ confluent-kafka distributed + flaky graphviz pytest requests diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 4c26a62060e..3ace2e925cb 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -14,14 +14,14 @@ , codecov }: -buildPythonPackage { +buildPythonPackage rec { pname = "stumpy"; - version = "1.0"; + version = "1.4"; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; - rev = "115e477c1eec9291ab7c1fd8da30d67a70854f8e"; # no git version tag + rev = "v${version}"; sha256 = "0s2s3y855jjwdb7p55zx8lknplz58ghpw547yzmqisacr968b67w"; }; @@ -42,8 +42,9 @@ buildPythonPackage { codecov ]; + # ignore changed numpy operations checkPhase = '' - pytest + pytest -k 'not allc' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 9fba92ca12f..88adbe4f7d9 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -30,12 +30,12 @@ buildPythonPackage rec { pname = "stytra"; - version = "0.8.33"; + version = "0.8.34"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b0aacc8e2c1bba33c337ebc76c0d8f2971c113d298aea2a375d84a5eeff5d83e"; + sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a"; }; doCheck = false; checkInputs = [ diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index ea937bef1be..6830c7c1343 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -2,27 +2,29 @@ , lib , buildPythonPackage , fetchFromGitHub -, numpy -, scipy -, matplotlib -, pandas -, astropy -, parfive , pythonOlder -, sqlalchemy -, scikitimage -, glymur -, beautifulsoup4 -, drms -, python-dateutil -, zeep -, tqdm + , asdf +, astropy , astropy-helpers +, beautifulsoup4 +, drms +, glymur , hypothesis +, matplotlib +, numpy +, pandas +, parfive , pytest-astropy -, pytestcov , pytest-mock +, pytestcov +, python-dateutil +, scikitimage +, scipy +, sqlalchemy +, towncrier +, tqdm +, zeep }: buildPythonPackage rec { @@ -47,6 +49,7 @@ buildPythonPackage rec { parfive sqlalchemy scikitimage + towncrier glymur beautifulsoup4 drms diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 358c70d3425..630a6600199 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0x34mzxvxj1kkld7sz9n90pdcinxcan56jg6cnnwkv87v7s1vna6"; + sha256 = "54dfac7b3c043dbf484b832512ad2103089f347b5b12307c63ffb4c287742382"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 59605f555d3..4e8f9ca857b 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.6"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.6.1"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "9769e3d2952e211b1245f1d0dfdbfbdde1f7779a3953832b7dd2b88a21ca6cc6"; + sha256 = "7386dba4f7e162e90766b5ea7cab5938c2fe3c620b310518c8ff504b283cb15b"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index add36ccf1b6..74f94aaf255 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.10.0"; + version = "3.10.1"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0n85nhj5hr8kv33jk4by8hnxm3kni5f4z1jhiw27dlf6cbgsv892"; + sha256 = "e00bba5b0b91f9d7ec3df0ac671136df7a7be0a14dfea38ca3850488bca73d8c"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index e3578cbf8d2..d650f350bd2 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -32,16 +32,24 @@ let }; in rustPlatform.buildRustPackage rec { pname = "tokenizers"; - version = "0.8.1.rc1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "python-v${version}"; - sha256 = "1bzvfffnjjskx8zlq1qsqfd47570my2wnbq4ip8i1hkz10q900qv"; + sha256 = "0sxdwx05hr87j2z32rk4rgwn6a26w9r7m5fgj6ah1sgagiiyxbjw"; }; - cargoSha256 = "0s5z3g1njb7wlyb32ba6xas4zc62c3zhmp1mrvghmaxpvljp6k7b"; + # Update parking_lot to be compatible with recent Rust versions, that + # replace asm! by llvm_asm!: + # + # https://github.com/Amanieu/parking_lot/pull/223 + # + # Remove once upstream updates this dependency. + cargoPatches = [ ./update-parking-lot.diff ]; + + cargoSha256 = "0cdkxmj8z2wdspn6r62lqlpvd0sj1z0cmb1zpqaajxvr0b2kjlj8"; sourceRoot = "source/bindings/python"; diff --git a/pkgs/development/python-modules/tokenizers/update-parking-lot.diff b/pkgs/development/python-modules/tokenizers/update-parking-lot.diff new file mode 100644 index 00000000000..d8f144465ac --- /dev/null +++ b/pkgs/development/python-modules/tokenizers/update-parking-lot.diff @@ -0,0 +1,63 @@ +diff --git a/bindings/python/Cargo.lock b/bindings/python/Cargo.lock +index f50db71..ea71817 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -269,7 +269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "lock_api" +-version = "0.3.3" ++version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -337,16 +337,16 @@ dependencies = [ + + [[package]] + name = "parking_lot" +-version = "0.10.0" ++version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] + name = "parking_lot_core" +-version = "0.7.0" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -409,7 +409,7 @@ dependencies = [ + "inventory 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "pyo3cls 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -768,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" + "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + "checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" +-"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" ++"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" + "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" + "checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8" +@@ -777,8 +777,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" + "checksum onig 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd91ccd8a02fce2f7e8a86655aec67bc6c171e6f8e704118a0e8c4b866a05a8a" + "checksum onig_sys 69.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3814583fad89f3c60ae0701d80e87e1fd3028741723deda72d0d4a0ecf0cb0db" +-"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" +-"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" ++"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" ++"checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" + "checksum paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4fb1930692d1b6a9cfabdde3d06ea0a7d186518e2f4d67660d8970e2fa647a" + "checksum paste-impl 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a" + "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix new file mode 100644 index 00000000000..a7573e669a8 --- /dev/null +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, click +, click-default-group +, incremental +, jinja2 +, pytestCheckHook +, toml +, twisted +, git # shells out to git +}: + +buildPythonPackage rec { + pname = "towncrier"; + version = "19.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15l1gb0hhi9pf3mhhb9vpc93w6w3hrih2ljmzbkgfb3dwqd1l9a8"; + }; + + propagatedBuildInputs = [ + click + click-default-group + incremental + jinja2 + toml + ]; + + # zope.interface collision + doCheck = !isPy27; + checkInputs = [ git twisted pytestCheckHook ]; + pythonImportsCheck = [ "towncrier" ]; + + meta = with lib; { + description = "Utility to produce useful, summarised news files"; + homepage = "https://github.com/twisted/towncrier/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index fe51fe1cad7..cac97d92b2a 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.15.1"; + version = "3.15.2"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8c9ad9b48659d291c5bc78bcabaa4d680d627687154b812fa52baedaa94f9f83"; + sha256 = "c696d36cd7c6a28ada2da780400e44851b20ee19ef08cfe73344a1dcebbbe9f3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 7d326ea152b..d3f83cec481 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.47.0"; + version = "4.48.0"; src = fetchPypi { inherit pname version; - sha256 = "63ef7a6d3eb39f80d6b36e4867566b3d8e5f1fe3d6cb50c5e9ede2b3198ba7b7"; + sha256 = "6baa75a88582b1db6d34ce4690da5501d2a1cb65c34664840a456b2c9f794d29"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 36963987b38..789ba7a1691 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "traits"; - version = "6.1.0"; + version = "6.1.1"; disabled = isPy27; # setup.py no longer py3 compat src = fetchPypi { inherit pname version; - sha256 = "97fca523374ae85e3d8fd78af9a9f488aee5e88e8b842e1cfd6d637a6f310fac"; + sha256 = "807da52ee0d4fc1241c8f8a04d274a28d4b23d3a5f942152497d19405482d04f"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index b4d009e630e..01788f63d4f 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.0.0"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "e569f359a58e4567b14265abe89b3de4b0f95bbbf8f491a9a7d45219628735ec"; + sha256 = "74fb4db848ac1343241fa4dc5d9bf3fab561f309826c602e8a3568309df91fe3"; }; propagatedBuildInputs = [ traits pyface six ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 1f1451c5f0c..eb7c1c2aa48 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/transformers"; description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ danieldk pashashocky ]; }; } diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index e16f4027ce5..37d1043f215 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.12.0"; + version = "0.12.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ycmpwjv5xp25993divjhaq5j766zgcy22xx39xfc1pcvldq5g7n"; + sha256 = "1w19m9lws55k9sjhras47hpfpqwq1jm5vy135nj65yhkblygqg19"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 6ae449d8cca..7d749ea4a9b 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.7.4"; + version = "3.7.14"; src = fetchPypi { inherit pname version; - sha256 = "195jx8q6rri8nl1fkhirlwvpv8ahrbnhrrprws5kw2phdnq3qy3b"; + sha256 = "bd3d88fc179d6dfd6d47f63dec4bb8da204c070e78cb2b483f86b33886bf627b"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 4b8afbddb37..21e1ac13ca6 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -24,10 +24,10 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; - version = "5.6.2"; + version = "5.6.4"; src = fetchPypi { inherit pname version; - sha256 = "0mlfl34zmmqrwip39mvhkk0h6dsljqwff2mk1ldahm253d4vzflp"; + sha256 = "d89da52a9a0a9bcbbc316fc72eea8810bac64307d22c90ab2d70a4b0cd9b1a9c"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index b0df4008992..29db9a702b0 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tvnamer"; - version = "2.5"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "75e38454757c77060ad3782bd071682d6d316de86f9aec1c2042d236f93aec7b"; + sha256 = "ba181a947dcfe20c860825b3580d2a6f1a896cf9b5fef093b8c3f00640581a1f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 2f365fc0039..a717ab2bc9d 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "twill"; - version = "2.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "225e114da85555d50433a1e242ed4215fe613c30072d13fbe4c4aacf0ad53b0a"; + sha256 = "85bc45bc34e3d4116123e3021c07d3a86b5e67be1ee01bc8062288eb83ae7799"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 5095265e33f..608ce8b65fe 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchFromGitHub, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub{ owner = "python"; repo = "typed_ast"; rev = version; - sha256 = "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb"; + sha256 = "086r9qhls6mz1w72a6d1ld3m4fbkxklf6mgwbs8wpw0zlxjm7y40"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index 6c25031a8dc..0d5c2119921 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -5,11 +5,11 @@ let in buildPythonPackage rec { pname = "typing"; - version = "3.7.4.1"; + version = "3.7.4.3"; src = fetchPypi { inherit pname version; - sha256 = "91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23"; + sha256 = "1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9"; }; # Error for Python3.6: ImportError: cannot import name 'ann_module' diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 535f0f03c3e..9e793ec3fb3 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.7.0"; + version = "3.7.3"; src = fetchPypi { inherit pname version; - sha256 = "cb0d5dd28ed6b82da17bcb29b84f5823dc8398d9dafb0e4ee8e6f958db220134"; + sha256 = "a45f98f40edb47c2a0e2786ffe7d68fc2cb4ad05b2efcb50e95c337f6ecae353"; }; checkInputs = [ nose pytest hypothesis six ]; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 0c54f8f2518..2715388e8f2 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.9"; + version = "1.25.10"; src = fetchPypi { inherit pname version; - sha256 = "3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527"; + sha256 = "91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a"; }; NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix new file mode 100644 index 00000000000..1490172a463 --- /dev/null +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchFromGitHub, nose, mock }: + +buildPythonPackage rec { + pname = "uvcclient"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "kk7ds"; + repo = pname; + rev = "58e7a53815482b7778481f81cde95f53a60bb6f6"; + sha256 = "0k8aswrk1n08w6pi6dg0zdzsmk23cafihkrss9ywg3i85w7q43x2"; + }; + + checkInputs = [ + nose + mock + ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Client for Ubiquiti's Unifi Camera NVR"; + homepage = "https://github.com/kk7ds/uvcclient"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index b193ee27d54..b81481b0774 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage , fetchPypi, pythonOlder -, pytest, jupyter_core, pandas, ipywidgets }: +, pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: buildPythonPackage rec { pname = "vega"; @@ -12,7 +12,11 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ jupyter_core pandas ipywidgets ]; + propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; + + # currently, recommonmark is broken on python3 + doCheck = false; + checkInputs = [ altair ]; meta = with stdenv.lib; { description = "An IPython/Jupyter widget for Vega and Vega-Lite"; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 5ca27330103..8be6bb146f5 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.0.21"; + version = "20.0.28"; src = fetchPypi { inherit pname version; - sha256 = "1kxnxxwa25ghlkpyrxa8pi49v87b7ps2gyla7d1h6kbz9sfn45m1"; + sha256 = "688a61d7976d82b92f7906c367e83bb4b3f0af96f8f75bfcd3da95608fe8ac6c"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 7f37b8def75..a545a9510b8 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "136c5qwmvpkdy4njpcwhppnhah7jjlhhjzzzk5lpk8i6f4fz2xg8"; + sha256 = "ee3809f4ce00e1e7f424b1572c753cff0dcaca2ca684e67e31f985033a9f070b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 5347c696cc2..17f7b540c60 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.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "0ss58k33l5vah894lykid6ar6kw7z1f29cl4hzr5xvgs8fvfyq65"; + sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04"; }; 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 75f65377b46..7d5cbc69eca 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wcwidth"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "edbc2b718b4db6cdf393eefe3a420183947d6aa312505ce6754516f458ff8830"; + sha256 = "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index c3778609e57..a4146d4d3b1 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -1,7 +1,8 @@ { stdenv, buildPythonPackage, fetchPypi , itsdangerous, hypothesis -, pytest, requests +, pytestCheckHook, requests , pytest-timeout +, isPy3k }: buildPythonPackage rec { @@ -14,11 +15,14 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ itsdangerous ]; - checkInputs = [ pytest requests hypothesis pytest-timeout ]; + checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; - checkPhase = '' - pytest ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"} - ''; + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ + "test_get_machine_id" + ]; + + # Python 2 pytest fails with INTERNALERROR due to a deprecation warning. + doCheck = isPy3k; meta = with stdenv.lib; { homepage = "https://palletsprojects.com/p/werkzeug/"; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 4527006fadd..fd93cbdcea3 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -1,41 +1,51 @@ { lib -, setuptools -, pip , buildPythonPackage , fetchFromGitHub -, pytest -, pytestcov -, coverage -, jsonschema , bootstrapped-pip +, setuptools }: buildPythonPackage rec { pname = "wheel"; - version = "0.33.6"; + version = "0.34.2"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "1bg4bxazsjxp621ymaykd8l75k7rvcvwawlipmjk7nsrl72l4p0s"; + sha256 = "1mwh35ycv07ajnpcjc4rjdmndh6nyg03gdgag5m8c2af7z1xlcmj"; name = "${pname}-${version}-source"; }; - checkInputs = [ pytest pytestcov coverage ]; - nativeBuildInputs = [ bootstrapped-pip setuptools ]; + nativeBuildInputs = [ + bootstrapped-pip + setuptools + ]; - catchConflicts = false; # No tests in archive doCheck = false; + pythonImportsCheck = [ "wheel" ]; # We add this flag to ignore the copy installed by bootstrapped-pip pipInstallFlags = [ "--ignore-installed" ]; - meta = { - description = "A built-package format for Python"; - license = with lib.licenses; [ mit ]; + meta = with lib; { homepage = "https://bitbucket.org/pypa/wheel/"; + description = "A built-package format for Python"; + longDescription = '' + This library is the reference implementation of the Python wheel packaging standard, + as defined in PEP 427. + + It has two different roles: + + - A setuptools extension for building wheels that provides the bdist_wheel setuptools command + - A command line tool for working with wheel files + + It should be noted that wheel is not intended to be used as a library, + and as such there is no stable, public API. + ''; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ siriobalmelli ]; }; } diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index efd3fbd77ab..dc0e47ff2dc 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "wtf-peewee"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "acd05d136c8595da3327fcf9176fa85fdcec1f2aac51d235e46e6fc7a0871283"; + sha256 = "4ac1b457f3255ee2d72915267884a16e5fb502e1e7bb793f2f1301c926e3599a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 410abbbb622..66667c74ef3 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "2.3.1"; + version = "2.3.3"; pname = "WTForms"; src = fetchPypi { inherit pname version; - sha256 = "0whrd9cqhlibm31yqhvhp9illddxf0cpgcn3v806f7ajmsri66l6"; + sha256 = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c"; }; propagatedBuildInputs = [ markupsafe ]; diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index e185e26a4f7..406493362c4 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -1,29 +1,18 @@ { lib , stdenv -, openglSupport ? true -, libX11 -, pyopengl , buildPythonPackage , fetchPypi , pkgconfig -, libjpeg -, libtiff -, SDL -, gst-plugins-base -, libnotify -, freeglut -, xorg , which , cairo -, requests , pango -, pathlib2 , python , doxygen , ncurses -, libpng -, gstreamer , wxGTK +, numpy +, pillow +, six }: buildPythonPackage rec { @@ -38,16 +27,7 @@ buildPythonPackage rec { doCheck = false; nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; - - buildInputs = [ libjpeg libtiff SDL - gst-plugins-base libnotify freeglut xorg.libSM ncurses - requests libpng gstreamer libX11 - pathlib2 - (wxGTK.gtk) - ] - ++ lib.optional openglSupport pyopengl; - - hardeningDisable = [ "format" ]; + buildInputs = [ ncurses wxGTK.gtk ]; DOXYGEN = "${doxygen}/bin/doxygen"; @@ -68,10 +48,9 @@ buildPythonPackage rec { installPhase = '' ${python.interpreter} setup.py install --skip-build --prefix=$out - wrapPythonPrograms ''; - passthru = { inherit wxGTK openglSupport; }; + passthru = { inherit wxGTK; }; meta = { diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 960c544740c..7dc6cf2896f 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.45.2"; + version = "2.45.3"; src = fetchPypi { inherit pname version; - sha256 = "16e4d27040f7cb10171fb747e0193ff71b035597c63837133beee6ce4ba6ad6e"; + sha256 = "e083195efc07f84fb22da9e74d5d9f857d3c82a3947995b0d4f3ff9b11a1a7c5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 3e05dc1bfad..abb7354db03 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.39"; + version = "0.0.42"; nativeBuildInputs = [ pytest ]; buildInputs = [ aiohttp zigpy ]; src = fetchPypi { inherit pname version; - sha256 = "99d4b20a933b97b323c558f4057036ebe349bf603e97826c498d17d9cc80ff0b"; + sha256 = "7b9c6217054b9c49bfe249fa38d993490e901ab29f198022d569e3505e6c7f20"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 8c9a41cdb34..e85784e51ad 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.22.0"; + version = "0.22.2"; propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ]; checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { inherit pname version; - sha256 = "1y8n96g5g6qsx8s2z028f1cyp2w8y7kksi8k2yyzpqvmanbxyjhc"; + sha256 = "a43129932c6e4af0d2d57542218faf7695e2424ce18a5a8915d016e1303f5e44"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index a658f989687..df0835841bc 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.1"; + version = "4.6.2"; src = fetchPypi { inherit pname version; - sha256 = "d9c7c27673d787faff8a83797ce34d6ebcae26a370e25bddb465ac2182766aca"; + sha256 = "91628918218b3e6f6323de2a7b845e09ddc5cae131c034896c051b084bba3c92"; }; propagatedBuildInputs = [ |