From a640d8692587b8946e009cae47e05f00c6ecbc46 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 22 Jun 2023 16:41:04 -0500 Subject: [PATCH 1/3] Add missing header --- src/cpp/configoptions.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cpp/configoptions.cpp b/src/cpp/configoptions.cpp index eab87a9d2..aee264540 100644 --- a/src/cpp/configoptions.cpp +++ b/src/cpp/configoptions.cpp @@ -27,6 +27,7 @@ */ #include +#include #include "configoptions.h" #include "srexception.h" #include "logger.h" From 6acb47a5c444cf5252269b6ea6059764d1d8aded Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 22 Jun 2023 16:43:35 -0500 Subject: [PATCH 2/3] Revert --- src/cpp/configoptions.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cpp/configoptions.cpp b/src/cpp/configoptions.cpp index aee264540..eab87a9d2 100644 --- a/src/cpp/configoptions.cpp +++ b/src/cpp/configoptions.cpp @@ -27,7 +27,6 @@ */ #include -#include #include "configoptions.h" #include "srexception.h" #include "logger.h" From b3741ab1e7af79ab2f32a9725b1aa88fa533a67d Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 22 Jun 2023 16:48:30 -0500 Subject: [PATCH 3/3] Remove srobject.from_pybind() method --- doc/changelog.rst | 3 +++ src/python/module/smartredis/srobject.py | 15 --------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/doc/changelog.rst b/doc/changelog.rst index 2e7c00897..27c6755f7 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -8,6 +8,7 @@ To be released at some future point in time Description +- Remove unneeded method from Python SRObject class - Remove debug output in pybind layer - Update Hiredis version to 1.1.0 - Enable parallel build for the SmartRedis examples @@ -23,6 +24,7 @@ Description Detailed Notes +- Remove from_pybind() from Python SRObject class as it's not needed and didn't work properly anyway (PR358_) - Remove debug output in pybind layer associated with put_dataset (PR352_) - Updated to the latest version of Hiredis (1.1.0) (PR351_) - Enable parallel build for the SmartRedis examples by moving utility Fortran code @@ -44,6 +46,7 @@ users need not import `iso_c_binding` in their own applications (PR340_) - New pip-install target in Makefile will be a dependency of the lib target going forward so that users don't have to manually pip install SmartRedis in the future (PR330_) - Added ConfigOptions class and API, which will form the backbone of multiDB support (PR303_) +.. _PR358: https://github.com/CrayLabs/SmartRedis/pull/358 .. _PR352: https://github.com/CrayLabs/SmartRedis/pull/352 .. _PR351: https://github.com/CrayLabs/SmartRedis/pull/351 .. _PR349: https://github.com/CrayLabs/SmartRedis/pull/349 diff --git a/src/python/module/smartredis/srobject.py b/src/python/module/smartredis/srobject.py index 787e6786b..d0cf2bff6 100644 --- a/src/python/module/smartredis/srobject.py +++ b/src/python/module/smartredis/srobject.py @@ -43,21 +43,6 @@ def __init__(self, context): else: self._srobject = context - @staticmethod - def from_pybind(srobject): - """Initialize a SRObject object from - a PySRObject object - - :param srobject: The pybind PySRObject object to use for construction - :type srobject: PySRObject - :return: The newly constructed¸ SRObject from the PySRObject - :rtype: SRObject - """ - typecheck(srobject, "srobject", PySRObject) - new_srobject = SRObject(srobject._name) - new_srobject.set_data(srobject) - return new_srobject - @exception_handler def get_srobject(self): """Return the PySRObject attribute