From 9aa2c781aa6e486aba9bbc39cf62edbde7bb01a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Feb 2024 14:18:28 +0100 Subject: [PATCH 1/3] python311Packages.fakeredis: 2.20.1 -> 2.21.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.20.1...v2.21.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.21.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b39241bc9058..97849371f0cd 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.20.1"; + version = "2.21.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-TmgHAskR5MF/lzF0NHgXKecLsSCoc7xsm7gRgupm0Ws="; + hash = "sha256-A+XOCWeXVt8SUkKM+TKra8xODuCD0QE9+/8FefUt4OY="; }; nativeBuildInputs = [ From 07538cfddf00780802f0780f1fae6e805deeccfe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Feb 2024 08:52:22 +0100 Subject: [PATCH 2/3] python311Packages.pyprobables: init at 0.6.0 Probabilistic data structures https://github.com/barrust/pyprobables --- .../python-modules/pyprobables/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pyprobables/default.nix diff --git a/pkgs/development/python-modules/pyprobables/default.nix b/pkgs/development/python-modules/pyprobables/default.nix new file mode 100644 index 000000000000..be4410cce276 --- /dev/null +++ b/pkgs/development/python-modules/pyprobables/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "pyprobables"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "barrust"; + repo = "pyprobables"; + rev = "refs/tags/v${version}"; + hash = "sha256-maikrZlBzhv35zPXmKqdJzAz6eZDmluLUvkOkaPTCDU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "probables" + ]; + + meta = with lib; { + description = "Probabilistic data structures"; + homepage = "https://github.com/barrust/pyprobables"; + changelog = "https://github.com/barrust/pyprobables/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71d7fc931e7b..6d27dd918abf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9327,6 +9327,8 @@ self: super: with self; { pyprecice = callPackage ../development/python-modules/pyprecice { }; + pyprobables = callPackage ../development/python-modules/pyprobables { }; + pyproject-api = callPackage ../development/python-modules/pyproject-api { }; pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { }; From 59cc65262f66dd00faaaf1f5d141fe4f775aacf0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Feb 2024 08:57:04 +0100 Subject: [PATCH 3/3] python311Packages.fakeredis: refactor - fix license (is BSD 3-Clause not MIT) - add more extra --- .../python-modules/fakeredis/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 97849371f0cd..df8e34dafffe 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -6,19 +6,19 @@ , lupa , poetry-core , pybloom-live +, pyprobables , pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder , redis -, six , sortedcontainers }: buildPythonPackage rec { pname = "fakeredis"; version = "2.21.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -35,7 +35,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis - six sortedcontainers ]; @@ -54,7 +53,13 @@ buildPythonPackage rec { aioredis ]; bf = [ - pybloom-live + pyprobables + ]; + cf = [ + pyprobables + ]; + probabilistic = [ + pyprobables ]; }; @@ -66,7 +71,7 @@ buildPythonPackage rec { description = "Fake implementation of Redis API"; homepage = "https://github.com/dsoftwareinc/fakeredis-py"; changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; }