diff options
Diffstat (limited to 'pkgs/development/python-modules')
15 files changed, 86 insertions, 84 deletions
diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix index a2c4eaf5ff8e..5d79aaa1bc32 100644 --- a/pkgs/development/python-modules/aiofile/default.nix +++ b/pkgs/development/python-modules/aiofile/default.nix @@ -1,9 +1,9 @@ { lib , aiomisc -, asynctest , caio , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder }: @@ -22,13 +22,20 @@ buildPythonPackage rec { hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w="; }; + patches = [ + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/mosquito/aiofile/commit/9253ca42022f17f630ccfb6811f67876910f8b13.patch"; + hash = "sha256-yMRfqEbdxApFypEj27v1zTgF/4kuLf5aS/+clo3mfZo="; + }) + ]; + propagatedBuildInputs = [ caio ]; nativeCheckInputs = [ aiomisc - asynctest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix deleted file mode 100644 index 454a972f177b..000000000000 --- a/pkgs/development/python-modules/bedup/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, btrfs-progs -, contextlib2 -, pyxdg -, pycparser -, alembic -, cffi -, pythonOlder -, isPyPy -}: - -buildPythonPackage rec { - version = "0.10.1"; - pname = "bedup"; - disabled = pythonOlder "3.3"; - - src = fetchFromGitHub { - owner = "g2p"; - repo = "bedup"; - rev = "v${version}"; - sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6"; - }; - - buildInputs = [ btrfs-progs ]; - propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ] - ++ lib.optionals (!isPyPy) [ cffi ]; - - meta = with lib; { - description = "Deduplication for Btrfs"; - longDescription = '' - Deduplication for Btrfs. bedup looks for new and changed files, - making sure that multiple copies of identical files share space - on disk. It integrates deeply with btrfs so that scans are - incremental and low-impact. - ''; - homepage = "https://github.com/g2p/bedup"; - license = licenses.gpl2; - maintainers = with maintainers; [ bluescreen303 ]; - }; -} diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 8a53a9d1d58f..0b420e9362c9 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -1,7 +1,6 @@ { lib , autopep8 , buildPythonPackage -, contextlib2 , django , factory_boy , fetchFromGitHub @@ -72,7 +71,6 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - contextlib2 networkx pydot factory_boy diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index b9c9e65a4fe6..6e225df0fd90 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -2,13 +2,11 @@ , buildPythonPackage , fetchPypi , isPy27 -, contextlib2 , pytest , pytestCheckHook , vcrpy , citeproc-py , requests -, setuptools , six }: @@ -22,10 +20,9 @@ buildPythonPackage rec { sha256 = "f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8"; }; - # bin/duecredit requires setuptools at runtime - propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + propagatedBuildInputs = [ citeproc-py requests six ]; - nativeCheckInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + nativeCheckInputs = [ pytest pytestCheckHook vcrpy ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 1b933d182ad9..0aa5c6583784 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-BEnSPRuQUnKXtPAJfjxS+fwE0rpPj1U2yRK8eImKMYw="; + hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc="; }; # avoid circular dependency with xmlschema which directly depends on this @@ -28,7 +28,6 @@ buildPythonPackage rec { meta = with lib; { description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"; homepage = "https://github.com/sissaschool/elementpath"; - changelog = "https://github.com/sissaschool/elementpath/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index c1039db8829c..9fa13391b6ad 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, contextlib2 , cython , fuse , pkg-config @@ -29,8 +28,6 @@ buildPythonPackage rec { buildInputs = [ fuse ]; - propagatedBuildInputs = [ contextlib2 ]; - preConfigure = '' substituteInPlace setup.py \ --replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'" diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index b00a7703cf05..336439824140 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.20.0"; + version = "1.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eDRM1MkdYTSlk7Xj5FVB5mbje3R/+KYxbDZo3R5qtrI="; + hash = "sha256-lrXIZ4MP0Rbl99DsjvGyOLTNpNGuqG2P7PUYJg4Tb78="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; + changelog = "https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9b290730be9d..77ed843d47cd 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nltk"; - version = "3.8"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-dLMIJqN9eNU0JxBbvQN92IAlG+Jp/KZO5TCDikbtVfw="; + hash = "sha256-GDTaPQaCy6Tyzt4vmq1rD6+2RhukUdsO+2+cOXmNZNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index a6f290633edc..b21f343db32a 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-E7PnfSdSO52/TzDfyclZRVhZ1eNOkhxE9xLWm4Np7/k="; + sha256 = "sha256-QQs5lQNnhX+XtlCTaB/iSVouI9Y3d6is6vlsVqFtFm4="; }; nativeBuildInputs = [ @@ -50,9 +50,13 @@ buildPythonPackage rec { postPatch = '' chmod +x tools/protoc-gen-mypy.sh.in - patchShebangs tools/protoc-gen-mypy.py - substituteInPlace tools/protoc-gen-mypy.sh.in \ - --replace "/bin/bash" "${bash}/bin/bash" + patchShebangs tools/protoc-gen-mypy.sh.in + ''; + + # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set + # to lib64 and cmake incorrectly looks for the protobuf library in lib64 + preConfigure = '' + export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" ''; preBuild = '' diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index e2d94ac02561..c020992bee22 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pytestCheckHook , coveralls , numpy -, contextlib2 , decopatch , more-itertools , nestedtext @@ -24,6 +24,14 @@ buildPythonPackage rec { sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; }; + patches = [ + (fetchpatch { + name = "replace contextlib2-with-contextlib.patch"; + url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch"; + hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ="; + }) + ]; + # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml @@ -38,7 +46,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - contextlib2 decopatch more-itertools nestedtext diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index c8813208d5e8..a096973a9367 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -2,8 +2,8 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi , fetchFromGitHub +, setuptools , jinja2 , pygments , markupsafe @@ -14,17 +14,23 @@ buildPythonPackage rec { pname = "pdoc"; - version = "12.0.2"; + version = "12.3.1"; disabled = pythonOlder "3.7"; + format = "pyproject"; + # the Pypi version does not include tests src = fetchFromGitHub { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - sha256 = "FVfPO/QoHQQqg7QU05GMrrad0CbRR5AQVYUpBhZoRi0="; + sha256 = "sha256-SaLrE/eHxKnlm6BZYbcZZrbrUZMeHJ4eCcqMsFvyZ7I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jinja2 pygments @@ -48,6 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pdoc" ]; meta = with lib; { + changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md"; homepage = "https://pdoc.dev/"; description = "API Documentation for Python Projects"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 7fabc513e9b1..18e841f85e1d 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -1,11 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , msgpack +, poetry-core , pytestCheckHook , pythonOlder , pyyaml , ruamel-yaml +, setuptools , toml , tomli , tomli-w @@ -13,8 +16,8 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,9 +25,23 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = "refs/tags/${version}"; - hash = "sha256-42VDZ4aASFFWhRY3ApBQ4dq76eD1flZtxUM9hpA9iiI="; + hash = "sha256-CvcVN5DTaT8mSf2FtFrt7DHP+YLbVI15/5Vjfmgae34="; }; + patches = [ + # Switch to poetry-core, https://github.com/cdgriffith/Box/pull/247 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/cdgriffith/Box/commit/a43b98c5f5ff1074568dcef27cf17e7065d1019c.patch"; + hash = "sha256-ul/MVSzgjN3D+Vuzn7YPITaDrtS58vDmA23hy1EVF9U="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + setuptools + ]; + passthru.optional-dependencies = { all = [ msgpack @@ -64,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python dictionaries with advanced dot notation access"; homepage = "https://github.com/cdgriffith/Box"; + changelog = "https://github.com/cdgriffith/Box/blob/${version}/CHANGES.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index c095ea9ca921..008813330dc8 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage -, contextlib2 , fetchPypi , mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -19,8 +19,12 @@ buildPythonPackage rec { hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc="; }; - propagatedBuildInputs = [ - contextlib2 + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "contextlib2" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index 9be77facf08e..290637cb8abb 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scrapy-splash"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a7c17735415151ae01f07b03c7624e7276a343779b3c5f4546f655f6133df42f"; + sha256 = "sha256-7PEwJk3AjgxGHIYH7K13dGimStAd7bJinA+BvV/NcpU="; }; propagatedBuildInputs = [ scrapy six ]; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 646db47538bb..62756a4eab2c 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.7.1"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4="; + hash = "sha256-gHGsbGXxhewsdv6FCflNmf6ggFGf3CBvkIqSDV4F/kM="; }; nativeBuildInputs = [ @@ -118,12 +118,18 @@ buildPythonPackage rec { "test_xmliter_encoding" "test_download" "test_reactor_default_twisted_reactor_select" + "URIParamsSettingTest" + "URIParamsFeedOptionTest" + # flaky on darwin-aarch64 + "test_fixed_delay" + "test_start_requests_laziness" ]; postInstall = '' installManPage extras/scrapy.1 - install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy - install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy + installShellCompletion --cmd scrapy \ + --zsh extras/scrapy_zsh_completion \ + --bash extras/scrapy_bash_completion ''; pythonImportsCheck = [ @@ -143,6 +149,5 @@ buildPythonPackage rec { changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; - platforms = platforms.unix; }; } |