pycall 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2526ea3050985dc6d864e979804fb4ebaa9c36d8239b48809a9cd31dd01de5
-  data.tar.gz: 68df5fcac7fd5c574009ebbc33f0d9c1724ff8d5057d4dfaa69832b8509e4a92
+  metadata.gz: 7b2f11d56347f0f7a8977916c73468aa165a23350ed271e7cdb064341211aabb
+  data.tar.gz: 0d4c68470567e1a2d58d2512f8ca883dfaca1329f4d89a255d0917f3b2c85f7b
 SHA512:
-  metadata.gz: c52cd3ac7b709238a1b3ec95ed7eb45bcfaa5ef8a40b74f8de15cec928350152769c915250f27290e1b7f2bfb84032faa3a39837d0598c2927a114f6989f11dc
-  data.tar.gz: 6c45f609e09251815588b0a02095af9d221e2c715d4e614d16888326fc46c6158a631b6cc514d9b3e673468abf2834e003074a5e77f27b46098c5ab698328459
+  metadata.gz: dd61f72199c6986c9bbe5260a7f43c92a6e8ef2036a4fb94c2d3ff14a74c1b21a306f601e6ccee73dd709fb76cc48b24af1002a3b95cbe18ecc7604015f8e028
+  data.tar.gz: 4040cec7aa67bb7edf1a8f07896e6c7b62b971b7e15a78171d8424465087dff5b25e8bedd0971f9c2060944712f1b14905605e9261933f480162a87f2bbd925b

data/.github/workflows/ci.yml

@@ -41,14 +41,6 @@ jobs:
         - { 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: "" }
 
-        # The latest Python 2
-        - { os: ubuntu-20.04   , ruby: 3.1   , python: "2.x"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 3.0   , python: "2.x"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.7   , python: "2.x"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.6   , python: "2.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: "" }
-
         # 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: "" }
@@ -56,17 +48,12 @@ jobs:
         - { 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: "" }
 
         # 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:"  }
-        - { os: ubuntu-18.04   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
-
-        # Ubuntu 18.04 with venv
-        - { os: ubuntu-18.04   , ruby: "3.1" , python: "3.8"  , python_architecture: x64 , venv: "venv:"  }
 
         # macOS with venv
         - { os: macos-latest   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
@@ -75,7 +62,7 @@ jobs:
         #- { 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
 
@@ -84,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 }}
@@ -119,7 +106,7 @@ jobs:
       matrix:
         os:
         - ubuntu-20.04
-        - macos-latest
+        #- macos-latest
         ruby:
         - "3.1"
         python:

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,18 @@
 # 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: `+@`, `-@`, `~`

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
 
@@ -144,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
@@ -162,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/pycall.c

@@ -966,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
@@ -1061,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");
   }
@@ -1099,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");
     }
 
@@ -1119,7 +1123,9 @@ 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
@@ -1203,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");
   }
@@ -1223,11 +1230,11 @@ 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;
 }
@@ -1242,6 +1249,7 @@ pycall_libpython_helpers_m_delitem(VALUE mod, VALUE pyptr, VALUE key)
   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");
   }
@@ -1273,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");
   }
@@ -1311,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");
   }
@@ -1708,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;
@@ -1726,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;
@@ -1938,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 *

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.2"
+  VERSION = "1.5.0"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler