From 809b19d7cb813970117f3991526f7d0a167e85fe Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 23 Dec 2023 14:13:20 +0100 Subject: [PATCH 1/3] python3Packages.strct: init at 0.0.32 --- .../python-modules/strct/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/strct/default.nix diff --git a/pkgs/development/python-modules/strct/default.nix b/pkgs/development/python-modules/strct/default.nix new file mode 100644 index 000000000000..7244002d4169 --- /dev/null +++ b/pkgs/development/python-modules/strct/default.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, setuptools +, pytestCheckHook +, sortedcontainers +}: + +buildPythonPackage rec { + pname = "strct"; + version = "0.0.32"; + pyproject = true; + + src = fetchFromGitHub { + owner = "shaypal5"; + repo = "strct"; + rev = "v${version}"; + hash = "sha256-ctafvdfSOdp7tlCUYg7d5XTXR1qBcWvOVtGtNUnhYIw="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace \ + "--cov" \ + "#--cov" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + sortedcontainers + ]; + + pythonImportsCheck = [ + "strct" + "strct.dicts" + "strct.hash" + "strct.lists" + "strct.sets" + "strct.sortedlists" + ]; + + meta = with lib; { + description = "A small pure-python package for data structure related utility functions"; + homepage = "https://github.com/shaypal5/strct"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cc0aec97ed1..41004672a5b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13738,6 +13738,8 @@ self: super: with self; { strawberry-graphql = callPackage ../development/python-modules/strawberry-graphql { }; + strct = callPackage ../development/python-modules/strct { }; + streamdeck = callPackage ../development/python-modules/streamdeck { }; streaming-form-data = callPackage ../development/python-modules/streaming-form-data { }; From 05a38203248f0be2a64810fba28d9afa65b97e48 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 23 Dec 2023 14:13:55 +0100 Subject: [PATCH 2/3] python3Packages.birch: init at 0.0.35 --- .../python-modules/birch/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/birch/default.nix diff --git a/pkgs/development/python-modules/birch/default.nix b/pkgs/development/python-modules/birch/default.nix new file mode 100644 index 000000000000..3afd6d3df06a --- /dev/null +++ b/pkgs/development/python-modules/birch/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, strct +, pytestCheckHook +, pyyaml +}: + +buildPythonPackage rec { + pname = "birch"; + version = "0.0.35"; + pyproject = true; + + src = fetchFromGitHub { + owner = "shaypal5"; + repo = "birch"; + rev = "v${version}"; + hash = "sha256-KdQZzQJvJ+logpcLQfaqqEEZJ/9VmNTQX/a4v0oBC98="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace \ + "--cov" \ + "#--cov" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + strct + ]; + + pythonImportsCheck = [ + "birch" + "birch.casters" + "birch.exceptions" + "birch.paths" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + preCheck = '' + export HOME="$(mktemp -d)" + ''; + + + meta = with lib; { + description = "Simple hierarchical configuration for Python packages"; + homepage = "https://github.com/shaypal5/birch"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41004672a5b0..09735cf830a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1476,6 +1476,8 @@ self: super: with self; { bip32 = callPackage ../development/python-modules/bip32 { }; + birch = callPackage ../development/python-modules/birch { }; + bitarray = callPackage ../development/python-modules/bitarray { }; bitbox02 = callPackage ../development/python-modules/bitbox02 { }; From 4b868c2df260baf5c1831dfd8a2a5c3da9152bcf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 23 Dec 2023 13:44:22 +0100 Subject: [PATCH 3/3] python3Packages.cachier: 2.2.1 -> 2.2.2 diff: https://github.com/python-cachier/cachier/compare/v2.2.1...v2.2.2 --- .../python-modules/cachier/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index 2a1fe461d51c..28159a16454c 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -1,29 +1,31 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , pythonRelaxDepsHook , setuptools , watchdog , portalocker -, pathtools , pytestCheckHook , pymongo , dnspython , pymongo-inmemory , pandas +, birch }: buildPythonPackage rec { pname = "cachier"; - version = "2.2.1"; - format = "setuptools"; + version = "2.2.2"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-nm98LT87Z7yErKvIqMp93OEX9TDojqqtItgryHgSQJQ="; + src = fetchFromGitHub { + owner = "python-cachier"; + repo = "cachier"; + rev = "v${version}"; + hash = "sha256-zUZqT4SIwZRqhRS/wHIzIYVULnp5aYcytCQd17T0D/4="; }; pythonRemoveDeps = [ "setuptools" ]; @@ -36,7 +38,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ watchdog portalocker - pathtools ]; preCheck = '' @@ -52,6 +53,7 @@ buildPythonPackage rec { dnspython pymongo-inmemory pandas + birch ]; disabledTests = [