forked from pool/python-hiredis
Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| aaa23dfa68 | |||
| 4a148a29ae | |||
| 92d4ae3cab | |||
| 799bcd1872 |
@@ -1,42 +0,0 @@
|
|||||||
From c2a20695aae53de7b5160e29675344df0b805fa6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
|
||||||
Date: Sat, 18 Mar 2023 15:18:08 -0400
|
|
||||||
Subject: [PATCH] pack: Replace sdsalloc.h with alloc.h
|
|
||||||
|
|
||||||
Fixes #158.
|
|
||||||
|
|
||||||
* src/pack.c: Replace sdsalloc.h with alloc.h.
|
|
||||||
(pack_command): Replace s_malloc with hi_malloc.
|
|
||||||
---
|
|
||||||
src/pack.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/pack.c b/src/pack.c
|
|
||||||
index 443e9d3..23e4004 100644
|
|
||||||
--- a/src/pack.c
|
|
||||||
+++ b/src/pack.c
|
|
||||||
@@ -16,7 +16,7 @@ extern sds sdscpylen(sds s, const char *t, size_t len);
|
|
||||||
extern sds sdsnewlen(const void *init, size_t initlen);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include <hiredis/sdsalloc.h>
|
|
||||||
+#include <hiredis/alloc.h>
|
|
||||||
|
|
||||||
PyObject *
|
|
||||||
pack_command(PyObject *cmd)
|
|
||||||
@@ -32,7 +32,7 @@ pack_command(PyObject *cmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
Py_ssize_t tokens_number = PyTuple_Size(cmd);
|
|
||||||
- sds *tokens = s_malloc(sizeof(sds) * tokens_number);
|
|
||||||
+ sds *tokens = hi_malloc(sizeof(sds) * tokens_number);
|
|
||||||
if (tokens == NULL)
|
|
||||||
{
|
|
||||||
return PyErr_NoMemory();
|
|
||||||
@@ -118,4 +118,4 @@ pack_command(PyObject *cmd)
|
|
||||||
sdsfreesplitres(tokens, tokens_number);
|
|
||||||
hi_free(lengths);
|
|
||||||
return result;
|
|
||||||
-}
|
|
||||||
\ No newline at end of file
|
|
||||||
+}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:733e2456b68f3f126ddaf2cd500a33b25146c3676b97ea843665717bda0c5d43
|
|
||||||
size 87598
|
|
||||||
3
hiredis-3.3.0.tar.gz
Normal file
3
hiredis-3.3.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:105596aad9249634361815c574351f1bd50455dc23b537c2940066c4a9dea685
|
||||||
|
size 89048
|
||||||
@@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 15 09:45:54 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
||||||
|
|
||||||
|
- Update to 3.3.0
|
||||||
|
* Add official support for Python 3.14
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 1 11:06:20 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
||||||
|
|
||||||
|
- update to 3.2.1
|
||||||
|
* BREAKING: Return Redis sets as Python lists
|
||||||
|
* Update Python 3.13 compatibility
|
||||||
|
* Fix memory leaks and segfaults in RESP3 map parsing
|
||||||
|
* Update hiredis to 1.3.0
|
||||||
|
- Drop 159-sdsalloc-to-alloc.patch, merged upstream
|
||||||
|
- Run tests
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jan 2 22:32:52 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
Tue Jan 2 22:32:52 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-hiredis
|
# spec file for package python-hiredis
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%{?sle15_python_module_pythons}
|
%{?sle15_python_module_pythons}
|
||||||
Name: python-hiredis
|
Name: python-hiredis
|
||||||
Version: 2.3.2
|
Version: 3.3.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Python wrapper for hiredis
|
Summary: Python wrapper for hiredis
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
@@ -27,18 +27,16 @@ Source: https://files.pythonhosted.org/packages/source/h/hiredis/hiredis
|
|||||||
# PATCH-FIX-UPSTREAM drop-vendor-sources.patch gh#redis/hiredis-py#90 mcepl@suse.com
|
# PATCH-FIX-UPSTREAM drop-vendor-sources.patch gh#redis/hiredis-py#90 mcepl@suse.com
|
||||||
# Allow to use platform hiredis libs on build
|
# Allow to use platform hiredis libs on build
|
||||||
Patch0: drop-vendor-sources.patch
|
Patch0: drop-vendor-sources.patch
|
||||||
# PATCH-FIX-UPSTREAM 159-sdsalloc-to-alloc.patch gh#redis/hiredis-py#158 mcepl@suse.com
|
|
||||||
# Don't use sdsalloc, we actually don't need it
|
|
||||||
Patch1: 159-sdsalloc-to-alloc.patch
|
|
||||||
# PATCH-FIX-UPSTREAM 161-use-system-hiredis.patch gh#redis/hiredis-py#158 mcepl@suse.com
|
# PATCH-FIX-UPSTREAM 161-use-system-hiredis.patch gh#redis/hiredis-py#158 mcepl@suse.com
|
||||||
# use system hiredis instead
|
# use system hiredis instead
|
||||||
Patch2: 161-use-system-hiredis.patch
|
Patch2: 161-use-system-hiredis.patch
|
||||||
BuildRequires: %{python_module devel}
|
BuildRequires: %{python_module devel}
|
||||||
BuildRequires: %{python_module pip}
|
BuildRequires: %{python_module pip}
|
||||||
|
BuildRequires: %{python_module pytest}
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
BuildRequires: %{python_module wheel}
|
BuildRequires: %{python_module wheel}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: hiredis-devel >= 1.0.0
|
BuildRequires: hiredis-devel >= 1.3.0
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
%python_subpackages
|
%python_subpackages
|
||||||
|
|
||||||
@@ -58,9 +56,8 @@ rm -r vendor/hiredis
|
|||||||
%pyproject_install
|
%pyproject_install
|
||||||
%python_expand %fdupes %{buildroot}%{$python_sitearch}
|
%python_expand %fdupes %{buildroot}%{$python_sitearch}
|
||||||
|
|
||||||
# %%check
|
%check
|
||||||
# export PYTHONPATH=%%{buildroot}%%{$python_sitearch}
|
%pytest_arch
|
||||||
# %%python_exec test.py
|
|
||||||
|
|
||||||
%files %{python_files}
|
%files %{python_files}
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|||||||
Reference in New Issue
Block a user