diff options
Diffstat (limited to 'pkgs/development/python-modules')
29 files changed, 449 insertions, 91 deletions
diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 16c772a38538..618c0e0d9023 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.7"; + version = "0.4.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-0zcyMn0Y0UI5S8JGdYVXkK7FBdSHCA0FOmkmXDT9P48="; + hash = "sha256-jbL6f6gDH6AxsfuD7mFtvCGKLqy/NKoo5bUmXN9hBrM="; }; prePatch = '' diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 08c5ec156b22..92c58450cee4 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.2.3"; + version = "5.2.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-HIUBHyuh66PjHRPTFKIq859+tSYnaseQE9GOMduxBP4="; + hash = "sha256-h1xpP3fFr8+twa5jXQrZfKFjNAlCvXv7sFvhgJZ88H0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix index ee3efac57914..5ffe2e769cc9 100644 --- a/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.3.6"; + version = "1.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-h+Q9g0kznGMLLi8i/iKodGXB+f/m3PXoF6h6hhIX9ys="; + hash = "sha256-nKXZXOpwVN8Xe1vwwPGPucvyffiIQ8I4D+0A3qGco5w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 5dd902bcb968..a8107fac2b84 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "21"; + version = "22"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sobmPegDBI/4EvdpxrY28TsNO8vyLhuRsV9s+5WThR4="; + hash = "sha256-IWeWNvshz+NxX4ijIyaleRmThNstpKYplcMQUC1/6F8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 858d758039d7..be8514f08acd 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.38"; + version = "1.31.39"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-ZgduwHPPoW+RPMtudt8GsggJdHhgQNY6mo0pdFnryuc="; + hash = "sha256-pqpGnPXZT5lDnTpXBfsJk0/tBtUovgazAWZf/TZJfNg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index ece01851c1a4..9507cad79502 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.25.0"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-o8pjoVuZLifGOmijJIl2LpjLguYwPLRVB44iFsGe1BM="; + hash = "sha256-wM27HW5w8fDjHoGV+OGDTaO5SKJrq8fGKh1EPQt+wlo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 1864b58d92d3..9a198ab21fc6 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.3.1"; + version = "5.3.3"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+E0cIaFSDBFsK30mWTkmWBGRQ1oDqnS3fJQbk8ocYhA="; + hash = "sha256-uskO+ZtwubW11M/Ov28atRaLhsYSC8fFgUzYI039k4E="; }; propagatedBuildInputs = [ @@ -95,6 +95,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; + changelog = "https://github.com/celery/celery/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 70601478b1bd..150a8e36747a 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.4"; + version = "2.2.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gCq01lfAoKoS74C8gjj84mZpXDMtdNVaRLwhlEXwiPI="; + hash = "sha256-D25deUPMWc6KRlwytSfZqoPeJGmTV304slUP9gCyrUw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index 13fbe5ab123d..9185fe48bb9d 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "coredis"; - version = "4.15.1"; + version = "4.16.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9nojHufUt53Ovoos4gaR7qh1xN8D1+gJOEyFsOndXJU="; + hash = "sha256-7qpoNc5/z8/EKtGWULrPPwfH9swYe9TqqUL+zxrFQSk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index d9b16bcc069a..8b8ca7a7208b 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.14"; + version = "0.5.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pCvVKHh2elHaukEJNTw8MgJmoTlYjO9aVWFCQXXD13c="; + hash = "sha256-ADWNB2Eu4TwlAvchyzBwGiw9YT9McPr9lsNfo1lR1WI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index af221199c910..539c3324204e 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -1,39 +1,55 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, loguru , mbstrdecoder -, typepy , pytestCheckHook +, pythonOlder +, tcolorpy , termcolor +, typepy }: buildPythonPackage rec { pname = "dataproperty"; - version = "0.55.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-ODSrKZ8M/ni9r2gkVIKWaKkdr+3AVi4INkEKJ+cmb44="; + rev = "refs/tags/v${version}"; + hash = "sha256-adUxUU9eASkC9n5ppZYNN0MP19u4xcL8XziBWSCp2L8="; }; - propagatedBuildInputs = [ mbstrdecoder typepy ]; + propagatedBuildInputs = [ + mbstrdecoder + typepy + tcolorpy + ] ++ typepy.optional-dependencies.datetime; + + passthru.optional-dependencies = { + logging = [ + loguru + ]; + }; - nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ termcolor ]; + nativeCheckInputs = [ + pytestCheckHook + termcolor + ]; - # Tests fail, even on non-nixos - pytestFlagsArray = [ - "--deselect test/test_dataproperty.py::Test_DataPeroperty_len::test_normal_ascii_escape_sequence" - "--deselect test/test_dataproperty.py::Test_DataPeroperty_is_include_ansi_escape::test_normal" - "--deselect test/test_dataproperty.py::Test_DataPeroperty_repr::test_normal" + pythonImportsCheck = [ + "dataproperty" ]; meta = with lib; { + description = "Library for extracting properties from data"; homepage = "https://github.com/thombashi/dataproperty"; - description = "A library for extracting properties from data"; - maintainers = with maintainers; [ genericnerdyusername ]; + changelog = "https://github.com/thombashi/DataProperty/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 73d41944702b..e927665bdc85 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { "click" "mashumaro" "networkx" + "logbook" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix index a5250afff471..a08e2a6e4ebc 100644 --- a/pkgs/development/python-modules/funsor/default.nix +++ b/pkgs/development/python-modules/funsor/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "funsor"; - version = "0.4.5"; + version = "0.4.6"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pyro-ppl"; repo = "funsor"; rev = "refs/tags/${version}"; - hash = "sha256-3JxnRlJN/kYstcIKt8cvDmqnp8oyoA4jkMBDVuAMa5Q="; + hash = "sha256-Prj1saT0yoPAP8rDE0ipBEpR3QMk4PS12VSJlxc22p8="; }; # Disable the tests that rely on downloading assets from the internet as well as the linting checks. diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index a7e141ddf9ff..9aa76821650b 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.8.13"; + version = "2023.8.14"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SZIxZHuw3YLGA3dU73jxCahq2pxTyeflXJxnOfJtyJg="; + hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index d1c3ccb9ea0a..b6a54dccc73d 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "json5"; - version = "0.9.9"; + version = "0.9.14"; src = fetchFromGitHub { owner = "dpranke"; repo = "pyjson5"; rev = "v${version}"; - hash = "sha256-0ommoTv5q7YuLNF+ZPWW/Xg/8CwnPrF7rXJ+eS0joUs="; + hash = "sha256-cshP1kraLENqWuQTlm4HPAP/0ywRRLFOJI8mteWcjR4="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 0038f57b114d..de73ea621b47 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,16 +19,15 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "1.0.1"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; - format = "pyproject"; - src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-cf7BpF6WSoHQJQW0IXdpCAGTdkX9RNWZ4JovTHvcPho="; + hash = "sha256-3OxduJ93TmbS/fKSKmVXs5vj2IZMX5MqKPTeGklFCbM="; }; postPatch = '' @@ -55,14 +54,16 @@ buildPythonPackage rec { ypy-websocket ]; - pythonImportsCheck = [ "jupyter_collaboration" ]; - nativeCheckInputs = [ pytest-asyncio pytest-jupyter pytestCheckHook ]; + pythonImportsCheck = [ + "jupyter_collaboration" + ]; + pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" ]; @@ -71,11 +72,11 @@ buildPythonPackage rec { export HOME=$TEMP ''; - meta = { - changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; + meta = with lib; { description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; - license = lib.licenses.bsd3; - maintainers = lib.teams.jupyter.members; + changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index cede627f9110..0d393d0e8ae5 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "klaus"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - hash = "sha256-kQcza2beyekJhRT9RwSdMIkeyapcUDtjgkapK3rocvg="; + hash = "sha256-VAwIdmwdo/Rim2sVlR605Wo5/zkNOMiGkh40qLrENmU="; }; prePatch = '' diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index cdccecf72b09..af8e8ed29be9 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.1"; + version = "5.3.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+9dXLZLAv3HBEqa0UWMVPepae2pwHsFrVown0P0jcPI="; + hash = "sha256-C6IT9jCiyydycorvVqxog9w6LxNDXhAEj26X1IUG270="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index e6d155760d51..d8251a40099f 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -1,30 +1,87 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }: +{ lib +, brotli +, buildPythonPackage +, cython +, execnet +, fetchFromGitHub +, jinja2 +, pytestCheckHook +, pythonOlder +, pyzmq +, redis +, setuptools +, sqlalchemy +}: buildPythonPackage rec { pname = "logbook"; - version = "1.5.3"; + version = "1.6.0"; + format = "setuptools"; - src = fetchPypi { - pname = "Logbook"; - inherit version; - sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "getlogbook"; + repo = "logbook"; + rev = "refs/tags/${version}"; + hash = "sha256-2K6fM6MFrh3l0smhSz8RFd79AIOXQZJQbNLTJM4WZUo="; }; - nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; + nativeBuildInputs = [ + cython + setuptools + ]; - propagatedBuildInputs = [ brotli ]; + passthru.optional-dependencies = { + execnet = [ + execnet + ]; + sqlalchemy = [ + sqlalchemy + ]; + redis = [ + redis + ]; + zmq = [ + pyzmq + ]; + compression = [ + brotli + ]; + jinja = [ + jinja2 + ]; + all = [ + brotli + execnet + jinja2 + pyzmq + redis + sqlalchemy + ]; + }; - checkPhase = '' - find tests -name \*.pyc -delete - py.test tests - ''; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = { - homepage = "https://pythonhosted.org/Logbook/"; + pythonImportsCheck = [ + "logbook" + ]; + + disabledTests = [ + # Test require Redis instance + "test_redis_handler" + ]; + + meta = with lib; { description = "A logging replacement for Python"; - license = lib.licenses.bsd3; + homepage = "https://logbook.readthedocs.io/"; + changelog = "https://github.com/getlogbook/logbook/blob/${version}/CHANGES"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index a7b109d127eb..ff9326a8ba7d 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -1,22 +1,26 @@ { lib +, beautifulsoup4 , buildPythonPackage , drawio-headless -, fetchPypi -, pythonOlder +, fetchFromGitHub , mkdocs -, beautifulsoup4 +, pathspec +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.2"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-H/eqrwlZntEYoKkJZKiRV+KyzkrDKRirMDDSciFNIGo="; + src = fetchFromGitHub { + owner = "Blueswen"; + repo = "mkdocs-swagger-ui-tag"; + rev = "refs/tags/v${version}"; + hash = "sha256-/Spvj3lt7p+ZUbA/7xaQMLCSmHOOsoCRliqaAN+YU3g="; }; propagatedBuildInputs = [ @@ -24,10 +28,22 @@ buildPythonPackage rec { beautifulsoup4 ]; + nativeCheckInputs = [ + pathspec + pytestCheckHook + ]; + pythonImportsCheck = [ "mkdocs_swagger_ui_tag" ]; + disabledTests = [ + # Don't actually build results + "test_material" + "test_material_dark_scheme_name" + "test_template" + ]; + meta = with lib; { description = "A MkDocs plugin supports for add Swagger UI in page"; homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag"; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 1447ceb9bcf1..96790c04c450 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.11.0"; + version = "5.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-xPMO1Db1+TwOT+JsBGJcTc7BL2B8Eb1K3kqKMGnsUmE="; + hash = "sha256-feKKBbULkWxEgUaMROvmQph2YTAgSOVDRz/OnpzG9Ac="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 2cf9223978bd..13f5819a6ef3 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.110.2"; + version = "2.111.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-4+qP/eCd3xy0Q3Nrwbj2VpyNWqiKL82nrX7Od0yHToo="; + hash = "sha256-7lkxk/oFb5DPH3LcOJLJByMaf4xQB8L6FLKrXOn+HsM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix new file mode 100644 index 000000000000..9bd81077abfd --- /dev/null +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -0,0 +1,111 @@ +{ lib +, buildPythonPackage +, pythonRelaxDepsHook +, fetchFromGitHub +, attrdict +, beautifulsoup4 +, cython +, fire +, fonttools +, lmdb +, lxml +, numpy +, opencv4 +, openpyxl +, pdf2docx +, pillow +, premailer +, pyclipper +, pymupdf +, python-docx +, rapidfuzz +, scikit-image +, shapely +, tqdm +, paddlepaddle +, lanms-neo +, polygon3 +}: + +let + version = "2.7.0.1"; +in +buildPythonPackage { + pname = "paddleocr"; + inherit version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "PaddlePaddle"; + repo = "PaddleOCR"; + rev = "254786752a2659e184822b4b2de5637a05236590"; + hash = "sha256-M/Fpk9swX9Gds7o5poM9Iv6LOhKoZNbe0Wv9JNMPOU0="; + }; + + patches = [ + # The `ppocr.data.imaug` re-exports the `IaaAugment` and `CopyPaste` + # classes. These classes depend on the `imgaug` package which is + # unmaintained and has been removed from nixpkgs. + # + # The image OCR feature of PaddleOCR doesn't use these classes though, so + # they work even after stripping the the `IaaAugment` and `CopyPaste` + # exports. It probably breaks some of the OCR model creation tooling that + # PaddleOCR provides, however. + ./remove-import-imaug.patch + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + # trying to relax only pymupdf makes the whole build fail + pythonRelaxDeps = true; + pythonRemoveDeps = [ + "imgaug" + "visualdl" + "opencv-python" + "opencv-contrib-python" + ]; + + propagatedBuildInputs = [ + attrdict + beautifulsoup4 + cython + fire + fonttools + lmdb + lxml + numpy + opencv4 + openpyxl + pdf2docx + pillow + premailer + pyclipper + pymupdf + python-docx + rapidfuzz + scikit-image + shapely + tqdm + paddlepaddle + lanms-neo + polygon3 + ]; + + # TODO: The tests depend, among possibly other things, on `cudatoolkit`. + # But Cudatoolkit fails to install. + # preCheck = "export HOME=$TMPDIR"; + # nativeCheckInputs = with pkgs; [ which cudatoolkit ]; + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/PaddlePaddle/PaddleOCR"; + license = licenses.asl20; + description = "Multilingual OCR toolkits based on PaddlePaddle"; + longDescription = '' + PaddleOCR aims to create multilingual, awesome, leading, and practical OCR + tools that help users train better models and apply them into practice. + ''; + changelog = "https://github.com/PaddlePaddle/PaddleOCR/releases/tag/v${version}"; + maintainers = with maintainers; [ happysalada ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch b/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch new file mode 100644 index 000000000000..f24156fb6a12 --- /dev/null +++ b/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch @@ -0,0 +1,20 @@ +diff --git a/ppocr/data/imaug/__init__.py b/ppocr/data/imaug/__init__.py +index 121582b4..a6987c75 100644 +--- a/ppocr/data/imaug/__init__.py ++++ b/ppocr/data/imaug/__init__.py +@@ -16,7 +16,6 @@ from __future__ import division + from __future__ import print_function + from __future__ import unicode_literals + +-from .iaa_augment import IaaAugment + from .make_border_map import MakeBorderMap + from .make_shrink_map import MakeShrinkMap + from .random_crop_data import EastRandomCropData, RandomCropImgMask +@@ -30,7 +29,6 @@ from .rec_img_aug import BaseDataAugmentation, RecAug, RecConAug, RecResizeImg, + RFLRecResizeImg, SVTRRecAug + from .ssl_img_aug import SSLRotateResize + from .randaugment import RandAugment +-from .copy_paste import CopyPaste + from .ColorJitter import ColorJitter + from .operators import * + from .label_ops import * diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix new file mode 100644 index 000000000000..b82712dc443f --- /dev/null +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, importlib-metadata +, importlib-resources +, setuptools +, packaging +, tomli +, tox +}: + +buildPythonPackage rec { + pname = "pkg-about"; + version = "1.0.8"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "pkg_about"; + inherit version; + extension = "zip"; + hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA="; + }; + + nativeBuildInputs = [ + packaging + setuptools + tox + ]; + + propagatedBuildInputs = [ + importlib-metadata + importlib-resources + packaging + setuptools + tomli + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pkg_about" + ]; + + meta = with lib; { + description = "Python metadata sharing at runtime"; + homepage = "https://github.com/karpierz/pkg_about/"; + changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst"; + license = licenses.zlib; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix new file mode 100644 index 000000000000..7e59dbf9b112 --- /dev/null +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, setuptools +, setuptools-scm +, numpy +, pybind11 +, wheel +, pytestCheckHook +, pythonOlder +, graphviz +}: + +buildPythonPackage rec { + pname = "pyhepmc"; + version = "2.12.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-po1ad02dpY69RRhaRApskH6tdOaSIsCl5PgpjsAzyKo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + setuptools + setuptools-scm + wheel + ]; + + buildInputs = [ + pybind11 + ]; + + propagatedBuildInputs = [ + numpy + ]; + + dontUseCmakeConfigure = true; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ]; + + preBuild = '' + export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES" + ''; + + nativeCheckInputs = [ + graphviz + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyhepmc" ]; + + meta = with lib; { + description = "Easy-to-use Python bindings for HepMC3"; + homepage = "https://github.com/scikit-hep/pyhepmc"; + changelog = "https://github.com/scikit-hep/pyhepmc/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} + diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 8a1597b597ec..86af2ae0846f 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -105,11 +105,13 @@ buildPythonPackage rec { "pathvalidate" ]; - # Circular dependency disabledTests = [ + # Circular dependency "test_normal_from_file" "test_normal_from_text" "test_normal_clear_theme" + # Test compares CLI output + "test_normal" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix index f2a8d4bf1dc8..53766a3134a5 100644 --- a/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.3.3"; + version = "0.4.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "microsoft"; repo = "playwright-pytest"; rev = "refs/tags/v${version}"; - hash = "sha256-2xdRW8Q10x6mtNs/EdAsgrOtVmvLAOdbIGXfyeB8ZAg="; + hash = "sha256-yYFzaIPYOsuvS8bGcuwQQNS/CtvGUe1XQdORmfEJQmU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index a1d9e7df1534..c5c393b29c01 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -26,14 +26,23 @@ buildPythonPackage rec { propagatedBuildInputs = [ mbstrdecoder - python-dateutil - pytz - packaging ]; + passthru.optional-dependencies = { + datetime = [ + python-dateutil + pytz + packaging + ]; + }; + nativeCheckInputs = [ pytestCheckHook tcolorpy + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "typepy" ]; meta = with lib; { |