diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 69acb43af861..c2f201774fea 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -56,6 +56,7 @@ buildPythonApplication rec { libsass lxml markupsafe + mock num2words ofxparse passlib @@ -76,7 +77,7 @@ buildPythonApplication rec { reportlab requests vobject - werkzeug1 + werkzeug xlrd XlsxWriter xlwt @@ -92,6 +93,6 @@ buildPythonApplication rec { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; license = licenses.lgpl3Only; - maintainers = [ maintainers.mkg20001 ]; + maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index b8a80c5e9c11..1f6679625ec7 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -18,6 +18,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ matplotlib numpy + packaging pyqt4 Rtree scipy diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index c1d6669c8c2f..0e1d377be28e 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -11,6 +11,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "corrscope"; version = "0.7.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "corrscope"; @@ -19,8 +20,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m"; }; - format = "pyproject"; - patches = [ # Remove when bumping past 0.7.1 (fetchpatch { @@ -30,11 +29,28 @@ mkDerivationWith python3Packages.buildPythonApplication rec { }) ]; - nativeBuildInputs = [ wrapQtAppsHook ] ++ (with python3Packages; [ poetry-core ]); + nativeBuildInputs = [ + wrapQtAppsHook + ] ++ (with python3Packages; [ + poetry-core + ]); - buildInputs = [ ffmpeg qtbase ]; + buildInputs = [ + ffmpeg + qtbase + ]; - propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel-yaml ]; + propagatedBuildInputs = with python3Packages; [ + appdirs + atomicwrites + attrs + click + matplotlib + numpy + packaging + pyqt5 + ruamel-yaml + ]; dontWrapQtApps = true; diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index cf3028612698..4c16861823fd 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.5"; + version = "1.1.6"; src = fetchPypi { inherit pname version; - sha256 = "169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"; + sha256 = "4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2"; }; propagatedBuildInputs = [ markupsafe ]; diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index bacfe95a9a13..1fa304f57a8a 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Markups"; - version = "3.1.2"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "2954d53656d9ec84f2f6c077e91a1de534e05647f20d327757283bbb5a857770"; + sha256 = "ab9747a72c1c6457418eb4276c79871977c13a654618e4f12e2a1f0990fbf2fc"; }; checkInputs = [ markdown docutils pygments pyyaml ]; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 611686e5c0af..30a0e68dea0c 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.14.1"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "eb0383bd431c0d7b2320179904cab00120a10977e3c9671d99efbbed17efb55a"; + sha256 = "72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index 82613ffa52aa..9685f5c9969d 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -1,13 +1,15 @@ -{ buildPythonPackage -, numpy -, matplotlib +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, matplotlib +, numpy +, packaging }: buildPythonPackage rec { pname = "adjusttext"; version = "0.7.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "Phlya"; @@ -16,12 +18,21 @@ buildPythonPackage rec { sha256 = "02apaznnnmwmrn342f22dj5dldn56gdl9v5qix07ah6kgp9503yw"; }; - propagatedBuildInputs = [ matplotlib numpy ]; + nativeBuildInputs = [ + packaging + ]; + + propagatedBuildInputs = [ + matplotlib + numpy + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "adjustText" ]; + pythonImportsCheck = [ + "adjustText" + ]; meta = with lib; { description = "Iteratively adjust text position in matplotlib plots to minimize overlaps"; diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix index 3e6f33a23e57..4776a1035bfe 100644 --- a/pkgs/development/python-modules/aiocron/default.nix +++ b/pkgs/development/python-modules/aiocron/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "aiocron"; - version = "1.7"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rX07m9iIl5NP/RiTf/I1q5+wE1goD9QOAUYf1fdjSL0="; + sha256 = "48546513faf2eb7901e65a64eba7b653c80106ed00ed9ca3419c3d10b6555a01"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 05027dc0170d..033ba87933a7 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "0vvk9j8cfdqvq8hw2qc6ajfzsy8x1afabf83mxafffq92rwknd4y"; + sha256 = "sha256-V7F+xalFGMgTgT30Gmd9FVV3cPndI/i9cB5vEuW/KVc="; }; nativeBuildInputs = [ @@ -35,7 +35,9 @@ buildPythonPackage rec { "test_sendfile_file" ]; - pythonImportsCheck = [ "aiofiles" ]; + pythonImportsCheck = [ + "aiofiles" + ]; meta = { description = "File support for asyncio"; diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index ed270cddd981..1e4763453209 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { disabledTests = [ # makes http request to another server + # https://github.com/etianen/aiohttp-wsgi/issues/32 "testEnviron" ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index db1f810cbc87..f96fa8820384 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.0"; + version = "3.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-07GdjRg7z9aLJb7rq43DMIKC/iyj1uo8tM0QGzwnn40="; + sha256 = "fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578"; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index 556510828914..cbf7415ef9f5 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -2,23 +2,36 @@ , aiohttp , async-timeout , buildPythonPackage +, fetchFromGitHub , fetchPypi +, fetchpatch , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aiopvapi"; - version = "1.6.14"; + version = "unstable-2021-09-27"; format = "setuptools"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "02bl7q166j6rb8av9n1jz11xlwhrzmbkjq70mwr86qaj63pcxrak"; + src = fetchFromGitHub { + owner = "sander76"; + repo = "aio-powerview-api"; + rev = "7b362e28a8ec8c9a53905879d8b519e03fd88e13"; + sha256 = "sha256-7bZLCv9PEJr61vimw39m89w/rha3tQWM8TWMtfd8kjQ="; }; + patches = [ + (fetchpatch { + # Drop loop= kwarg from async_timeout and ClientSession calls + # https://github.com/sander76/aio-powerview-api/pull/13 + url = "https://github.com/sander76/aio-powerview-api/commit/7be67268050fbbf7652ce5a020d2ff26f34d0b27.patch"; + sha256 = "sha256-7QPwrMP1Sbrayg63YZJcRkVDAqcm6hqh0fuJdrUk5WY="; + }) + ]; + propagatedBuildInputs = [ aiohttp async-timeout diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index b39d3902740d..06f61981561b 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "amazon_kclpy"; - version = "2.0.2"; + version = "2.0.6"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "v${version}"; - sha256 = "12yxcwml6g86sv1pj3wc2k97md9szdj6xx07qwri1mr9bdkzw7rv"; + sha256 = "0gbpwhpd9i13vi0cch48qqrma90p230psqrkbfcjvdah69w434l4"; }; # argparse is just required for python2.6 diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 492c835f018e..42f37e130994 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -11,6 +11,7 @@ , click , pydot , ipython +, packaging , pyqt5 , pyperclip , nose @@ -39,6 +40,12 @@ buildPythonPackage rec { sha256 = "1aparxiq11y0hbvkayp92w684nyxyyx7mi0n1x6x51g5z6c58vmy"; }; + nativeBuildInputs = [ + packaging + ] ++ lib.optionals withGui [ + qt5.wrapQtAppsHook + ]; + propagatedBuildInputs = [ asn1crypto click @@ -67,10 +74,6 @@ buildPythonPackage rec { ]; inherit doCheck; - nativeBuildInputs = lib.optionals withGui [ - qt5.wrapQtAppsHook - ]; - # If it won't be verbose, you'll see nothing going on for a long time. checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index a23f668529d1..f4ec1c184627 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.0.3"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "15j0ljgw1rjxq4xiywxxxnxj4r6vwk8dwljkdsjmq3qmwgifcswg"; + sha256 = "7684612f7543c5f07f3e8135667eeb22a9dbd98f625cc69901ba9924329ef24f"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index c0f7274a80dd..a2e35265d448 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,8 +1,15 @@ -{ lib, buildPythonPackage, fetchFromGitHub, sqlite, isPyPy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, sqlite +, isPyPy +, pytestCheckHook +}: buildPythonPackage rec { pname = "apsw"; - version = "3.33.0-r1"; + version = "3.36.0-r1"; + format = "setuptools"; disabled = isPyPy; @@ -10,14 +17,38 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "05mxcw1382xx22285fnv92xblqby3adfrvvalaw4dc6rzsn6kcan"; + sha256 = "sha256-kQqJqDikvEC0+PNhQxSNTcjQc+RwvaOSGz9VL3FCetg="; }; - buildInputs = [ sqlite ]; + buildInputs = [ + sqlite + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + disabledTests = [ + "testCursor" + "testLoadExtension" + "testShell" + "testVFS" + "testVFSWithWAL" + "testdb" + ]; + + pythonImportsCheck = [ + "apsw" + ]; meta = with lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; homepage = "https://github.com/rogerbinns/apsw"; license = licenses.zlib; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 72bbdb7b977c..fc66509a194a 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "16fc29bbd9e425e3eb0fef3018297910a0f4568f21116fc31771e2760a50e074"; + sha256 = "c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840"; }; postPatch = '' diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 25210e4740bd..c3ec514844c2 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.22.0"; + version = "3.22.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-5gJZx7UIZ7HLgXyvk4/MHtODcCQT320uGv5+oH9lrO4="; + sha256 = "sha256-AE32sOoEsRFMeQ+t/kXUEl6w5TElxmqTQlr4U9gqtDI="; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index b6ba53055d36..101f84b4fcea 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , isPyPy , lazy-object-proxy @@ -15,32 +14,23 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.8.2"; # Check whether the version is compatible with pylint + version = "2.9.0"; # Check whether the version is compatible with pylint - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6.2"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "0140h4l7licwdw0scnfzsbi5b2ncxi7fxhdab7c1i3sk01r4asp6"; + sha256 = "sha256-sImWiWULZ1HS3JyQHfEhc4ZRZ6anOUTqZZGNIYj2MaY="; }; - SETUPTOOLS_SCM_PRETEND_VERSION=version; - - patches = [ - (fetchpatch { - # Allow wrapt 1.13 (https://github.com/PyCQA/astroid/pull/1203) - url = "https://github.com/PyCQA/astroid/commit/fd510e08c2ee862cd284861e02b9bcc9a7fd9809.patch"; - sha256 = "1s10whslcqnyz251fb76qkc9p41gagxljpljsmw89id1wywmjib4"; - }) - ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools-scm ]; - # From astroid/__pkginfo__.py propagatedBuildInputs = [ lazy-object-proxy wrapt @@ -52,6 +42,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # assert (1, 1) == (1, 16) + "test_end_lineno_string" + ]; + passthru.tests = { inherit pylint; }; diff --git a/pkgs/development/python-modules/async_stagger/default.nix b/pkgs/development/python-modules/async_stagger/default.nix index 638e326e0da4..3dafd2b21941 100644 --- a/pkgs/development/python-modules/async_stagger/default.nix +++ b/pkgs/development/python-modules/async_stagger/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { pname = "async_stagger"; version = "0.3.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -23,7 +25,14 @@ buildPythonPackage rec { pytest-mock ]; - pythonImportsCheck = [ "async_stagger" ]; + disabledTests = [ + # RuntimeError: Logic bug in... + "test_stagger_coro_gen" + ]; + + pythonImportsCheck = [ + "async_stagger" + ]; meta = with lib; { description = "Happy Eyeballs connection algorithm and underlying scheduling logic in asyncio"; diff --git a/pkgs/development/python-modules/asyncio-nats-client/default.nix b/pkgs/development/python-modules/asyncio-nats-client/default.nix index b5017123850f..46dbcdbacd5e 100644 --- a/pkgs/development/python-modules/asyncio-nats-client/default.nix +++ b/pkgs/development/python-modules/asyncio-nats-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncio-nats-client"; - version = "0.11.4"; + version = "0.11.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.py"; rev = "v${version}"; - sha256 = "1aj57xi2rj1xswq8air13xdsll1ybpi0nmz5f6jq01azm0zy9xyd"; + sha256 = "0zwiijaswmfdk71diqmdpb6nx54fmgi8hy0vwx2m3ihhsyjxj82h"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 9c9e2d623dc4..7ae4cb1b7898 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.24.0"; + version = "0.25.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-3S+gY8M0SCNIfZ3cy0CALwJiLd+L+KbMU4he56LBwMY="; + sha256 = "63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index cb9503fe6e9c..80e29932ee2d 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.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "df65a654744ccdc4843ce09c38612fd8f702c84be501b1d955c3ac0b9ad28dc5"; + sha256 = "4055fbdeeb692d3d52c6e3c628d7513fc71f147920cac7d0da05b6dbb5ec8c8d"; }; buildInputs = [ cppy ]; diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index c03b423932df..73422a0624c8 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.0.2"; + version = "1.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "1cg63qhf823nf785kyl96r7vyxfl6dlbwsmhcpny8vb65pl9gng5"; + sha256 = "08zpaclg5f9g1pix0jaq42i2ph12xc8djjrmhxz0yygw5rsilgl4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 737989ac3183..80c57ef732c2 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.7"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0"; + sha256 = "44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979"; }; propagatedBuildInputs = [ pycodestyle toml ]; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 4c1fb77dc69b..d69f009aaf4c 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,30 +1,44 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, typing-extensions +, pytestCheckHook +}: buildPythonPackage rec { pname = "avro"; - version = "1.10.2"; + version = "1.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "381b990cc4c4444743c3297348ffd46e0c3a5d7a17e15b2f4a9042f6e955c31a"; + sha256 = "1206365cc30ad561493f735329857dd078533459cee4e928aec2505f341ce445"; }; - patchPhase = '' - # this test requires network access - sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py - '' + (lib.optionalString isPy3k '' - # these files require twisted, which is not python3 compatible - rm avro/txipc.py - rm avro/test/txsample* - ''); + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; - nativeBuildInputs = [ pycodestyle ]; - propagatedBuildInputs = [ isort ]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Requires network access + "test_server_with_path" + ]; + + pythonImportsCheck = [ + "avro" + ]; meta = with lib; { - description = "A serialization and RPC framework"; - homepage = "https://pypi.python.org/pypi/avro/"; + description = "Python serialization and RPC framework"; + homepage = "https://github.com/apache/avro"; license = licenses.asl20; - maintainers = [ maintainers.zimbatm ]; + maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index f5b83df26640..8a4799c688b4 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -21,10 +21,9 @@ buildPythonPackage rec { azure-keyvault-secrets ]; - # this is just a meta package, which contains keys and secrets + # this is just a meta package, which contains keys and secrets packages doCheck = false; - - pythonNamespaces = [ "azure" ]; + doBuild = false; pythonImportsCheck = [ "azure.keyvault.keys" diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 43edd16f66aa..78b34dfbf17c 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.11.1"; + version = "8.12.1"; src = fetchPypi { inherit pname version; - sha256 = "4e7b8769c0f09fee403d0a5f637f8b575b191a79a92e140811aa109ce7461f0c"; + sha256 = "45b2b932ce6681f5c6ce8cba39abdd423b579b0568c76fa48b1e09c88368ede7"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 63cd373abf77..9017cbed0d6d 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.3.3"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "a5fdcc181835561447fcc5a371300973fce4114692d5853addec284d1cdeb677"; + sha256 = "f0a4b53364ed3b7eb936c5cb1a4f4132369e394c7ae0a8ef420459410958033d"; }; patches = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 6d8cb85fa884..bf26eca41b64 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.18.54"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.20.13"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-LYHcSEAgBZ/HOBZZhDBBB9TbHGd0tjENCMiSoXUfaYA="; + sha256 = "bbf53a077d6a0575ddec8026f0475ca6ee6f41b227914bf315bf3e049a3d653a"; }; 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 bf291411608a..b34dbfbac98c 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.21.54"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.23.14"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-RhJ7OjhdDsc9GZS4lYsjt54GE+EsSGNxoQDfmStyobk="; + sha256 = "sha256-6NUsvy5zxiaM8sIH9H48+z7eCYP5PotZZ0tUYo5+8fE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 64fe3c455ee5..0cedc7655ac0 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.21"; + version = "0.22.1"; src = fetchPypi { inherit pname version; - sha256 = "88aa9b89974f6a7726499a2608fa7ded216d84c69e78114ab2ef996a45709487"; + sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200"; }; patches = [ (substituteAll { diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 95e24e98d51c..8cf820edbfec 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.13.0"; + version = "4.13.1"; src = fetchPypi { inherit pname version; - sha256 = "de8270c24c4557bcb76d2079bb4cabf380ce467d17c65f10ee5159da7ff8496a"; + sha256 = "4f6addf89f5cd6123243ddc89db325e50fceec825845901dad553fde115bd938"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 834dd42bc087..8056cd181d53 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.4"; + version = "2.13.6"; src = fetchPypi { inherit pname version; - sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63"; + sha256 = "ac6edd48b1d7b1fba383dd0840fd49c53266f6bd426111a0195bcc640f4aff0f"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 7e94bd55b28f..6e0637d2a6bc 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.8.0"; + version = "0.8.1"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9f92c05effd8175763799d19ca55592e89b053318f611148a6725159aea41d67"; + sha256 = "f4f2ee712a1e468a2ce5c0a32f67739a83331f0cb7b9c50b9e7510daefc12169"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index aa1e3d1d8648..b7e906c3b91b 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "bx-python"; - version = "0.8.11"; + version = "0.8.12"; disabled = isPy27; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "v${version}"; - sha256 = "0cz5vgw19hmkcg689vr540q2gl2lb3xcf1lphm7zbfp8wmypcadm"; + sha256 = "0mclahslz34vq9x424jmzsxk0nmpm1j716fa8h3zwr9ssvch7skc"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix index 3c4466648633..993684bd5a38 100644 --- a/pkgs/development/python-modules/castepxbin/default.nix +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "castepxbin"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; rev = "v${version}"; - sha256 = "16wnd1mwhl204d1s3har2fhyhyjg86sypg00bj812dxk8zixxszf"; + sha256 = "0bqicpdyisbcz8argy4ppm59zzkcn9lcs4y1mh2f31f75x732na3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index cd6d21b7c651..123703d4aa35 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "celery"; - version = "5.1.2"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "8d9a3de9162965e97f8e8cc584c67aad83b3f7a267584fa47701ed11c3e0d4b0"; + sha256 = "b41a590b49caf8e6498a57db628e580d5f8dc6febda0f42de5d783aed5b7f808"; }; # click is only used for the repl, in most cases this shouldn't impact diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 57806426d95a..07af19a43846 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -4,11 +4,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.6"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"; + sha256 = "920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index f0769f57275a..4a409cb41e03 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -5,6 +5,7 @@ , aws-sam-translator , importlib-metadata , importlib-resources +, jschema-to-python , jsonpatch , jsonschema , junit-xml @@ -12,6 +13,7 @@ , pathlib2 , pyyaml , requests +, sarif-om , setuptools , six , mock @@ -21,13 +23,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.54.2"; + version = "0.56.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "04d5zyjnrl3b6cb2fxmbpii27mnq77wqsglfxfv2a1zj2p9xby0p"; + sha256 = "0wpsj719r0p122qmi3nznzqnxqb0nx53isg9fma75894pvq2v5wc"; }; postPatch = '' @@ -37,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aws-sam-translator + jschema-to-python jsonpatch jsonschema junit-xml @@ -44,6 +47,7 @@ buildPythonPackage rec { pathlib2 pyyaml requests + sarif-om setuptools six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; @@ -70,6 +74,7 @@ buildPythonPackage rec { # Tests depend on network access (fails in getaddrinfo) "test_update_resource_specs_python_2" "test_update_resource_specs_python_3" + "test_sarif_formatter" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index 66d9e23668b4..7f7f54b73d91 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.0.5"; + version = "2.0.8"; src = fetchFromGitHub { owner = "Ousret"; repo = "charset_normalizer"; rev = version; - sha256 = "0pv6yf5ialc82iimsjbq3gp5hh02pg4a7sdma48gd81h4h8qd627"; + sha256 = "sha256-+acnzdDcujnMa0FYlWaAX7Ga9APMRlvBLKoogIyY8YM="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 2873b7e99ef0..0e80ee1a41e4 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.3.1"; + version = "5.4.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "11jazr5s2rmcxbkpb79gllwlyxvji3f0ryfrj7mkbyvfnfv43gly"; + sha256 = "1ay9dlblxkx3pxqmizj2am9gf60j1pl6ir23yj7chg8dbafdbv8p"; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 8b8f536bab6f..ce229665c659 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3"; + sha256 = "c68aac08d0d25853234a38fdbf1f33503849af3d5d677a4d0aacd42b0be6a4a1"; }; postPatch = '' diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index f7308fd8ba93..8339af8094c4 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.2.0"; + version = "2.3.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "34cd12424d9e2835eff125146af3d9f4a4c2931c6bc5a3cea9790bd4f55756d9"; + sha256 = "cad18787a26147dad4b161d75c5ab7de16ffe91fef1cfad8e6f18b712746e800"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 17fe45f1cf49..90616dc1f8ab 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.5.2"; + version = "1.6.0"; # - we need to use the tarball from PyPi # or the full git checkout (with .git) @@ -20,7 +20,7 @@ buildPythonPackage rec { # because it does not include required metadata src = fetchPypi { inherit pname version; - sha256 = "9f4f3e6eb9caeb479e98d604770645b57469cd25b39e28df1916ffcd593efbe6"; + sha256 = "a695544ab314e6d795b72ece9e67b51c6668c569b21303158e00452db43c5756"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 16059fe3d6b5..facbc3206894 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "09a6e82a55af45f5e946d7002ed997869abf6f57d28fdc79f128132b5da18bf8"; + sha256 = "1be95183f70282422d594fa42426be6923070a4bd8335621f6347f3aeee81db0"; }; # there are no tests diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 3eeae353d115..5f227fa4f9ef 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "5.0.2"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "85d5de102cfe6d14a5172676f09d19c465ce63d6019cf0a4ef13385fc535e828"; + sha256 = "202b9679a809b703720afa2eacaad4c6c2d63196070e5d9edc953c0489dfd536"; }; # No tests available diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index 1762d60dfde5..891e67f64466 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -3,7 +3,7 @@ let pname = "crccheck"; - version = "1.0"; + version = "1.1"; in buildPythonPackage { inherit pname version; @@ -11,7 +11,7 @@ in buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "1ay9lgy80j7lklm07iw2wq7giwnv9fbv50mncblqlc39y322vi0p"; + sha256 = "45962231cab62b82d05160553eebd9b60ef3ae79dc39527caef52e27f979fa96"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 549d6062c174..3ef99936c47a 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "curtsies"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "933b503767ce38fe32a1f77639d9a4fa3d5229d41abb31a91a6fcbdf01511a55"; + sha256 = "11efbb153d9cb22223dd9a44041ea0c313b8411e246e7f684aa843f6aa9c1600"; }; propagatedBuildInputs = [ blessings cwcwidth ] diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 2f1797bf4fed..514b53b873a9 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.8.1"; + version = "6.8.3"; src = fetchPypi { inherit pname version; - sha256 = "3f16d3d40f7f2e1f6032132170d8fd4ba2f4f9ea419f13d7a68091bbe1949583"; + sha256 = "05e7a2b099d4eb36e74116311b693dcc3103763aee92ef32079be0b6d4832fa0"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index a5606ac3dd20..3b7d701f1114 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "8.2.1"; + version = "8.3.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "12e7e913a7a10fd8caafb9855e6703a601b7dd5cc596fcd489d0ac9529608b6c"; + sha256 = "3b2d215af4441463c97ea469b9cc307460739f89fdfa8ea222ea3518f1a424d9"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index 643a57e259ff..b9bd167c6a94 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cycler"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"; + sha256 = "9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f"; }; checkInputs = [ coverage nose ]; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 86ee238eb10f..9b1b9ecb8da6 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPyPy -, nose +, pytestCheckHook , toolz , python , isPy27 @@ -10,21 +10,25 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.11.0"; + version = "0.11.2"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "c64f3590c3eb40e1548f0d3c6b2ccde70493d0b8dc6cc7f9f3fec0bb3dcd4222"; + sha256 = "ea23663153806edddce7e4153d1d407d62357c05120a4e8485bddf1bd5ab22b4"; }; - checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; - checkPhase = '' - nosetests -v $out/${python.sitePackages} + # tests are located in cytoolz/tests, however we can't import cytoolz + # from $PWD, as it will break relative imports + preCheck = '' + cd cytoolz + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; + checkInputs = [ pytestCheckHook ]; + meta = { homepage = "https://github.com/pytoolz/cytoolz/"; description = "Cython implementation of Toolz: High performance functional utilities"; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 62f2a30507b5..60df07076827 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { - version = "1.9.0"; + version = "2021.11.30"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "2f376a7114133b484a6d393f62298473116fc49c79ec7d50d5b031d752f54307"; + sha256 = "4f73306b5ee56e9b41b133697062d0028d30b1ece883ac6b56532fea5bd3e94a"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index d656b055d119..cc44a6e97eb7 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "2.21.0"; + version = "2021.11.0"; pname = "dask-mpi"; src = fetchPypi { inherit pname version; - sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7"; + sha256 = "602d2e2d7816a4abc1eb17998e1acc93a43b6f82bf94a6accca169a42de21898"; }; propagatedBuildInputs = [ dask distributed mpi4py ]; diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index f0aa7a074c6d..c3bc5aee76c2 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.2"; + version = "9.1.4"; src = fetchPypi { inherit pname version; - sha256 = "9672aae60b299de58a527f320df45769cadf436398e21f4ce73424a25badb7a7"; + sha256 = "0e4c9178635d47b18ca12284c8ba970747e0b2e2fb7dd6f0a06d35788e81cb91"; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 0c1b8137bc98..b4b60da17f9f 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.11.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "0pm14cp7xaagpf4j96v0ybi5gn3r9p0if3pc197ckwx6sw3lx29p"; + sha256 = "sha256-5J2hhy52eZqVSaeJNIOM9RzZatq3aewAulS3OX76+Io="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 5a611c989f4d..7908b3c6b496 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -31,14 +31,15 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.58.1"; + version = "0.59.4"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-dtKqp7LV1fRjwOMAlmmAnC19j8hLA1oixGextATW6z0="; + sha256 = "sha256-bH/VREo2f84wloA2jgXnQkGNSRRRYmSvUXmI0wMfmYM="; }; nativeBuildInputs = [ pytest-runner ]; @@ -79,7 +80,6 @@ buildPythonPackage rec { --replace "pint~=0.9" "pint" \ --replace "pluggy~=0.13.0" "pluggy" \ --replace "uvicorn~=0.11" "uvicorn" \ - --replace "PyYAML~=5.3" "PyYAML" ''; # takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews @@ -108,6 +108,6 @@ buildPythonPackage rec { description = "Multi-tool for exploring and publishing data"; homepage = "https://datasette.io/"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 5738dc64e759..587f73d81ed8 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -31,6 +31,13 @@ buildPythonPackage rec { sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8="; }; + # the complete extra is for usage with conda, which we + # don't care about + postPatch = '' + substituteInPlace setup.py \ + --replace "dask[complete]" "dask" + ''; + propagatedBuildInputs = [ dask bokeh @@ -56,11 +63,24 @@ buildPythonPackage rec { netcdf4 ]; + preCheck = '' + export HOME=$TMPDIR + ''; + pytestFlagsArray = [ "-n $NIX_BUILD_CORES" "datashader" ]; + disabledTests = [ + # not compatible with current version of bokeh + # see: https://github.com/holoviz/datashader/issues/1031 + "test_interactive_image_update" + # latest dask broken array marshalling + # see: https://github.com/holoviz/datashader/issues/1032 + "test_raster_quadmesh_autorange_reversed" + ]; + disabledTestPaths = [ # 31/50 tests fail with TypeErrors "datashader/tests/test_datatypes.py" diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index b623fe302783..6dfb531a78b6 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,15 +19,20 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.10.0"; + version = "2021.11.2"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "0kfq7lwv2n2wiws4v2rj36wx56jvkp2fl6zxg04p2lc3vcgha9za"; + sha256 = "f86a01a2e1e678865d2e42300c47552b5012cd81a2d354e47827a1fd074cc302"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "dask == 2021.11.2" "dask" + ''; + propagatedBuildInputs = [ bokeh click diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index de01f4f70417..4cb23d989fae 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -1,29 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, django-discover-runner -, mock , dj-database-url , dj-email-url , dj-search-url -, django-cache-url -, six , django +, django-cache-url +, django-discover-runner +, fetchPypi +, importlib-metadata +, mock +, pythonOlder , setuptools-scm }: buildPythonPackage rec { - version = "2.2"; pname = "django-configurations"; + version = "2.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915"; + sha256 = "e2ca25530e184f0ee3b7f5ae69563461a93a8914493306ee0bf6d71e7d8ad1d0"; }; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ six ]; - checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url ]; + buildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + django-discover-runner + mock + dj-database-url + dj-email-url + dj-search-url + django-cache-url + ]; checkPhase = '' export PYTHONPATH=.:$PYTHONPATH @@ -35,10 +54,14 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed doCheck = false; + pythonImportsCheck = [ + "configurations" + ]; + meta = with lib; { - homepage = "https://django-configurations.readthedocs.io/"; description = "A helper for organizing Django settings"; + homepage = "https://django-configurations.readthedocs.io/"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix index 311fae425a5e..c85d5d3fcc75 100644 --- a/pkgs/development/python-modules/django-formtools/default.nix +++ b/pkgs/development/python-modules/django-formtools/default.nix @@ -1,19 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, django, python }: +{ lib +, buildPythonPackage +, django +, fetchPypi +, python +, pythonOlder +, setuptools-scm +}: buildPythonPackage rec { pname = "django-formtools"; - version = "2.2"; + version = "2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1chkbl188yj6hvhh1wgjpfgql553k6hrfwxzb8vv4lfdq41jq9y5"; + sha256 = "9663b6eca64777b68d6d4142efad8597fe9a685924673b25aa8a1dcff4db00c3"; }; - propagatedBuildInputs = [ django ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ]; + checkPhase = '' ${python.interpreter} -m django test --settings=tests.settings ''; + pythonImportsCheck = [ + "formtools" + ]; + meta = with lib; { description = "A set of high-level abstractions for Django forms"; homepage = "https://github.com/jazzband/django-formtools"; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 18a6808a21ef..de8db9683963 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.4.1"; + version = "2.5.1"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "v${version}"; - sha256 = "1dy3mhj60xlqy7f65zh80sqn6qywsp697r6yy3jcl5wmwizzhybr"; + sha256 = "169mj0i8x9184ggks2l6ck669b2kxg75na1a09kqk3rzrb6kg1z2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 95b860a3331d..7282cf3b9872 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-statici18n"; - version = "2.0.1"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0cqwfirzjbanibq3mfz9lcwqnc8655zpysf9hk9g3lbwj2m478sp"; + sha256 = "5c85192fa95e3ef3727517ac104add8959fc0a54be3d13440a8a3319fddbc778"; }; propagatedBuildInputs = [ django django_appconf ]; diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index 2e58047d8a9c..61a32e2561a3 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, rcssmin, rjsmin, django_appconf }: + buildPythonPackage rec { pname = "django_compressor"; version = "2.4.1"; @@ -9,8 +10,9 @@ buildPythonPackage rec { sha256 = "3358077605c146fdcca5f9eaffb50aa5dbe15f238f8854679115ebf31c0415e0"; }; postPatch = '' - substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \ - --replace 'rjsmin == 1.0.12' 'rjsmin' + substituteInPlace setup.py \ + --replace 'rcssmin == 1.0.6' 'rcssmin' \ + --replace 'rjsmin == 1.1.0' 'rjsmin' ''; # requires django-sekizai, which we don't have packaged yet diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 348228a8c028..97836b247a33 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "ad6d714b4b9b824e22b88d47201cc0f74b5c4294c8d4e1f8d7ac7c3631ef3188"; + sha256 = "6991f16e5d3a972912db3d56e3a714d10b07becd566ab87f85f2e9b671981339"; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index e0e83e0c0619..facfc2fafcdb 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.15.3"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "e1a2f32573396335a8935dfc2afb29e34eff34babec1150927ff74fcd4bbdb9d"; + sha256 = "23cea52eca76e605fa2f34b13ae8d2bf60240737ee9ed3f60c667a4f64d28adf"; }; propagatedBuildInputs = [ ply ]; diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index a1010f96d62e..dbfb857614e1 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -1,39 +1,52 @@ { lib , buildPythonPackage +, chardet +, docutils , fetchPypi , pbr -, docutils -, six -, chardet -, stevedore -, restructuredtext_lint , pygments +, pytestCheckHook +, pythonOlder +, restructuredtext_lint +, stevedore }: buildPythonPackage rec { pname = "doc8"; - version = "0.9.1"; + version = "0.10.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0e967db31ea10699667dd07790f98cf9d612ee6864df162c64e4954a8e30f90d"; + sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548"; }; - buildInputs = [ pbr ]; + buildInputs = [ + pbr + ]; + propagatedBuildInputs = [ docutils - six chardet stevedore restructuredtext_lint pygments ]; - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; - meta = { + pythonImportsCheck = [ + "doc8" + ]; + + meta = with lib; { description = "Style checker for Sphinx (or other) RST documentation"; - homepage = "https://launchpad.net/doc8"; - license = lib.licenses.asl20; + homepage = "https://github.com/pycqa/doc8"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix index f4f2a36f5394..432f77220adc 100644 --- a/pkgs/development/python-modules/docstring-to-markdown/default.nix +++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "docstring-to-markdown"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XVTlSqqWmvnB5nvjvgGDJmg71KKTq2hHB4//QW7ugvA="; + sha256 = "0rflkbms94wkcypjcnz30bc4w4iww91h7sqq3j2b6ypzl4g48csa"; }; patches = [ diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 7fc0cb3b12ba..e43f7d7f2d1d 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.23.0"; + version = "11.25.0"; src = fetchFromGitHub { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "1zrwr73dirmkbkcpy8v49hb52xffh0k9wp2603aysg9435w1rxvx"; + sha256 = "1ln6m6wiym5608i26abs8a5nm4mnn7s3czhnpg9nyjyndnr7k0xj"; }; postPatch = '' diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 53913f77d2b5..e896e79908b6 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -1,21 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, - django, pillow +{ lib +, buildPythonPackage +, django +, fetchPypi +, pillow +, pytestCheckHook +, pythonOlder +, reportlab +, svglib }: buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.7.2"; + version = "2.8"; + format = "setuptools"; - meta = { - description = "Easy thumbnails for Django"; - homepage = "https://github.com/SmileyChris/easy-thumbnails"; - license = lib.licenses.bsd3; - }; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a7dd9cf97efaf70ba5d76484a962f08ba65b31f1681bc417257743650e9e8a8a"; + sha256 = "fd2249d936671847fc54a2d6c8c87bcca8f803001967dd03bab6b8bcb7590825"; }; - propagatedBuildInputs = [ django pillow ]; + propagatedBuildInputs = [ + django + pillow + svglib + reportlab + ]; + + # Tests require a Django instance which is setup + doCheck = false; + + pythonImportsCheck = [ + "easy_thumbnails" + ]; + + meta = with lib; { + description = "Easy thumbnails for Django"; + homepage = "https://github.com/SmileyChris/easy-thumbnails"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 152561b69cee..b8f75776217a 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "eliot"; - version = "1.13.0"; + version = "1.14.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5760194b308a7ab35514ae1b942d88e9f2359071556d82580383f09ca586fff7"; + sha256 = "c2f099a3e8d5ecfc22745766e7cc664a48db64b6b89d986dff270491d8683149"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index db1ff91ee0eb..77bbd480e9ba 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax"; - version = "0.1.3"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-OiVPjWqQw1u0OL6/uYlT+FP2XDh7l3OZyVtQfycHICI="; + sha256 = "sha256-EcYEpYv+EwwEfW8Sy7aQjFAPpmsA6qVbmlwrPdxdnEw="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 587dcf149231..f755d545598c 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.17"; + version = "0.5.18"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-viuBuyGzAUcfb4qSecZsDvoAU++FNhuwNJET/s0qyOI="; + sha256 = "1w2fclpmcb41k2a3226jk62hdclc8b18kxih2ads90r4yxgpxc8p"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index 0f2ca79d6411..a327c3f457d2 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , envoy-utils , fetchFromGitHub +, fetchpatch , httpx , pytest-asyncio , pytest-raises @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "envoy-reader"; version = "0.20.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jesserizzo"; @@ -37,7 +39,18 @@ buildPythonPackage rec { --replace "pytest-runner>=5.2" "" ''; - pythonImportsCheck = [ "envoy_reader" ]; + patches = [ + # Support for later httpx, https://github.com/jesserizzo/envoy_reader/pull/82 + (fetchpatch { + name = "support-later-httpx.patch"; + url = "https://github.com/jesserizzo/envoy_reader/commit/6019a89419fe9c830ba839be7d39ec54725268b0.patch"; + sha256 = "17vsrx13rskvh8swvjisb2dk6x1jdbjcm8ikkpidia35pa24h272"; + }) + ]; + + pythonImportsCheck = [ + "envoy_reader" + ]; meta = with lib; { description = "Python module to read from Enphase Envoy units"; diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 58c14699880e..1e5db008dea9 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -7,11 +7,12 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1"; + version = "4.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "c076794a511a34b5b91871c1cf6374dbc323ec69fca3f50eb718f20b171259d6"; + sha256 = "sha256-26ngXHjOkQrnWgY1GlWSR5GRqNxXCsDNbRinfpgTiHM="; }; checkInputs = [ @@ -24,7 +25,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest" ''; - pythonImportsCheck = [ "ephem" ]; + pythonImportsCheck = [ + "ephem" + ]; meta = with lib; { description = "Compute positions of the planets and stars"; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 24639b98e64b..038b66a8efed 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.32.0"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b"; + sha256 = "80144f489c1bb273a51b6f96ff9785a382d2866b9bab1f5bd748385019f4141f"; }; propagatedBuildInputs = [ dnspython greenlet pyopenssl six ] diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 4b4d6bdd7fc2..add6f3f90c56 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.1.2"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "92ae36ff5cf38428bd3695629b5065d161c658fb0de0faf2c20cd7a99dac3820"; + sha256 = "26696726cc70c019d1b76bb25e4823c93f0837ddc86bc4ea26c08165270b4d92"; }; propagatedBuildInputs = [ colorama tqdm ]; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index c0adaeaa5589..ff8c097d6ff3 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.12.0"; + version = "0.12.1.post1"; src = fetchPypi { inherit pname version; - sha256 = "d45ace0a813ae65f202ce0356eb29c40a5e8fde071e4d6b5be0a89587ebaeab2"; + sha256 = "e91e57d8298f3ccf4cce3c5e065bea6eb17033e3c5432b8a22214009c266b2ab"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 96ea9d4be1e8..ec3acfc775d0 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -4,17 +4,14 @@ , pythonOlder , brotlipy , zopfli -, fs , lxml , scipy , munkres , unicodedata2 , sympy -, matplotlib , reportlab , sphinx , pytestCheckHook -, pytest-randomly , glibcLocales }: @@ -34,13 +31,11 @@ buildPythonPackage rec { # all dependencies are optional, but # we run the checks with them + checkInputs = [ pytestCheckHook - pytest-randomly # etree extra lxml - # ufo extra - fs # woff extra brotlipy zopfli @@ -49,8 +44,6 @@ buildPythonPackage rec { munkres # symfont sympy - # varLib - matplotlib # pens reportlab sphinx @@ -72,6 +65,15 @@ buildPythonPackage rec { "test_ttcompile_timestamp_calcs" ]; + disabledTestPaths = [ + # avoid test which depend on fs and matplotlib + # fs and matplotlib were removed to prevent strong cyclic dependencies + "Tests/misc/plistlib_test.py" + "Tests/pens" + "Tests/ufoLib" + ]; + + meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index e2ebc07ae31b..e1ab3d9da89b 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.0.7"; # 2.0.6 breaks canonicaljson + version = "2.1.0"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a68f609d1af67da80b45519fdcfca2d60249c0a8c96e68279c1b6ddd92128204"; + sha256 = "0189168749ddea8601afd648146c502533f93ae33840eb76cd71f694742623cd"; }; pythonImportsCheck = [ @@ -34,6 +34,10 @@ buildPythonPackage rec { disabledTests = [ # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' "test_union" + # non-standard assertions + "test_repr" + "test_format" + "test_str" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 88aba1554445..0ab3778f55cf 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -20,14 +20,17 @@ buildPythonPackage rec { pname = "fs"; - version = "2.4.13"; + version = "2.4.14"; src = fetchPypi { inherit pname version; - sha256 = "caab4dc1561d63c92f36ee78976f6a4a01381830d8420ce34a78d4f1bb1dc95f"; + sha256 = "9555dc2bc58c58cac03478ac7e9f622d29fe2d20a4384c24c90ab50de2c7b36c"; }; buildInputs = [ glibcLocales ]; + + # strong cycle with paramaterized + doCheck = false; checkInputs = [ pyftpdlib mock psutil pytestCheckHook ]; propagatedBuildInputs = [ six appdirs pytz ] ++ lib.optionals (!isPy3k) [ backports_os ] diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 851f76128761..195a7e822d76 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -1,4 +1,5 @@ { lib +, beautifulsoup4 , buildPythonApplication , fetchPypi , filelock @@ -10,19 +11,31 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.0.2"; + version = "4.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XSYc3mCsFW+x6aZFDNtUE9lHv9vPUvkdsqmbtFX7aQw="; + sha256 = "bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc"; }; - propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; + propagatedBuildInputs = [ + beautifulsoup4 + filelock + requests + tqdm + setuptools + six + ]; checkPhase = '' $out/bin/gdown --help > /dev/null ''; + pythonImportsCheck = [ + "gdown" + ]; + meta = with lib; { description = "A CLI tool for downloading large files from Google Drive"; homepage = "https://github.com/wkentaro/gdown"; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index 2c54bc4910b5..7b37be48f100 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,37 +1,49 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, cached-property, frozendict, pystache, pyyaml, pytest, pytest-runner +{ lib +, buildPythonPackage +, cached-property +, chevron +, fetchPypi +, frozendict +, pystache +, pythonOlder +, pyyaml }: buildPythonPackage rec { pname = "genanki"; - version = "0.11.0"; + version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f2be87e3c2850bba21627d26728238f9655b448e564f8c70ab47caef558b63ef"; + sha256 = "f787ac440ff37a3ef3389030e992e3527f000f7a69498f797033ccfad07ebe62"; }; propagatedBuildInputs = [ - pytest-runner cached-property + chevron frozendict pystache pyyaml ]; - checkInputs = [ pytest ]; - - disabled = !isPy3k; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; # relies on upstream anki doCheck = false; - checkPhase = '' - py.test - ''; + + pythonImportsCheck = [ + "genanki" + ]; meta = with lib; { - homepage = "https://github.com/kerrickstaley/genanki"; description = "Generate Anki decks programmatically"; + homepage = "https://github.com/kerrickstaley/genanki"; license = licenses.mit; maintainers = with maintainers; [ teto ]; }; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index fcf2441b2e83..2a626c9c9ea8 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "4.4.0"; + version = "4.5.0"; pname = "geoip2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f150bed3190d543712a17467208388d31bd8ddb49b2226fba53db8aaedb8ba89"; + sha256 = "b542252e87eb40adc3a2fc0f4e84b514c4c5e04ed46923a3a74d509f25f3103a"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 0d5b46b4dd30..7e30b8e83f49 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.5.2"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "f3c5884d62be75162426728e3d86788740b13e363b197ef592f1443dba240709"; + sha256 = "d80ec9ff42b7219f33558185499d0b4365597fc55ff886207b45f5632e099780"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index a5fa11578146..0895270d6c9c 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "gitdb"; - version = "4.0.7"; + version = "4.0.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005"; + sha256 = "bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"; }; propagatedBuildInputs = [ smmap ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index ae6f465b1bf2..9d548b685efd 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -4,40 +4,67 @@ , google-auth , googleapis-common-protos , grpcio +, grpcio-status , protobuf , proto-plus , requests , mock , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-api-core"; - version = "2.1.0"; + version = "2.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XsJ7lCs00EVZy/NnRDC7g/w9dOfTK4u9McRGbnF0C4M="; + sha256 = "97349cc18c2bb2415f64f1353a80273a289a61294ce3eb2f7ce682d251bdd997"; }; propagatedBuildInputs = [ googleapis-common-protos google-auth grpcio + grpcio-status protobuf proto-plus requests ]; - checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - pythonImportsCheck = [ "google.api_core" ]; + disabledTests = [ + # Those grpc_helpers tests are failing + "test_wrap_unary_errors" + "test_wrap_stream_errors_raised" + "test_wrap_stream_errors_read" + "test_wrap_stream_errors_aiter" + "test_wrap_stream_errors_write" + "test_wrap_unary_errors" + "test___next___w_rpc_error" + "test_wrap_stream_errors_invocation" + "test_wrap_stream_errors_iterator_initialization" + "test_wrap_stream_errors_during_iteration" + "test_exception_with_error_code" + ]; + + pythonImportsCheck = [ + "google.api_core" + ]; meta = with lib; { description = "Core Library for Google Client Libraries"; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index b612a58c4f9e..185c7579e4f7 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,24 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi -, google-auth, google-auth-httplib2, google-api-core -, httplib2, six, uritemplate, oauth2client, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, google-auth +, google-auth-httplib2 +, google-api-core +, httplib2 +, uritemplate +, oauth2client +, setuptools +, pythonOlder +}: buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.25.0"; + version = "2.31.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dNgF7xC4sfWL04U53T0D+vEYj2TuPKQorAQtU59fVcc="; + sha256 = "3f64a5eee6fa03ab51806dccf48e342fda83fea60c290518c6a2dfdbf2de9efd"; }; + propagatedBuildInputs = [ + google-auth + google-auth-httplib2 + google-api-core + httplib2 + uritemplate + oauth2client + setuptools + ]; + # No tests included in archive doCheck = false; - propagatedBuildInputs = [ - google-auth google-auth-httplib2 google-api-core - httplib2 six uritemplate oauth2client setuptools - ]; - pythonImportsCheck = [ "googleapiclient" ]; diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 076d1e2da4f7..b51a5569a595 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.3.0"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KAD2360pxs7V+vnKDDjqi6Hr4lWbEMApvQIePeMwFic="; + sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index a3ecf1a6ec4b..05963856edce 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -1,20 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, google-api-core }: +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.8"; + version = "0.1.9"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "29101f61fa0e07db6385a94da45aef8edb4efde0d2b700fbbf65164c045744a8"; + sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "google-api-core[grpc] >= 1.26.0, < 2.0.0dev" "google-api-core[grpc] >= 1.26.0, < 2.0.1" - ''; - - propagatedBuildInputs = [ google-api-core ]; + propagatedBuildInputs = [ + google-api-core + ]; # No tests in repo doCheck = false; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index b96d61bf6724..5daa88ed9492 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.28.1"; + version = "2.30.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DiNT2X5SktyM5URHtxL7nolJbnFLXKz8PVNmFNHEYdw="; + sha256 = "4e3b5e3dcc475d5a601d84872ac0b63e059540be2251b1c4165c51106d572855"; }; propagatedBuildInputs = [ @@ -59,6 +60,8 @@ buildPythonPackage rec { "test_list_rows_page_size" "test_list_rows_scalars" "test_list_rows_scalars_extreme" + "test_dry_run" + "test_session" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" # requires network diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index ef02d0671b05..0351bd51e2ee 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NaH18CqG4PouKMZp8NtKdtkoZxoo+7u0k6tZup0cuak="; + sha256 = "476d1f71ab78089e0638e0aaf34bfdc99bab4fce8f4170ba6321a5243d13c5c7"; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 72d8e7ec60ab..0e0d5982c6e2 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "b4a3ba5bc93fb38008077335546daef9f5ea59a1b3accb98b0d07ca7fe6c6e37"; + sha256 = "136fb153740d4154d8c9ef306284f7f899399de45eef2c9027ca3e56249c4e2d"; }; propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index cf2ff18eddba..4872f7ac448a 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "973f33f4da9598a30769e27510fc0cd4470f9081ba694c6c589bb8c0b86a0a6d"; + sha256 = "2a25f7535f21cdeabfccb07fe4a75eae5a47bb36b82025537755b37d3376da46"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 28116c61f709..67a8daf6f997 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -5,6 +5,7 @@ , google-api-core , google-cloud-testutils , grpc-google-iam-v1 +, grpcio-status , libcst , mock , proto-plus @@ -14,6 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; version = "2.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -23,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core + grpcio-status libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 4a83a96be332..98c9f3163202 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "b99e11360668ed0c034c8cf3a34caf6fd4a52efaf62d54dd85407c3ad20b715c"; + sha256 = "b13e0a614b4865287a4b5fc43f4810d3d48fef7e24d9bcf54cb4bd93bfbb2bf2"; }; propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 5ad4c2a31f66..9d97437b8151 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.42.3"; + version = "1.43.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d1TU3KpFl1UUtATs4NortCkqy8Z8pVmmnhKhnVT82wY="; + sha256 = "f3b4f4be5c8a1b5727a8f7136c94d3bacdd4b7bf11f9553f51ae4c1d876529d3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 2c208511ee3f..24775464a120 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "3d79051b6ca170c2a4f159bf56ac3f66c1e5360486121e72c06fdaa3911154bf"; + sha256 = "9c60ea86b28998935875b5aea0b89b0a3aac5e433e0039236f633c5d0ff5f8b8"; }; propagatedBuildInputs = [ click google-auth six ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 5e0de87f44b9..06c1eeb857f9 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.7.1"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "e81beafa612f288fe74db55dd3a409f96cb01d2bac117bcd06a4e5b427d81476"; + sha256 = "e8e272ab54be00285c8f9451081d833980c9fc2a1eff828448dfe315dfa61250"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix index 171f87b5ddb2..b7424c44f6de 100644 --- a/pkgs/development/python-modules/gradient-utils/default.nix +++ b/pkgs/development/python-modules/gradient-utils/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gradient-utils"; - version = "0.3.2"; + version = "0.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Paperspace"; repo = pname; rev = "v${version}"; - sha256 = "083hnkv19mhvdc8nx28f1nph50c903gxh9g9q8531abv0w8m0744"; + sha256 = "19plkgwwfs6298vjplgsvhirixi3jbngq5y07x9c0fjxk39fa2dk"; }; postPatch = '' diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 556688323b1e..735dc03b6df7 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.8.9"; + version = "1.8.13"; src = fetchPypi { inherit pname version; - sha256 = "c05913efe7fcc9f75c1fe84c157d2c2cf3ec0983e132d418c6e59fabc6361a1e"; + sha256 = "0fa4a0553c28839e364d3aac27ec7292d26c1df27b8c54701d57eb7eda0b14f2"; }; postPatch = '' diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index 38c11cc4c8be..7a28bc08cda4 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "graphene"; - version = "3.0.0b8"; + version = "3.0.0"; src = fetchFromGitHub { owner = "graphql-python"; repo = "graphene"; rev = "v${version}"; - sha256 = "sha256-Pgln369s4qXdKqLxhX+AkgpDQm+MfSZ/OVmB1AaawHI="; + sha256 = "0qgp3nl6afyz6y27bw175hyqppx75pp1vqwl7nvlpwvgwyyc2mnl"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 1909dd99fe0f..8906af53ce19 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest-benchmark +, pytest-asyncio , pytestCheckHook , pythonOlder }: @@ -9,6 +10,8 @@ buildPythonPackage rec { pname = "graphql-core"; version = "3.1.6"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -19,11 +22,14 @@ buildPythonPackage rec { }; checkInputs = [ + pytest-asyncio pytest-benchmark pytestCheckHook ]; - pythonImportsCheck = [ "graphql" ]; + pythonImportsCheck = [ + "graphql" + ]; meta = with lib; { description = "Port of graphql-js to Python"; diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 2096f22a249c..10e7190d1fde 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "0.3"; + version = "0.3.1"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "v${version}"; - sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r"; + sha256 = "07dmfb1aplha01d22b41js7634dac4v28pv1l3bzssqhi4yyds7h"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 540d3027b94e..e4a3401109b4 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy3k , fetchPypi +, django , colorama , coverage , unidecode @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "green"; version = "3.3.0"; + format = "setuptools"; disabled = !isPy3k; @@ -29,17 +31,28 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - colorama coverage unidecode lxml + colorama + coverage + unidecode + lxml ]; # let green run it's own test suite checkPhase = '' - $out/bin/green -tvvv green + $out/bin/green -tvvv \ + green.test.test_version \ + green.test.test_cmdline \ + green.test.test_command ''; + pythonImportsCheck = [ + "green" + ]; + meta = with lib; { description = "Python test runner"; homepage = "https://github.com/CleanCut/green"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix new file mode 100644 index 000000000000..cb36e4387ef3 --- /dev/null +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, googleapis-common-protos +, grpc +, grpcio +, protobuf +, pythonOlder +}: + +buildPythonPackage rec { + pname = "grpcio-status"; + inherit (grpc) version; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "JVM8TWXX1ROmOPDEuIsrZnAOO/Q+aZWlWjvRXsC3eQI="; + }; + + propagatedBuildInputs = [ + googleapis-common-protos + grpcio + protobuf + ]; + + # Projec thas no tests + doCheck = false; + + pythonImportsCheck = [ + "grpc_status" + ]; + + meta = with lib; { + description = "GRPC Python status proto mapping"; + homepage = "https://github.com/grpc/grpc/tree/master/src/python/grpcio_status"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index 50140ef8308d..4fa9d62b7ac8 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "gruut-ipa"; - version = "0.9.3"; + version = "0.11.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d/AbvgAD3GHXpwhqjT5Xt9q7Kix+eFMX4kW2BywZWX0="; + sha256 = "08n79v60jhkz5vhychsicjz4bhz8v4gb2djmz5dfdaivyr0h3bsf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index e781c2127dab..f4f3a7eb13fa 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.5.0"; + version = "2.5.1"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "0zw3ihbzkldwijz9phwivnzwylj30a2a4lknfbwm6vkx78rdrb1a"; + sha256 = "00cy4lw7xnl2skfx7fg7cs1c8lrbaxvkym9j6zfi1dbvsdd0r103"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index ce2ba8d3730f..330172f56cee 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.7.0"; + version = "1.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "0ybijgsr4ra7x1w86sva4qljhm54ilm2zv4z0ry1r14kq9hmjfa4"; + sha256 = "1xdcnm66b07m7chf04pp58p3khvy547hns1fw1xffd4n51kl42pp"; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix index 3ec69d686952..04ba3b9520fa 100644 --- a/pkgs/development/python-modules/gviz-api/default.nix +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "gviz_api"; - version = "1.9.0"; + version = "1.10.0"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg"; + sha256 = "a05055fed8c279f34f4b496eace7648c7fe9c1b06851e8a36e748541f1adbb05"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index e555a41cfb0a..701b8f78f83b 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.4.0"; + version = "3.6.0"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ee1c683d91ab010d5e85cb61e8f9e7ee0d8eab545bf3dd50a9618f1d0e8f615e"; + sha256 = "8752d2814a92aba4e2b2a5922d2782d0029102d99caaf3c201a566bc0b40db29"; }; # avoid strict pinning of numpy diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 70b1a1fe5276..27c2167ff1dd 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.4.0"; + version = "10.4.1"; src = fetchPypi { inherit pname version; - sha256 = "64fd249a7fcabea60953fc3e7f08da6a85960aca367c04d078b999b7f6fd0246"; + sha256 = "b47d9a1e0af3d7b54edd646581ac3e3ab046a572368eeb22dfd89dff7f9964d2"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 69756083e5d8..eccdcdaed422 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hg-git"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "aae1c47328bb7f928778712654c3d5f100445190e2891f175dac66d743fdb2e8"; + sha256 = "27e6d7686a1548d4632dcc977f2ff3ce2e42d80735339b1f3b389b7481260cc4"; }; propagatedBuildInputs = [ dulwich mercurial ]; diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index e6759f498a32..cd7d523c2a7c 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { pname = "homematicip"; version = "1.0.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -42,6 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace homematicip/aio/connection.py \ + --replace ", loop=self._loop" "" + ''; + disabledTests = [ # Assert issues with datetime "test_contact_interface_device" @@ -67,7 +74,9 @@ buildPythonPackage rec { "test_websocket" ]; - pythonImportsCheck = [ "homematicip" ]; + pythonImportsCheck = [ + "homematicip" + ]; meta = with lib; { description = "Python module for the homematicIP REST API"; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 089c2d9fcc42..99eb08a35a9d 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -3,12 +3,14 @@ , pythonOlder , fetchFromGitHub , anyio +, certifi , h11 , h2 , pproxy , pytest-asyncio , pytestCheckHook , pytest-cov +, pytest-httpbin , sniffio , trio , trustme @@ -17,18 +19,19 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.13.7"; + version = "0.14.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-9hG9MqqEYMT2j7tXafToGYwHbJfp9/klNqZozHSbweE="; + sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo="; }; propagatedBuildInputs = [ anyio + certifi h11 h2 sniffio @@ -39,19 +42,12 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook pytest-cov + pytest-httpbin trio trustme uvicorn ]; - disabledTestPaths = [ - # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known - "tests/test_threadsafety.py" - "tests/async_tests/" - "tests/sync_tests/test_interfaces.py" - "tests/sync_tests/test_retries.py" - ]; - pythonImportsCheck = [ "httpcore" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index f73d81cc6aaa..fac9ecba6ce9 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -6,26 +6,30 @@ , flask , httpcore , httpx +, hypercorn , pytest-asyncio , pytest-trio , pytestCheckHook , python-socks , pythonOlder , sniffio +, starlette , trio , yarl }: buildPythonPackage rec { pname = "httpx-socks"; - version = "0.4.1"; + version = "0.7.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "romis2012"; repo = pname; rev = "v${version}"; - sha256 = "1rz69z5fcw7d5nzy5q2q0r9gxrsqijgpg70cnyr5br6xnfgy01ar"; + sha256 = "1wigmkhn4ymfr12z9vhdaimjcma9llicwrr29q0cc8xmy23f3445"; }; propagatedBuildInputs = [ @@ -40,13 +44,17 @@ buildPythonPackage rec { checkInputs = [ flask + hypercorn pytest-asyncio pytest-trio pytestCheckHook + starlette yarl ]; - pythonImportsCheck = [ "httpx_socks" ]; + pythonImportsCheck = [ + "httpx_socks" + ]; meta = with lib; { description = "Proxy (HTTP, SOCKS) transports for httpx"; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 014272bcc107..543308a3fdc1 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -9,6 +9,7 @@ , httpcore , rfc3986 , sniffio +, python , pytestCheckHook , pytest-asyncio , pytest-trio @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.19.0"; + version = "0.21.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-bUxxeUYqOHBmSL2gPQG5cIq6k5QY4Kyhj9ToA5yZXPA="; + sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc="; }; propagatedBuildInputs = [ @@ -50,12 +51,24 @@ buildPythonPackage rec { pythonImportsCheck = [ "httpx" ]; + # testsuite wants to find installed packages for testing entrypoint + preCheck = '' + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + disabledTests = [ # httpcore.ConnectError: [Errno 101] Network is unreachable "test_connect_timeout" # httpcore.ConnectError: [Errno -2] Name or service not known "test_async_proxy_close" "test_sync_proxy_close" + # sensitive to charset_normalizer output + "iso-8859-1" + "test_response_no_charset_with_iso_8859_1_content" + ]; + + disabledTestPaths = [ + "tests/test_main.py" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 9744a7487300..cf0b27c6c5b3 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -5,6 +5,7 @@ , filelock , importlib-metadata , packaging +, pyyaml , requests , ruamel-yaml , tqdm @@ -13,19 +14,20 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.0.18"; + version = "0.1.2"; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "v${version}"; - sha256 = "sha256-SxA7rAdKuSrSYFIuxG81lblPJOL69Yx4rBccVrbQa/g="; + sha256 = "1pmi76vinwwn0bcxy5hj8pxhzqxdbzp0y3hsd631yyys01s0n6xd"; }; nativeBuildInputs = [ packaging ]; propagatedBuildInputs = [ filelock + pyyaml requests ruamel-yaml tqdm diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix index d407ff95a010..605377a2ec39 100644 --- a/pkgs/development/python-modules/hyperopt/default.nix +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -1,29 +1,53 @@ -{ lib, fetchPypi, buildPythonPackage -, cloudpickle, numpy, future, networkx -, six, tqdm, scipy, pymongo +{ lib +, buildPythonPackage +, cloudpickle +, fetchPypi +, future +, networkx +, numpy +, py4j +, pymongo +, pyspark +, scipy +, six +, tqdm }: buildPythonPackage rec { pname = "hyperopt"; - version = "0.2.5"; + version = "0.2.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "bc6047d50f956ae64eebcb34b1fd40f186a93e214957f20e87af2f10195295cc"; + sha256 = "1bf89ae58050bbd32c7307199046117feee245c2fd9ab6255c7308522b7ca149"; }; - propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ]; + propagatedBuildInputs = [ + cloudpickle + future + networkx + numpy + py4j + pymongo + pyspark + scipy + six + tqdm + ]; # tries to use /homeless-shelter to mimic container usage, etc doCheck = false; - pythonImportsCheck = [ "hyperopt" ]; + pythonImportsCheck = [ + "hyperopt" + ]; meta = with lib; { description = "Distributed Asynchronous Hyperparameter Optimization"; - homepage = "http://hyperopt.github.com/hyperopt/"; - license = licenses.bsd2; - platforms = platforms.unix; + homepage = "http://hyperopt.github.io/hyperopt/"; + license = licenses.bsd2; + platforms = platforms.unix; maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 799d7e0702fe..4cf8acf70872 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.24.5"; + version = "6.27.1"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "+pPnMgbLdYbh0xqPewNOJRaL7VtxeN73wbHHuK0fNYo="; + sha256 = "05kfz041vrd9fy8gl8ch05g806jj4j6l1cnwhqgygagn9z3aq1jx"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 8c3c3670c424..1f8b4063dd79 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.13.0"; + version = "3.13.2"; src = fetchPypi { inherit pname version; - sha256 = "b27aec03e8c666b3e36c68b2331871f37a0c6c0467fe0f73462fda7300d3c19f"; + sha256 = "9c615b3a6e9d9dc1c69d8f38742b156e12408521fa180a66558bbb7b850bbbc2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index cb8636f135a8..dd0112860105 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "idna"; - version = "3.2"; + version = "3.3"; src = fetchPypi { inherit pname version; - sha256 = "467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"; + sha256 = "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index da5dfddcfb13..c027eba98742 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dlKGXjUUnyYmPDilo0LQg9OkSkBnMYNgzlFLIfI0T6I="; + sha256 = "11gvw0yqb3y5ddifs5f38bgslvfmw1bmd9rga1ynlrmmgmhxym6h"; }; checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 1672e798f304..f27c9fded9b2 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -7,15 +7,16 @@ , pillow , psutil , pytestCheckHook +, tifffile }: buildPythonPackage rec { pname = "imageio"; - version = "2.9.0"; + version = "2.12.0"; disabled = isPy27; src = fetchPypi { - sha256 = "52ddbaeca2dccf53ba2d6dec5676ca7bc3b2403ef8b37f7da78b7654bb3e10f0"; + sha256 = "c416dd68328ace8536ff333cbb8927954036be56e201fed416e53e8f95e08a6c"; inherit pname version; }; @@ -28,6 +29,7 @@ buildPythonPackage rec { checkInputs = [ psutil pytestCheckHook + tifffile ]; preCheck = '' @@ -36,6 +38,20 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" ''; + disabledTests = [ + # tries to pull remote resources, even with IMAGEIO_NO_INTERNET + "test_png_remote" + # needs git history + "test_mvolread_out_of_bytes" + "test_imiter" + "test_memory_size" + "test_legacy_write_empty" + ]; + + disabledTestPaths = [ + "tests/test_pillow.py" + ]; + meta = with lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "http://imageio.github.io/"; diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index 42cf6b50764d..0fbe88a520fe 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "imagesize"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"; + sha256 = "cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 21e371c1a48b..f18750af1ffb 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.4.1"; + version = "6.5.1"; src = fetchPypi { inherit pname version; - sha256 = "df3355e5eec23126bc89767a676c5f0abfc7f4c3497d118c592b83b316e8c0cd"; + sha256 = "dd27172bccbbcfef952991e49372e4c6fd1c14eed0df05ebd5b4335cb27a81a2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 7b844228225b..2065dc2349fd 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.28.0"; + version = "7.29.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11"; + sha256 = "4f69d7423a5a1972f6347ff233e38bbf4df6a150ef20fbb00c635442ac3060aa"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 0c46ecd8e1d3..6c0b15c41b37 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.6.1"; + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6cc15428bfcd5c7daae73c45c776b34056fe4d885a34192fb93efc80d6b9753f"; + sha256 = "fa8ff9b9a73b5a925c4af4c05f1839df2bd0fae0063871f403ee821792d5ab72"; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 125dc2691e5b..1cba03531b5b 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.29"; + version = "1.30"; src = fetchPypi { inherit pname version; - sha256 = "8245562ed713fd473520f81361cdc1b15835920e1ceb7d588678cd153e77c2b6"; + sha256 = "148b32a593f3d932a33daad01fdaa4639918eca74a6e153d9729dd8b3cba3345"; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index b68bcc303256..c8a9efdb54f8 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -1,16 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, pytest-asyncio }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, pytest-asyncio +, typing-extensions +}: buildPythonPackage rec { pname = "janus"; - version = "0.6.2"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "127edc891f9e13420dd12f230d5113fa3de7f93662b81acfaf845989edf5eebf"; + sha256 = "f10dcf5776e8d49cc30ec86d5eb7268eeec39abaa24fe0332ee8fb8fa3611845"; }; disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ + typing-extensions + ]; + checkInputs = [ pytest-asyncio pytestCheckHook ]; # also fails upstream: https://github.com/aio-libs/janus/pull/258 diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix new file mode 100644 index 000000000000..7be059359259 --- /dev/null +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "jaraco-context"; + version = "4.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.context"; + rev = "v${version}"; + sha256 = "O9Lwv2d/qbiXxIVCp6FLmVKaz0MzAUkoUd0jAyIvgJc="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonNamespaces = [ + "jaraco" + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "jaraco.context" ]; + + + meta = with lib; { + description = "Python module for context management"; + homepage = "https://github.com/jaraco/jaraco.context"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 3ad652af7643..1316c2b4e729 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314"; + sha256 = "659a64743047d00c6ae2a2aa60573c62cfc0b4b70eaa14fa50c80360ada32aa8"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 32e8aa23aeb4..054f68ba2f24 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -1,33 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , importlib-resources , jaraco_functools +, jaraco-context , setuptools-scm }: buildPythonPackage rec { pname = "jaraco.text"; - version = "3.5.1"; + version = "3.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ede4e9103443b62b3d1d193257dfb85aab7c69a6cef78a0887d64bb307a03bc3"; + sha256 = "901d3468eaaa04f1d8a8f141f54b8887bfd943ccba311fc1c1de62c66604dfe0"; }; - pythonNamespaces = [ "jaraco" ]; + pythonNamespaces = [ + "jaraco" + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; - nativeBuildInputs =[ setuptools-scm ]; propagatedBuildInputs = [ + jaraco-context jaraco_functools - ] ++ lib.optional (pythonOlder "3.7") [ importlib-resources ]; + ] ++ lib.optional (pythonOlder "3.9") [ + importlib-resources + ]; # no tests in pypi package doCheck = false; + pythonImportsCheck = [ + "jaraco.text" + ]; + meta = with lib; { description = "Module for text manipulation"; homepage = "https://github.com/jaraco/jaraco.text"; license = licenses.mit; maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index ce9a7758bc61..dd9680abcc0d 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "jax"; - version = "0.2.24"; + version = "0.2.25"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "jax-v${version}"; - sha256 = "1mmn1m4mprpwqlb1smjfdy3f74zm9p3l9dhhn25x6jrcj2cgc5pi"; + sha256 = "0f32is9896g4shfhjipj3rlgpjxci5y607lp8gxlgsdzdqfpckm2"; }; # jaxlib is _not_ included in propagatedBuildInputs because there are diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 8aead2738f40..90e4634b46c9 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.34.8"; + version = "0.34.11"; format = "pyproject"; src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mJGgDDjPZXde4M4OHwj81KYoaFXFAwOZ+v18YE+arFE="; + sha256 = "0gxpq93mfyzhjz5yvjwv2jjda1djpf20x38893ngswsm7lrh62x5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index ca96e63060da..8c7687511628 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jellyfin-apiclient-python"; - version = "1.7.2"; + version = "1.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A="; + sha256 = "a47d66166d1e9d3f0b38260004081bfd3fd9c07ca1b50181bbb980c4d7aeee34"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index f2b014ff5240..5613b904f63d 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.10.0"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8MP8YHIkxDqjPsUYv6ROmuRwcGMzPpsVCRwxga3XdYU="; + sha256 = "42ea423f44beafee0e985009124968e300447f6e3be4180e83568cf21520d1b1"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jinja2/2.nix b/pkgs/development/python-modules/jinja2/2.nix index 3cdf83a74db9..02127a50df74 100644 --- a/pkgs/development/python-modules/jinja2/2.nix +++ b/pkgs/development/python-modules/jinja2/2.nix @@ -21,7 +21,8 @@ buildPythonPackage rec { # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 - doCheck = !stdenv.is32bit || isPy3k; + # warnings are no longer being filtered correctly for python2 + doCheck = !stdenv.is32bit && isPy3k; checkPhase = '' pytest -v tests -W ignore::DeprecationWarning diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 7be9367da916..5d7ca68b19b7 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "3.0.2"; + version = "3.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"; + sha256 = "611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index b262e6883322..c091480f63c6 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "e9bcaf605411cadaec04841ae2d5f77ebb178b7b6df7c9aed1d97399ac18685b"; + sha256 = "40ef59f2f537ec01bafe698dad66281f6ccf4642f747411647db403ab8fa9a2d"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix new file mode 100644 index 000000000000..a9100e061d7b --- /dev/null +++ b/pkgs/development/python-modules/jschema-to-python/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchPypi +, attrs +, jsonpickle +, pbr +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jschema-to-python"; + version = "1.2.3"; + + src = fetchPypi { + pname = "jschema_to_python"; + inherit version; + sha256 = "76ff14fe5d304708ccad1284e4b11f96a658949a31ee7faed9e0995279549b91"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + attrs + jsonpickle + ]; + + checkInputs =[ + pytestCheckHook + ]; + + pythonImportsCheck = [ "jschema_to_python" ]; + + meta = with lib; { + description = "Generate source code for Python classes from a JSON schema"; + homepage = "https://github.com/microsoft/jschema-to-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index 39249c648f56..2bd41e0815b4 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.1"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "5a34b698db1eb79ceac454159d3f7c12a451a91f6334a4f638454327b7a89962"; + sha256 = "f09f8deecaaa5aea65b5eb4f67ca4e54e1a61f7a11c75085e360fe6feb6a48bf"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix index aec66d4ec4b7..d7080b71f79e 100644 --- a/pkgs/development/python-modules/jsonwatch/default.nix +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jsonwatch"; - version = "0.2.0"; + version = "0.6.0"; disabled = isPyPy; # doesn't find setuptools src = fetchFromGitHub { owner = "dbohdan"; repo = "jsonwatch"; rev = "v${version}"; - sha256 = "sha256-yLN6jOxAz+B7zvV3tGT6Nxi17v9ZOtWpbtSi0o1h48U="; + sha256 = "0abmyv3nrfqhjmfnvpn4q3yc05a1gamfxj5frlbn1lidzzhb8rac"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index b543008988ea..9cb465947551 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.0.6"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "8b6e06000eb9399775e0a55c52df6c1be4766666209c22f90c2691ded0e338dc"; + sha256 = "a5f995a73cffb314ed262713ae6dfce53c6b8216cea9f332071b8ff44a6e1654"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index f83ba1362341..a7dd89a1f89a 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.8.1"; + version = "4.9.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ef210dcb4fca04de07f2ead4adf408776aca94d17151d6f750ad6ded0b91ea16"; + sha256 = "dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa"; }; checkInputs = [ pytest mock glibcLocales nose ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 686be89d2a7e..ab2900a2f88b 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.3"; + version = "3.2.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7d74593e52d4dbfacbb98e14cac4bc765ea2cffb1b980675f44930d622871705"; + sha256 = "f692e0d95338d60f72dde660f16f3955a087775c59ec541ddb25952e3f97e9b1"; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 0079194f4fa7..f5efb24633bb 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "k5test"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c"; + sha256 = "2c9181133f3d52c8e29a5ba970b668273c08f855e5da834aaee2ea9efeb6b069"; }; patches = [ diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index ad7d87138569..08eeed7141ae 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "karton-dashboard"; version = "1.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "CERT-Polska"; @@ -28,7 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "Flask==1.1.1" "Flask" \ - --replace "prometheus-client==0.9.0" "prometheus-client" + --replace "prometheus-client==0.10.0" "prometheus-client" ''; # Project has no tests. pythonImportsCheck requires MinIO configuration diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 53b83fe95755..319461b98344 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.2.1"; + version = "5.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f262a2adc71b53e5b7dad4933bbdee65d8766ca4df6a9043b13edaad2144aaec"; + sha256 = "0f5d0763fb916808f617b886697b2be28e6bc35026f08e679697fc814b48a608"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 5c7d7afedc43..ba7579d10670 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.6.1"; + version = "3.10.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "v${version}"; - sha256 = "0mix7ajdvyhyvi8nwmxz62mzwl3242h2pzj84zikrmh1ampwvg3g"; + sha256 = "0afrzxy8hmsvqp84mf89k7sqlzzyh6xwp2pz5abj0981mqlzf2x9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 292a13d7bd09..e3454acd5cd9 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -3,30 +3,48 @@ , marisa-trie , pythonOlder , fetchPypi -, nose +, poetry-core +, pytestCheckHook +, language-data }: buildPythonPackage rec { pname = "langcodes"; - version = "3.2.1"; - disabled = pythonOlder "3.3"; + version = "3.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "779a6da5036f87b6b56c180b2782ab111ddd6aa9157670a9b918402b0e07cd93"; + sha256 = "794d07d5a28781231ac335a1561b8442f8648ca07cd518310aeb45d6f0807ef6"; }; - propagatedBuildInputs = [ marisa-trie ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ nose ]; + propagatedBuildInputs = [ + language-data + marisa-trie + ]; - checkPhase = '' - nosetests - ''; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: assert 'Unknown language [aqk]' == 'Aninka' + "test_updated_iana" + ]; + + pythonImportsCheck = [ + "langcodes" + ]; meta = with lib; { - description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish"; - homepage = "https://github.com/LuminosoInsight/langcodes"; + description = "Python toolkit for working with and comparing the standardized codes for languages"; + homepage = "https://github.com/LuminosoInsight/langcodes"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix new file mode 100644 index 000000000000..98d4885b1e94 --- /dev/null +++ b/pkgs/development/python-modules/language-data/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, marisa-trie +, poetry-core +, pythonOlder +}: + +buildPythonApplication rec { + pname = "language-data"; + version = "1.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "rspeer"; + repo = "language_data"; + rev = "v${version}"; + sha256 = "51TUVHXPHG6ofbnxI6+o5lrtr+QCIpGKu+OjDK3l7Mc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + marisa-trie + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "language_data" + ]; + + meta = with lib; { + description = "Supplement module for langcodes"; + homepage = "https://github.com/rspeer/language_data"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 84c3ad8c614d..ff489f4cf222 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.38"; + version = "0.1.41"; src = fetchPypi { inherit pname version; - sha256 = "df1fffc4f586eaa95b8cf910176d28997e65a3ecd43d9c0af34e46078b6b6ee3"; + sha256 = "7246a1a0442a63aff0b5de2796d306f0033e1937b3c9b9c2a92c9101cde4fe8d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 712b15f17f22..774cb572e95b 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -9,13 +9,14 @@ , python , pythonOlder , pyyaml +, setuptools-scm , typing-extensions , typing-inspect }: buildPythonPackage rec { pname = "libcst"; - version = "0.3.21"; + version = "0.3.23"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,9 +25,21 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "063bl21gyyd25i2v0j6kz29cxxdfhng2nins4i2qblmac90f2nqy"; + sha256 = "1r4aiqpndqa75119faknsghi7zxyjrx5r6i7cb3d0liwiqrkzrvx"; }; + postPatch = '' + # test try to format files, which isn't necessary when consuming releases + sed -i libcst/codegen/generate.py \ + -e '/ufmt/c\ pass' + ''; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ hypothesis typing-extensions diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 1753b0dce8c1..ba45ffbdeac4 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.10.9"; + version = "2021.11.20"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "907a4a0765ab29ccd1c2247efa0eda7a9bd82d3be3a2ecfdeb9b9e6fbb9aa56e"; + sha256 = "da9c33497a09b4ed0cff6ed44954bbde6cb317edb68d56c73ef235128a802c11"; }; postPatch = '' diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 984219b802b7..60deaa5af127 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.6.3"; + version = "4.6.4-5"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${pname}-${version}"; - sha256 = "1rhkv75qr4ij3653l97sy752gyp6f20sxfpiqp1vp08fpy47q8qn"; + rev = "lxml-${version}"; + sha256 = "159cc48nl40qsx8pc8sasgny5xc0s3y0xrq3w3aw53s3ijncsgfl"; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 180264f102d0..cc84fa75c699 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "3.1.3"; + version = "3.1.10"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; + rev = version; + sha256 = "0a4gic8xh3simkk5k8302rxwf765pr6y63k3js79mkl983vpxcim"; }; nativeBuildInputs = [ setuptools-scm pkgconfig pytest-runner ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 0e874d25f679..a9ecee77dce9 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo , which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection -, certifi, pillow +, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging , enableGhostscript ? true, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -17,30 +17,64 @@ let in buildPythonPackage rec { - version = "3.4.3"; + version = "3.5.0"; pname = "matplotlib"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "06032j0ccjxldx4z9kf97qps2g36mfgvy1nap3b9n75kzmnm4kzw"; + sha256 = "38892a254420d95594285077276162a5e9e9c30b6da08bdc2a4d53331ad9a6fa"; }; XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + setuptools-scm + setuptools-scm-git-archive + ]; - buildInputs = [ which sphinx ] - ++ lib.optional enableGhostscript ghostscript - ++ lib.optional stdenv.isDarwin [ Cocoa ]; + buildInputs = [ + which + sphinx + ] ++ lib.optional enableGhostscript [ + ghostscript + ] ++ lib.optional stdenv.isDarwin [ + Cocoa + ]; - propagatedBuildInputs = - [ cycler python-dateutil numpy pyparsing tornado freetype qhull - kiwisolver certifi libpng mock pytz pillow ] - ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] - ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] - ++ lib.optionals enableQt [ pyqt5 ]; + propagatedBuildInputs = [ + certifi + cycler + fonttools + freetype + kiwisolver + libpng + mock + numpy + packaging + pillow + pyparsing + python-dateutil + pytz + qhull + tornado + ] ++ lib.optionals enableGtk3 [ + cairo + gobject-introspection + gtk3 + pycairo + pygobject3 + ] ++ lib.optionals enableTk [ + libX11 + tcl + tk + tkinter + ] ++ lib.optionals enableQt [ + pyqt5 + ]; passthru.config = { directories = { basedirlist = "."; }; @@ -52,7 +86,9 @@ buildPythonPackage rec { enable_lto = false; }; }; + setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config); + preBuild = '' cp "$setup_cfg" ./setup.cfg ''; @@ -74,6 +110,12 @@ buildPythonPackage rec { substituteInPlace src/_c_internal_utils.c \ --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 + '' + + # avoid matplotlib trying to download dependencies + '' + echo "[libs] + system_freetype=true + system_qhull=true" > mplsetup.cfg ''; # Matplotlib needs to be built against a specific version of freetype in @@ -86,5 +128,4 @@ buildPythonPackage rec { license = with licenses; [ psfl bsd0 ]; maintainers = with maintainers; [ lovek323 veprbl ]; }; - } diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index c7aa300928f0..0c5b58714933 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.11.3"; + version = "0.12.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eZ8fWemS808Hz6KoQWfMsk5WfaO+vj0kTyInhtE20Qk="; + sha256 = "c8d226a96e57d52bb532d7e572ba5670d2e2143f720063a4bbd04a77049030d4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 169928e48b68..6f13e63b9341 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mayavi"; - version = "4.7.3"; + version = "4.7.4"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "Zw0AI7nNLSNGxFHbm6L2HaI6XfUDOyWuqJy22BuUZPA="; + sha256 = "ec50e7ec6afb0f9224ad1863d104a0d1ded6c8deb13e720652007aaca2303332"; }; postPatch = '' diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index b87b87a1e4b8..b07f68401e25 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.27.5"; + version = "0.28.1"; src = fetchPypi { inherit pname version; - sha256 = "0aqq9zil6h7kxsg3v2008nr6lv47qvcsash8qzmi1xh6r4x606zy"; + sha256 = "3b57eb7b3b332614dcba1fa53c8cc1253dbccf962b111517ea16cbecce9a11d5"; }; propagatedBuildInputs = [ ipykernel ]; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index abd79d22dc16..255c9039ae97 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.20.2"; + version = "1.21.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b15ff0c7e5e64f864a0b40c99b9a582227315eca2065d9f831db9aeb8f24637b"; + sha256 = "5524a371f19c66a18e7ebe9b1085a77f63a6ae514271e487428f28187d79fc8f"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 8739c0812833..7225e695c878 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.0"; + version = "3.10.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1fcb4203ae257145b97c865135b3a064b47f20f42dde88c8579f43d88f1a7dfb"; + sha256 = "c77e75432c21108e5a28a529793eb2b82753b6f7050ac9f59fc5d7a72fa74c0f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index a03b3a06c393..21f0b70f63ac 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.10.0"; + version = "8.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HevKvrHfeTgUhZ1kqBrXyxBQTCQ0k2jM8hTGZMR09B8="; + sha256 = "7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 262e5d5ecd0e..3feeca74ccd6 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "msgpack"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1109s2yynrahwi64ikax68hx0mbclz8p35afmpphw5dwynb49q7s"; + sha256 = "51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index b7a0f39990ea..ad1e321e9f84 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.0.3"; + version = "2.1.0"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432"; + sha256 = "973235686f1b720536d417bf0a0d39b4ab3d5086b2b6ad5e6752393428c02b12"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 0aad9299f5b9..3c9d625db70f 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "natsort"; - version = "7.1.1"; + version = "7.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "00c603a42365830c4722a2eb7663a25919551217ec09a243d3399fa8dd4ac403"; + sha256 = "e7054b4e1f47365f141602a742685165a552291b643a214652d0dd9d6cea58d1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index a6b09cbe31e9..400d59272ee1 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.2.0"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - sha256 = "16ceecd0afaa8fd26c245fa32e2c52066c02f13aa73387fffafd84750baea863"; + sha256 = "5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a"; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 8d0c597a1af0..68a544c9ab07 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -49,12 +49,12 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.6.1"; + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8428cfc633d8e3b8c5650e241e9eedcf637b7969bcd40f3423334d4c6b0992b5"; + sha256 = "e689fe2e5049598c9cd3708e8df1cac732fa1a88696f283e3bc0a70fecb8ab51"; }; postPatch = '' diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index d17ad5884f37..b40a95ded33e 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.4"; + version = "6.4.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "26b0095c568e307a310fd78818ad8ebade4f00462dada4c0e34cbad632b9085d"; + sha256 = "7bcdf79bd1cda534735bd9830d2cbedab4ee34d8fe1df6e7b946b3aab0902ba3"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index fef5dfb163bd..945828fbc19f 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.21.2"; + version = "1.21.4"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc"; + sha256 = "e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index db2043a6f929..9bb807784ca7 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "0.59.0"; + version = "0.60.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PfdgzScjmKv6yM6+Yu64LLxJe7JdTdcHV290qM6avw0="; + sha256 = "aa6efead2ac116482f29aecc2c14ba3b4c76a6f8dede93bf296a2b65492ef420"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 6c7935c39b9a..b63baa80b397 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.44.1"; + version = "1.44.2"; src = fetchPypi { inherit pname version; - sha256 = "ec0f40465fad5260a1b2c1ad39dc12c5df65828e171bf2aafb13c1c3883628ba"; + sha256 = "4ce0827bc41d5bf5558284c18048344343f7c4c6e280b64bbe53fb51ab454892"; }; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 476a2433ee07..880a5afdce63 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,11 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.3"; + version = "1.3.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "272c8cb14aa9793eada6b1ebe81994616e647b5892a370c7135efb2924b701df"; + sha256 = "a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc"; }; nativeBuildInputs = [ cython ]; @@ -91,6 +92,8 @@ buildPythonPackage rec { "test_from_coo" # AssertionError: No common DType exists for the given inputs "test_comparison_invalid" + # AssertionError: Regex pattern '"quotechar" must be string, not int' + "python-kwargs2" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 3f6875f4986f..cfb95b23f41c 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -17,7 +17,7 @@ let in buildPythonPackage rec { pname = "panel"; - version = "0.12.1"; + version = "0.12.5"; # Don't forget to also update the node packages # 1. retrieve the package.json file @@ -25,7 +25,7 @@ buildPythonPackage rec { # 3. node2nix src = fetchPypi { inherit pname version; - sha256 = "e4898d60abdb82f8a429df7f59dbf8bcaf7e19b3e633555512ceb4ce06678458"; + sha256 = "351481f2a2176359b28effa64c9d9fce487d6758514109cab96f9ed84787ae99"; }; # Since 0.10.0 panel attempts to fetch from the web. diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 88d63f0de93f..86cdb73b2607 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -13,15 +13,18 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.7.2"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"; + sha256 = "e673b10ee0f1c80d46182d3af7751d033d9b573dd7054d2d0aa46be186c3c1d2"; }; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; + # with python 3.9.6+, the deprecation warnings will fail the test suite + # see: https://github.com/pyinvoke/invoke/issues/829 + doCheck = false; checkInputs = [ invoke pytestCheckHook pytest-relaxed mock ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index ab4aeba84b69..53743052f4e4 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "parsy"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bfc941ea5a69e6ac16bd4f7d9f807bbc17e35edd8b95bcd2499a25b059359012"; + sha256 = "7c411373e520e97431f0b390db9d2cfc5089bc1d33f4f1584d2cdc9e6368f302"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index bc15e5e9f2a6..244b51f3f844 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , nose +, python +, pytestCheckHook , six , paste , pastedeploy @@ -23,10 +25,22 @@ buildPythonPackage rec { six ]; - checkInputs = [ nose ]; + # test suite seems to unset PYTHONPATH + doCheck = false; + checkInputs = [ nose pytestCheckHook ]; pythonNamespaces = [ "paste" ]; + disabledTestPaths = [ + "appsetup/testfiles" + ]; + + pythonImportsCheck = [ + "paste.script" + "paste.deploy" + "paste.util" + ]; + meta = with lib; { description = "A pluggable command-line frontend, including commands to setup package file layouts"; homepage = "https://github.com/cdent/pastescript/"; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index d9887b626afa..8775faa53c24 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.7.0"; + version = "5.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1dvkqixz227bhhk7c9r2bwcm7kmkfqyxw1bkha0jf3z88laclla6"; + sha256 = "672d8ebee84921862110f23fcec2acea191ef58543d34dfe9ef3d9f13c31cddf"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 202e6fdaf6a8..093e3e67ab23 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.16.1"; + version = "0.16.2"; disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; rev = "v${version}"; - sha256 = "0q2zag77drcjkjm0cbvy2sf6fq2a4yl5li1zv1xfwmy53ami9b5l"; + sha256 = "013kpj2df5grkrzxak22k01mskpmwf7g3aa1fmxdwi90bb1sabs5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 2ba18dd92e4e..2ff55f732cd5 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "a067c121654917ecbe07fbd71c807c34bbdb1ea029e269ddd11925ee7e191d3f"; + sha256 = "2a9aa89bc62022408781b39d188fabf5a3ad1103b6630f32c4e27e395f7966ee"; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 8a95acc211d2..438360260822 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -1,21 +1,21 @@ { lib , buildPythonPackage , fetchPypi -, setuptools +, flit-core }: buildPythonPackage rec { pname = "pex"; - version = "2.1.55"; - format = "setuptools"; + version = "2.1.56"; + format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "1f6b60b9c50996ec3476e36dddff34afa98dc2d68fa73ed121d3c41232df1379"; + sha256 = "8dfb7ef551cc9d3d03a6e2dc1b1ba6183cd94f3cde7431836f017d60cc992d53"; }; nativeBuildInputs = [ - setuptools + flit-core ]; # A few more dependencies I don't want to handle right now... diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index c6bb944c232b..e0f29d366e10 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.3.2"; + version = "8.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1361y215ydmdh4il1vay5831aqivmpwgzjqrphqjdiq0ipnz7qyx"; + sha256 = "b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 62bab6694d79..9d54eef4d706 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.3.1"; + version = "6.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9"; + sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 5ef6c785fed0..c4811044ae2b 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.3.1"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6598393e898a9c5ae78397f76f07002ec41fd92e5f746d3b9806248d53885643"; + sha256 = "735d50738c760ecbf3a38e2336b8c1b119bff2d857096e4f68af31089b798161"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 2534ebcedf91..28a67f1da82e 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,16 +19,21 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.15.2"; + version = "0.15.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "sha256-VmLQ3L9FTHgdRPYmMg7ZoUApLEGKd5NANrSofhP1OQY="; + sha256 = "sha256-HaH0LcH6L3R9vLT0vlM1absMTbfqgEeVi/aP2FqdnQY="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "aiohttp==3.8.0" "aiohttp>=3.8.0" + ''; + propagatedBuildInputs = [ aiohttp async-timeout diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 278caa44b143..a99591c259d9 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.7.0"; + version = "1.7.1"; checkInputs = [ pytest ]; @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "317744342c755319907c773cc87c3a30adaa3a41b0d34c0ce02d9d1904922dce"; + sha256 = "3c0ac8c4ee57b2adddc82909d3c738a62ef5f77faf24ec7cb6f0a117e1679740"; }; } diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index a9e3930f67f4..86bbd847aa28 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.11.18"; + version = "0.11.19"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = version; - sha256 = "sha256-1wpy4WofqrPusOI2BHRqSHfXlRpbuLOx97egzSAbB8E="; + sha256 = "sha256-zYX2MMFIgts5brFb/hsgLHZbY5mncqnCmk7nGdxj/BM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index ddaa842e9b11..85aaa1e656d8 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.2.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6d465005573a5c058d4ca343449a5b28c21252b86afcdfa168cdc6a440f0b24c"; + sha256 = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 9a01769695ac..6c7cede280cf 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "client_python"; rev = "v${version}"; - sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg"; + sha256 = "1a0kllal5vkkdv325k0mx1mha2l9808mcz4dqx6qrgfskz8c2xjl"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index a6d60567ef96..dd2494729efd 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.19.4"; + version = "1.19.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "416dc38b090ca2093f6fac74977ac4a5599e496483a43c0076e6f6a4dd77ed9c"; + sha256 = "bdf45f0e0be71510eb2ec9db4da78afde7b5fb8b0a507a36340a9b6ce8e48e58"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 1af8fd38bad8..34660a84cd60 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.1"; + version = "2.9.2"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0z0v2d5gpgy0wf2ypqxv955c9k44yszd7r20km5s79yhy6k06lyy"; + sha256 = "a84da9fa891848e0270e8e04dcca073bc9046441eeb47069f5c0e36783debbea"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 3459c5c99742..81e1627324ad 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,37 +1,49 @@ { lib , buildPythonPackage +, dataclasses , isPy3k , fetchPypi , jedi , pygments , urwid +, urwid-readline , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pudb"; - version = "2021.1"; + version = "2021.2.2"; + format = "setuptools"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e"; + sha256 = "82a524ab4b89d2c701b089071ccc6afa9c8a838504e3d68eb33faa8a8abbe4cb"; }; propagatedBuildInputs = [ jedi pygments urwid + urwid-readline + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook ]; preCheck = '' export HOME=$TMPDIR ''; - checkInputs = [ - pytest-mock - pytestCheckHook + pythonImportsCheck = [ + "pudb" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index ce7abe4dc273..c1cf60ca4d77 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.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"; + sha256 = "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"; }; # Circular dependency on pytest diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 6ad9673b9755..cf24d21e17f5 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.9.2"; + version = "0.10.9.3"; src = fetchPypi { inherit pname version; - sha256 = "624f97c363b8dd84822bc666b12fa7f7d97824632b2ff3d852cc491359ce7615"; + sha256 = "0d92844da4cb747155b9563c44fc322c9a1562b3ef0979ae692dbde732d784dd"; }; # No tests in archive diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 8642c9affbdc..cbab9bacfb81 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "21.8.3"; + version = "21.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oWNtY8R2MooHIT0LcRG7Y1cPGrij7d9gUiYwJQwj2XU="; + sha256 = "c6519fee13bf06e3bb3f20cacdea8eba9140385a7c2546df5dbae4887f768383"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index daa879a58a0d..3ad29916575a 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.13.2"; + version = "0.14.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "9692013af3b86b096b5423b88179c6c9b604baff5a6b6f89ba5f40429feb7a3e"; + sha256 = "73c4d03aad333f2a7cb4405abe96f55a33cffa4b5a2d23fad6ac5767c45562ef"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index 5fe7cab1cdb2..c8283f93c512 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycparser"; - version = "2.20"; + version = "2.21"; src = fetchPypi { inherit pname version; - sha256 = "2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"; + sha256 = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index 7e95c60be828..6626ee19d920 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydeck"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1zi0gqzd0byj16ja74m2dm99a1hmrlhk26y0x7am07vb1d8lvvsy"; + sha256 = "907601c99f7510e16d27d7cb62bfa145216d166a2b5c9c50cfe2b65b032ebd2e"; }; pythonImportsCheck = [ "pydeck" ]; diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 32f0dde17af8..dd166b78f862 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pydmd"; - version = "0.3.3"; + version = "0.4"; src = fetchFromGitHub { owner = "mathLab"; repo = "PyDMD"; rev = "v${version}"; - sha256 = "1516dhmpwi12v9ly9jj18wpz9k696q5k6aamlrbby8wp8smajgrv"; + sha256 = "1qwa3dyrrm20x0pzr7rklcw7433fd822n4m8bbbdd7z83xh6xm8g"; }; propagatedBuildInputs = [ future numpy scipy matplotlib ]; diff --git a/pkgs/development/python-modules/pydocstyle/2.nix b/pkgs/development/python-modules/pydocstyle/2.nix deleted file mode 100644 index 9ce4ffc0f816..000000000000 --- a/pkgs/development/python-modules/pydocstyle/2.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder -, snowballstemmer, six, configparser -, pytest, mock, pathlib }: - -buildPythonPackage rec { - pname = "pydocstyle"; - version = "2.1.1"; - - # no tests on PyPI - # https://github.com/PyCQA/pydocstyle/issues/302 - src = fetchFromGitHub { - owner = "PyCQA"; - repo = pname; - rev = version; - sha256 = "1h0k8lpx14svc8dini62j0kqiam10pck5sdzvxa4xhsx7y689g5l"; - }; - - propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; - - checkInputs = [ pytest mock ] ++ lib.optional (pythonOlder "3.4") pathlib; - - checkPhase = '' - # test_integration.py installs packages via pip - py.test --cache-clear -vv src/tests -k "not test_integration" - ''; - - meta = with lib; { - description = "Python docstring style checker"; - homepage = "https://github.com/PyCQA/pydocstyle/"; - license = licenses.mit; - maintainers = with maintainers; [ dzabraev ]; - }; -} diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 36c61ace8563..0658e1857174 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,33 +1,40 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, mock -, pytest +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub , snowballstemmer +, pytestCheckHook }: buildPythonPackage rec { pname = "pydocstyle"; - version = "5.0.2"; + version = "6.1.1"; disabled = !isPy3k; + format = "setuptools"; + src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "03z8miyppm2xncrc9yjilwl7z5c5cpv51zha580v64p8sb2l0j7j"; + sha256 = "sha256-j0WMD2qKDdMaKG2FxrrM/O7zX4waJ1afaRPRv70djkE="; }; - propagatedBuildInputs = [ snowballstemmer ]; + propagatedBuildInputs = [ + snowballstemmer + ]; - checkInputs = [ pytest mock ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - # test_integration.py installs packages via pip - py.test --cache-clear -vv src/tests -k "not test_integration" - ''; + disabledTestPaths = [ + "src/tests/test_integration.py" # runs pip install + ]; meta = with lib; { description = "Python docstring style checker"; - homepage = "https://github.com/PyCQA/pydocstyle/"; + homepage = "https://github.com/PyCQA/pydocstyle"; license = licenses.mit; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 317691066f47..a2815c3e1e2d 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -1,24 +1,52 @@ { lib , buildPythonPackage , fetchPypi +, nose +, numpy +, setuptools-scm , six +, pytestCheckHook }: buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.2"; + version = "0.6.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "d1258f8d053cba0c90fe329254e8ec59eb28b535b48d9d06e8c7f1d74b8e4531"; + sha256 = "93adf036a75e08dc9b1dcd59de6a4db2f65a48c603edabe2e499764b6535ed50"; }; - propagatedBuildInputs = [ six ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + nose + numpy + pytestCheckHook + ]; + + disabledTests = [ + # PyPI releases don't ship all the needed files for the tests + "test_index_zero_length" + "test_fetch_zero_length" + "test_read_back_index" + ]; + + pythonImportsCheck = [ + "pyfaidx" + ]; meta = with lib; { homepage = "https://github.com/mdshw5/pyfaidx"; description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; license = licenses.bsd3; - maintainers = [ maintainers.jbedo ]; + maintainers = with maintainers; [ jbedo ]; }; } diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 217e552aa0e1..eb5eb993ef48 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.1"; + version = "4.5.3"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "002a065dcbf59c2caa039e4fc4ba01d1d636aa63ee9c794d4c9fc01f0e2d6dc0"; + sha256 = "f49db689c1d5db6172131479ca77bd474ba2cb886c869b9867fb89cdab2df397"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 27bfcff16d81..ab4ca1efdc15 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "602bffa8b4dbc185a6c7f36515563b600e0ee9002583c97ae3150eedaf340edb"; + sha256 = "d7faa29558436decc2e78110f38d6677eb366b683ba5cdc2803d47195711165d"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 1aa96dfe464d..12378cfd72d1 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -1,34 +1,66 @@ -{ lib, buildPythonPackage, fetchPypi -, eradicate, mccabe, pycodestyle, pydocstyle, pyflakes -, pytest, ipdb }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, git +, eradicate +, mccabe +, mypy +, pycodestyle +, pydocstyle +, pyflakes +, vulture +, pytestCheckHook +}: buildPythonPackage rec { pname = "pylama"; - version = "7.7.1"; + version = "8.0.6"; - src = fetchPypi { - inherit pname version; - sha256 = "9bae53ef9c1a431371d6a8dca406816a60d547147b60a4934721898f553b7d8f"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "klen"; + repo = "pylama"; + rev = version; + sha256 = "sha256-Olq/CZ/t1wqACoknAKsvdDKnyLZkxRtHokpu33I3trg="; }; + patches = [ + (substituteAll { + src = ./paths.patch; + git = "${lib.getBin git}/bin/git"; + }) + ]; + propagatedBuildInputs = [ eradicate mccabe + mypy pycodestyle pydocstyle pyflakes + vulture ]; - checkInputs = [ pytest ipdb ]; + checkInputs = [ + pytestCheckHook + ]; - # tries to mess with the file system - doCheck = false; + disabledTests = [ + "test_pylint" # infinite recursion + "test_quotes" # FIXME package pylama-quotes + "test_radon" # FIXME package radon + ]; + + pythonImportsCheck = [ + "pylama.main" + ]; meta = with lib; { description = "Code audit tool for python"; homepage = "https://github.com/klen/pylama"; - # ambiguous license declarations: https://github.com/klen/pylama/issues/64 - license = [ licenses.lgpl3 ]; + license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pylama/paths.patch b/pkgs/development/python-modules/pylama/paths.patch new file mode 100644 index 000000000000..ab6a4719f354 --- /dev/null +++ b/pkgs/development/python-modules/pylama/paths.patch @@ -0,0 +1,13 @@ +diff --git a/pylama/hook.py b/pylama/hook.py +index 029c9dc..9f1a9b9 100644 +--- a/pylama/hook.py ++++ b/pylama/hook.py +@@ -26,7 +26,7 @@ def run(command: str) -> Tuple[int, List[bytes], List[bytes]]: + + def git_hook(error=True): + """Run pylama after git commit.""" +- _, files_modified, _ = run("git diff-index --cached --name-only HEAD") ++ _, files_modified, _ = run("@git@ diff-index --cached --name-only HEAD") + + options = parse_options() + setup_logger(options) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 4bf6c4ad93e8..a2814c5b18ea 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -6,6 +6,7 @@ , installShellFiles , astroid , isort +, GitPython , mccabe , platformdirs , toml @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.11.1"; + version = "2.12.1"; disabled = pythonOlder "3.6"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "08kc9139v1sd0vhna0rqikyds0xq8hxv0j9707n2i1nbv2z6xhsv"; + sha256 = "0vvf5b9cwp85mcz7j7zn2pa1m5avmnadi4z50jh3dga9njp8hl97"; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ buildPythonPackage rec { ''; checkInputs = [ + GitPython pytest-benchmark pytest-xdist pytestCheckHook @@ -56,6 +58,7 @@ buildPythonPackage rec { # calls executable in one of the tests preCheck = '' export PATH=$PATH:$out/bin + export HOME=$TEMPDIR ''; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 50dc87a926f2..66eb934a2a9d 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.17"; + version = "2.4.18"; src = fetchPypi { inherit pname version; - sha256 = "84e2af4d8099afd37c5d887261a168e7bde4ec2354f12f65c72dad1a4cd8f21d"; + sha256 = "ee40af9fad9c054237800cc835df5c0975504de13e5c29001be496893083fa83"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 0d18175d7e6d..6b627ca672ff 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.12.0"; + version = "3.12.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I="; + sha256 = "704879b6a54c45ad76cea7c6789c1ae7185050acea7afd15b58318fa1932ed45"; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 4d8dbee2c2e7..c98fb6dddcf8 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.2.0"; + version = "6.2.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1r3jfjg4cpdilrmlyml514hqmjgabyrrs4cvmdr56rylg1sp4gf3"; + sha256 = "18ae0f83ec2dc20892b98c84127ce9149ab40fa3c3120097377e1506884b27b8"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 41cdcad20385..2f65aa899e39 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.17.0"; + version = "0.18.0"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "sha256-RDeBq6pwBGCBNIn8YOPQr96GuL6FKEYeLAPQD6XN0iE="; + sha256 = "042ca27r6634xg2ixgvq1079cp714wmm6ml7bwc1snn0wxxzywfg"; }; nativeBuildInputs = [ samtools ]; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 3ec6392f884c..9e09724624c2 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.15.1"; + version = "0.16.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f"; + sha256 = "7496c5977ce88c34379df64a66459fe395cd05543f0a2f837016e7144391fcfb"; }; buildInputs = [ pytest ] diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 0ae23ff57276..74e4c77c0fa2 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.11.0"; + version = "0.11.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "efcb24a366d3b033d343298c2a60eae418b06803c85373450f10306815c7c632"; + sha256 = "b7a0aeb79b85ee81a3c72c49019b4bfeb57fa920abaa6c17ba8be3be9c5290f1"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index b0bc07b6c162..819c0a14832f 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.13.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "0lh7df3ysxmjzvx6242xb6qiwpfxrnj70kjmw5sndvzmy5dfpxfc"; + sha256 = "08dxvjkxlnam3r0yp17495d1vksyawzzkpykacjql1gi6hqlfrwg"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 577400b859eb..a3f57ff40e7a 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2"; + sha256 = "ef6f04193dc0f7e8df5b27b3a8834318fa12eaf025436d2a99afff1b73cde761"; }; propagatedBuildInputs = [ werkzeug ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b8f4814e533f..f71522a40dc6 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { "test_rsync_report" "test_init_rsync_roots" "test_rsyncignore" + # flakey + "test_internal_errors_propagate_to_controller" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index 8346074c9c51..fe421fa55d38 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "8.1.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "b57b432b2ac9161c2482a569a023211d2d3d0ada81c4da62c8f6e47f0b2bf82d"; + sha256 = "7b2f08a2d1cc05d2c1f84f02fadb2208678b1acb501acfe2de33720078ec7b9f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 22bf7ea7ece4..774ca6855aee 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.19.0"; + version = "0.19.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"; + sha256 = "a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 7189a235deda..e26e60c43ec4 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.4.7"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7"; + sha256 = "b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7"; }; # Let's make the library default to our gpg binary diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 39597afa8540..4aa8d853ebdb 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.2.4"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "0c1g46hpzjhqbjcmv6xm3by3jprcjhzjslqzrp95hdkbykvrgs5x"; + sha256 = "067dlhwwv4mkrirnmqinrvkbfx59hf7fiah081d62a46vxvpnv9s"; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 5ffe1a1ea730..aea8b6dab303 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "2d90af35c5beccc53fa6b0f5a3c4b330a065e86924c33c42b017f18943ab2b05"; + sha256 = "d53f69238cdc454c0297f513e0b481a039d0bac723990ebd5ab9d3d29633956e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index dcf268808275..e6c2d016bb09 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -1,17 +1,48 @@ -{ lib, buildPythonPackage, trio, curio, async-timeout, fetchPypi, pythonOlder }: +{ lib +, async-timeout +, buildPythonPackage +, curio +, fetchFromGitHub +, flask +, pytest-asyncio +, pytest-trio +, pythonOlder +, pytestCheckHook +, trio +, yarl +}: buildPythonPackage rec { pname = "python-socks"; - version = "1.2.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "1n6xb18jy41ybgkmamakg6psp3qididd45qknxiggngaiibz43kx"; - }; + version = "2.0.0"; + format = "setuptools"; disabled = pythonOlder "3.6.1"; - propagatedBuildInputs = [ trio curio async-timeout ]; + src = fetchFromGitHub { + owner = "romis2012"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-iTwlUyfTD2ZhOvBX3IDqjkeW4Z2tfKxvQjIV7GGBVJA="; + }; + + propagatedBuildInputs = [ + trio + curio + async-timeout + ]; + + checkInputs = [ + flask + pytest-asyncio + pytest-trio + pytestCheckHook + yarl + ]; + + pythonImportsCheck = [ + "python_socks" + ]; meta = with lib; { description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index adb675c0db55..cb3b5b850e36 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.12.0"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MTtEShTQ+bYoy/PoxS8sQnFlj56KM9QiKFHC5PD3t6A="; + sha256 = "b200dcfbc6842bd4cac29efd0ea9ef34d3b8625957472ba7aa3ae0242437e2cc"; }; propagatedBuildInputs = [ pbr python-keystoneclient ]; diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix index 423f87c1f7d3..27289a13d5d6 100644 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/pkgs/development/python-modules/pytwitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytwitchapi"; - version = "2.5.0"; + version = "2.5.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "0sbzl9a4zxnvnvkmmmfc9c157dgq7y6qfb2cid5nym6jhxkixnqk"; + sha256 = "091p9yx0cc7aclj76s1n1jdzkypicy9b2mxgmk2fym5viqlgpbkk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index c3eb750783fd..b25d9d3b5ae4 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.15"; + version = "2.1.16"; src = fetchPypi { inherit pname version; - sha256 = "8bca4077dbdc1434dcbc6759407367b6561e3505aa9555b1bc0b45989dcf50b2"; + sha256 = "654c03014a15f846786807a2ece6f525a8fec883d1c857742c8e37da149a81ed"; }; nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index 66c996a487ba..cbd7681c63f9 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.1.1"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1a64b40f6acb4ffbaccce0545d7fc641744f95351f62e4c6aaa40549326008c9"; + sha256 = "6cbd69b047bb4e00873097472133425f5f08a4e6bc8b3f0ae709274d4d5e9a8d"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/pywick/default.nix b/pkgs/development/python-modules/pywick/default.nix index c675686ef833..0db11576203a 100644 --- a/pkgs/development/python-modules/pywick/default.nix +++ b/pkgs/development/python-modules/pywick/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pywick"; - version = "0.5.6"; + version = "0.6.5"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "achaiah"; repo = pname; rev = "v${version}"; - sha256 = "1gmlifnv9kji0d1jwg1pa8d96zg48w17qg0sgxwy1y1jf3hn37bm"; + sha256 = "0wnijdvqgdpzfdsy1cga3bsr0n7zzsl8hp4dskqwxx087g5h1r84"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 9d6a483071be..b56e80eb80c7 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.1.1"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "bbc34bca14f65535afcb401bc74b752bac955e5313001ba640383f7e5857dc49"; + sha256 = "bb3b9f0d674055e627c1097779c0d5e028176706d3b6be39cf52235f6ddcc88e"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 1d7b4e95e854..7498c9c1e0f2 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.6.4"; + version = "1.6.5"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a79877781b8e8e9bd5612faebd3991d75d7189f2941021d2adea9b4b4c5b9b7b"; + sha256 = "512d2aca27c4515e55743852e0ab227190739d9595d2c4b6ae97b23d1a2bdd26"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 3de6f2038038..ab74662e3b4c 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rcssmin"; - version = "1.0.6"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya"; + sha256 = "27fc400627fd3d328b7fe95af2a01f5d0af6b5af39731af5d071826a1f08e362"; }; # The package does not ship tests, and the setup machinary confuses diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 873a39244fe3..c9c5011da617 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; + sha256 = "722fefbd253d0bbcbf5250b7b9c4aca5722cde4ca38bfbf863a551a5fc26edfa"; }; checkInputs = [ sphinx pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 71d4cd7425d1..de2b799a051b 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.6.1"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "68f9324000cfc5570b5a59a92306691b5d655078a399f20bc72c2581fe903261"; + sha256 = "f0c4b47b012d893b0b9f5703cf6f01b5593714a3fc1e7dc73efbbfe26bb7e16a"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index 0a023dab8714..17a8191455ae 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -4,36 +4,43 @@ , cryptography , requests , pykerberos +, pyspnego , pytestCheckHook +, pytest-mock , mock }: buildPythonPackage rec { pname = "requests-kerberos"; - version = "0.12.0"; + version = "0.13.0"; # tests are not present in the PyPI version src = fetchFromGitHub { owner = "requests"; repo = pname; rev = "v${version}"; - sha256 = "1qw96aw84nljh9cip372mfv50p1yyirfgigavvavgpc3c5g278s6"; + sha256 = "0yvfg2cj3d10l8fd8kyal4hmpd7fd1c3bca13cj9ril5l573in76"; }; + # avoid needing to package krb5 + postPatch = '' + substituteInPlace setup.py \ + --replace "pyspnego[kerberos]" "pyspnego" + ''; + propagatedBuildInputs = [ cryptography requests pykerberos + pyspnego ]; checkInputs = [ mock pytestCheckHook + pytest-mock ]; - # they have a setup.py which mentions a test suite that doesn't exist... - patches = [ ./fix_setup.patch ]; - pythonImportsCheck = [ "requests_kerberos" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch b/pkgs/development/python-modules/requests-kerberos/fix_setup.patch deleted file mode 100644 index 67cc3a60f77e..000000000000 --- a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ./setup.py 1980-01-02 00:00:00.000000000 +0000 -+++ ./setup.py 1980-01-02 00:00:00.000000000 +0000 -@@ -56,6 +56,5 @@ - ':sys_platform=="win32"': ['winkerberos>=0.5.0'], - ':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'], - }, -- test_suite='test_requests_kerberos', - tests_require=['mock'], - ) diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 0d7f509b4a0e..d085d43008bb 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.17.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "0w8idh6l2iq04ydz7r2qisq9jsxq8wszkx97kx4g3yjwg4ypvc6k"; + sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index 4e47915bdf76..5be65fee2395 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -1,27 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, pythonPackages }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, selectors2 +}: buildPythonPackage rec { pname = "rfc6555"; - version = "0.0.0"; + version = "0.1.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "05sjrd6jc0sdvx0z7d3llk82rx366jlmc7ijam0nalsv66hbn70r"; + src = fetchFromGitHub { + owner = "sethmlarson"; + repo = pname; + rev = "v${version}"; + sha256 = "Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM="; }; - propagatedBuildInputs = with pythonPackages; [ selectors2 ]; + propagatedBuildInputs = [ + selectors2 + ]; - checkInputs = with pythonPackages; [ mock pytest ]; - # disabling tests that require a functional DNS IPv{4,6} stack to pass. - patches = [ ./disable_network_tests.patch ]; - # default doCheck = true; is not enough, apparently - postCheck = '' - py.test tests/ - ''; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Disabling tests that require a functional DNS IPv{4,6} stack to pass + "test_create_connection_has_proper_timeout" + ]; + + pythonImportsCheck = [ + "rfc6555" + ]; meta = with lib; { description = "Python implementation of the Happy Eyeballs Algorithm"; - homepage = "https://pypi.org/project/rfc6555"; + homepage = "https://github.com/sethmlarson/rfc6555"; license = licenses.asl20; maintainers = with maintainers; [ endocrimes ]; }; diff --git a/pkgs/development/python-modules/rfc6555/disable_network_tests.patch b/pkgs/development/python-modules/rfc6555/disable_network_tests.patch deleted file mode 100644 index dc59111ac43f..000000000000 --- a/pkgs/development/python-modules/rfc6555/disable_network_tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tests/test_create_connection.py b/tests/test_create_connection.py -index fe38026..cdb26b4 100644 ---- a/tests/test_create_connection.py -+++ b/tests/test_create_connection.py -@@ -6,10 +6,12 @@ from .test_utils import requires_network - - - class _BasicCreateConnectionTests(object): -+ - @requires_network - def test_create_connection_google(self): - sock = rfc6555.create_connection(('www.google.com', 80)) - -+ @requires_network - @pytest.mark.parametrize('timeout', [None, 5.0]) - def test_create_connection_has_proper_timeout(self, timeout): - sock = rfc6555.create_connection(('www.google.com', 80), timeout=timeout) -diff --git a/tests/test_ipv6.py b/tests/test_ipv6.py -index 3ee8564..f0db28e 100644 ---- a/tests/test_ipv6.py -+++ b/tests/test_ipv6.py -@@ -2,7 +2,9 @@ import socket - import mock - import rfc6555 - -+from .test_utils import requires_network - -+@requires_network - def test_ipv6_available(): - assert rfc6555._detect_ipv6() - diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index ff330289734d..98c26c7a7ff3 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.12.0"; + version = "10.14.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "1qq4k0pxq3r0463z4h65i9rb8cvilpnqmparklj5y5qk6svz0y2n"; + sha256 = "1j1m1064gmy07ah4crds5sd0k7dcwvf2b1z6rvjfvq4v9fx962qv"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index d78c445a3e56..2dbc72b1d0ca 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi"; + sha256 = "6c529feb6c400984452494c52dd9fdf59185afeacca2afc5174a28ab37751a1b"; }; # The package does not ship tests, and the setup machinary confuses diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 82a5fd3fed67..e72a72308643 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.7.0"; + version = "3.8.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "55bd5a11bb1fe60a5a83446e6a3e1e81b13fc671e3b660aa55912a263c1f63aa"; + sha256 = "aedf8a02bcb7344404cf8575d0ada25d6c7dc2fcb65de2113c4e07c63d2446c2"; }; # unit tests are impure diff --git a/pkgs/development/python-modules/rpcq/default.nix b/pkgs/development/python-modules/rpcq/default.nix index 671038c8b468..82db76bc859f 100644 --- a/pkgs/development/python-modules/rpcq/default.nix +++ b/pkgs/development/python-modules/rpcq/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "rpcq"; version = "3.9.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -42,7 +43,14 @@ buildPythonPackage rec { --replace "msgpack>=0.6,<1.0" "msgpack" ''; - pythonImportsCheck = [ "rpcq" ]; + disabledTests = [ + # Test doesn't work properly on Hydra + "test_client_backlog" + ]; + + pythonImportsCheck = [ + "rpcq" + ]; meta = with lib; { description = "The RPC framework and message specification for rigetti Quantum Cloud services"; diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index b4668e3d2eaf..ccfd237862d7 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.7.2"; + version = "4.8"; src = fetchPypi { inherit pname version; - sha256 = "9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9"; + sha256 = "5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 2ed6361b256e..e8a8bbea801b 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2021.10.1"; + version = "2021.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-STriUFPlJiVSokep8cOiyPvNIPWQf85jp0kSa6WP4F4="; + sha256 = "3c23eac1fa5b685c9d507950b24f75929e8bcd1ea98b9a95cf2a9cb66ee6c9f5"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index ece8af476d87..3df0a94cf8e5 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.63.1"; + version = "2.69.0"; src = fetchPypi { inherit pname version; - sha256 = "924847e9793b76d188049718aabbcad975296bb267812ad18e0279e7af0cb748"; + sha256 = "8e9051a44a82be07e32d83cfc12d724fd1cb76f83ade34cd9e69c45a8d37c676"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index 38d73d461c2d..c854017ae782 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -1,24 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, sanic, sanic-testing, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, sanic +, sanic-testing +, pytestCheckHook +}: buildPythonPackage rec { pname = "Sanic-Auth"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198"; }; - propagatedBuildInputs = [ sanic ]; + propagatedBuildInputs = [ + sanic + ]; - checkInputs = [ pytestCheckHook sanic-testing ]; + checkInputs = [ + pytestCheckHook + sanic-testing + ]; - pythonImportsCheck = [ "sanic_auth" ]; + postPatch = '' + # Support for httpx>=0.20.0 + substituteInPlace tests/test_auth.py \ + --replace "allow_redirects=False" "follow_redirects=False" + ''; + + pythonImportsCheck = [ + "sanic_auth" + ]; meta = with lib; { description = "Simple Authentication for Sanic"; homepage = "https://github.com/pyx/sanic-auth/"; license = licenses.bsdOriginal; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 6161f5c5eb02..2fab2a3df889 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -12,6 +12,7 @@ , pytest-benchmark , pytest-sugar , pytestCheckHook +, pythonOlder , sanic-routing , sanic-testing , ujson @@ -22,13 +23,16 @@ buildPythonPackage rec { pname = "sanic"; - version = "21.9.1"; + version = "21.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TRrJr/L8AXLAARPjhBi2FxNh+jvxxdeMN24cT1njmqY="; + sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i"; }; postPatch = '' @@ -85,6 +89,10 @@ buildPythonPackage rec { "test_auto_reload" "test_no_exceptions_when_cancel_pending_request" "test_ipv6_address_is_not_wrapped" + # Failure of the redirect tests seems to be related to httpx>0.20.0 + "test_redirect" + "test_chained_redirect" + "test_unix_connection" # These appear to be very sensitive to output of commands "test_access_logs" "test_auto_reload" @@ -99,7 +107,9 @@ buildPythonPackage rec { # for the same local port __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "sanic" ]; + pythonImportsCheck = [ + "sanic" + ]; meta = with lib; { description = "Web server and web framework"; diff --git a/pkgs/development/python-modules/sarif-om/default.nix b/pkgs/development/python-modules/sarif-om/default.nix new file mode 100644 index 000000000000..b7b334ebf9ba --- /dev/null +++ b/pkgs/development/python-modules/sarif-om/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi +, attrs +, pbr +}: + +buildPythonPackage rec { + pname = "sarif-om"; + version = "1.0.4"; + + src = fetchPypi { + pname = "sarif_om"; + inherit version; + sha256 = "cd5f416b3083e00d402a92e449a7ff67af46f11241073eea0461802a3b5aef98"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + attrs + ]; + + pythonImportsCheck = [ "sarif_om" ]; + + # no tests included with tarball + doCheck = false; + + meta = with lib; { + description = "Classes implementing the SARIF 2.1.0 object model"; + homepage = "https://github.com/microsoft/sarif-python-om"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index c3445c1d3ad9..bf836fa45831 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.2.20211104054942"; + version = "8.2.20211116214159"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1crKyAON8iZBYxP6bhj0MxV3fSpnCh3Lqp8x91KLBT8="; + sha256 = "0c737af600e0a03dd97c93b9867e862463b65d95580ba711fd22f542bc80ad00"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 0f76efe2ea59..d8240fd83333 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.10"; + version = "0.4.11"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "0x6ba02f3sba9341nhyg9jdcbl9c1h880d8m75ybdpbn7zlaya1d"; + sha256 = "18r5nk8d5y79ihzjkjm5l0hiw2sjgj87px7vwb0bxbs73f5v353b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index e7ac79b42837..b717432a653e 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,23 +19,14 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.24.1"; + version = "1.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "oDNKGALmTWVgIsO/q1anP71r9LEpg0PzaIryFRgQu98="; + sha256 = "sha256-rCyp27dU1hz+HIO6hINJjvlR0puT7AnW8AKEfyEKmdo="; }; - patches = [ - # This patch fixes compatibility with numpy 1.20. It was merged before 0.24.1 was released, - # but for some reason was not included in the 0.24.1 release tarball. - (fetchpatch { - url = "https://github.com/scikit-learn/scikit-learn/commit/e7ef22c3ba2334cb3b476e95d7c083cf6b48ce56.patch"; - sha256 = "174554k1pbf92bj7wgq0xjj16bkib32ailyhwavdxaknh4bd9nmv"; - }) - ]; - buildInputs = [ pillow glibcLocales diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 2e19d2d42042..9c3b28e0a9ac 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.7.1"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "6b47d5fa7ea651054362561a28b1ccc8da9368a39514c1bbf6c0977a1c376764"; + sha256 = "ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf"; }; nativeBuildInputs = [ cython gfortran pythran ]; diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index c8663478d882..5586fa238323 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pytest-asyncio , pytestCheckHook }: @@ -20,6 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index d1095b199972..c190093bb30f 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -32,14 +32,24 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Tests fail because of AttributeError:... + "TestKDEPlotBivariate" + "TestBoxPlotter" + "TestCatPlot" + "TestKDEPlotUnivariate" + "test_with_rug" + "test_bivariate_kde_norm" + ]; + pythonImportsCheck= [ "seaborn" ]; - meta = { + meta = with lib; { description = "Statisitical data visualization"; homepage = "https://seaborn.pydata.org/"; - license = with lib.licenses; [ bsd3 ]; - maintainers = with lib.maintainers; [ fridh ]; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 58fa81b444f3..1637814cadd2 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "secp256k1"; - version = "0.13.2"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c"; + sha256 = "82c06712d69ef945220c8b53c1a0d424c2ff6a1f64aee609030df79ad8383397"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index a91be0151119..8a35d3ed71a6 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -6,13 +6,14 @@ buildPythonPackage rec { pname = "Send2Trash"; - version = "1.5.0"; + version = "1.8.1b0"; + format = "pyproject"; src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; rev = version; - sha256 = "1c76zldhw2ay7q7r00nnzcampjz9lkqfcbzqpm0iqp5i6bmmv30v"; + sha256 = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; }; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index b7349caa233f..afda360b4127 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b9844751e40710e84a457c5bc29b21c383ccb2b63d76eeaad72f7f1c808c8828"; + sha256 = "789a11a87ca02491896e121efdd64e8fd93327b69e8f2f7d42f03e2569648e88"; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 128dacfd55a8..fbd43953b592 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "shap"; - version = "0.39.0"; + version = "0.40.0"; disabled = isPy27; src = fetchFromGitHub { owner = "slundberg"; repo = pname; rev = "v${version}"; - sha256 = "065c40k6g8sy6ynzk4k8k7iddl18g2b6kb9kg4m6g7npclmn5wvp"; + sha256 = "0ra0dp319qj13wxaqh2vz4xhn59m9h3bfg1m6wf3cxsix737b1k4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index f1c1efbc0ec2..5b7aad436fe1 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -2,21 +2,25 @@ , buildPythonPackage , isPy3k , fetchPypi +, django , pep8 }: buildPythonPackage rec { pname = "shortuuid"; - version = "1.0.1"; + version = "1.0.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3c11d2007b915c43bee3e10625f068d8a349e04f0d81f08f5fa08507427ebf1f"; + sha256 = "9435e87e5a64f3b92f7110c81f989a3b7bdb9358e22d2359829167da476cfc23"; }; - buildInputs = [pep8]; + checkInputs = [ + django + pep8 + ]; meta = with lib; { description = "A generator library for concise, unambiguous and URL-safe UUIDs"; diff --git a/pkgs/development/python-modules/simple-di/default.nix b/pkgs/development/python-modules/simple-di/default.nix index 4977c3a4bf14..612d913b7b6f 100644 --- a/pkgs/development/python-modules/simple-di/default.nix +++ b/pkgs/development/python-modules/simple-di/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "simple_di"; - version = "0.1.2"; + version = "0.1.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0wqbfbajnwmkzih0jl3mncalr7dslvmwhb5mk11asqvmbp1xhn30"; + sha256 = "2667f2b9095e86c7726b3853c30b37f527f7d247282c7dd0b3428a7fb5d1a8a9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 52e55c71aff0..1e6def5ae78a 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.17.5"; + version = "3.17.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1vljsd5bk12gasadkxcddwhmp38fj64x1aqi4frk3frq9lp8h3a1"; + sha256 = "1irlp5sakbdfcf717qmrx0r9rjlmwk0vza6zm3y55d32zw5c1cxg"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 4966e8c8fb28..179ab7ce1bfc 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "smpplib"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "3d513178a35573f66faac4ef2127c4bd73307ddb463d145b17b013cf709d9ddd"; + sha256 = "c0b01947b47e404f42ccb59e906b6e4eb507963c971d59b44350db0f29c76166"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 5f3029de2a70..a1813fac54e2 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snowballstemmer"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"; + sha256 = "09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"; }; # No tests included diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 3f4ec9a0f561..af6cd8defc7a 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.6.2"; + version = "2.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ce131b1dd059a4d081e78595d618654bf9b9fc184d78352f24512375467257d1"; + sha256 = "81175ff9fe0355a7e9007a087458dddc0816985ec10dc122e690de03549afbff"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 954599ffefaa..6c50cc6e1150 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.2.1"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc"; + sha256 = "b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 32506c2d9e74..95ba3c946343 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -11,31 +11,21 @@ buildPythonPackage rec { pname = "spacy-alignments"; - version = "0.8.3"; + version = "0.8.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-zrqBjaIjtF6bJMbmw7Zo+BeApN6sxxfLkrzsDjdvC78="; + sha256 = "sha256-1HApl/RZ0w5Tf2OPu1QBUa36uIqilp+dDbPjujn0e9s="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit patches src; + inherit src; name = "${pname}-${version}"; - hash = "sha256-YRyG2yflEXKklNqXiDD9oK3J1lq4o704+Eeu2hyY3xI="; + sha256 = "sha256-oFSruBnoodv6/0/OrmJ/2SVoWm3u3FGtzVJ9xgp0+Cg="; }; - patches = [ - # Add Cargo.lock, from upstream PR: - # https://github.com/explosion/spacy-alignments/pull/3 - (fetchpatch { - url = "https://github.com/explosion/spacy-alignments/commit/7b0ba13ff0d245bfbbe344a36fb7bbd311dd4906.diff"; - sha256 = "sha256-jx97SSC+3z+ByInNs8Uq58H50eCo4fDCwEi6VKxRs2k="; - excludes = [ ".gitignore" ]; - }) - ]; - nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index d959ad8947d6..0d095cfef07e 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -29,13 +29,13 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.1.3"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WAhOZKJ5lxkupI8Yq7MOwUjFu+edBNF7pNL8JiEAwqI="; + sha256 = "68e54b2a14ce74eeecea9bfb0b9bdadf8a4a8157765dbefa7e50d25a1bf0f2f3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 374838df54f0..75693f3657e4 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "sphinx"; - version = "4.2.0"; + version = "4.3.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "129x3kljxq7sbg5cc12z3cmjsili6l3qrsxllkx97id1a85f7zmj"; + sha256 = "sha256-8Yj6cPZFG8ycbbZtMR+fsIAOX0brxroi6nYjP+WhnxA="; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 08a87a2f7c02..d20fdafee1a8 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-978aPtaqUDHcswDdFynzi+IjDYaBmCZDZk+dmDkhajY="; + sha256 = "0iri6sh6h7l1p8xg04bj3bphs1hwxh43sfnrv1c8b1wy84w988y9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 25389f2784ed..38558f004984 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.1.5"; + version = "5.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f9ce23187f5de18f489fb03c38d884e4484b9c7292f9831faaa029fb7752fc93"; + sha256 = "cd04acc88426acee9c4ce6bb91f50c13fc161a437e68bca701243b3415ce9d08"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index b2715b4d29ed..ec18a1ee76d0 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.17.1"; + version = "3.19"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0cfde0c46a2d4c09d6df8609fe53642bc3ab443bcef3106d8f1eabeb3fccbe3d"; + sha256 = "509099fce5f25faada6e76b6fb90e8ef5ba0f1715177933a816718be0c8e7244"; }; postPatch = '' diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 9b76edc1bae5..1d74a62babd4 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "273a6382cc98a404d20779351cd5bb12e746397fbe18a8e9ccec4ae3c0ffa0e2"; + sha256 = "73fa9769214a310486d7916453a09bd38b07d28a9dcbdf27719183c1d7d949f6"; }; postPatch = '' diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index a8c451ebf9a9..ddb3a314f0a7 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.62.0"; + version = "2.63.0"; src = fetchPypi { inherit pname version; - sha256 = "1fb51d67a961ea889c5be324f020535ed511c6f483bd13a07f48f6e369fa8df0"; + sha256 = "816c935e31d82737a9e4362c662e8702bdf9000ea1bd36882cd4cbd23eb81ae1"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 3d1a8f8af674..2e90d3350dbe 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub +, pytestCheckHook , pytest-asyncio -, python-rapidjson , pretend , freezegun , twisted @@ -14,25 +13,23 @@ buildPythonPackage rec { pname = "structlog"; - version = "21.2.0"; + version = "21.4.0"; + format = "flit"; - src = fetchPypi { - inherit pname version; - sha256 = "7ac42b565e1295712313f91edbcb64e0840a9037d888c8954f11fa6c43270e99"; + # sdist is missing conftest.py + src = fetchFromGitHub { + owner = "hynek"; + repo = "structlog"; + rev = version; + sha256 = "sha256-uXFSrC1TvQV46uu0sadC3eMq7yk5TnrpQE8m6NSv1Bg="; }; - checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] - ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ]; + checkInputs = [ pytestCheckHook pytest-asyncio pretend freezegun simplejson twisted ]; propagatedBuildInputs = [ six ]; - checkPhase = '' - # rm tests/test_twisted.py* - py.test - ''; - meta = { description = "Painless structural logging"; - homepage = "http://www.structlog.org/"; + homepage = "https://github.com/hynek/structlog"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index a72ca40c21a1..a1cdd5b84e0e 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; rev = "v${version}"; - sha256 = "0x5kac8fqsi3fkfwjdn0d7anslprxaz6cizky9cyj0rpbp0b0yc3"; + sha256 = "1h3mqz570s9rc45d217xrykcy8f4fnpyk178smam2fzynlr90gd8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 80d86c3edb01..ac8a55e24d80 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.3.1"; pname = "taskw"; src = fetchPypi { inherit pname version; - sha256 = "7673d80b3d5bace5b35eb71f5035e313a92daab6e437694128d8ce7dcdaf66fb"; + sha256 = "1a68e49cac2d4f6da73c0ce554fd6f94932d95e20596f2ee44a769a28c12ba7d"; }; patches = [ ./use-template-for-taskwarrior-install-path.patch ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index d2123d207eb1..9524f7e44970 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -7,6 +7,8 @@ , catalogue , cymem , cython +, contextvars +, dataclasses , Accelerate , CoreFoundation , CoreGraphics @@ -27,17 +29,19 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.10"; + version = "8.0.13"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-teTbjSTmvopfHkoXhUdyt5orVgIkUZ9Qoh85UcokAB8="; + sha256 = "sha256-R2YqOuM9RFp3tup7dyREgFx7uomR8SLjUNr3Le3IFxo="; }; - buildInputs = [ cython ] - ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ + cython + ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreFoundation CoreGraphics @@ -56,7 +60,12 @@ buildPythonPackage rec { tqdm pydantic wasabi - ] ++ lib.optional (pythonOlder "3.8") typing-extensions; + ] ++ lib.optional (pythonOlder "3.8") [ + typing-extensions + ] ++ lib.optional (pythonOlder "3.7") [ + contextvars + dataclasses + ]; checkInputs = [ hypothesis @@ -71,7 +80,9 @@ buildPythonPackage rec { "thinc/tests" ]; - pythonImportsCheck = [ "thinc" ]; + pythonImportsCheck = [ + "thinc" + ]; meta = with lib; { description = "Practical Machine Learning for NLP in Python"; diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index f495541f5de1..2e4676267215 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.8.30"; + version = "2021.11.2"; src = fetchPypi { inherit pname version; - sha256 = "8760e61e30106ea0dab9ec42a238d70a3ff55dde9c54456e7b748fe717cb782d"; + sha256 = "153e31fa1d892f482fabb2ae9f2561fa429ee42d01a6f67e58cee13637d9285b"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 6100d2a7c53d..234cb471e46d 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -1,23 +1,19 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "toolz"; - version = "0.11.1"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1grz3zvw5ixwqqlbv0n7j11mlcxb66cirh5i9x9zw8kqy0hpk967"; + sha256 = "6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33"; }; - checkInputs = [ nose ]; - - checkPhase = '' - nosetests toolz/tests - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/pytoolz/toolz"; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 6bf5c069c64a..5479a0b12258 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.12.2"; + version = "4.12.5"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SndnMiXWiDW+E1G+WaUTVv3lySavJWF0nFDZLOxzObc="; + sha256 = "07v72fyhm1s3bzg2kvaff15d7d8na39nlqpf5gyxaqvp3hglc3qy"; }; nativeBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index acd7c7acfb47..0e95da38eaea 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -11,7 +11,6 @@ , sniffio , stdenv , jedi -, pylint , astor , yapf }: @@ -26,7 +25,7 @@ buildPythonPackage rec { sha256 = "895e318e5ec5e8cea9f60b473b6edb95b215e82d99556a03eb2d20c5e027efe1"; }; - checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ]; + checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi yapf ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. disabledTests = [ "getnameinfo" diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 4ad2f9f959c5..8ee48d938e38 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.2.0"; + version = "6.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U73dzLTUJnOw24/ELQzjnxJ0PvjV+zE/PNuQHXbEukw="; + sha256 = "418f16c45b7130555447af901639b92bb188d39f46ce7fe4dfcd941c5959ed7e"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index fb5617321747..d60db84d68af 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -5,22 +5,34 @@ , aiohttp , yarl , aresponses +, poetry-core , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "twentemilieu"; - version = "0.3.0"; + version = "0.4.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "frenck"; repo = "python-twentemilieu"; rev = "v${version}"; - sha256 = "1ff35sh73m2s7fh4d8p2pjwdbfljswr8b8lpcjybz8nsh0286xph"; + sha256 = "1lf31ldbrsmxhbrcg284pwpvjfmwnssv3gqwd5vm2hvd9lwqn6ii"; }; + # coverage tests aren't useful when consuming releases + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '--cov' "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp yarl diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 0385bd707068..63e1502226d9 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.12.1"; + version = "2.13.2"; src = fetchPypi { inherit pname version; - sha256 = "c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051"; + sha256 = "7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"; }; buildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index b3e38c864070..8545db539fbf 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.18.0"; + version = "3.18.1"; src = fetchPypi { inherit pname version; - sha256 = "a391d1a9138fe53fe08aeb6aa15ca7f1a188659b9a6c12af5313c55730eccd6c"; + sha256 = "6696bf3cabc51dcc076e8de025c405dbdea7488c5268c2febd14527dac82c233"; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix index ec9cd4d17331..ee815fa15e1f 100644 --- a/pkgs/development/python-modules/typical/default.nix +++ b/pkgs/development/python-modules/typical/default.nix @@ -1,18 +1,19 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, inflection -, pendulum , fastjsonschema -, typing-extensions -, orjson +, fetchFromGitHub , future-typing +, inflection +, mypy +, orjson +, pandas +, pendulum , poetry-core , pydantic +, pytestCheckHook +, pythonOlder , sqlalchemy -, pandas -, mypy +, typing-extensions }: buildPythonPackage rec { @@ -20,6 +21,8 @@ buildPythonPackage rec { version = "2.7.9"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "seandstewart"; repo = "typical"; @@ -31,15 +34,18 @@ buildPythonPackage rec { ./use-poetry-core.patch ]; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ inflection pendulum fastjsonschema orjson - typing-extensions future-typing + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; checkInputs = [ @@ -51,18 +57,23 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_ujson" # We use orjson + # We use orjson + "test_ujson" + # ConstraintValueError: Given value <{'key... + "test_tagged_union_validate" ]; disabledTestPaths = [ "benchmark/" ]; - pythonImportsCheck = [ "typic" ]; + pythonImportsCheck = [ + "typic" + ]; meta = with lib; { + description = "Python library for runtime analysis, inference and validation of Python types"; homepage = "https://python-typical.org/"; - description = "Typical: Python's Typing Toolkit."; license = licenses.mit; maintainers = with maintainers; [ kfollesdal ]; }; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 70e676f6b2cc..4d12af0689d8 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "4.2.0"; + version = "4.3.0"; disabled = isPyPy || pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "fffe509f556861c7343c6cba57ed05fe7bcf4b48a934a5b946ccb45428cf8883"; + sha256 = "baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index c5aa9f0bac94..349f0f8ef9a1 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.8.1"; + version = "20.10.0"; src = fetchPypi { inherit pname version; - sha256 = "bcc17f0b3a29670dd777d6f0755a4c04f28815395bca279cdcb213b97199a6b8"; + sha256 = "576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index c13f7b6d7d3a..5967b9b9abb7 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "bc3aec042637947d4e999121bab224077a6f7ede4af745102f41737f7c81c05a"; + sha256 = "8561e41bbcca5fadce4a8d974ca2f96cbe7710d835bfed6a55ed6d10900ef5d5"; }; patches = [ diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 6d2725796a09..9fba5785c447 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "watchdog"; version = "2.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -38,7 +39,14 @@ buildPythonPackage rec { --replace "--cov-report=term-missing" "" ''; - pythonImportsCheck = [ "watchdog" ]; + disabledTestPaths = [ + # Tests are flaky + "tests/test_inotify_buffer.py" + ]; + + pythonImportsCheck = [ + "watchdog" + ]; meta = with lib; { description = "Python API and shell utilities to monitor file system events"; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 611c84ea814c..2e13d95c3825 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -1,21 +1,23 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , python , pythonOlder -, stdenv }: buildPythonPackage rec { pname = "websockets"; - version = "10.0"; + version = "10.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aaugustin"; repo = pname; rev = version; - sha256 = "sha256-F10C8ukjYfbn2X2PMzrdSDqvs51/A9lx8Y3kv8YJ8Cw="; + sha256 = "sha256-FFaoqxa+TmKJ+P6T7HrwodjbVCir+2qJSfZsoj6deJU="; }; # Tests fail on Darwin with `OSError: AF_UNIX path too long` @@ -34,7 +36,9 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "websockets" ]; + pythonImportsCheck = [ + "websockets" + ]; meta = with lib; { description = "WebSocket implementation in Python"; diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 00aff794372d..49b7097549d6 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -1,21 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, tornado, paramiko }: +{ lib +, buildPythonPackage +, fetchPypi +, paramiko +, pytestCheckHook +, tornado +}: buildPythonPackage rec { pname = "webssh"; version = "1.5.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4="; }; - propagatedBuildInputs = [ tornado paramiko ]; + propagatedBuildInputs = [ + paramiko + tornado + ]; - pythonImportsCheck = [ "webssh" ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "webssh" + ]; meta = with lib; { + description = "Web based SSH client"; homepage = "https://github.com/huashengdun/webssh/"; - description = "Web based ssh client"; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; }; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 898fa4556ec3..c75c59ac1c9c 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -12,13 +12,15 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.0.1"; + version = "2.0.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; + sha256 = "sha256-qiu2/I3ujWxQTArB5/X33FgQqZA+eTtvcVqfAVva25o="; }; propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ @@ -54,5 +56,6 @@ buildPythonPackage rec { utility libraries. ''; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index bb8f1ab3b4d5..8f6cb6ad1867 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.5.1"; + version = "3.5.2"; src = fetchPypi { inherit pname version; - sha256 = "079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7"; + sha256 = "e0731a60ba540cd19bbbefe771a9076dcd2dde90713a8f87f27f53f2d1db7727"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index cb6ec2b606d5..ead63367f8ce 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -1,28 +1,30 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , aiohttp -, backoff -, poetry-core -, packaging -, yarl , aresponses +, awesomeversion +, backoff +, buildPythonPackage +, cachetools +, fetchFromGitHub +, poetry-core , pytest-asyncio , pytestCheckHook +, pythonOlder +, yarl }: buildPythonPackage rec { pname = "wled"; - version = "0.8.0"; - disabled = pythonOlder "3.8"; + version = "0.10.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "1jhykilb81sp1srxk91222qglwdlr993ssvgfnl837nbcx6ws1hw"; + sha256 = "0ivh6yxpswz730i33fwr4hj8nwdmdyw4n6p89x9sxmvjmd7ihkgm"; }; nativeBuildInputs = [ @@ -31,8 +33,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + awesomeversion backoff - packaging + cachetools yarl ]; @@ -49,7 +52,9 @@ buildPythonPackage rec { --replace "--cov" "" ''; - pythonImportsCheck = [ "wled" ]; + pythonImportsCheck = [ + "wled" + ]; meta = with lib; { description = "Asynchronous Python client for WLED"; diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index d4bdac9e6f5d..e567a8a672ef 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.13.1"; + version = "1.13.3"; # No tests in archive doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "909a80ce028821c7ad01bdcaa588126825931d177cdccd00b3545818d4a195ce"; + sha256 = "1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185"; }; meta = { diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index a39c3532f4b8..cbec33483ccd 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xattr"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44"; + sha256 = "bf11c8c857215e3ef60b031e7807264f30af4348d7565a7e9b8dca70593753c7"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index 8c872d0bbd19..f5509676d114 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "XStatic-jquery-ui"; - version = "1.12.1.1"; + version = "1.13.0.1"; src = fetchPypi { inherit version pname; - sha256 = "d6ba48bb474420a8bcb2be02eef6ae96281ec24eff6befa54f04ebc9e4cc8910"; + sha256 = "3697e5f0ef355b8f4a1c724221592683c2db031935cbb57b46224eef474bd294"; }; # no tests implemented diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 634ff5ec54e1..ad23a6cc169d 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.5.1"; + version = "1.5.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "68c70e1b6a2ce5c2c0ee64ba9c63efc9ab6e6f8acb2f51e19d570b0287e61cc9"; + sha256 = "33f0d58f4803b0b2badf860cd31fb83d3f7edecdd2c01dd09cd6511abbf0e6b9"; }; propagatedBuildInputs = [ httpx ]; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 9e5b05821295..11c6f84850bd 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.10.2"; + version = "2.10.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5c6ae914ab9215631bb95c09e76b9b9b4fffa70fec0c7bca26b68387d858ebe2"; + sha256 = "76932665c2146ebdf15f6dba254f9e0030552fbfcf9322dea822bff96fbce693"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 2d1a5880d0de..70e329cce9e9 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.4.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b244904c5148067c3f1899d29a2c1a28faca747b143192c0f825e6bf3170a347"; + sha256 = "1329846261cf6c552b05579f3cfad199b2d178510d0b4703eb5f7cdd6ebad01a"; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index 00defd161509..9472000f15d1 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9fa04d95e8e7e9056091eed9819da6e65dde68de39c2b93617d361d1eb8a7c0c"; + sha256 = "2201aef8ad75ee5a881284d7a6acd384661d6dca7bde5e80a22839a77124595b"; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index c3bc0d0bff4d..2638d4314784 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.3.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "39a5ba631830703ea011383447135063db6d182794487dda9b8c1f515bb70b0f"; + sha256 = "4869229fc909e4aa8e76665a718f90dc88f73858b32ca5fa3dea6840e9210fb4"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 0b9d6b473831..754b2e8cea6a 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -20,17 +20,18 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.20.54"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.22.14"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-stnuPobBKIpKA4iTKGTO5kmMEl7grFdZNryz40S599M="; + sha256 = "sha256-FTGtUqdjZel8XqSrO3s3XQNqR6fyTO3mc1gyIQfk9n8="; }; # https://github.com/aws/aws-cli/issues/4837 postPatch = '' substituteInPlace setup.py \ - --replace "docutils>=0.10,<0.16" "docutils>=0.10" + --replace "docutils>=0.10,<0.16" "docutils>=0.10" \ + --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" ''; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 2b820aa95699..7e2970861c17 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -119,9 +119,6 @@ let ''; }; - azure-appconfiguration = overrideAzureMgmtPackage super.azure-appconfiguration "1.1.1" "zip" - "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; - azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32da"; @@ -311,6 +308,17 @@ let azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.7.0" "tar.gz" "cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9"; + azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec { + version = "1.1.1"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; + extension = "zip"; + }; + }); + azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 38ba47a51223..4d877030e537 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = pname; rev = version; - sha256 = "0663hzpmn6p5xh65d2gk4yk2zh992lfd9lhdwwabhpv3n85nza75"; + sha256 = "0kya9a2zs1c518z4p34pfjx2sms6843gh3c9qc9zvk4lr4g7hw3x"; }; nativeBuildInputs = with python3.pkgs; [ @@ -19,19 +19,26 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ + aiocache + aiosqlite beautifulsoup4 browser-cookie3 cryptography - Mako - markupsafe - pysocks + dnspython httpx httpx-ntlm httpx-socks + loguru + Mako + markupsafe + pysocks six + sqlalchemy tld yaswfp - ] ++ lib.optionals (python3.pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (python3.pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = with python3.pkgs; [ respx @@ -42,9 +49,18 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # Ignore pinned versions substituteInPlace setup.py \ - --replace "==" ">=" + --replace "httpx-socks[asyncio] == 0.5.1" "httpx-socks[asyncio]" \ + --replace "markupsafe==1.1.1" "markupsafe" \ + --replace "importlib_metadata==3.7.2" "importlib_metadata" \ + --replace "browser-cookie3==0.11.4" "browser-cookie3" \ + --replace "cryptography==3.3.2" "cryptography" \ + --replace "httpx[brotli]==0.20.0" "httpx" \ + --replace "sqlalchemy>=1.4.26" "sqlalchemy" \ + --replace "aiocache==0.11.1" "aiocache" \ + --replace "aiosqlite==0.17.0" "aiosqlite" \ + --replace "dnspython==2.1.0" "dnspython" substituteInPlace setup.cfg \ - --replace " --cov" "" + --replace " --cov --cov-report=xml" "" ''; preCheck = '' @@ -92,6 +108,7 @@ python3.pkgs.buildPythonApplication rec { "test_title_false_positive" "test_title_positive" "test_true_positive_request_count" + "test_unregistered_cname" "test_url_detection" "test_warning" "test_whole" @@ -108,7 +125,9 @@ python3.pkgs.buildPythonApplication rec { "test_persister_upload" ]; - pythonImportsCheck = [ "wapitiCore" ]; + pythonImportsCheck = [ + "wapitiCore" + ]; meta = with lib; { description = "Web application vulnerability scanner"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index feefdf6d4c9a..fb8f6b5d6853 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3398,6 +3398,8 @@ in { grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + grpcio-status = callPackage ../development/python-modules/grpcio-status { }; + grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; gruut = callPackage ../development/python-modules/gruut { }; @@ -3960,6 +3962,8 @@ in { jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + jaraco-context = callPackage ../development/python-modules/jaraco-context { }; + jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; @@ -4036,6 +4040,8 @@ in { jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; + jschema-to-python = callPackage ../development/python-modules/jschema-to-python { }; + jsmin = callPackage ../development/python-modules/jsmin { }; json5 = callPackage ../development/python-modules/json5 { }; @@ -4267,6 +4273,8 @@ in { langdetect = callPackage ../development/python-modules/langdetect { }; + language-data = callPackage ../development/python-modules/language-data { }; + lark-parser = callPackage ../development/python-modules/lark-parser { }; latexcodec = callPackage ../development/python-modules/latexcodec { }; @@ -8461,6 +8469,8 @@ in { sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; + sarif-om = callPackage ../development/python-modules/sarif-om { }; + sarge = callPackage ../development/python-modules/sarge { }; sasmodels = callPackage ../development/python-modules/sasmodels { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index d96d5a4252f7..e62803108071 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -438,8 +438,6 @@ with self; with super; { pydns = callPackage ../development/python-modules/pydns { }; - pydocstyle = callPackage ../development/python-modules/pydocstyle/2.nix { }; - pyechonest = callPackage ../development/python-modules/pyechonest { }; pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };