From e4b40c4c4b51ce671eaf9028965292b8e357e019 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 13:39:29 +0200 Subject: [PATCH 1/7] python311Packages.logbook: update meta --- pkgs/development/python-modules/logbook/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index e6d155760d51..bc051df768bc 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -22,9 +22,11 @@ buildPythonPackage rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = { - homepage = "https://pythonhosted.org/Logbook/"; + 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; [ ]; }; } From 1fa7b1e2675c13b9bc13542d9829b45650d7400e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 13:41:25 +0200 Subject: [PATCH 2/7] python311Packages.logbook: equalize content --- .../python-modules/logbook/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index bc051df768bc..757db7f562c7 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytest +, mock +, brotli +}: buildPythonPackage rec { pname = "logbook"; @@ -10,9 +17,15 @@ buildPythonPackage rec { sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36"; }; - nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; + nativeCheckInputs = [ + pytest + ] ++ lib.optionals (!isPy3k) [ + mock + ]; - propagatedBuildInputs = [ brotli ]; + propagatedBuildInputs = [ + brotli + ]; checkPhase = '' find tests -name \*.pyc -delete From d2ebe5752479f84e54af453231af89baaff0add6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 13:42:20 +0200 Subject: [PATCH 3/7] python311Packages.logbook: add pythonImportsCheck --- pkgs/development/python-modules/logbook/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index 757db7f562c7..5fc43a8801f0 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ + "logbook" + ]; + meta = with lib; { description = "A logging replacement for Python"; homepage = "https://logbook.readthedocs.io/"; From 45b5ebde0974d13ce51cba0d1bd9977c4788ed42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 13:43:26 +0200 Subject: [PATCH 4/7] python311Packages.logbook: switch to pytestCheckHook --- pkgs/development/python-modules/logbook/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index 5fc43a8801f0..f21bf3e1ce25 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k -, pytest +, pytestCheckHook , mock , brotli }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytest + pytestCheckHook ] ++ lib.optionals (!isPy3k) [ mock ]; @@ -27,11 +27,6 @@ buildPythonPackage rec { brotli ]; - checkPhase = '' - find tests -name \*.pyc -delete - py.test tests - ''; - # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; From 17c37b2c4452ca349ab1f19b4b5798892ced2fd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Aug 2023 14:05:41 +0200 Subject: [PATCH 5/7] python311Packages.logbook: 1.5.3 -> 1.6.0 Changelog: https://github.com/getlogbook/logbook/blob/1.6.0/CHANGES --- .../python-modules/logbook/default.nix | 77 +++++++++++++++---- 1 file changed, 60 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index f21bf3e1ce25..d8251a40099f 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -1,31 +1,69 @@ { lib -, buildPythonPackage -, fetchPypi -, isPy3k -, pytestCheckHook -, mock , 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="; + }; + + nativeBuildInputs = [ + cython + setuptools + ]; + + passthru.optional-dependencies = { + execnet = [ + execnet + ]; + sqlalchemy = [ + sqlalchemy + ]; + redis = [ + redis + ]; + zmq = [ + pyzmq + ]; + compression = [ + brotli + ]; + jinja = [ + jinja2 + ]; + all = [ + brotli + execnet + jinja2 + pyzmq + redis + sqlalchemy + ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.optionals (!isPy3k) [ - mock - ]; - - propagatedBuildInputs = [ - brotli - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -34,6 +72,11 @@ buildPythonPackage rec { "logbook" ]; + disabledTests = [ + # Test require Redis instance + "test_redis_handler" + ]; + meta = with lib; { description = "A logging replacement for Python"; homepage = "https://logbook.readthedocs.io/"; From 5b9a5471c1706e02ed671cc2649a509a1945872a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 16:58:54 +0200 Subject: [PATCH 6/7] python311Packages.dbt-core: relax logbook constraint --- pkgs/development/python-modules/dbt-core/default.nix | 1 + 1 file changed, 1 insertion(+) 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 = [ From eeecd453c5002dedd9616afa0d344c8579c9e026 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 17:09:54 +0200 Subject: [PATCH 7/7] cobang: 0.9.6 -> 0.10.1 Diff: https://github.com/hongquan/CoBang/compare/refs/tags/v0.9.6...v0.10.1 --- .../0001-Poetry-core-and-pillow-9.patch | 32 ------------- pkgs/applications/misc/cobang/default.nix | 46 ++++++++++--------- 2 files changed, 25 insertions(+), 53 deletions(-) delete mode 100644 pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch diff --git a/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch deleted file mode 100644 index 7ba0dab2d1e2..000000000000 --- a/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001 -From: "P. R. d. O" -Date: Fri, 4 Mar 2022 07:03:17 -0600 -Subject: [PATCH] Pillow update - ---- - pyproject.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 5dc25e0..b3ba397 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -11,7 +11,7 @@ readme = "README.rst" - [tool.poetry.dependencies] - python = "^3.7" - logbook = "^1.5.3" --Pillow = "^8.2.0" -+Pillow = "^9.0.0" - requests = "^2.24.0" - kiss-headers = "^2.2.3" - single-version = "^1.5.1" -@@ -33,4 +33,4 @@ skip-string-normalization = true - - [build-system] --requires = ["poetry>=0.12"] -+requires = ["poetry-core"] --build-backend = "poetry.masonry.api" -+build-backend = "poetry.core.masonry.api" --- -2.35.1 - diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index d8f8932fd734..d3d203b6ae01 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -1,49 +1,62 @@ { lib +, atk , buildPythonApplication , fetchFromGitHub -, wrapGAppsHook -, atk , gdk-pixbuf , gobject-introspection -, gtk3 , gst-plugins-good +, gst-python +, gtk3 +, kiss-headers , libhandy , librsvg +, logbook , networkmanager , pango -, gst-python -, kiss-headers -, logbook , pillow , poetry-core , pygobject3 +, pytestCheckHook , python , python-zbar +, pythonRelaxDepsHook , requests , single-version -, pytestCheckHook }: +, wrapGAppsHook +}: buildPythonApplication rec { pname = "cobang"; - version = "0.9.6"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; - rev = "v${version}"; - sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw="; + rev = "refs/tags/v${version}"; + hash = "sha256-yNDnBTBmwcP3g51UkkLNyF4eHYjblwxPxS2lMwbFKUM="; }; - patches = [ - ./0001-Poetry-core-and-pillow-9.patch + pythonRelaxDeps = [ + "logbook" + "Pillow" ]; nativeBuildInputs = [ gobject-introspection + pythonRelaxDepsHook wrapGAppsHook ]; + buildInputs = [ + atk + gdk-pixbuf + gst-plugins-good + libhandy + networkmanager + pango + ]; + propagatedBuildInputs = [ gst-python kiss-headers @@ -56,15 +69,6 @@ buildPythonApplication rec { single-version ]; - buildInputs = [ - atk - gdk-pixbuf - gst-plugins-good - libhandy - networkmanager - pango - ]; - nativeCheckInputs = [ pytestCheckHook ];