pycall 1.2.0.beta1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ee819add9bcf3e4c3a3fb4f4fdc7b94abe6ccf1a969a8aabe9bd7edf9aa6701
-  data.tar.gz: '03839cbba19832eca0cf90ee7e85cf4cd953f2f5bba2dd12bcc9005097393482'
+  metadata.gz: ba0b7938e482d87e6a6eb540b92b2e581974fc6e894e674c7da00b4b68807b15
+  data.tar.gz: ad5ce0352f59744abf9193e69cf33719f9314aad45e9c24fd6584fe73873330e
 SHA512:
-  metadata.gz: d22a8905b5d7c9f9f2793fd8bb0ed003fa418ab35f8048faced61145d577502571ab0d0bbfb187bb689ee59f8e99539b3de9789d4905584340041e801e951c0f
-  data.tar.gz: d382691fcdd3995347d126ff70fa0dfc1e877b9136bfce4ca6ac6d783aa7802da544250b03601ae9d335ae4fd9c72af15ab412450e14c2d20a05a29b16b58763
+  metadata.gz: cc2eb8963c91d69086eccab17cb06ebea072908f77f3e4f85a23f328f858f7cda29ebec70c519fa70f3fc88eaf5e37b61b88136515f2326e0c239467a522067b
+  data.tar.gz: cfb14589abee3741fcec45f31d8d94dc076341ae425ee0302e50628e6ffafdfff665a6e90c67a80ce10df6a8866282bc221ecddf198d0049ee85d1055bb50255

data/.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+name: CI
+
+on:
+- push
+
+jobs:
+  test:
+    name: Test
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+        - ubuntu-18.04
+        - macos-latest
+        ruby_version:
+        - 2.7.x
+        - 2.6.x
+        - 2.5.x
+        - 2.4.x
+        python_version:
+        - 3.8.x
+        - 3.7.x
+        - 3.6.x
+        - 2.7.x
+        python_architecture:
+        - x64
+
+    steps:
+      - name: Setup Ruby
+        if: matrix.ruby_version != 'master-nightly'
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python_version }}
+          architecture: ${{ matrix.python_architecture }}
+
+      - name: Checkout
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+
+      - name: Prepare environment
+        run: |
+          gem install bundler
+
+      - name: Install requirements
+        run: |
+          pip install --user numpy
+          bundle install
+
+      - name: Compile pycall.so
+        run: |
+          bundle exec rake compile
+
+      - name: Python investigator
+        run: |
+          python lib/pycall/python/investigator.py
+
+      - name: Test
+        run: |
+          PYTHON=python bundle exec rake

data/.travis.yml

@@ -2,48 +2,74 @@ language: ruby
 
 os: linux
 
-dist: trusty
+dist: bionic
 sudo: required
 
 rvm:
 - ruby-head
-- 2.5.0
-- 2.4.3
-- 2.3.5
+- 2.7
+- 2.6
+- 2.5
+- 2.4
 
 env:
   global:
   - PYCALL_DEBUG_FIND_LIBPYTHON=1
   matrix:
-  - PYENV_VERSION=2.7.13
-  - PYENV_VERSION=3.6.2
-  - PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
-  - PYENV_VERSION=miniconda2-4.1.11
-  - PYENV_VERSION=miniconda3-4.3.11
+  - PYENV_VERSION=3.8.0
+  - PYENV_VERSION=3.7.5
+  - PYENV_VERSION=2.7.17
+  - PYENV_VERSION=system LIBPYTHON=/usr/lib/x86_64-linux-gnu/libpython3.6m.so
+  - PYENV_VERSION=system LIBPYTHON=/usr/lib/x86_64-linux-gnu/libpython2.7.so
+  - PYENV_VERSION=miniconda2-4.3.30
+  - PYENV_VERSION=miniconda3-4.3.30
 
 matrix:
   include:
   - os: osx
-    osx_image: xcode9
+    osx_image: xcode11.2
     compiler: clang
-    rvm: 2.4.1
-    env: PYENV_VERSION=3.6.2
+    rvm: 2.7
+    env: PYENV_VERSION=3.8.0
   - os: osx
-    osx_image: xcode9
+    osx_image: xcode11.2
     compiler: clang
-    rvm: 2.4.1
-    env: PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
+    rvm: 2.6
+    env: PYENV_VERSION=3.8.0
   - os: osx
-    osx_image: xcode9
+    osx_image: xcode11.2
     compiler: clang
-    rvm: 2.4.1
+    rvm: 2.5
+    env: PYENV_VERSION=3.8.0
+  - os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    rvm: 2.4
+    env: PYENV_VERSION=3.8.0
+  - os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    rvm: 2.7
+    env: PYENV_VERSION=miniconda3-4.3.11
+  - os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    rvm: 2.6
+    env: PYENV_VERSION=miniconda3-4.3.11
+  - os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    rvm: 2.5
+    env: PYENV_VERSION=miniconda3-4.3.11
+  - os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    rvm: 2.4
     env: PYENV_VERSION=miniconda3-4.3.11
   allow_failures:
   - os: osx
 
 before_install:
-- gem update --system
-- gem update bundler
 - export PATH="$(pyenv root)/bin:$PATH"
 - eval "$(pyenv init -)"
 

data/CHANGES.md

@@ -1,6 +1,36 @@
 # The change history of PyCall
 
-## master
+## 1.3.1
+
+* Stop using `&proc` idiom to prevent warnings
+
+  *Kenta Murata*
+
+## 1.3.0
+
+* Add `PyCall.without_gvl` for explicitly releasing the RubyVM GVL
+
+* Fix for missing if in PyObjectWrapper
+
+  *Kouhei Sutou*
+
+* Fix for Anaconda environment
+
+  *Ryo MATSUMIYA*
+
+* Fix against `unknown symbol "PyInt_AsSsize_t"` (Fiddle::DLError)
+
+  *Kouhei Sutou*
+
+* Fix for `TypeError: Compared with non class/module`
+
+  *Archonic*
+
+## 1.2.1
+
+* Prevent circular require in pycall/iruby.rb
+
+## 1.2.0
 
 * Add `PyCall::Tuple#to_ary`
 

data/README.md

@@ -5,8 +5,9 @@
 
 # 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://travis-ci.org/mrkn/pycall.rb.svg?branch=master)](https://travis-ci.org/mrkn/pycall.rb)
-[![Build status](https://ci.appveyor.com/api/projects/status/071is0f4iu0vy8lp/branch/master?svg=true)](https://ci.appveyor.com/project/mrkn/pycall.rb/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/0fad23u4qj1yr49e/branch/master?svg=true)](https://ci.appveyor.com/project/mrkn/pycall-rb/branch/master)
 
 This library provides the features to directly call and partially interoperate
 with Python from the Ruby language.  You can import arbitrary Python modules
@@ -23,6 +24,15 @@ 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.
 
+## Note for pyenv users
+
+pycall.rb requires Python's shared library (e.g. `libpython3.7m.so`).
+pyenv does not build the shared library in default, so you need to specify `--enable-shared` option at the installation like below:
+
+```
+$ env PYTHON_CONFIGURE_OPTS='--enable-shared' pyenv install 3.7.2
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -52,6 +62,45 @@ the `Math.sin` in Ruby:
 Type conversions from Ruby to Python are automatically performed for numeric,
 boolean, string, arrays, and hashes.
 
+### Releasing the RubyVM GVL during Python function calls
+
+You may want to release the RubyVM GVL when you call a Python function that takes very long runtime.
+PyCall provides `PyCall.without_gvl` method for such purpose.  When PyCall performs python function call,
+PyCall checks the current context, and then it releases the RubyVM GVL when the current context is in a `PyCall.without_gvl`'s block.
+
+```ruby
+PyCall.without_gvl do
+  # In this block, all Python function calls are performed without
+  # the GVL acquisition.
+  pyobj.long_running_function()
+end
+
+# Outside of PyCall.without_gvl block,
+# all Python function calls are performed with the GVL acquisition.
+pyobj.long_running_function()
+```
+
+### Debugging python finder
+
+When you encounter `PyCall::PythonNotFound` error, you can investigate PyCall's python finder by setting `PYCALL_DEBUG_FIND_LIBPYTHON` environment variable to `1`.  You can see the log like below:
+
+```
+$ PYCALL_DEBUG_FIND_LIBPYTHON=1 ruby -rpycall -ePyCall.builtins
+DEBUG(find_libpython) find_libpython(nil)
+DEBUG(find_libpython) investigate_python_config("python3")
+DEBUG(find_libpython) libs: ["Python.framework/Versions/3.7/Python", "Python", "libpython3.7m", "libpython3.7", "libpython"]
+DEBUG(find_libpython) libpaths: ["/opt/brew/opt/python/Frameworks/Python.framework/Versions/3.7/lib", "/opt/brew/opt/python/lib", "/opt/brew/opt/python/Frameworks", "/opt/brew/Cellar/python/3.7.2_1/Frameworks/Python.framework/Versions/3.7", "/opt/brew/Cellar/python/3.7.2_1/Frameworks/Python.framework/Versions/3.7/lib"]
+DEBUG(find_libpython) Unable to find /opt/brew/opt/python/Frameworks/Python.framework/Versions/3.7/lib/Python.framework/Versions/3.7/Python
+DEBUG(find_libpython) Unable to find /opt/brew/opt/python/Frameworks/Python.framework/Versions/3.7/lib/Python.framework/Versions/3.7/Python.dylib
+DEBUG(find_libpython) Unable to find /opt/brew/opt/python/Frameworks/Python.framework/Versions/3.7/lib/darwin/Python.framework/Versions/3.7/Python
+DEBUG(find_libpython) Unable to find /opt/brew/opt/python/Frameworks/Python.framework/Versions/3.7/lib/darwin/Python.framework/Versions/3.7/Python.dylib
+DEBUG(find_libpython) Unable to find /opt/brew/opt/python/lib/Python.framework/Versions/3.7/Python
+DEBUG(find_libpython) Unable to find /opt/brew/opt/python/lib/Python.framework/Versions/3.7/Python.dylib
+DEBUG(find_libpython) Unable to find /opt/brew/opt/python/lib/darwin/Python.framework/Versions/3.7/Python
+DEBUG(find_libpython) Unable to find /opt/brew/opt/python/lib/darwin/Python.framework/Versions/3.7/Python.dylib
+DEBUG(find_libpython) dlopen("/opt/brew/opt/python/Frameworks/Python.framework/Versions/3.7/Python") = #<Fiddle::Handle:0x00007fc012048650>
+```
+
 ## PyCall object system
 
 PyCall wraps pointers of Python objects in `PyCall::PyPtr` objects.

data/appveyor.yml

@@ -6,10 +6,6 @@ environment:
     PYTHONDIR: "C:\\Python27"
     PYTHON: "C:\\Python27\\python.exe"
 
-  - ruby_version: "24"
-    PYTHONDIR: "C:\\Python34"
-    PYTHON: "C:\\Python34\\python.exe"
-
   - ruby_version: "24"
     PYTHONDIR: "C:\\Python35"
     PYTHON: "C:\\Python35\\python.exe"
@@ -23,10 +19,6 @@ environment:
     PYTHONDIR: "C:\\Python27-x64"
     PYTHON: "C:\\Python27-x64\\python.exe"
 
-  - ruby_version: "24-x64"
-    PYTHONDIR: "C:\\Python34-x64"
-    PYTHON: "C:\\Python34-x64\\python.exe"
-
   - ruby_version: "24-x64"
     PYTHONDIR: "C:\\Python35-x64"
     PYTHON: "C:\\Python35-x64\\python.exe"
@@ -57,10 +49,6 @@ environment:
     PYTHONDIR: "C:\\Python27-x64"
     PYTHON: "C:\\Python27-x64\\python.exe"
 
-  - ruby_version: "23-x64"
-    PYTHONDIR: "C:\\Python34-x64"
-    PYTHON: "C:\\Python34-x64\\python.exe"
-
   - ruby_version: "23-x64"
     PYTHONDIR: "C:\\Python35-x64"
     PYTHON: "C:\\Python35-x64\\python.exe"

data/ci/travis_install.sh

@@ -10,19 +10,35 @@ if test -z "$PYENV_VERSION"; then
   exit 1
 fi
 
+pyenv_root=$(pyenv root)
+
 if test -n "$LIBPYTHON"; then
-  export LIBPYTHON=$(pyenv root)/$LIBPYTHON
+  if test ! -f $LIBPYTHON; then
+    if test -f ${pyenv_root}/$LIBPYTHON; then
+      export LIBPYTHON=${pyenv_root}/$LIBPYTHON
+    else
+      echo "Invalid value in LIBPYTHON: ${LIBPYTHON}" >&2
+      exit 1
+    fi
+  fi
 fi
 
-if test "$PYENV_VERSION" = "system"; then
-  if test -z "$LIBPYTHON"; then
-    echo "ERROR: LIBPYTHON is not provided for PYENV_VERSION=system" >2
-    exit 1
+(
+  cd $(pyenv root)
+  if [ -d .git ]; then
+    git fetch origin
+    git checkout master
+    git reset --hard origin/master
   fi
-  # NOTE: PYENV_VERSION should be the version of LIBPYTHON during install script
-  PYENV_VERSION=$(basename $(dirname $(dirname $LIBPYTHON)))
-fi
-PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install -f $PYENV_VERSION
+)
+
+case $PYENV_VERSION in
+system)
+  ;;
+*)
+  PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install -f $PYENV_VERSION
+  ;;
+esac
 
 case "$PYENV_VERSION" in
 *conda*)
@@ -40,6 +56,11 @@ case "$PYENV_VERSION" in
   travis_retry conda create -q -n test-environment python=$python_version numpy
   source $(pyenv prefix)/bin/activate test-environment
   ;;
+system)
+  travis_retry pip install --user numpy
+  sudo sh -c "apt-get update && apt-get install --no-install-recommends -y python3-pip"
+  travis_retry python3.6 -m pip install --user numpy
+  ;;
 *)
   travis_retry pip install --user numpy
   ;;

data/examples/classifier_comparison.rb

@@ -2,7 +2,7 @@ require 'pycall/import'
 include PyCall::Import
 
 pyimport 'numpy', as: :np
-pyfrom 'sklearn.cross_validation', import: :train_test_split
+pyfrom 'sklearn.model_selection', import: :train_test_split
 pyfrom 'sklearn.preprocessing', import: :StandardScaler
 pyfrom 'sklearn.datasets', import: %i(make_moons make_circles make_classification)
 pyfrom 'sklearn.neighbors', import: :KNeighborsClassifier

data/examples/hist.rb

@@ -20,7 +20,7 @@ num_bins = 50
 
 fig, ax = *plt.subplots
 
-n, bins, patches = *ax.hist(x, num_bins, normed: 1)
+n, bins, patches = *ax.hist(x, num_bins, density: 1)
 
 y = mlab.normpdf(bins, mu, sigma)
 ax.plot(bins, y, '--')

data/examples/notebooks/classifier_comparison.ipynb

@@ -38,7 +38,7 @@
     "include PyCall::Import\n",
     "\n",
     "pyimport 'numpy', as: :np\n",
-    "pyfrom 'sklearn.cross_validation', import: :train_test_split\n",
+    "pyfrom 'sklearn.model_selection', import: :train_test_split\n",
     "pyfrom 'sklearn.preprocessing', import: :StandardScaler\n",
     "pyfrom 'sklearn.datasets', import: %i(make_moons make_circles make_classification)\n",
     "pyfrom 'sklearn.neighbors', import: :KNeighborsClassifier\n",

data/ext/pycall/libpython.c

@@ -30,7 +30,13 @@ lookup_libpython_api(VALUE libpython_handle, char const *name)
   arg.libpython_handle = libpython_handle;
   arg.name = name;
   addr = rb_protect((VALUE (*)(VALUE))lookup_libpython_api_0, (VALUE)&arg, &state);
-  return (state || NIL_P(addr)) ? NULL : NUM2PTR(addr);
+  if (state) {
+    rb_set_errinfo(Qnil);
+    return NULL;
+  }
+  else {
+    return NIL_P(addr) ? NULL : NUM2PTR(addr);
+  }
 }
 
 #define LOOKUP_API_ENTRY(api_name) lookup_libpython_api(libpython_handle, #api_name)

data/ext/pycall/pycall.c

@@ -70,6 +70,52 @@ pycall_after_fork(VALUE mod)
   return Qnil;
 }
 
+static volatile pycall_tls_key without_gvl_key;
+
+int
+pycall_without_gvl_p(void)
+{
+  /*
+   * In pthread, the default value is NULL (== 0).
+   *
+   * In Win32 thread, the default value is 0 (initialized by TlsAlloc).
+   */
+  return (int)pycall_tls_get(without_gvl_key);
+}
+
+static inline int
+pycall_set_without_gvl(void)
+{
+  return pycall_tls_set(without_gvl_key, (void *)1);
+}
+
+static inline int
+pycall_set_with_gvl(void)
+{
+  return pycall_tls_set(without_gvl_key, (void *)0);
+}
+
+VALUE
+pycall_without_gvl(VALUE (* func)(VALUE), VALUE arg)
+{
+  int state;
+  VALUE result;
+
+  pycall_set_without_gvl();
+
+  result = rb_protect(func, arg, &state);
+
+  pycall_set_with_gvl();
+
+  return result;
+}
+
+static VALUE
+pycall_m_without_gvl(VALUE mod)
+{
+  return pycall_without_gvl(rb_yield, Qnil);
+}
+
 /* ==== PyCall::PyPtr ==== */
 
 const rb_data_type_t pycall_pyptr_data_type = {
@@ -890,7 +936,7 @@ struct call_pyobject_call_params {
   PyObject *kwargs;
 };
 
-PyObject *
+static inline PyObject *
 call_pyobject_call(struct call_pyobject_call_params *params)
 {
   PyObject *res;
@@ -899,7 +945,7 @@ call_pyobject_call(struct call_pyobject_call_params *params)
 }
 
 PyObject *
-pyobject_call_without_gvl(PyObject *pycallable, PyObject *args, PyObject *kwargs)
+pyobject_call(PyObject *pycallable, PyObject *args, PyObject *kwargs)
 {
   PyObject *res;
   struct call_pyobject_call_params params;
@@ -907,9 +953,14 @@ pyobject_call_without_gvl(PyObject *pycallable, PyObject *args, PyObject *kwargs
   params.args = args;
   params.kwargs = kwargs;
 
-  res = (PyObject *)rb_thread_call_without_gvl(
-      (void * (*)(void *))call_pyobject_call, (void *)&params,
-      (rb_unblock_function_t *)pycall_interrupt_python_thread, NULL);
+  if (pycall_without_gvl_p()) {
+    res = (PyObject *)rb_thread_call_without_gvl(
+        (void * (*)(void *))call_pyobject_call, (void *)&params,
+        (rb_unblock_function_t *)pycall_interrupt_python_thread, NULL);
+  }
+  else {
+    res = call_pyobject_call(&params);
+  }
 
   return res;
 }
@@ -961,7 +1012,7 @@ pycall_call_python_callable(PyObject *pycallable, int argc, VALUE *argv)
     }
   }
 
-  res = pyobject_call_without_gvl(pycallable, args, kwargs); /* New reference */
+  res = pyobject_call(pycallable, args, kwargs); /* New reference */
   if (!res) {
     pycall_pyerror_fetch_and_raise("PyObject_Call in pycall_call_python_callable");
   }
@@ -2185,6 +2236,9 @@ Init_pycall(void)
 
   rb_define_module_function(mPyCall, "after_fork", pycall_after_fork, 0);
 
+  pycall_tls_create(&without_gvl_key);
+  rb_define_module_function(mPyCall, "without_gvl", pycall_m_without_gvl, 0);
+
   /* PyCall::PyPtr */
 
   cPyPtr = rb_define_class_under(mPyCall, "PyPtr", rb_cBasicObject);

data/ext/pycall/pycall_internal.h

@@ -11,10 +11,19 @@ extern "C" {
 #include <ruby.h>
 #include <ruby/encoding.h>
 #include <ruby/thread.h>
+
 #include <assert.h>
 #include <inttypes.h>
 #include <limits.h>
 
+#if defined(_WIN32)
+# define PYCALL_THREAD_WIN32
+# include <ruby/win32.h>
+#elif defined(HAVE_PTHREAD_H)
+# define PYCALL_THREAD_PTHREAD
+# include <pthread.h>
+#endif
+
 #if SIZEOF_LONG == SIZEOF_VOIDP
 # define PTR2NUM(x)   (LONG2NUM((long)(x)))
 # define NUM2PTR(x)   ((void*)(NUM2ULONG(x)))
@@ -492,6 +501,23 @@ extern PyTypeObject PyRuby_Type;
 
 PyObject * PyRuby_New(VALUE ruby_object);
 
+/* ==== thread support ==== */
+
+#if   defined(PYCALL_THREAD_WIN32)
+typedef DWORD pycall_tls_key;
+#elif defined(PYCALL_THREAD_PTHREAD)
+typedef pthread_key_t pycall_tls_key;
+#else
+# error "unsupported thread type"
+#endif
+
+int pycall_tls_create(pycall_tls_key* tls_key);
+void *pycall_tls_get(pycall_tls_key tls_key);
+int pycall_tls_set(pycall_tls_key tls_key, void *ptr);
+
+int pycall_without_gvl_p(void);
+VALUE pycall_without_gvl(VALUE (* func)(VALUE), VALUE arg);
+
 /* ==== pycall ==== */
 
 typedef struct {

data/ext/pycall/thread.c

@@ -0,0 +1,36 @@
+#include "pycall_internal.h"
+
+#if defined(PYCALL_THREAD_WIN32)
+int pycall_tls_create(pycall_tls_key *tls_key)
+{
+  *tls_key = TlsAlloc();
+  return *tls_key == TLS_OUT_OF_INDEXES;
+}
+
+void *pycall_tls_get(pycall_tls_key tls_key)
+{
+  return TlsGetValue(tls_key);
+}
+
+int pycall_tls_set(pycall_tls_key tls_key, void *ptr)
+{
+  return 0 == TlsSetValue(tls_key, ptr);
+}
+#endif
+
+#if defined(PYCALL_THREAD_PTHREAD)
+int pycall_tls_create(pycall_tls_key *tls_key)
+{
+  return pthread_key_create(tls_key, NULL);
+}
+
+void *pycall_tls_get(pycall_tls_key tls_key)
+{
+  return pthread_getspecific(tls_key);
+}
+
+int pycall_tls_set(pycall_tls_key tls_key, void *ptr)
+{
+  return pthread_setspecific(tls_key, ptr);
+}
+#endif

data/lib/pycall.rb

@@ -4,6 +4,7 @@ module PyCall
   require 'pycall/pyerror'
   require 'pycall/pyobject_wrapper'
   require 'pycall/pytypeobject_wrapper'
+  require 'pycall/pymodule_wrapper'
   require 'pycall/init'
 
   module_function
@@ -48,6 +49,15 @@ module PyCall
     end
   end
 
+  def getattr(*args)
+    obj, *rest = args
+    LibPython::Helpers.getattr(obj.__pyptr__, *rest)
+  end
+
+  def hasattr?(obj, name)
+    LibPython::Helpers.hasattr?(obj.__pyptr__, name)
+  end
+
   def import_module(name)
     LibPython::Helpers.import_module(name)
   end

data/lib/pycall/dict.rb

@@ -33,9 +33,9 @@ module PyCall
       v
     end
 
-    def each
+    def each(&block)
       return enum_for unless block_given?
-      LibPython::Helpers.dict_each(__pyptr__, &proc)
+      LibPython::Helpers.dict_each(__pyptr__, &block)
       self
     end
 

data/lib/pycall/iruby_helper.rb

@@ -1,4 +1,4 @@
-require 'pycall'
+require 'pycall' unless defined?(::PyCall)
 require 'iruby'
 
 module PyCall

data/lib/pycall/libpython/finder.rb

@@ -27,12 +27,12 @@ module PyCall
         def find_python_config(python = nil)
           python ||= DEFAULT_PYTHON
           Array(python).each do |python_cmd|
-            python_config = investigate_python_config(python_cmd)
-            return [python_cmd, python_config] unless python_config.empty?
+            begin
+              python_config = investigate_python_config(python_cmd)
+              return [python_cmd, python_config] unless python_config.empty?
+            rescue
+            end
           end
-        rescue
-          raise ::PyCall::PythonNotFound
-        else
           raise ::PyCall::PythonNotFound
         end
 
@@ -40,10 +40,6 @@ module PyCall
           debug_report("find_libpython(#{python.inspect})")
           python, python_config = find_python_config(python)
 
-          set_PYTHONHOME(python_config)
-          libs = make_libs(python_config)
-          libpaths = make_libpaths(python_config)
-
           # Try LIBPYTHON environment variable first.
           if (libpython = ENV['LIBPYTHON'])
             if File.file?(libpython)
@@ -59,6 +55,9 @@ module PyCall
           end
 
           # Find libpython (we hope):
+          set_PYTHONHOME(python_config)
+          libs = make_libs(python_config)
+          libpaths = make_libpaths(python_config)
           multiarch = python_config[:MULTIARCH] || python_config[:multiarch]
           libs.each do |lib|
             libpaths.each do |libpath|
@@ -121,7 +120,7 @@ module PyCall
         end
 
         def set_PYTHONHOME(python_config)
-          if !ENV.has_key?('PYTHONHOME') && python_config[:conda]
+          if !ENV.has_key?('PYTHONHOME')
             case RUBY_PLATFORM
             when /mingw32/, /cygwin/, /mswin/
               ENV['PYTHONHOME'] = python_config[:exec_prefix]

data/lib/pycall/list.rb

@@ -13,9 +13,9 @@ module PyCall
       PyCall.len(self)
     end
 
-    def each
+    def each(&block)
       return enum_for unless block_given?
-      LibPython::Helpers.sequence_each(__pyptr__, &proc)
+      LibPython::Helpers.sequence_each(__pyptr__, &block)
       self
     end
 

data/lib/pycall/pymodule_wrapper.rb

@@ -0,0 +1,46 @@
+require 'pycall/pyobject_wrapper'
+
+module PyCall
+  module PyModuleWrapper
+    include PyObjectWrapper
+
+    def [](*args)
+      case args[0]
+      when String, Symbol
+        PyCall.getattr(self, args[0])
+      else
+        super
+      end
+    end
+  end
+
+  module_function
+
+  class WrapperModuleCache < WrapperObjectCache
+    def initialize
+      super(LibPython::API::PyModule_Type)
+    end
+
+    def check_wrapper_object(wrapper_object)
+      unless wrapper_object.kind_of?(Module) && wrapper_object.kind_of?(PyObjectWrapper)
+        raise TypeError, "unexpected type #{wrapper_object.class} (expected Module extended by PyObjectWrapper)"
+      end
+    end
+
+    def self.instance
+      @instance ||= self.new
+    end
+  end
+
+  private_constant :WrapperModuleCache
+
+  def wrap_module(pymodptr)
+    check_ismodule(pymodptr)
+    WrapperModuleCache.instance.lookup(pymodptr) do
+      Module.new do |mod|
+        mod.instance_variable_set(:@__pyptr__, pymodptr)
+        mod.extend PyModuleWrapper
+      end
+    end
+  end
+end

data/lib/pycall/pyobject_wrapper.rb

@@ -170,43 +170,15 @@ module PyCall
 
   module_function
 
-  class WrapperModuleCache < WrapperObjectCache
-    def initialize
-      super(LibPython::API::PyModule_Type)
-    end
-
-    def check_wrapper_object(wrapper_object)
-      unless wrapper_object.kind_of?(Module) && wrapper_object.kind_of?(PyObjectWrapper)
-        raise TypeError, "unexpected type #{wrapper_object.class} (expected Module extended by PyObjectWrapper)"
-      end
-    end
-
-    def self.instance
-      @instance ||= self.new
-    end
-  end
-
-  private_constant :WrapperModuleCache
-
-  def wrap_module(pymodptr)
-    check_ismodule(pymodptr)
-    WrapperModuleCache.instance.lookup(pymodptr) do
-      Module.new do |mod|
-        mod.instance_variable_set(:@__pyptr__, pymodptr)
-        mod.extend PyObjectWrapper
-      end
-    end
+  def check_ismodule(pyptr)
+    return if pyptr.kind_of? LibPython::API::PyModule_Type
+    raise TypeError, "PyModule object is required"
   end
 
   def check_isclass(pyptr)
     pyptr = pyptr.__pyptr__ if pyptr.kind_of? PyObjectWrapper
     return if pyptr.kind_of? LibPython::API::PyType_Type
-    return defined?(LibPython::API::PyClass_Type) && pyptr.kind_of?(LibPython::API::PyClass_Type)
+    return if defined?(LibPython::API::PyClass_Type) && pyptr.kind_of?(LibPython::API::PyClass_Type)
     raise TypeError, "PyType object is required"
   end
-
-  def check_ismodule(pyptr)
-    return if pyptr.kind_of? LibPython::API::PyModule_Type
-    raise TypeError, "PyModule object is required"
-  end
 end

data/lib/pycall/python/investigator.py

@@ -1,12 +1,8 @@
 from distutils.sysconfig import get_config_var
 import sys
 
-def conda():
-    return 'conda' in sys.version or 'Continuum' in sys.version
-
 for var in ('executable', 'exec_prefix', 'prefix'):
   print(var + ': ' + str(getattr(sys, var)))
-print('conda: ' + ('true' if conda() else 'false'))
 print('multiarch: ' + str(getattr(getattr(sys, 'implementation', sys), '_multiarch', None)))
 for var in ('VERSION', 'INSTSONAME', 'LIBRARY', 'LDLIBRARY', 'LIBDIR', 'PYTHONFRAMEWORKPREFIX', 'MULTIARCH'):
   print(var + ': ' + str(get_config_var(var)))

data/lib/pycall/pytypeobject_wrapper.rb

@@ -51,8 +51,18 @@ module PyCall
 
     def <(other)
       case other
+      when self
+        false
       when PyTypeObjectWrapper
         __pyptr__ < other.__pyptr__
+      when Class
+        false if other.ancestors.include?(self)
+      when Module
+        if ancestors.include?(other)
+          true
+        elsif other.ancestors.include?(self)
+          false
+        end
       else
         raise TypeError, "compared with non class/module"
       end

data/lib/pycall/version.rb

@@ -1,3 +1,9 @@
 module PyCall
-  VERSION = "1.2.0.beta1"
+  VERSION = "1.3.1"
+
+  module Version
+    numbers, TAG = VERSION.split("-")
+    MAJOR, MINOR, MICRO = numbers.split(".").map(&:to_i)
+    STRING = VERSION
+  end
 end

data/pycall.gemspec

@@ -5,7 +5,13 @@ require 'pycall/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "pycall"
-  spec.version       = PyCall::VERSION
+  version_components = [
+    PyCall::Version::MAJOR.to_s,
+    PyCall::Version::MINOR.to_s,
+    PyCall::Version::MICRO.to_s,
+    PyCall::Version::TAG,
+  ]
+  spec.version       = version_components.compact.join(".")
   spec.authors       = ["Kenta Murata"]
   spec.email         = ["mrkn@mrkn.jp"]
 
@@ -30,11 +36,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/pycall/extconf.rb"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rake-compiler-dock"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "launchy"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta1
+  version: 1.3.1
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ extensions:
 - ext/pycall/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -171,6 +172,7 @@ files:
 - ext/pycall/pycall_internal.h
 - ext/pycall/range.c
 - ext/pycall/ruby_wrapper.c
+- ext/pycall/thread.c
 - images/pycallrb_logo.png
 - images/pycallrb_logo_200.png
 - lib/pycall.rb
@@ -187,6 +189,7 @@ files:
 - lib/pycall/list.rb
 - lib/pycall/pretty_print.rb
 - lib/pycall/pyerror.rb
+- lib/pycall/pymodule_wrapper.rb
 - lib/pycall/pyobject_wrapper.rb
 - lib/pycall/python/PyCall/__init__.py
 - lib/pycall/python/PyCall/six.py
@@ -214,12 +217,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: pycall