pycall 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b016b6c9b12867d113713238ecc171cc4fde8965197c79c59abf66d8bb3b252e
-  data.tar.gz: abb36597376d37744972f7bb537ab61032387c73947d7846b9947bb622bf04ac
+  metadata.gz: 7b2f11d56347f0f7a8977916c73468aa165a23350ed271e7cdb064341211aabb
+  data.tar.gz: 0d4c68470567e1a2d58d2512f8ca883dfaca1329f4d89a255d0917f3b2c85f7b
 SHA512:
-  metadata.gz: 18bc020ef0c1f1d82e3796ae023170ee287bbf966c3efd12dd48f730eec585b7b70e00352d316e8e524e608c70bff0348937c1afc434ba7d6ae634223f0e1fa6
-  data.tar.gz: 9ea69bb090386a7a280be6a7c779b406f49a3de2da5b406c64529be6a462535cbe9eefaad404e3dd1dab6bc98a5840e2825708f8d1602e1404ab4dbd83ce43b2
+  metadata.gz: dd61f72199c6986c9bbe5260a7f43c92a6e8ef2036a4fb94c2d3ff14a74c1b21a306f601e6ccee73dd709fb76cc48b24af1002a3b95cbe18ecc7604015f8e028
+  data.tar.gz: 4040cec7aa67bb7edf1a8f07896e6c7b62b971b7e15a78171d8424465087dff5b25e8bedd0971f9c2060944712f1b14905605e9261933f480162a87f2bbd925b

data/.github/workflows/ci.yml

@@ -21,38 +21,48 @@ jobs:
       fail-fast: false
       matrix:
         os:
+        - ubuntu-latest
         - ubuntu-20.04
         - macos-latest
         ruby:
+        - "3.2"
+        - "3.1"
         - "3.0"
-        - 2.7
-        - 2.6
+        - "2.7"
         python:
-        - 3.x
-        - 2.x
+        - "3.x"
         python_architecture:
         - x64
         venv:
         - ""
         include:
-        - { os: ubuntu-20.04   , ruby: 2.5   , python: 3.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.4   , python: 3.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.5   , python: 2.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.4   , python: 2.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.8 , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.7 , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.6 , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-18.04   , ruby: 2.7   , python: 3.8 , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: debug , python: 3.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: ubuntu-18.04   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: ubuntu-18.04   , ruby: "3.0" , python: 3.8 , python_architecture: x64 , venv: "venv:"  }
-        - { os: macos-latest   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: macos-latest   , ruby: "3.0" , python: 3.8 , python_architecture: x64 , venv: "venv:"  }
-        #- { os: macos-latest   , ruby: debug , python: 3.x , python_architecture: x64 , venv: "" }
+        # Old ruby and the latest Python 3
+        - { os: ubuntu-20.04   , ruby: 2.6   , python: "3.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.5   , python: "3.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.4   , python: "3.x"  , python_architecture: x64 , venv: "" }
+
+        # Ruby 2.7 with Each Python 3.x
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.11" , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.10" , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.9"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.8"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.7"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.6"  , python_architecture: x64 , venv: "" }
+
+        # Ruby-debug with the latest Python 3
+        - { os: ubuntu-20.04   , ruby: debug , python: "3.x"  , python_architecture: x64 , venv: "" }
+
+        # Ruby 3.1 with the latest Python 3 with venv
+        - { os: ubuntu-20.04   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
+
+        # macOS with venv
+        - { os: macos-latest   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
+        - { os: macos-latest   , ruby: "3.1" , python: "3.8"  , python_architecture: x64 , venv: "venv:"  }
+
+        #- { os: macos-latest   , ruby: debug , python: "3.x" , python_architecture: x64 , venv: "" }
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
 
@@ -61,7 +71,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_architecture }}
@@ -96,11 +106,11 @@ jobs:
       matrix:
         os:
         - ubuntu-20.04
-        - macos-latest
+        #- macos-latest
         ruby:
-        - "3.0"
+        - "3.1"
         python:
-        - 3.8
+        - "3.10"
 
     steps:
     - uses: actions/checkout@v2

data/.github/workflows/windows.yml

@@ -26,7 +26,6 @@ jobs:
         - 2.6
         python:
         - 3.x
-        - 2.x
         python_architecture:
         - x64
         include:
@@ -34,7 +33,7 @@ jobs:
         #- { os: windows-latest , ruby: mswin , python: 3.x , python_architecture: x64 }
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
 
@@ -43,7 +42,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_architecture }}

data/CHANGES.md

@@ -1,5 +1,24 @@
 # The change history of PyCall
 
+## 1.5.0
+
+* Fix to prevent distutils deprecation warning (#159)
+
+  *Christopher Dilks*
+
+* Drop Python 2.7 support
+
+* Fix memory leak of Python objects. (#129)
+  This should fixes #128 and maybe also fixes #164.
+
+  *mknkmyza*
+
+## 1.4.2
+
+* Add supports of unary operators: `+@`, `-@`, `~`
+* Fix `without_gvl` for exceptions occurred in the given block
+* Add PyCall.setattr and PyCall.delattr
+
 ## 1.4.1
 
 * Fix SEGV occurred on Windows

data/README.md

@@ -19,9 +19,7 @@ pycall.rb supports Ruby version 2.4 or higher.
 
 ## Supported Python versions
 
-pycall.rb supports Python version 2.7 or higher.
-
-Note that in Python 2.7 old-style class, that is defined without a super class, is not fully supported in pycall.rb.
+pycall.rb supports Python version 3.7 or higher.
 
 ## Note for pyenv users
 
@@ -32,12 +30,6 @@ pyenv does not build the shared library in default, so you need to specify `--en
 $ env PYTHON_CONFIGURE_OPTS='--enable-shared' pyenv install 3.7.2
 ```
 
-## Note for Windows users
-
-Currently, pycall.rb does not support Windows.  Please try to use pycall.rb on WSL2 environment.
-
-On Windows, the error "[BUG] object allocation during garbage collection phase" is occurred at unpredictable timings.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -59,9 +51,8 @@ Or install it yourself as:
 Here is a simple example to call Python's `math.sin` function and compare it to
 the `Math.sin` in Ruby:
 
-    require 'pycall/import'
-    include PyCall::Import
-    pyimport :math
+    require 'pycall'
+    math = PyCall.import_module("math")
     math.sin(math.pi / 4) - Math.sin(Math::PI / 4)   # => 0.0
 
 Type conversions from Ruby to Python are automatically performed for numeric,
@@ -151,9 +142,9 @@ Use [mrkn/pandas.rb](https://github.com/mrkn/pandas.rb) instead of just importin
 
 PyCall wraps pointers of Python objects in `PyCall::PyPtr` objects.
 `PyCall::PyPtr` class has two subclasses, `PyCall::PyTypePtr` and
-`PyCall::PyRubyPtr`.  `PyCall::PyTypePtr` is specialized for type (and classobj
-in 2.7) objects, and `PyCall::PyRubyPtr` is for the objects that wraps pointers
-of Ruby objects.
+`PyCall::PyRubyPtr`.  `PyCall::PyTypePtr` is specialized for type objects,
+and `PyCall::PyRubyPtr` is for the objects that wraps pointers of
+Ruby objects.
 
 These `PyCall::PyPtr` objects are used mainly in PyCall infrastructure.
 Instead, we usually treats the instances of `Object`, `Class`, `Module`, or
@@ -169,18 +160,33 @@ translates Ruby's coerce system into Python's swapped operation protocol.
 ## Deploying on Heroku
 
 Heroku's default version of Python is not compiled with the `--enabled-shared`
-option and can't be accessed by PyCall. Alternative [buildpacks](https://devcenter.heroku.com/articles/buildpacks) are available,
-including these that have been reported to work with PyCall:
-
-https://github.com/richgong/heroku-buildpack-python
-https://github.com/dsounded/heroku-buildpack-python
-https://github.com/ReforgeHQ/heroku-buildpack-python
-
-These community-developed buildpacks are not supported by Heroku, so it's
-worth examining the source to make sure the buildpack you use suits your
-needs. For instance, 'ReforgeHQ' works well with Python 3.8.1, but has not
-been configured to work with other versions and may not be as generally
-useful as the 'dsounded' or 'richgong' buildpacks.
+option and can't be accessed by PyCall.
+
+There are many ways to make our heroku use Python that is compiled with the `--enabled-shared` option:
+
+  - use Heroku's official Python buildpacks `post_compile` hooks to recompile the python if the `--enabled-shared` option is not enabled.
+    example script of `post_compile` in ruby on rails app `bin/post_compile`.
+
+        set -e
+        buildpack_url=https://github.com/heroku/heroku-buildpack-python
+        buildpack_vsn=v197 # adjust version accordingly https://github.com/heroku/heroku-buildpack-python/tags
+
+        # rebuild python if it's missing enable-shared
+        if  ! python3 -msysconfig | grep enable-shared \
+            > /dev/null; then
+          PYTHON_VERSION="$(< runtime.txt)"
+          git clone -b "$buildpack_vsn" "$buildpack_url" _buildpack
+          export WORKSPACE_DIR="$PWD/_buildpack/builds"
+          rm -f .heroku/python/bin/python   # prevent failing ln after build
+          sed -i 's!figure --pre!figure --enable-shared --pre!' \
+            "$WORKSPACE_DIR"/runtimes/python3
+          "$WORKSPACE_DIR/runtimes/$PYTHON_VERSION" /app/.heroku/python/
+          rm -fr _buildpack
+        fi
+
+  - use your own precompiled python with `--enabled-shared` options then fork the official heroku [python buildspacks](https://github.com/heroku/heroku-buildpack-python) and change the `BUILDPACK_S3_BASE_URL` with your own uploaded precompiled python in Amazon's S3.
+  - use 3rd party buildpacks from the [markets](https://elements.heroku.com/buildpacks) that have python with `--enabled-shared` option.
+
 
 The buildpack will expect to find both a `runtime.txt` and a `requirements.txt` 
 file in the root of your project. You will need to add these to specify the 

data/ext/pycall/libpython.c

@@ -110,6 +110,7 @@ pycall_init_libpython_api_table(VALUE libpython_handle)
   INIT_API_TABLE_ENTRY(PyObject_GetAttrString, required);
   INIT_API_TABLE_ENTRY(PyObject_SetAttrString, required);
   INIT_API_TABLE_ENTRY(PyObject_HasAttrString, required);
+  INIT_API_TABLE_ENTRY(PyObject_DelAttrString, optional);
   INIT_API_TABLE_ENTRY(PyObject_GetItem, required);
   INIT_API_TABLE_ENTRY(PyObject_SetItem, required);
   INIT_API_TABLE_ENTRY(PyObject_DelItem, required);

data/ext/pycall/pycall.c

@@ -52,7 +52,7 @@ pycall_python_hexversion(void)
 
 #define python_is_unicode_literals (python_major_version >= 3)
 
-long pycall_hash_salt;
+intptr_t pycall_hash_salt;
 
 static VALUE pycall_call_python_callable(PyObject *pycallable, int argc, VALUE *argv);
 
@@ -80,7 +80,7 @@ pycall_without_gvl_p(void)
    *
    * In Win32 thread, the default value is 0 (initialized by TlsAlloc).
    */
-  return (int)pycall_tls_get(without_gvl_key);
+  return pycall_tls_get(without_gvl_key) != (void*)0;
 }
 
 static inline int
@@ -107,6 +107,10 @@ pycall_without_gvl(VALUE (* func)(VALUE), VALUE arg)
 
   pycall_set_with_gvl();
 
+  if (state) {
+    rb_jump_tag(state);
+  }
+
   return result;
 }
 
@@ -410,7 +414,6 @@ pycall_pyptr_inspect(VALUE obj)
 
   cname = rb_class_name(CLASS_OF(obj));
   str = rb_sprintf("#<%"PRIsVALUE":%p type=%s addr=%p>", cname, (void*)obj, Py_TYPE(pyobj)->tp_name, pyobj);
-  OBJ_INFECT(str, obj);
 
   return str;
 }
@@ -861,6 +864,51 @@ pycall_libpython_helpers_m_hasattr_p(VALUE mod, VALUE pyptr, VALUE name)
   return res ? Qtrue : Qfalse;
 }
 
+static VALUE
+pycall_libpython_helpers_m_setattr(VALUE mod, VALUE pyptr, VALUE name, VALUE val)
+{
+  PyObject *pyobj, *pyval;
+
+  if (!is_pycall_pyptr(pyptr)) {
+    rb_raise(rb_eTypeError, "PyCall::PyPtr is required");
+  }
+
+  pyobj = get_pyobj_ptr(pyptr);
+
+  if (RB_TYPE_P(name, T_SYMBOL)) {
+    name = rb_sym_to_s(name);
+  }
+
+  pyval = pycall_pyobject_from_ruby(val);
+  if (Py_API(PyObject_SetAttrString)(pyobj, StringValueCStr(name), pyval) == -1) {
+    pycall_pyerror_fetch_and_raise("PyObject_SetAttrString");
+  }
+
+  return Qnil;
+}
+
+static VALUE
+pycall_libpython_helpers_m_delattr(VALUE mod, VALUE pyptr, VALUE name)
+{
+  PyObject *pyobj;
+
+  if (!is_pycall_pyptr(pyptr)) {
+    rb_raise(rb_eTypeError, "PyCall::PyPtr is required");
+  }
+
+  pyobj = get_pyobj_ptr(pyptr);
+
+  if (RB_TYPE_P(name, T_SYMBOL)) {
+    name = rb_sym_to_s(name);
+  }
+
+  if (Py_API(PyObject_DelAttrString)(pyobj, StringValueCStr(name)) == -1) {
+    pycall_pyerror_fetch_and_raise("PyObject_DelAttrString");
+  }
+
+  return Qnil;
+}
+
 static VALUE
 pycall_libpython_helpers_m_callable_p(VALUE mod, VALUE pyptr)
 {
@@ -918,10 +966,10 @@ pycall_extract_kwargs_from_ruby_hash(VALUE key, VALUE value, VALUE arg)
   key_cstr = StringValueCStr(key);
   pyvalue = pycall_pyobject_from_ruby(value);
 
-  if (Py_API(PyDict_SetItemString)(kwargs, key_cstr, pyvalue) < 0) {
-    return ST_STOP;
-  }
-  return ST_CONTINUE;
+  int res = Py_API(PyDict_SetItemString)(kwargs, key_cstr, pyvalue);
+  pycall_Py_DecRef(pyvalue);
+
+  return (res < 0) ? ST_STOP : ST_CONTINUE;
 }
 
 static void
@@ -1013,6 +1061,10 @@ pycall_call_python_callable(PyObject *pycallable, int argc, VALUE *argv)
   }
 
   res = pyobject_call(pycallable, args, kwargs); /* New reference */
+  pycall_Py_DecRef(args);
+  if (kwargs) {
+      pycall_Py_DecRef(kwargs);
+  }
   if (!res) {
     pycall_pyerror_fetch_and_raise("PyObject_Call in pycall_call_python_callable");
   }
@@ -1051,9 +1103,9 @@ pycall_pyobject_wrapper_wrapper_method(int argc, VALUE *argv, VALUE wrapper)
 
     name_cstr[RSTRING_LEN(name) - 1] = '\0';
     res = Py_API(PyObject_SetAttrString)(pyobj, name_cstr, attr);
+    pycall_Py_DecRef(attr);
     name_cstr[RSTRING_LEN(name) - 1] = '=';
     if (res == -1) {
-      pycall_Py_DecRef(attr);
       pycall_pyerror_fetch_and_raise("PyObject_SetAttrString in pycall_pyobject_wrapper_wrapper_method");
     }
 
@@ -1071,13 +1123,15 @@ pycall_pyobject_wrapper_wrapper_method(int argc, VALUE *argv, VALUE wrapper)
   if (PyType_Check(attr) || PyClass_Check(attr))
     return pycall_pyobject_to_ruby(attr);
 
-  return pycall_call_python_callable(attr, argc, argv);
+  VALUE obj = pycall_call_python_callable(attr, argc, argv);
+  pycall_Py_DecRef(attr);
+  return obj;
 }
 
 static VALUE
 pycall_libpython_helpers_m_define_wrapper_method(VALUE mod, VALUE wrapper, VALUE name)
 {
-  VALUE pyptr, name_sym;
+  VALUE pyptr;
   PyObject *pyobj, *attr;
   char *name_cstr;
 
@@ -1089,12 +1143,8 @@ pycall_libpython_helpers_m_define_wrapper_method(VALUE mod, VALUE wrapper, VALUE
   pyobj = get_pyobj_ptr(pyptr);
 
   if (RB_TYPE_P(name, T_SYMBOL)) {
-    name_sym = name;
     name = rb_sym_to_s(name);
   }
-  else if (RB_TYPE_P(name, T_STRING)) {
-    name_sym = rb_str_intern(name);
-  }
 
   name_cstr = StringValueCStr(name);
   if (name_cstr[RSTRING_LEN(name) - 1] == '=') {
@@ -1159,6 +1209,7 @@ pycall_libpython_helpers_m_getitem(VALUE mod, VALUE pyptr, VALUE key)
   pyobj_key = pycall_convert_index(key);
 
   pyobj_v = Py_API(PyObject_GetItem)(pyobj, pyobj_key);
+  pycall_Py_DecRef(pyobj_key);
   if (!pyobj_v) {
     pycall_pyerror_fetch_and_raise("PyObject_GetItem in pycall_libpython_helpers_m_getitem");
   }
@@ -1179,17 +1230,17 @@ pycall_libpython_helpers_m_setitem(VALUE mod, VALUE pyptr, VALUE key, VALUE v)
   pyobj_value = pycall_pyobject_from_ruby(v);
 
   res = Py_API(PyObject_SetItem)(pyobj, pyobj_key, pyobj_value);
+  pycall_Py_DecRef(pyobj_key);
+  pycall_Py_DecRef(pyobj_value);
   if (res == -1) {
     pycall_pyerror_fetch_and_raise("PyObject_SetItem in pycall_libpython_helpers_m_setitem");
   }
-  Py_API(Py_DecRef(pyobj_key));
-  Py_API(Py_DecRef(pyobj_value));
 
   return v;
 }
 
 static VALUE
-pycall_libpython_helpers_m_delitem(VALUE mod, VALUE pyptr, VALUE key, VALUE v)
+pycall_libpython_helpers_m_delitem(VALUE mod, VALUE pyptr, VALUE key)
 {
   PyObject *pyobj, *pyobj_key;
   int res;
@@ -1198,11 +1249,12 @@ pycall_libpython_helpers_m_delitem(VALUE mod, VALUE pyptr, VALUE key, VALUE v)
   pyobj_key = pycall_convert_index(key);
 
   res = Py_API(PyObject_DelItem)(pyobj, pyobj_key);
+  pycall_Py_DecRef(pyobj_key);
   if (res == -1) {
     pycall_pyerror_fetch_and_raise("PyObject_DelItem");
   }
 
-  return v;
+  return Qnil;
 }
 
 static VALUE
@@ -1229,6 +1281,7 @@ pycall_libpython_helpers_m_dict_contains(VALUE mod, VALUE pyptr, VALUE key)
   pyobj = check_get_pyobj_ptr(pyptr, Py_API(PyDict_Type));
   pyobj_key = pycall_pyobject_from_ruby(key);
   res = Py_API(PyDict_Contains)(pyobj, pyobj_key);
+  pycall_Py_DecRef(pyobj_key);
   if (res == -1) {
     pycall_pyerror_fetch_and_raise("PyDict_Contains");
   }
@@ -1267,6 +1320,7 @@ pycall_libpython_helpers_m_sequence_contains(VALUE mod, VALUE pyptr, VALUE key)
 
   pyobj_key = pycall_pyobject_from_ruby(key);
   res = Py_API(PySequence_Contains)(pyobj, pyobj_key);
+  pycall_Py_DecRef(pyobj_key);
   if (res == -1) {
     pycall_pyerror_fetch_and_raise("PySequence_Contains");
   }
@@ -1664,6 +1718,7 @@ pycall_pytuple_to_a(PyObject *pyobj)
     PyObject *pytem = Py_API(PyTuple_GetItem)(pyobj, i);
     Py_API(Py_IncRef)(pytem);
     rb_ary_push(ary, pycall_pyobject_to_ruby(pytem));
+    pycall_Py_DecRef(pytem);
   }
 
   return ary;
@@ -1682,6 +1737,7 @@ pycall_pysequence_to_a(PyObject *pyobj)
   for (i = 0; i < n; ++i) {
     PyObject *pytem = Py_API(PySequence_GetItem)(pyobj, i);
     rb_ary_push(ary, pycall_pyobject_to_ruby(pytem));
+    pycall_Py_DecRef(pytem);
   }
 
   return ary;
@@ -1894,12 +1950,10 @@ pycall_pydict_from_ruby_iter(VALUE key, VALUE value, VALUE arg)
   pyobj_key = pycall_pyobject_from_ruby(key);
   pyobj_value = pycall_pyobject_from_ruby(value);
   res = Py_API(PyObject_SetItem)(pydictobj, pyobj_key, pyobj_value);
-  if (res == -1) {
-    return ST_STOP;
-  }
-  Py_API(Py_DecRef)(pyobj_key);
-  Py_API(Py_DecRef)(pyobj_value);
-  return ST_CONTINUE;
+  pycall_Py_DecRef(pyobj_key);
+  pycall_Py_DecRef(pyobj_value);
+
+  return (res == -1) ? ST_STOP : ST_CONTINUE;
 }
 
 PyObject *
@@ -2017,6 +2071,8 @@ pycall_pyerror_fetch_and_raise(char const *format, ...)
   va_list args;
   VALUE pyerror, msg;
 
+  RBIMPL_NONNULL_ARG(format);
+
   pyerror = pycall_pyerror_fetch();
   if (!NIL_P(pyerror))
     rb_exc_raise(pyerror);
@@ -2074,11 +2130,24 @@ pycall_pystring_from_formatv(char const *format, va_list vargs)
 
 /* ==== Python ==== */
 
+int
+pycall_PyObject_DelAttrString(PyObject *pyobj, const char *attr_name)
+{
+  /* PyObject_DelAttrString is defined by using PyObject_SetAttrString in CPython's abstract.h */
+  return Py_API(PyObject_SetAttrString)(pyobj, attr_name, NULL);
+}
+
 static void
 init_python(void)
 {
   static char const *argv[1] = { "" };
 
+  /* optional functions */
+  if (! Py_API(PyObject_DelAttrString)) {
+    /* The case of PyObject_DelAttrString as a macro */
+    Py_API(PyObject_DelAttrString) = pycall_PyObject_DelAttrString;
+  }
+
   Py_API(Py_InitializeEx)(0);
   Py_API(PySys_SetArgvEx)(0, (char **)argv, 0);
 
@@ -2236,7 +2305,7 @@ Init_pycall(void)
 
   rb_define_module_function(mPyCall, "after_fork", pycall_after_fork, 0);
 
-  pycall_tls_create(&without_gvl_key);
+  pycall_tls_create((pycall_tls_key *)&without_gvl_key);
   rb_define_module_function(mPyCall, "without_gvl", pycall_m_without_gvl, 0);
 
   /* PyCall::PyPtr */
@@ -2301,6 +2370,8 @@ Init_pycall(void)
   rb_define_module_function(mHelpers, "compare", pycall_libpython_helpers_m_compare, 3);
   rb_define_module_function(mHelpers, "getattr", pycall_libpython_helpers_m_getattr, -1);
   rb_define_module_function(mHelpers, "hasattr?", pycall_libpython_helpers_m_hasattr_p, 2);
+  rb_define_module_function(mHelpers, "setattr", pycall_libpython_helpers_m_setattr, 3);
+  rb_define_module_function(mHelpers, "delattr", pycall_libpython_helpers_m_delattr, 2);
   rb_define_module_function(mHelpers, "callable?", pycall_libpython_helpers_m_callable_p, 1);
   rb_define_module_function(mHelpers, "call_object", pycall_libpython_helpers_m_call_object, -1);
   rb_define_module_function(mHelpers, "getitem", pycall_libpython_helpers_m_getitem, 2);

data/ext/pycall/pycall_internal.h

@@ -34,6 +34,22 @@ extern "C" {
 # error ---->> ruby requires sizeof(void*) == sizeof(long) or sizeof(LONG_LONG) to be compiled. <<----
 #endif
 
+#ifndef RUBY_ASSERT
+# define RUBY_ASSERT(expr) assert(expr)
+#endif
+
+#ifndef RBIMPL_ATTR_NONNULL
+# define RBIMPL_ATTR_NONNULL(list) /* void */
+#endif
+
+#ifndef RBIMPL_NONNULL_ARG
+# define RBIMPL_NONNULL_ARG(arg) RUBY_ASSERT(arg)
+#endif
+
+#ifndef RBIMPL_ATTR_FORMAT
+# define RBIMPL_ATTR_FORMAT(x, y, z) /* void */
+#endif
+
 #ifndef RB_INTEGER_TYPE_P
 # define RB_INTEGER_TYPE_P(obj) pycall_integer_type_p(obj)
 static inline int
@@ -568,6 +584,7 @@ typedef struct {
   PyObject * (* PyObject_GetAttrString)(PyObject *, char const *);
   int (* PyObject_SetAttrString)(PyObject *, char const *, PyObject *);
   int (* PyObject_HasAttrString)(PyObject *, char const *);
+  int (* PyObject_DelAttrString)(PyObject *, char const *);
   PyObject * (* PyObject_GetItem)(PyObject *, PyObject *);
   int (* PyObject_SetItem)(PyObject *obj, PyObject *key, PyObject *value);
   int (* PyObject_DelItem)(PyObject *, PyObject *);
@@ -692,6 +709,8 @@ PyObject *pycall_pylist_from_ruby(VALUE);
 PyObject *pycall_pydict_from_ruby(VALUE);
 PyObject *pycall_pyslice_from_ruby(VALUE);
 
+RBIMPL_ATTR_NONNULL((1))
+RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 0)
 NORETURN(void pycall_pyerror_fetch_and_raise(char const *format, ...));
 
 unsigned long pycall_default_tp_flags(void);
@@ -714,7 +733,7 @@ void pycall_init_gcguard(void);
 void pycall_init_ruby_wrapper(void);
 
 #define pycall_hash_salt_32 0xb592cd9b
-extern long pycall_hash_salt;
+extern intptr_t pycall_hash_salt;
 extern VALUE pycall_mPyCall;
 extern VALUE pycall_cPyPtr;
 extern VALUE pycall_eError;

data/ext/pycall/ruby_wrapper.c

@@ -136,7 +136,7 @@ static void *
 PyRuby_hash_long(PyRubyObject *pyro)
 {
   VALUE obj, rbhash;
-  long h;
+  intptr_t h;
 
   obj = PyRuby_get_ruby_object_and_set_pyerr((PyObject *)pyro);
   if (obj == Qundef)
@@ -152,9 +152,9 @@ static long
 PyRuby_hash_long_with_gvl(PyRubyObject *pyro)
 {
   if (!ruby_thread_has_gvl_p()) {
-    return (long)CALL_WITH_GVL(PyRuby_hash_long, pyro);
+    return (long)(intptr_t)CALL_WITH_GVL(PyRuby_hash_long, pyro);
   }
-  return (long)PyRuby_hash_long(pyro);
+  return (long)(intptr_t)PyRuby_hash_long(pyro);
 }
 
 static void *
@@ -171,10 +171,10 @@ PyRuby_hash_hash_t(PyRubyObject *pyro)
 #if SIZEOF_PY_HASH_T == SIZEOF_LONG
   /* In this case, we can assume sizeof(Py_hash_t) == sizeof(long) */
   h = NUM2SSIZET(rbhash);
-  return (void *)(h == -1 ? (Py_hash_t)pycall_hash_salt : h);
+  return (void *)(h == -1 ? pycall_hash_salt : h);
 #else
   /* In this case, we can assume sizeof(long) == 4 and sizeof(Py_hash_t) == 8 */
-  h = (pycall_hash_salt_32 << 32) | FIX2LONG(rbhash);
+  h = ((Py_hash_t)pycall_hash_salt_32 << 32) | FIX2LONG(rbhash);
   return (void *)(h == -1 ? ((pycall_hash_salt << 32) | pycall_hash_salt) : h);
 #endif
 }

data/lib/pycall/pyobject_wrapper.rb

@@ -13,6 +13,12 @@ module PyCall
     end
 
     OPERATOR_METHOD_NAMES = {
+      # Unary operators
+      :+@ => :__pos__,
+      :-@ => :__neg__,
+      :~  => :__invert__,
+
+      # Binary operators
       :+  => :__add__,
       :-  => :__sub__,
       :*  => :__mul__,

data/lib/pycall/python/investigator.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import ctypes.util
-from distutils.sysconfig import get_config_var, get_python_version
+from sysconfig import get_config_var, get_python_version
 import os
 import sys
 

data/lib/pycall/version.rb

@@ -1,5 +1,5 @@
 module PyCall
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 
   module Version
     numbers, TAG = VERSION.split("-")

data/lib/pycall.rb

@@ -59,6 +59,14 @@ module PyCall
     LibPython::Helpers.hasattr?(obj.__pyptr__, name)
   end
 
+  def setattr(obj, name, val)
+    LibPython::Helpers.setattr(obj.__pyptr__, name, val)
+  end
+
+  def delattr(obj, name)
+    LibPython::Helpers.delattr(obj.__pyptr__, name)
+  end
+
   def same?(left, right)
     case left
     when PyObjectWrapper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.3.13
 signing_key: 
 specification_version: 4
 summary: pycall