Merge pull request #251354 from fabaff/logbook-bump

python311Packages.logbook: 1.5.3 -> 1.6.0

pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch

@@ -1,32 +0,0 @@
-From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001
-From: "P. R. d. O" <d.ol.rod@tutanota.com>
-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
-

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
   ];

pkgs/development/python-modules/dbt-core/default.nix

@@ -51,6 +51,7 @@ buildPythonPackage rec {
     "click"
     "mashumaro"
     "networkx"
+    "logbook"
   ];
 
   propagatedBuildInputs = [

pkgs/development/python-modules/logbook/default.nix

@@ -1,30 +1,87 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }:
+{ lib
+, 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=";
   };
 
-  nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];
+  nativeBuildInputs = [
+    cython
+    setuptools
+  ];
 
-  propagatedBuildInputs = [ brotli ];
+  passthru.optional-dependencies = {
+    execnet = [
+      execnet
+    ];
+    sqlalchemy = [
+      sqlalchemy
+    ];
+    redis = [
+      redis
+    ];
+    zmq = [
+      pyzmq
+    ];
+    compression = [
+      brotli
+    ];
+    jinja = [
+      jinja2
+    ];
+    all = [
+      brotli
+      execnet
+      jinja2
+      pyzmq
+      redis
+      sqlalchemy
+    ];
+  };
 
-  checkPhase = ''
-    find tests -name \*.pyc -delete
-    py.test tests
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;
 
-  meta = {
-    homepage = "https://pythonhosted.org/Logbook/";
+  pythonImportsCheck = [
+    "logbook"
+  ];
+
+  disabledTests = [
+    # Test require Redis instance
+    "test_redis_handler"
+  ];
+
+  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; [ ];
   };
 }