Skip to content

Commit 64b2f13

Browse files
authored
rclip: 1.10.3 -> 1.11.0 (#359848)
2 parents e439619 + 9884d89 commit 64b2f13

File tree

3 files changed

+113
-13
lines changed

3 files changed

+113
-13
lines changed

pkgs/by-name/rc/rclip/package.nix

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,45 @@
1-
{ lib
2-
, python3Packages
3-
, fetchFromGitHub
1+
{
2+
lib,
3+
python3Packages,
4+
fetchFromGitHub,
45
}:
56
python3Packages.buildPythonApplication rec {
67
pname = "rclip";
7-
version = "1.10.3";
8+
version = "1.11.0";
89
pyproject = true;
910

1011
src = fetchFromGitHub {
1112
owner = "yurijmikhalevich";
1213
repo = "rclip";
1314
rev = "refs/tags/v${version}";
14-
hash = "sha256-MdqO6X1dbIzmDuDSjrbmKbQfPIPcyhVIbodERYu9PZU=";
15+
hash = "sha256-bu9kz0CCq78lp+d2uPoApzZnVybwyWD/fwgnXYG52dk=";
1516
};
1617

17-
nativeBuildInputs = with python3Packages; [
18+
build-system = with python3Packages; [
1819
poetry-core
1920
];
2021

21-
propagatedBuildInputs = with python3Packages; [
22+
dependencies = with python3Packages; [
23+
numpy
2224
open-clip-torch
2325
pillow
2426
requests
2527
torch
2628
torchvision
2729
tqdm
30+
rawpy
2831
];
2932

30-
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
31-
32-
pythonRelaxDeps = [ "torch" "torchvision" ];
33+
pythonRelaxDeps = [
34+
"pillow"
35+
"torch"
36+
"torchvision"
37+
];
3338

3439
pythonImportsCheck = [ "rclip" ];
3540

41+
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
42+
3643
disabledTestPaths = [
3744
# requires network
3845
"tests/e2e/test_rclip.py"
@@ -45,11 +52,12 @@ python3Packages.buildPythonApplication rec {
4552
"test_loads_full_model_when_text_processing_only_requested_and_checkpoint_doesnt_exist"
4653
];
4754

48-
meta = with lib; {
55+
meta = {
4956
description = "AI-Powered Command-Line Photo Search Tool";
5057
homepage = "https://github.com/yurijmikhalevich/rclip";
51-
license = licenses.mit;
52-
maintainers = with maintainers; [ iynaix ];
58+
changelog = "https://github.com/yurijmikhalevich/rclip/releases/tag/v${version}";
59+
license = lib.licenses.mit;
60+
maintainers = with lib.maintainers; [ iynaix ];
5361
mainProgram = "rclip";
5462
};
5563
}
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
lib,
3+
buildPythonPackage,
4+
fetchFromGitHub,
5+
6+
# build-system
7+
cython,
8+
setuptools,
9+
10+
# nativeBuildInputs
11+
pkg-config,
12+
13+
# buildInputs
14+
libraw,
15+
16+
# dependencies
17+
numpy,
18+
19+
# tests
20+
imageio,
21+
pytestCheckHook,
22+
scikit-image,
23+
}:
24+
25+
buildPythonPackage rec {
26+
pname = "rawpy";
27+
version = "0.23.2";
28+
pyproject = true;
29+
30+
src = fetchFromGitHub {
31+
owner = "letmaik";
32+
repo = "rawpy";
33+
rev = "refs/tags/v${version}";
34+
hash = "sha256-s7/YbD5Jy9Jzry817djG63Zs4It8b1S95qmcJgPYGZQ=";
35+
};
36+
37+
build-system = [
38+
cython
39+
numpy
40+
setuptools
41+
];
42+
43+
nativeBuildInputs = [
44+
pkg-config
45+
];
46+
47+
buildInputs = [
48+
libraw
49+
];
50+
51+
dependencies = [
52+
numpy
53+
];
54+
55+
env = {
56+
RAWPY_USE_SYSTEM_LIBRAW = 1;
57+
};
58+
59+
pythonImportsCheck = [
60+
"rawpy"
61+
"rawpy._rawpy"
62+
];
63+
64+
# Delete the source files to load the library from the installed folder instead of the source files
65+
preCheck = ''
66+
rm -rf rawpy
67+
'';
68+
69+
nativeCheckInputs = [
70+
imageio
71+
pytestCheckHook
72+
scikit-image
73+
];
74+
75+
disabledTests = [
76+
# rawpy._rawpy.LibRawFileUnsupportedError: b'Unsupported file format or not RAW file'
77+
"testFoveonFileOpenAndPostProcess"
78+
"testThumbExtractBitmap"
79+
];
80+
81+
meta = {
82+
description = "RAW image processing for Python, a wrapper for libraw";
83+
homepage = "https://github.com/letmaik/rawpy";
84+
license = with lib.licenses; [
85+
lgpl21Only
86+
mit
87+
];
88+
maintainers = with lib.maintainers; [ GaetanLepage ];
89+
};
90+
}

pkgs/top-level/python-packages.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13666,6 +13666,8 @@ self: super: with self; {
1366613666

1366713667
rawkit = callPackage ../development/python-modules/rawkit { };
1366813668

13669+
rawpy = callPackage ../development/python-modules/rawpy { };
13670+
1366913671
ray = callPackage ../development/python-modules/ray { };
1367013672

1367113673
raylib-python-cffi = callPackage ../development/python-modules/raylib-python-cffi {};

0 commit comments

Comments
 (0)