pycall 1.3.0.dev → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026f371fe891d8a8ef0fc80caefc2c22b1cefc22e937d3699d2aec0a42239d07
-  data.tar.gz: 51d1a6b56e187ceee4954eddf0d48e0c32d51d350e306ed05f6c7624bea914f4
+  metadata.gz: ca6f356d0a95d938f235c348ca3825d261590d2870b3e9bf9f27325d25a5e39e
+  data.tar.gz: 232853fded2a1afb7c6f0a8fdd7e49030879087f00528383c48c7039f0bb8c1a
 SHA512:
-  metadata.gz: 4e7c254cbd02e82a401ab75be52c84738d075b6cbc82c31013513d383af529746afa74df272a84432962d1fe1f0d4eca79a8688d149790ab0ccecf1e7cff679e
-  data.tar.gz: a7f31a993b56cd8b15df2d5d5c2847f71382bef26e26f3723194e71addbf44d35b2939d641a906f8ea12de796befc8f2bf975670db5edf2dd01855c1cac08d2b
+  metadata.gz: 25afa008419432d52ac88a8488341426eaf6287d51b686d5d5dbdb83f8673920a0370b194cfba6b8bbe34c173584d0c7e0c10575b312d0c86e97140b2b561276
+  data.tar.gz: 9a31e7fd32ef9267210e93ab0404f89835a237bcad65c07c8c382cb341969c6e087bede158d0218f591cf73e53cebbc3d5672915ced8942bf5d58aa190d7dcc9

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,9 +1,25 @@
 # The change history of PyCall
 
-## master
+## 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

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/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

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/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/lib/pycall/libpython/finder.rb

@@ -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/pyobject_wrapper.rb

@@ -178,7 +178,7 @@ module PyCall
   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
 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,5 +1,5 @@
 module PyCall
-  VERSION = "1.3.0-dev"
+  VERSION = "1.3.0"
 
   module Version
     numbers, TAG = VERSION.split("-")

data/pycall.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/pycall/extconf.rb"]
 
-  spec.add_development_dependency "bundler", ">= 1.17.2"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rake-compiler-dock"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.3.0.dev
+  version: 1.3.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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"
@@ -216,11 +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: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: pycall