diff options
Diffstat (limited to 'pkgs/development/python-modules')
14 files changed, 169 insertions, 46 deletions
diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index c11e09790eb76..602f87584ef7a 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.3.4"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-jInCWya146QI7D89zSAPChF8GMDj7NRzu9NvVIbkntM="; + hash = "sha256-2GmBO67sUIjasF5MHrDkZ4D+dk3xN+HNpc7nSN+qTaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix new file mode 100644 index 0000000000000..68d65069ae443 --- /dev/null +++ b/pkgs/development/python-modules/click-shell/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, pytestCheckHook +, pytest-click +}: + +buildPythonPackage rec { + pname = "click-shell"; + version = "2.1"; + format = "setuptools"; + + # PyPi release is missing tests + src = fetchFromGitHub { + owner = "clarkperkins"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI="; + }; + + propagatedBuildInputs = [ + click + ]; + + checkInputs = [ + pytest-click + pytestCheckHook + ]; + + pythonImportsCheck = [ + "click_shell" + ]; + + preCheck = "export HOME=$(mktemp -d)"; + + meta = with lib; { + description = "An extension to click that easily turns your click app into a shell utility"; + longDescription = '' + This is an extension to click that easily turns your click app into a + shell utility. It is built on top of the built in python cmd module, + with modifications to make it work with click. It adds a 'shell' mode + with command completion to any click app. + ''; + homepage = "https://github.com/clarkperkins/click-shell"; + license = licenses.bsd3; + maintainers = with maintainers; [ binsky ]; + }; +} diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index c0519332342ea..368e95c2a1a02 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -8,50 +8,56 @@ , numpy , pytestCheckHook , pyyaml +, toml , pythonOlder }: buildPythonPackage rec { pname = "deepdiff"; - version = "5.8.2"; + version = "6.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "seperman"; repo = "deepdiff"; - rev = "v${version}"; - hash = "sha256-7eagu6lef5bc/4KU3y067LFOGtH6whda1ocBuRHS/kI="; + rev = "refs/tags/${version}"; + hash = "sha256-ngtQNyVQaywMyYitj37m0RJGBiMpjB4b8Rn+feMOjVU="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "ordered-set==4.0.2" "ordered-set" substituteInPlace tests/test_command.py \ --replace '/tmp/' "$TMPDIR/" ''; propagatedBuildInputs = [ - click ordered-set ]; - pythonImportsCheck = [ - "deepdiff" - ]; + passthru.optional-dependencies = { + cli = [ + clevercsv + click + pyyaml + toml + ]; + }; checkInputs = [ - clevercsv jsonpickle numpy pytestCheckHook - pyyaml + ] ++ passthru.optional-dependencies.cli; + + pythonImportsCheck = [ + "deepdiff" ]; meta = with lib; { description = "Deep Difference and Search of any Python object/data"; homepage = "https://github.com/seperman/deepdiff"; + changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 2478b07d90401..e179f5c94d203 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -11,12 +11,14 @@ }: buildPythonPackage rec { - pname = "Eve"; - version = "2.0.1"; + pname = "eve"; + version = "2.0.2"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-34dfYd1DSMAHSB0w6T8YPSQA3GUCgcNEFOD5sM+SapQ="; + inherit version; + pname = "Eve"; + sha256 = "80cad5702d07189c5f43f432d307c473331144477a6a360d22a27dc018366c13"; }; disabled = pythonOlder "3.7"; @@ -32,7 +34,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "events>=0.3,<0.4" "events>=0.3,<0.5" + --replace "flask<2.2" "flask" \ + --replace "events>=0.3,<0.4" "events>=0.3" ''; pythonImportsCheck = [ "eve" ]; diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 8697d4fee1da9..0bd151e236afe 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.0.6"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Cyr-ius"; repo = pname; - rev = version; - sha256 = "sha256-sD32zP3HWEq9FCM9PFywHaLEU+MJOvro+FpjrlM4dG4="; + rev = "refs/tags/${version}"; + sha256 = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 0ef45a56a6dee..f0b702b1b5133 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -1,9 +1,11 @@ { lib , aenum , aiohttp +, asynctest , buildPythonPackage , fetchFromGitHub , pydantic +, pytest-mock , pytestCheckHook , pythonOlder , requests @@ -11,7 +13,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "2.0.1"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-CO6ImL2e6B2yvHAQs3Cc7oaOllB5V9sap4bQS/XRnWI="; + hash = "sha256-dn5814eRZ9456Fn7blf1UzXPii4dXu3sjoXBV7CmwSs="; }; propagatedBuildInputs = [ @@ -31,6 +33,8 @@ buildPythonPackage rec { ]; checkInputs = [ + asynctest + pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index c15bb59f47382..c71bf3214b2c1 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.9.0"; + version = "0.10.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "beetbox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S90BgjKXpE4kAR0mPXgacmr2A+0hrkGpHRMeuvyFNCg="; + hash = "sha256-Sdb5Hvm4Y344msZGie4PJ88ZmFtWfc0chABtmwnEN/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index f132614d1ca00..b34c883d685cf 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -1,26 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, isPy3k -, bitcoinlib, GitPython, pysha3, git }: +{ lib +, bitcoinlib +, buildPythonPackage +, fetchFromGitHub +, git +, GitPython +, pysha3 +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "opentimestamps"; - version = "0.4.1"; - disabled = (!isPy3k); + version = "0.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # We can't use the pypi source because it doesn't include README.md which is - # needed in setup.py src = fetchFromGitHub { owner = "opentimestamps"; repo = "python-opentimestamps"; rev = "python-opentimestamps-v${version}"; - sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr"; + hash = "sha256-RRCAxDYWySmnG1sEQWurUDQsu+vPx9Npbr6BaoNGm1U="; }; - patches = [ - # build against bitcoinlib-0.11 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/opentimestamps/python-opentimestamps/pull/43.patch"; - sha256 = "0bxzk4pzpqk7zrk2x7vn2bj2n3pc5whf8ijbd225s6674q450zbg"; - }) + propagatedBuildInputs = [ + bitcoinlib + GitPython + pysha3 + ]; + + checkInputs = [ + git + pytestCheckHook ]; # Remove a failing test which expects the test source file to reside in the @@ -29,12 +40,14 @@ buildPythonPackage rec { rm opentimestamps/tests/core/test_git.py ''; - checkInputs = [ git ]; - propagatedBuildInputs = [ bitcoinlib GitPython pysha3 ]; + pythonImportsCheck = [ + "opentimestamps" + ]; - meta = { + meta = with lib; { description = "Create and verify OpenTimestamps proofs"; homepage = "https://github.com/opentimestamps/python-opentimestamps"; - license = lib.licenses.lgpl3; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 241953cda3ed2..e97db8beefe0b 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , cmake , boost @@ -9,6 +10,7 @@ , catch , numpy , pytestCheckHook +, libxcrypt }: buildPythonPackage rec { @@ -27,6 +29,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/python-modules/pycotap/default.nix b/pkgs/development/python-modules/pycotap/default.nix new file mode 100644 index 0000000000000..df7591459e2d3 --- /dev/null +++ b/pkgs/development/python-modules/pycotap/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pycotap"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-+Tjs1JMczRnZWY+2M9Xqu3k48IuEcXMV5SUmqmJ3yew="; + }; + + meta = with lib; { + description = "Test runner for unittest that outputs TAP results to stdout"; + homepage = "https://el-tramo.be/pycotap"; + license = licenses.mit; + maintainers = with maintainers; [ mwolfe ]; + }; +} diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 5c56150e8f535..e84374e4f744f 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -43,6 +43,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/natekspencer/pylitterbot/issues/73 + substituteInPlace pyproject.toml \ + --replace 'deepdiff = "^5.8.1"' 'deepdiff = ">=5.8.1"' + ''; + pytestFlagsArray = [ "--asyncio-mode=legacy" ]; diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index 3bee9f61780b4..8980a9ff592ba 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Pure-Python library built as a PDF toolkit"; - homepage = "https://github.com/py-pdf/PyPDF2"; + homepage = "https://pypdf2.readthedocs.io/"; changelog = "https://github.com/py-pdf/PyPDF2/raw/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ desiderius vrthra ]; diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix new file mode 100644 index 0000000000000..7be154a315c99 --- /dev/null +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, six, random2 }: + +buildPythonPackage rec { + pname = "pysol-cards"; + version = "0.14.2"; + + src = fetchPypi { + inherit version; + pname = "pysol_cards"; + sha256 = "sha256-wI3oV1d7w+7JcMOt08RbNlMWzChErNYIO7Vuox1A6vA="; + }; + + propagatedBuildInputs = [ six random2 ]; + + meta = with lib; { + description = "Generates Solitaire deals"; + homepage = "https://github.com/shlomif/pysol_cards"; + license = licenses.mit; + maintainers = with maintainers; [ mwolfe ]; + }; +} diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 0f5601bd4851a..b48804ed86709 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.82"; + version = "0.0.83"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-2pm0fLPw/ROjYwvaL1wyZ39ZAbAjwc1TPsbYsO0+vcI="; + hash = "sha256-N+DSaPohwkMJ+YjbnUi7k8GQ+YFd6Ng8n0yesEnOnRA="; }; propagatedBuildInputs = [ |