diff options
Diffstat (limited to 'pkgs/development/python-modules')
44 files changed, 307 insertions, 88 deletions
diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index d6487c8157b..782238c3f83 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "21974ce5d782c426ddbf7bdfc5e602a38783b1ee839a4a0ed0990240e2e123b5"; + sha256 = "1gc74a0i0slq3gn9kv3scn7c9x444z5nwjm3d14qilsgq6civsnd"; }; propagatedBuildInputs = [ aiohttp attrs ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 40dec3e1c1e..0cecdb0291e 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pythonAtLeast , attrs , chardet , multidict @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "aiohttp"; version = "3.6.2"; + # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures + disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5"; }; - disabled = pythonOlder "3.5"; - checkInputs = [ pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist pytest-mock pytestcov trustme brotlipy freezegun diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 13a9e4b546b..446bb9e6379 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "fab9607d11a2e05050ef766006b8fdd9424e7122c2bd6f34a5376be4c728e242"; + sha256 = "0srqbxxxffi3idqd161n5b90xyqy9gibigxxmvqag3nxab5vw1j6"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 6ac9acfac32..38157e13615 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.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0m0pddqrpfm526f0fyzzjpcp7hi3d6pj0bgk2vl004lkas4li1hw"; + sha256 = "1j925g7x0j8fzns431360myr8844swb8mb78wacw2vlj6x1c558c"; }; nativeBuildInputs = [ Babel ]; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix new file mode 100644 index 00000000000..51b523c010a --- /dev/null +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, aria2, poetry, pytest, pytestcov, pytest_xdist, responses +, asciimatics, loguru, requests, setuptools, websocket_client +}: + +buildPythonPackage rec { + pname = "aria2p"; + version = "0.7.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pawamoy"; + repo = pname; + rev = "v${version}"; + sha256 = "1inak3y2win58zbzykfzy6xp00f276sqsz69h2nfsd93mpr74wf6"; + }; + + nativeBuildInputs = [ poetry ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + checkInputs = [ aria2 responses pytest pytestcov pytest_xdist ]; + + # Tests are not all stable/deterministic, + # they rely on actually running an aria2c daemon and communicating with it, + # race conditions and deadlocks were observed, + # thus the corresponding tests are disabled + checkPhase = '' + pytest -nauto -k "not test_api and not test_cli and not test_interface" + ''; + + propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/pawamoy/aria2p"; + description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC"; + license = licenses.isc; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 5d1e3e6e3a9..41124e44854 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "8.1.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "21fabdd393ba2ff1162a490cfa0d2b72a715da8462b1645bd986241137fc771f"; + sha256 = "0czn781ywbwi8px54nlccsvw5s13y4wqmxhcrxkkl0y7rblqi5pr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 6cda959448c..4b8aef08f1c 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "55e129da3c3750cd5a26b91035990590a3f97aef4971de62d84de00f4fd6f1e4"; + sha256 = "0zmmfj7z1zrayjqwqybcn3bwm47d2ngyxm1g6fh2iw5c2f9czycv"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 90b45d0e3f0..f3dfaba6d9c 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b144e66cb8b947b871354edbcee15b78e107fb8f3a337d46d04cd8b73300741b"; + sha256 = "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 8e18986bfcb..6bf207c6e4c 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0cf4pknb5y2yz4jqwg7xm626zkfx8i8hqcr3dkvq21lrx7fz96r3"; + sha256 = "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 1f3056b9098..990f494eced 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0jhq8fi3dn2cncyv2rrgr4kldd254f30zgwf6p85rdgvg2p9k4hl"; + sha256 = "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix new file mode 100644 index 00000000000..78950d2971e --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, fetchPypi +, isPy3k +, lib + +# pythonPackages +, azure-core +, cryptography +, msrest +, futures +}: + +buildPythonPackage rec { + pname = "azure-storage-file-share"; + version = "12.0.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "15f5vk3vd2amggqqznx186raak9wgr57j0l1p9qa62kcl10bs9lg"; + }; + + propagatedBuildInputs = [ + azure-core + cryptography + msrest + ]; + + # requires checkout from monorepo + doCheck = false; + pythonImportsCheck = [ + "azure.core" + "azure.storage" + ]; + + meta = with lib; { + description = "Microsoft Azure File Share Storage Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index f119aedc4b8..d89ab9c3107 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.2.1"; pname = "bitarray"; src = fetchPypi { inherit pname version; - sha256 = "4f8706b651243c9faa981f075bcbdef2fab83e9b9bc9211ed2cb5849f9a68342"; + sha256 = "1kxrlxfj9nrx512sfwifwl9z4v6ky3qschl0zmk3s3dvc3s7bmif"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 8b7139f5a62..6470b7da859 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "boltons"; - version = "19.3.0"; + version = "20.0.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0pgqr2hf7lxag8nc8wnh8hpp8fd2lxccq9h0bb8lb9x8npnzhnbn"; + sha256 = "0scdslqi28b899i42m4c9pvhwv3kkw4wpi3n9zm5n64ggn5ngfbz"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index e627667f3ec..611cb5ad5ff 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "13ddpcbndb22zlg9gjsf2pbgad45g1w5cg4a3z83085fkgnib7sr"; + sha256 = "1l3ajhy68jddbgbizaa5hq65lgqkll6389hss4p2j36cbxbn7hiv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index ff2be45bf32..4f3a0ea04b8 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1g87pddsyas1r0f6z29047cwnz7ds4925f6n9g7b0pkj3k73ci06"; + sha256 = "07ynk46c9h47ibbdm93h15xbrzflsl4llm0jr4c8pm6krs6byb4z"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 8722a6629e4..4bb82b59856 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "00k5dbcwzqlyk4lcp5qh1q8xbrxmg9gzqs7vl2r6f3wxi4ydb5nw"; + sha256 = "0njix8g6g1dgfviick55p9calm82nnkhhgkikh7a5yvqk524cprg"; }; # Remove unneccessary circular dependency on buildbot @@ -36,7 +36,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0ai334y779jwqabrn2yjma41pw0a9k1qy7v68qbjd22n4my227ma"; + sha256 = "1wmay9bbb1wwf0zh9rw95swmdc7bxabgvx2n6dyyzs4p8k92px10"; }; buildInputs = [ buildbot-pkg ]; @@ -58,7 +58,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1j450hwvg729mivzijbrx8ngalx56qvrx8mwwgy8arfwpnyfkr9l"; + sha256 = "14b28vpkk68yk6zmdd64n7izb1r3barb7y711n4g37skqd13jygb"; }; buildInputs = [ buildbot-pkg ]; @@ -80,7 +80,7 @@ src = fetchPypi { inherit pname version; - sha256 = "19w8is5s7d7l60mlchh1zd9nidpkswi8fivfa36b97plibn0jgw1"; + sha256 = "1m8kbycjq7jsl72xbrzjj48hb65r53lfxx78yvlnhc2f9ian5vnh"; }; buildInputs = [ buildbot-pkg ]; @@ -102,7 +102,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1zl7y08rkw7bya6cli44msvcdgirsyfg3kxpf2z82vwgc6bwi785"; + sha256 = "1sbp13qimv8kc7dp0xz1pmda1x1n4948zgrz2pc45rwlbbn5h69r"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 048fb44a93b..6352b22b55d 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1kpj85x8xflrccvy840v9bl3q1j63rk9kahj1qirbai1fxwvzbik"; + sha256 = "0hr42fp3sw6c59qahihm9440618z7prwsy4z0ax553zvw47pc22l"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 05506a12db0..c1e19eb8560 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.13"; + version = "0.7.14"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fdcf335b800d892edfdbc87fdd539cb45166d8667edbec3dfbb1a3b5c3a35547"; + sha256 = "0l0ljm7n19522m6mb0jnbcwdyqya15vfj3li3mvfsyv4rkxvy18b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 2dba7e43391..6cc91f4b74c 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.22"; + version = "0.9.23"; src = fetchPypi { inherit pname version; - sha256 = "ba244b07c0b465ff54a6838dc61919599141dc92de1bf00bb0a70875189155e6"; + sha256 = "17ic6lxzz9yrwxh3l1skcqgr59c47w5fidj5qmrk1l26rkrjxlca"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index ed16f7f95e5..7066a188c77 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.5.0"; + version = "2.5.2"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2ba4e8dcd5439a245287fac056db02a9261432b1a44a5cffbe593032de86f1c7"; + sha256 = "09pgzx2m04hzpckwgz4iz9590ll5fk1mirlra89qps8ig1xmz5m5"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix index f76692c50d9..78405ed8a66 100644 --- a/pkgs/development/python-modules/fluidasserts/default.nix +++ b/pkgs/development/python-modules/fluidasserts/default.nix @@ -12,9 +12,12 @@ , azure-mgmt-compute , azure-mgmt-keyvault , azure-mgmt-network +, azure-mgmt-resource +, azure-mgmt-security , azure-mgmt-storage , azure-mgmt-web , azure-storage-file +, azure-storage-file-share , bandit , bcrypt , beautifulsoup4 @@ -39,6 +42,7 @@ , psycopg2 , pycrypto , pygments +, pyhcl , pyjks , pynacl , pyopenssl @@ -57,30 +61,30 @@ buildPythonPackage rec { pname = "fluidasserts"; - version = "20.1.28253"; + version = "20.1.33141"; disabled = !isPy37; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1d2smx9ywd1azsiwgavp69vlixmvwaabshprm192wnmprbghsp6c"; + sha256 = "01l6yb3r19q8b4kwqkrzn7mpfsr65zsgzax2fbs43hb6pq6vavnx"; }; patchPhase = '' # Version mismatches between current FluidAsserts and Nixpkgs substituteInPlace ./setup.py \ - --replace 'tlslite-ng==0.8.0-alpha29' 'tlslite-ng==0.7.5' \ - --replace 'boto3==1.10.17' 'boto3==1.10.1' \ + --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \ + --replace 'boto3==1.11.7' 'boto3==1.10.1' \ --replace 'cfn-flip==1.2.2' 'cfn-flip==1.1.0.post1' \ - --replace 'azure-mgmt-storage==7.1.0' 'azure-mgmt-storage==7.0.0' \ + --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \ + --replace 'pillow==7.0.0' 'pillow==6.2.1' \ # Functionality that will be not present for the momment # but that we'll work to add in the future # Just a minimal portion of fluidasserts use this substituteInPlace ./setup.py \ - --replace "'azure-storage-file-share==12.0.0'," "" \ --replace "'pymssql==2.1.4'," "" \ - --replace "'pytesseract==0.3.0'," "" \ + --replace "'pytesseract==0.3.1'," "" \ --replace "'pywinrm==0.4.1'," "" \ --replace "'mitmproxy==5.0.1'," "" \ @@ -96,9 +100,12 @@ buildPythonPackage rec { azure-mgmt-compute azure-mgmt-keyvault azure-mgmt-network + azure-mgmt-resource + azure-mgmt-security azure-mgmt-storage azure-mgmt-web azure-storage-file + azure-storage-file-share bandit bcrypt beautifulsoup4 @@ -123,6 +130,7 @@ buildPythonPackage rec { psycopg2 pycrypto pygments + pyhcl pyjks pynacl pyopenssl @@ -146,9 +154,10 @@ buildPythonPackage rec { rm test/conftest.py pytest \ + test/test_cloud_aws_terraform_{ebs,ec2}.py \ test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \ test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \ - test/test_format_{apk,file,jks,jwt,pdf,pkcs12,string}.py \ + test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \ test/test_helper_{asynchronous,crypto}.py \ test/test_lang_{javascript,java}.py \ test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \ diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index a276bd33b59..918ed268afa 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2019.12.25"; + version = "2020.1.17"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "1aa7jccwldxw3s0z668qqb0i0plsark1q3jvkmqkyp645w5bfilk"; + sha256 = "08qcisiscnx74pwavh3ai3lg92zfrikwzr06p700kwk1gp8xhf3v"; }; # tests require network connection diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 9b289032514..a0462795d23 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "html2text"; - version = "2019.9.26"; + version = "2020.1.16"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Alir3z4"; repo = pname; rev = version; - sha256 = "1gzcx4n6q71plq4zvb1z0fy3brrln0qqrd6jc89iiqn7r1ix8h87"; + sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9"; }; # python setup.py test is broken, use pytest diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index 15e7d00bcec..dd0c97fc3c5 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch # Build dependencies , glibcLocales # Test dependencies @@ -36,6 +37,15 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'gnureadline'" " " ''; + patches = [ + # Use the proper pygments lexer for python2 (https://github.com/ipython/ipython/pull/12095) + (fetchpatch { + name = "python2-lexer.patch"; + url = "https://github.com/ipython/ipython/pull/12095/commits/8805293b5e4bce9150cc2ad9c5d6d984849ae447.patch"; + sha256 = "16p4gl7a49v76w33j39ih7yspy6x2d14p9bh4wdpg9cafhw9nbc0"; + }) + ]; + buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 9200e004d0c..42f50c203e3 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.0.0"; + version = "6.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5"; + sha256 = "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 32d3ad0bada..ece3b4e3ed5 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "1.2.4"; + version = "1.2.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6adb88acd05b51512c37df477a18c36240823a591c2a51bf6556198414026d8f"; + sha256 = "086zl3pdsq2jwcxv7ppp3lpwh25mgnn0y0s6scmkrz158yj55kp3"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 961eb43f03b..41eb2b58ca8 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "132bad60c63debfb371a691cb6668a19938ec268599e9c49f1531a3bf0be7b1c"; + sha256 = "081c8dbql93bpl72pzg0z8vg482r3f350490mhqn965s10bz8say"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 54b98cf2136..893789d961d 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libnacl"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "saltstack"; repo = pname; rev = "v${version}"; - sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad"; + sha256 = "10rpim9lf0qd861a3miq8iqg8w87slqwqni7nq66h72jdk130axg"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 6a497358404..02adb5a8d16 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which -, contextlib2 +{ stdenv, fetchurl, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +, contextlib2, osxfuse }: +let + inherit (stdenv.lib) optionals optionalString; +in + buildPythonPackage rec { pname = "llfuse"; version = "1.3.6"; @@ -11,14 +15,29 @@ buildPythonPackage rec { sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii"; }; + patches = [ + # https://github.com/python-llfuse/python-llfuse/pull/23 (2 commits) + (fetchpatch { + url = "https://github.com/python-llfuse/python-llfuse/commit/7579b0e626da1a7882b13caedcdbd4a834702e94.diff"; + sha256 = "0vpybj4k222h20lyn0q7hz86ziqlapqs5701cknw8d11jakbhhb0"; + }) + (fetchpatch { + url = "https://github.com/python-llfuse/python-llfuse/commit/438c00ab9e10d6c485bb054211c01b7f8524a736.diff"; + sha256 = "1zhb05b7k3c9mjqshy9in8yzpbihy7f33x1myq5kdjip1k50cwrn"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse ]; - checkInputs = [ pytest attr which ]; + buildInputs = + optionals stdenv.isLinux [ fuse ] + ++ optionals stdenv.isDarwin [ osxfuse ]; + checkInputs = [ pytest which ] ++ + optionals stdenv.isLinux [ attr ]; propagatedBuildInputs = [ contextlib2 ]; checkPhase = '' - py.test -k "not test_listdir" + py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index ceb9f841a46..c12084f008e 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.4.0"; + version = "0.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d5ddf363b7e0e562652f283f74a89bf35601baf16b70f2cd2736a2f8c6638748"; + sha256 = "a6101fd435ac89ba5205a105a26a6ede9e4ddbb4408a6e167852efca47806d11"; }; checkInputs = [ pytestCheckHook colorama ]; 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" ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; meta = with stdenv.lib; { homepage = https://github.com/Delgan/loguru; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 461d70497bf..c0e86dd3751 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.11.1"; + version = "8.11.2"; src = fetchPypi { inherit pname version; - sha256 = "239507184ee5b1b83557005af1d5fcce70f83ae18f5dff45b94a67226db10d63"; + sha256 = "0j73mr3d3rf2r4nkaxbvl7323xima0l95pjagjzgk2piqwa3nbd2"; }; meta = { diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 101c10b1d12..8731c997aa7 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, python , six }: @@ -15,8 +16,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - # tests no longer packages on pypi - doCheck = false; + # darwin seems to hang + doCheck = !stdenv.isDarwin; + checkPhase = '' + cd examples + ${python.interpreter} -m ppft.tests + ''; meta = with stdenv.lib; { description = "Distributed and parallel python"; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 14166b4f43c..47715b9e567 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "6.4.0"; + version = "6.5.1"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "0j92wqyppif2k80zhzq30b04r8ljwjviply400kn4rjn54hxd4hb"; + sha256 = "0d5whaw4731gllffhwrh2qqnlki4j8q83xaf3v4spkd40ps3q7b4"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix new file mode 100644 index 00000000000..e409282980d --- /dev/null +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -0,0 +1,46 @@ +{ buildPythonPackage +, fetchFromGitHub +, isPy3k +, lib + +# pythonPackages +, coverage +, pytest +}: + +buildPythonPackage rec { + pname = "pyhcl"; + version = "0.4.0"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "virtuald"; + repo = pname; + rev = version; + sha256 = "09kwm3digbwn3kmbk76jswxgwfcfchik6cfa2xbhjanh4xs893hs"; + }; + + # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 + configurePhase = '' + echo '__version__ = "${version}"' > ./src/hcl/version.py + ''; + + checkInputs = [ + coverage + pytest + ]; + + # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/tests/run_tests.sh#L4 + checkPhase = '' + coverage run --source hcl -m pytest tests + ''; + + meta = with lib; { + description = "HCL is a configuration language. pyhcl is a python parser for it"; + homepage = "https://github.com/virtuald/pyhcl"; + license = licenses.mpl20; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index ba74817a63f..f43d8d0575b 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "0i25gh8wi87l4g0iflp81rlgmps4cdmp90hwypalp7gcbwfxfmzi"; + sha256 = "16s2x5ghrhz9ljm6h3y0pbwh97558vbs7l0yiicag4s0xyn0nzq0"; }; propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 52fe5209ade..9b70d76bfed 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "12.2.0"; + version = "12.3.0"; src = fetchPypi { inherit pname version; - sha256 = "346d42771c2b23384c59f5f41e05bd7e801a0ce118d8dcb95209bb73d5f694c5"; + sha256 = "0yrg5342zz0hpf2pc85ffwx57msa6jpcmvvjfkzh8nh2lc98aq21"; }; prePatch = '' @@ -23,7 +23,8 @@ buildPythonPackage rec { --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \ --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" + --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \ + --replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField" touch LICENSE.dual ''; @@ -38,6 +39,6 @@ buildPythonPackage rec { description = "This library provides a pure Python interface for the Telegram Bot API."; homepage = https://python-telegram-bot.org; license = licenses.lgpl3; - maintainers = with maintainers; [ veprbl ]; + maintainers = with maintainers; [ veprbl pingiun ]; }; } diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index a6c431764be..9392504ce26 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "05qypwlzjkw31x7qgn01d4kcf40mbymg5c9h3i7cx2r8sw29akjy"; + sha256 = "1w4im0hzx497binyx6a6awbyszk1bsz34prm4j72gl5kszkiq7yq"; }; propagatedBuildInputs = [ qtpy six ]; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 52dc89e3a96..909c54788b2 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.21.1"; + version = "1.21.2"; src = fetchPypi { inherit pname version; - sha256 = "834dfd084fed290b2b445545b0d1cac7822f3c0ed6ba09707efb1716bb485ede"; + sha256 = "1pbfmab3ixvaa845qp6ms2djcwp9c5vnlsr2bf9prmx5973khg7d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx/2.nix b/pkgs/development/python-modules/sphinx/2.nix index b6374989690..541c292fe8f 100644 --- a/pkgs/development/python-modules/sphinx/2.nix +++ b/pkgs/development/python-modules/sphinx/2.nix @@ -60,6 +60,13 @@ buildPythonPackage rec { # Lots of tests. Needs network as well at some point. doCheck = false; + patches = [ + # Since pygments 2.5, PythonLexer refers to python3. If we want to use + # python2, we need to explicitly specify Python2Lexer. + # Not upstreamed since there doesn't seem to be any upstream maintenance + # branch for 1.8 (and this patch doesn't make any sense for 2.x). + ./python2-lexer.patch + ]; # https://github.com/NixOS/nixpkgs/issues/22501 # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. postPatch = '' diff --git a/pkgs/development/python-modules/sphinx/python2-lexer.patch b/pkgs/development/python-modules/sphinx/python2-lexer.patch new file mode 100644 index 00000000000..cf4a243315a --- /dev/null +++ b/pkgs/development/python-modules/sphinx/python2-lexer.patch @@ -0,0 +1,22 @@ +diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py +index ac2bd1b06..63ca52de2 100644 +--- a/sphinx/highlighting.py ++++ b/sphinx/highlighting.py +@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken + from pygments.formatters import HtmlFormatter, LatexFormatter + from pygments.lexer import Lexer # NOQA + from pygments.lexers import get_lexer_by_name, guess_lexer +-from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \ ++from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \ + CLexer, TextLexer, RstLexer + from pygments.styles import get_style_by_name + from pygments.util import ClassNotFound +@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__) + + lexers = dict( + none = TextLexer(stripnl=False), +- python = PythonLexer(stripnl=False), ++ python = Python2Lexer(stripnl=False), + python3 = Python3Lexer(stripnl=False), + pycon = PythonConsoleLexer(stripnl=False), + pycon3 = PythonConsoleLexer(python3=True, stripnl=False), diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 70471aedbd7..e728739c294 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.4.4"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1l8ya0cln936x0mx2j5ngl1xwpc0r89hs3wcvb8x8paw3d4dl1ab"; + sha256 = "1jpj9ljc5g89jbnzwnmgz5s6jdrsgd6g9s09igvbw3pppi9070h0"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index d564adbc6e2..3f1c1e53c7c 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.41.0"; + version = "2.42.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2f0ec677136985ece9cca232f106c2a87193261cac1fe58d4e959215310a0da8"; + sha256 = "1vrs0mydj2j789slzfv5413qxa067zi7p34h2p63612gm3vdrcl9"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index b1fbf26e43b..00e2c5e2a4b 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -6,6 +6,7 @@ , libuv , psutil , isPy27 +, pythonAtLeast , CoreServices , ApplicationServices }: @@ -13,7 +14,8 @@ buildPythonPackage rec { pname = "uvloop"; version = "0.14.0"; - disabled = isPy27; + # python 3.8 hangs on tests, assuming it's subtly broken with race condition + disabled = isPy27 || pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index c7935208536..f15cefaa475 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchPypi +, fetchpatch , buildPythonPackage , python , zope_testrunner @@ -23,6 +24,14 @@ buildPythonPackage rec { sha256 = "20155942fa326e89ad8544225bafd74237af332ce9d7c7105a22318fe8269666"; }; + patches = [ + # Compatibility with transaction v3.0 + (fetchpatch { + url = "https://github.com/zopefoundation/ZODB/commit/0adcc6877f690186c97cc5da7e13788946d5e0df.patch"; + sha256 = "1zmbgm7r36nj5w7icpinp61fm81svh2wk213pzr3l0jxzr9i5qi4"; + }) + ]; + # remove broken test postPatch = '' rm -vf src/ZODB/tests/testdocumentation.py |