pyrox.dev
Merge pull request #251354 from fabaff/logbook-bump
python311Packages.logbook: 1.5.3 -> 1.6.0
authored by
Fabian Affolter
and committed by
GitHub
da4db608
cd4fa04d
-32
pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch
-32
pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch
···
1
-
From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001
2
-
From: "P. R. d. O" <d.ol.rod@tutanota.com>
3
-
Date: Fri, 4 Mar 2022 07:03:17 -0600
4
-
Subject: [PATCH] Pillow update
5
-
6
-
---
7
-
pyproject.toml | 4 ++--
8
-
1 file changed, 2 insertions(+), 2 deletions(-)
9
-
10
-
diff --git a/pyproject.toml b/pyproject.toml
11
-
index 5dc25e0..b3ba397 100644
12
-
--- a/pyproject.toml
13
-
+++ b/pyproject.toml
14
-
@@ -11,7 +11,7 @@ readme = "README.rst"
15
-
[tool.poetry.dependencies]
16
-
python = "^3.7"
17
-
logbook = "^1.5.3"
18
-
-Pillow = "^8.2.0"
19
-
+Pillow = "^9.0.0"
20
-
requests = "^2.24.0"
21
-
kiss-headers = "^2.2.3"
22
-
single-version = "^1.5.1"
23
-
@@ -33,4 +33,4 @@ skip-string-normalization = true
24
-
25
-
[build-system]
26
-
-requires = ["poetry>=0.12"]
27
-
+requires = ["poetry-core"]
28
-
-build-backend = "poetry.masonry.api"
29
-
+build-backend = "poetry.core.masonry.api"
30
-
--
31
-
2.35.1
32
-
+25
-21
pkgs/applications/misc/cobang/default.nix
+25
-21
pkgs/applications/misc/cobang/default.nix
···
1
1
{ lib
2
+
, atk
2
3
, buildPythonApplication
3
4
, fetchFromGitHub
4
-
, wrapGAppsHook
5
-
, atk
6
5
, gdk-pixbuf
7
6
, gobject-introspection
7
+
, gst-plugins-good
8
+
, gst-python
8
9
, gtk3
9
-
, gst-plugins-good
10
+
, kiss-headers
10
11
, libhandy
11
12
, librsvg
13
+
, logbook
12
14
, networkmanager
13
15
, pango
14
-
, gst-python
15
-
, kiss-headers
16
-
, logbook
17
16
, pillow
18
17
, poetry-core
19
18
, pygobject3
19
+
, pytestCheckHook
20
20
, python
21
21
, python-zbar
22
+
, pythonRelaxDepsHook
22
23
, requests
23
24
, single-version
24
-
, pytestCheckHook }:
25
+
, wrapGAppsHook
26
+
}:
25
27
26
28
buildPythonApplication rec {
27
29
pname = "cobang";
28
-
version = "0.9.6";
30
+
version = "0.10.1";
29
31
format = "pyproject";
30
32
31
33
src = fetchFromGitHub {
32
34
owner = "hongquan";
33
35
repo = "CoBang";
34
-
rev = "v${version}";
35
-
sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw=";
36
+
rev = "refs/tags/v${version}";
37
+
hash = "sha256-yNDnBTBmwcP3g51UkkLNyF4eHYjblwxPxS2lMwbFKUM=";
36
38
};
37
39
38
-
patches = [
39
-
./0001-Poetry-core-and-pillow-9.patch
40
+
pythonRelaxDeps = [
41
+
"logbook"
42
+
"Pillow"
40
43
];
41
44
42
45
nativeBuildInputs = [
43
46
gobject-introspection
47
+
pythonRelaxDepsHook
44
48
wrapGAppsHook
45
49
];
46
50
51
+
buildInputs = [
52
+
atk
53
+
gdk-pixbuf
54
+
gst-plugins-good
55
+
libhandy
56
+
networkmanager
57
+
pango
58
+
];
59
+
47
60
propagatedBuildInputs = [
48
61
gst-python
49
62
kiss-headers
···
54
67
python-zbar
55
68
requests
56
69
single-version
57
-
];
58
-
59
-
buildInputs = [
60
-
atk
61
-
gdk-pixbuf
62
-
gst-plugins-good
63
-
libhandy
64
-
networkmanager
65
-
pango
66
70
];
67
71
68
72
nativeCheckInputs = [
+1
pkgs/development/python-modules/dbt-core/default.nix
+1
pkgs/development/python-modules/dbt-core/default.nix
+72
-15
pkgs/development/python-modules/logbook/default.nix
+72
-15
pkgs/development/python-modules/logbook/default.nix
···
1
-
{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }:
1
+
{ lib
2
+
, brotli
3
+
, buildPythonPackage
4
+
, cython
5
+
, execnet
6
+
, fetchFromGitHub
7
+
, jinja2
8
+
, pytestCheckHook
9
+
, pythonOlder
10
+
, pyzmq
11
+
, redis
12
+
, setuptools
13
+
, sqlalchemy
14
+
}:
2
15
3
16
buildPythonPackage rec {
4
17
pname = "logbook";
5
-
version = "1.5.3";
18
+
version = "1.6.0";
19
+
format = "setuptools";
6
20
7
-
src = fetchPypi {
8
-
pname = "Logbook";
9
-
inherit version;
10
-
sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36";
21
+
disabled = pythonOlder "3.8";
22
+
23
+
src = fetchFromGitHub {
24
+
owner = "getlogbook";
25
+
repo = "logbook";
26
+
rev = "refs/tags/${version}";
27
+
hash = "sha256-2K6fM6MFrh3l0smhSz8RFd79AIOXQZJQbNLTJM4WZUo=";
11
28
};
12
29
13
-
nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];
30
+
nativeBuildInputs = [
31
+
cython
32
+
setuptools
33
+
];
14
34
15
-
propagatedBuildInputs = [ brotli ];
35
+
passthru.optional-dependencies = {
36
+
execnet = [
37
+
execnet
38
+
];
39
+
sqlalchemy = [
40
+
sqlalchemy
41
+
];
42
+
redis = [
43
+
redis
44
+
];
45
+
zmq = [
46
+
pyzmq
47
+
];
48
+
compression = [
49
+
brotli
50
+
];
51
+
jinja = [
52
+
jinja2
53
+
];
54
+
all = [
55
+
brotli
56
+
execnet
57
+
jinja2
58
+
pyzmq
59
+
redis
60
+
sqlalchemy
61
+
];
62
+
};
16
63
17
-
checkPhase = ''
18
-
find tests -name \*.pyc -delete
19
-
py.test tests
20
-
'';
64
+
nativeCheckInputs = [
65
+
pytestCheckHook
66
+
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
21
67
22
68
# Some of the tests use localhost networking.
23
69
__darwinAllowLocalNetworking = true;
24
70
25
-
meta = {
26
-
homepage = "https://pythonhosted.org/Logbook/";
71
+
pythonImportsCheck = [
72
+
"logbook"
73
+
];
74
+
75
+
disabledTests = [
76
+
# Test require Redis instance
77
+
"test_redis_handler"
78
+
];
79
+
80
+
meta = with lib; {
27
81
description = "A logging replacement for Python";
28
-
license = lib.licenses.bsd3;
82
+
homepage = "https://logbook.readthedocs.io/";
83
+
changelog = "https://github.com/getlogbook/logbook/blob/${version}/CHANGES";
84
+
license = licenses.bsd3;
85
+
maintainers = with maintainers; [ ];
29
86
};
30
87
}