pycall 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381593af8570fc0a96f4df77aad616cf93cf86afa336b0be1618ac39c68fdd73
-  data.tar.gz: b1c8075e157dd32d4699ea6ae581d148c4ae537b77f60437a31a1940e31bf8fe
+  metadata.gz: cbe8667d161e27770570029b6e2da005db45d5f2e61482ba7ffa96117fa82a61
+  data.tar.gz: 530c510c0accfc3b1af1daf69ad530855ecf943ffaf6dd9d47975bf7f89132a7
 SHA512:
-  metadata.gz: 5a4d26affe26f179752eba471971dfbee4a3336faf7337696dd0cc6cc8b4462e6e8dc27a7bb8d53495178fe2b09fa95c11a6f1da3366a645ac9106248ba5b376
-  data.tar.gz: c72271ccdb5a50f47ced48619468114666e7767ff697ff385968e61e721f7f8449c79d86f218607f1a0fb67ec31ec88f843aeb5cab491fbd481025e3917b9df6
+  metadata.gz: 179af9a8a76e9f4528990468e8eb776c9031390cea2f28219c3da8aaf5dbc017df1cf2dfdf254b549a9313800ec640f82d4ca5302d6b74d3b192cc79daaf896b
+  data.tar.gz: 71a248181b886b513a650aef95a583563d5bb34e125e8f0bc1dc838e47c8ab6d38480bfe77d017065c73c47177dccab6d5a27b28d666b401e325fb118e95ea30

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -3,14 +3,9 @@ name: CI
 on:
   push:
     branches:
-    - master
-    - "check/ci/**"
-    - "check/unix/**"
+    - "**"
+    - '!dependabot/**'
   pull_request:
-    types:
-    - opened
-    - synchronize
-    - reopened
 
 jobs:
   test:
@@ -22,9 +17,11 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        - ubuntu-20.04
+        - ubuntu-22.04
         - macos-latest
         ruby:
+        - "3.4"
+        - "3.3"
         - "3.2"
         - "3.1"
         - "3.0"
@@ -36,33 +33,35 @@ jobs:
         venv:
         - ""
         include:
+        # Python 3.11 with the latest Ruby
+        - { os: ubuntu-22.04   , ruby: 3.3   , python: "3.11" , 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: "" }
+        - { os: ubuntu-22.04   , ruby: 2.6   , python: "3.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-22.04   , ruby: 2.5   , python: "3.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-22.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: "" }
+        - { os: ubuntu-22.04   , ruby: 2.7   , python: "3.12" , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-22.04   , ruby: 2.7   , python: "3.11" , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-22.04   , ruby: 2.7   , python: "3.10" , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-22.04   , ruby: 2.7   , python: "3.9"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-22.04   , ruby: 2.7   , python: "3.8"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-22.04   , ruby: 2.7   , python: "3.7"  , python_architecture: x64 , venv: "" }
 
         # Ruby-debug with the latest Python 3
-        - { os: ubuntu-20.04   , ruby: debug , python: "3.x"  , python_architecture: x64 , venv: "" }
+        - { os: ubuntu-22.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:"  }
+        # The latest stable Ruby with the latest Python 3 with venv
+        - { os: ubuntu-22.04   , ruby: "3.3" , 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: "3.3" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
 
         #- { os: macos-latest   , ruby: debug , python: "3.x" , python_architecture: x64 , venv: "" }
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 1
 
@@ -71,7 +70,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v7
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_architecture }}
@@ -105,7 +104,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ubuntu-20.04
+        - ubuntu-22.04
         #- macos-latest
         ruby:
         - "3.1"
@@ -113,11 +112,11 @@ jobs:
         - "3.10"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 1
 
-    - uses: conda-incubator/setup-miniconda@v2
+    - uses: conda-incubator/setup-miniconda@v4
       with:
         activate-environment: test
         python-version: ${{ matrix.python }}

data/.github/workflows/release.yml

@@ -0,0 +1,48 @@
+name: Release
+on:
+  push:
+    tags:
+      - "*"
+jobs:
+  github:
+    name: GitHub
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: write
+      discussions: write
+    steps:
+      - uses: actions/checkout@v7
+      - name: Extract release note
+        run: |
+          ruby \
+            -e 'print("## PyCall "); \
+                puts(ARGF.read.split(/^## /)[1])' \
+            CHANGES.md > release-note.md
+      - name: Upload to release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          title=$(head -n1 release-note.md | sed -e 's/^## //')
+          tail -n +2 release-note.md > release-note-without-version.md
+          gh release create ${GITHUB_REF_NAME} \
+            --discussion-category Announcements \
+            --notes-file release-note-without-version.md \
+            --title "${title}"
+  rubygems:
+    name: RubyGems
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      id-token: write
+    environment: release
+    steps:
+      - uses: actions/checkout@v7
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler-cache: true
+      - uses: rubygems/configure-rubygems-credentials@v2.1.0
+      - name: Push gems
+        run: |
+          bundle exec rake release:rubygem_push

data/.github/workflows/windows.yml

@@ -3,14 +3,9 @@ name: Windows
 on:
   push:
     branches:
-    - master
-    - "check/ci/**"
-    - "check/windows/**"
+    - "**"
+    - '!dependabot/**'
   pull_request:
-    types:
-    - opened
-    - synchronize
-    - reopened
 
 jobs:
   test:
@@ -21,19 +16,24 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+        - "3.3"
+        - "3.2"
+        - "3.1"
         - "3.0"
-        - 2.7
-        - 2.6
+        - "2.7"
         python:
         - 3.x
         python_architecture:
         - x64
         include:
-        - { os: windows-latest , ruby: mingw , python: 3.x , python_architecture: x64 }
-        #- { os: windows-latest , ruby: mswin , python: 3.x , python_architecture: x64 }
+        # Python 3.11 with the latest Ruby
+        - { ruby: "3.3" , python: 3.11 , python_architecture: x64 }
+        # The development version of Ruby
+        - { ruby: mingw , python: 3.x  , python_architecture: x64 }
+        #- { ruby: mswin , python: 3.x , python_architecture: x64 }
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 1
 
@@ -42,7 +42,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v7
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_architecture }}
@@ -67,20 +67,21 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-        - "3.0"
+        - "3.3"
         python:
-        - 3.8
+        - 3.12
+        - 3.11
 
     defaults:
       run:
         shell: pwsh
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 1
 
-    - uses: conda-incubator/setup-miniconda@v2
+    - uses: conda-incubator/setup-miniconda@v4
       with:
         activate-environment: test
         python-version: ${{ matrix.python }}

data/CHANGES.md

@@ -1,5 +1,27 @@
 # The change history of PyCall
 
+## 1.5.3
+
+* Add support for Ruby 4.1 (#225).
+
+  *andreyzhelnin-st*
+
+* Add support for multi-threading (#223, #224).
+
+  *andreyzhelnin-st*
+
+## 1.5.2
+
+* Fix memory leak with str(list) (#169).
+
+  *mknkmyza*
+
+* Fix SEGV occured on Ruby process finalization.
+
+* Fix for supporting Ruby >= 3.3.
+
+* Fix for supporting Python >= 3.2.
+
 ## 1.5.1
 
 * Fix memory leak in rich compare methods (#167, #168).

data/README.md

@@ -5,8 +5,7 @@
 
 # PyCall: Calling Python functions from the Ruby language
 
-[![Build Status](https://github.com/mrkn/pycall.rb/workflows/CI/badge.svg)](https://github.com/mrkn/pycall.rb/actions?query=workflow%3ACI)
-[![Build status](https://ci.appveyor.com/api/projects/status/0fad23u4qj1yr49e/branch/master?svg=true)](https://ci.appveyor.com/project/mrkn/pycall-rb/branch/master)
+[![Build Status](https://github.com/red-data-tools/pycall.rb/workflows/CI/badge.svg)](https://github.com/red-data-tools/pycall.rb/actions?query=workflow%3ACI)
 
 This library provides the features to directly call and partially interoperate
 with Python from the Ruby language.  You can import arbitrary Python modules
@@ -21,6 +20,10 @@ pycall.rb supports Ruby version 2.4 or higher.
 
 pycall.rb supports Python version 3.7 or higher.
 
+## PyCall does not support multi-threaded use officially
+
+CPython's C-API has GIL acquiring/releasing functions such as `PyGILState_Ensure` and `PyGILState_Release`. Programmers can call CPython's C-APIs from outside of Python threads if they manage GIL's state by these functions. However, we do not want to officially support the multi-threaded use of PyCall because creating the feature enabling stable multi-threaded use in any situation is too difficult. We want to avoid incurring the costs to support such use cases.
+
 ## Note for pyenv users
 
 pycall.rb requires Python's shared library (e.g. `libpython3.7m.so`).
@@ -128,15 +131,15 @@ DEBUG(find_libpython) dlopen("/opt/brew/opt/python/Frameworks/Python.framework/V
 
 ### matplotlib
 
-Use [mrkn/matplotlib.rb](https://github.com/mrkn/matplotlib.rb) instead of just importing it by `PyCall.import_module("matplotlib")`.
+Use [red-data-tools/matplotlib.rb](https://github.com/red-data-tools/matplotlib.rb) instead of just importing it by `PyCall.import_module("matplotlib")`.
 
 ### numpy
 
-Use [mrkn/numpy.rb](https://github.com/mrkn/numpy.rb) instead of just importing it by `PyCall.import_module("numpy")`.
+Use [red-data-tools/numpy.rb](https://github.com/red-data-tools/numpy.rb) instead of just importing it by `PyCall.import_module("numpy")`.
 
 ### pandas
 
-Use [mrkn/pandas.rb](https://github.com/mrkn/pandas.rb) instead of just importing it by `PyCall.import_module("pandas")`.
+Use [red-data-tools/pandas.rb](https://github.com/red-data-tools/pandas.rb) instead of just importing it by `PyCall.import_module("pandas")`.
 
 ## PyCall object system
 
@@ -159,41 +162,16 @@ 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.
-
-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
+Heroku's default builds of Python are now compiled with the `--enabled-shared` option
+(when using Python 3.10 and newer) and so work out of the box with PyCall without
+the need for a custom buildpack.
 
-        # 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` 
+The Python buildpack will expect to find both a `.python-version` and a `requirements.txt` 
 file in the root of your project. You will need to add these to specify the 
 version of Python and any packages to be installed via `pip`, _e.g_ to use 
-version Python 3.8.1 and version 2.5 of the 'networkx' package:
+the latest patch version Python 3.12 and version 2.5 of the 'networkx' package:
 
-    $ echo "python-3.8.1" >> runtime.txt
+    $ echo "3.12" > .python-version
     $ echo "networkx==2.5" >> requirements.txt
 
 Commit these two files into project's repository. You'll use these to manage
@@ -212,12 +190,11 @@ For a Ruby/Rails application this will typically report the stock `heroku/ruby`
 buildpack, or possibly both `heroku/ruby` and `heroku/nodejs`. 
 
 Clear the list and progressively add back your buildpacks, starting with the Python 
-community-developed buildpack. For example, if `ruby` and `nodejs` buildpacks were 
-previously installed, and chosing the 'ReforgeHQ' buildback, your setup process will 
-be similar to this: 
+buildpack. For example, if `ruby` and `nodejs` buildpacks were previously installed,
+your setup process will be similar to this: 
 
     $ heroku buildpacks:clear
-    $ heroku buildpacks:add https://github.com/ReforgeHQ/heroku-buildpack-python -i 1
+    $ heroku buildpacks:add heroku/python -i 1
     $ heroku buildpacks:add heroku/nodejs -i 2
     # heroku buildpacks:add heroku/ruby -i 3
 
@@ -229,15 +206,12 @@ specify the order Heroku will load runtimes and execute bootstrapping code. It's
 important for the Python environment to be engaged first, as PyCall will need to 
 be able to find it when Ruby-based processes start. 
 
-Once you have set up your buildpacks, and have commited both `requirements.txt` and 
-`runtime.txt` files to git, deploy your Heroku application as your normally would.
+Once you have set up your buildpacks, and have committed both `requirements.txt` and 
+`.python-version` files to git, deploy your Heroku application as your normally would.
 The Python bootstrapping process will appear in the log first, followed by the Ruby
 and so on. PyCall should now be able to successfully call Python functions from 
 within the Heroku environment.
 
-NB It is also possible to specify buildpacks within Docker images on Heroku.
-See Heroku's [documentation on using Docker Images](https://devcenter.heroku.com/articles/build-docker-images-heroku-yml).
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies.
@@ -253,7 +227,7 @@ version, push git commits and tags, and push the `.gem` file to
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-https://github.com/mrkn/pycall.rb.
+https://github.com/red-data-tools/pycall.rb.
 
 
 ## Acknowledgement

data/Rakefile

@@ -91,3 +91,14 @@ end
 
 task default: :spec
 task spec: :compile
+
+
+release_task = Rake.application["release"]
+# We use Trusted Publishing.
+release_task.prerequisites.delete("build")
+release_task.prerequisites.delete("release:rubygem_push")
+release_task_comment = release_task.comment
+if release_task_comment
+  release_task.clear_comments
+  release_task.comment = release_task_comment.gsub(/ and build.*$/, "")
+end

data/docker/Dockerfile

@@ -183,7 +183,7 @@ RUN bundle exec iruby register
 
 # Deploy matplotlib's examples
 RUN mkdir -p /tmp \
-	&& curl -fsSL https://github.com/mrkn/matplotlib.rb/archive/master.tar.gz | tar -xzf - -C /tmp \
+	&& curl -fsSL https://github.com/red-data-tools/matplotlib.rb/archive/master.tar.gz | tar -xzf - -C /tmp \
 	&& mv /tmp/matplotlib.rb-master/examples /notebooks/examples/matplotlib \
         && rm -rf /tmp/matplotlib.rb-master
 

data/ext/pycall/extconf.rb

@@ -1,3 +1,5 @@
 require 'mkmf'
 
+have_func("RTYPEDDATA_GET_DATA")
+
 create_makefile('pycall')

data/ext/pycall/gc.c

@@ -1,5 +1,7 @@
 #include "pycall_internal.h"
 
+static ID id_gcguard_table;
+
 struct gcguard {
   st_table *guarded_objects;
 };
@@ -24,6 +26,7 @@ gcguard_free(void* ptr)
 {
   struct gcguard *gg = (struct gcguard *)ptr;
   st_free_table(gg->guarded_objects);
+  rb_ivar_set(mPyCall, id_gcguard_table, Qnil);
 }
 
 static size_t
@@ -69,7 +72,6 @@ gcguard_delete(VALUE gcguard, PyObject *pyptr)
   }
 }
 
-static ID id_gcguard_table;
 static PyObject *weakref_callback_pyobj;
 static PyObject *gcguard_weakref_destroyed(PyObject *self, PyObject *weakref);
 
@@ -98,7 +100,9 @@ void
 pycall_gcguard_delete(PyObject *pyobj)
 {
   VALUE gcguard = rb_ivar_get(mPyCall, id_gcguard_table);
-  gcguard_delete(gcguard, pyobj);
+  if (!NIL_P(gcguard)) {
+    gcguard_delete(gcguard, pyobj);
+  }
 }
 
 void

data/ext/pycall/libpython.c

@@ -217,6 +217,10 @@ pycall_init_libpython_api_table(VALUE libpython_handle)
     INIT_API_TABLE_ENTRY2(PyUnicode_DecodeUTF8, PyUnicodeUCS2_DecodeUTF8, required);
     INIT_API_TABLE_ENTRY2(PyUnicode_FromFormatV, PyUnicodeUCS2_FromFormatV, required);
   }
+
+  INIT_API_TABLE_ENTRY(PyGILState_Check, required);
+  INIT_API_TABLE_ENTRY(PyGILState_Ensure, required);
+  INIT_API_TABLE_ENTRY(PyGILState_Release, required);
 }
 
 void