pycall 1.2.1 → 1.4.1

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/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,85 @@
-from distutils.sysconfig import get_config_var
+#!/usr/bin/env python
+
+import ctypes.util
+from distutils.sysconfig import get_config_var, get_python_version
+import os
 import sys
 
-def conda():
-    return 'conda' in sys.version or 'Continuum' in sys.version
+is_windows = os.name == "nt"
+
+def linked_libpython():
+    if is_windows:
+        return _linked_libpython_windows()
+    return _linked_libpython_unix()
+
+class Dl_info(ctypes.Structure):
+    _fields_ = [
+        ("dli_fname", ctypes.c_char_p),
+        ("dli_fbase", ctypes.c_void_p),
+        ("dli_sname", ctypes.c_char_p),
+        ("dli_saddr", ctypes.c_void_p),
+    ]
+
+def _linked_libpython_unix():
+    libdl = ctypes.CDLL(ctypes.util.find_library("dl"))
+    libdl.dladdr.argtypes = [ctypes.c_void_p, ctypes.POINTER(Dl_info)]
+    libdl.dladdr.restype = ctypes.c_int
+
+    dlinfo = Dl_info()
+    retcode = libdl.dladdr(
+            ctypes.cast(ctypes.pythonapi.Py_GetVersion, ctypes.c_void_p),
+            ctypes.pointer(dlinfo))
+    if retcode == 0:  # means error
+        return None
+    path = os.path.realpath(dlinfo.dli_fname.decode())
+    if path == os.path.realpath(sys.executable):
+        return None
+    return path
+
+def _linked_libpython_windows():
+    # Based on: https://stackoverflow.com/a/16659821
+    from ctypes.wintypes import HANDLE, LPWSTR, DWORD
+
+    GetModuleFileName = ctypes.windll.kernel32.GetModuleFileNameW
+    GetModuleFileName.argtypes = [HANDLE, LPWSTR, DWORD]
+    GetModuleFileName.restype = DWORD
+
+    MAX_PATH = 260
+    try:
+        buf = ctypes.create_unicode_buffer(MAX_PATH)
+        GetModuleFileName(ctypes.pythonapi._handle, buf, MAX_PATH)
+        return buf.value
+    except (ValueError, OSError):
+        return None
+
+print("linked_libpython: {val}".format(val=(linked_libpython() or "None")))
+
+sys_keys = [ "executable", "exec_prefix", "prefix" ]
+
+for var in sys_keys:
+    print("{var}: {val}".format(var=var, val=(getattr(sys, var) or "None")))
+
+config_keys = [ "INSTSONAME", "LIBDIR", "LIBPL", "LIBRARY", "LDLIBRARY",
+                "MULTIARCH", "PYTHONFRAMEWORKPREFIX", "SHLIB_SUFFIX", "srcdir" ]
+
+for var in config_keys:
+    print("{var}: {val}".format(var=var, val=(get_config_var(var) or "None")))
+
+print("ABIFLAGS: {val}".format(val=get_config_var("ABIFLAGS") or get_config_var("abiflags") or "None"))
+
+version = get_python_version() or \
+          "{v.major}.{v.minor}".format(v=sys.version_info) or \
+          get_config_var("VERSION")
+print("VERSION: {val}".format(val=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)))
+if is_windows:
+    if hasattr(sys, "base_exec_prefix"):
+        PYTHONHOME = sys.base_exec_prefix
+    else:
+        PYTHONHOME = sys.exec_prefix
+else:
+    if hasattr(sys, "base_exec_prefix"):
+        PYTHONHOME = ":".join([sys.base_prefix, sys.base_exec_prefix])
+    else:
+        PYTHONHOME = ":".join([sys.prefix, sys.exec_prefix])
+print("PYTHONHOME: {val}".format(val=PYTHONHOME))

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.1"
+  VERSION = "1.4.1"
+
+  module Version
+    numbers, TAG = VERSION.split("-")
+    MAJOR, MINOR, MICRO = numbers.split(".").map(&:to_i)
+    STRING = VERSION
+  end
 end

data/lib/pycall/wrapper_object_cache.rb

@@ -1,5 +1,54 @@
 module PyCall
   class WrapperObjectCache
+
+    begin
+      ObjectSpace::WeakMap.new[42] = Object.new
+    rescue
+      WMAP_SUPPORT_INT_KEY = false
+    else
+      case RUBY_PLATFORM
+      when /cygwin/, /mingw/, /mswin/
+        WMAP_SUPPORT_INT_KEY = false
+      else
+        WMAP_SUPPORT_INT_KEY = true
+      end
+    end
+
+    if WMAP_SUPPORT_INT_KEY
+      def self.get_key(pyptr)
+        pyptr.__address__
+      end
+    else
+      class Key
+        @address_key_map = {}
+
+        def self.[](address)
+          # An instance of Key created here is parmanently cached in @address_key_map.
+          # This behavior is intentional.
+          @address_key_map[address] ||= new(address)
+        end
+
+        def initialize(address)
+          @address = address
+        end
+
+        attr_reader :address
+
+        def ==(other)
+          case other
+          when Key
+            self.address == other.address
+          else
+            super
+          end
+        end
+      end
+
+      def self.get_key(pyptr)
+        Key[pyptr.__address__]
+      end
+    end
+
     def initialize(*restricted_pytypes)
       unless restricted_pytypes.empty?
         restricted_pytypes.each do |pytype|
@@ -8,9 +57,7 @@ module PyCall
         end
       end
       @restricted_pytypes = restricted_pytypes
-      @wrapper_object_table = {}
-      @wrapped_pyptr_table = {}
-      @weakref_table = {}
+      @wrapper_object_table = ObjectSpace::WeakMap.new
     end
 
     def lookup(pyptr)
@@ -25,16 +72,14 @@ module PyCall
         end
       end
 
-      wrapper_object_id = @wrapper_object_table[pyptr.__address__]
-      if wrapper_object_id
-        wrapper_object = ObjectSpace._id2ref(wrapper_object_id) rescue nil
-        return wrapper_object if wrapper_object
+      key = self.class.get_key(pyptr)
+      wrapper_object = @wrapper_object_table[key]
+      unless wrapper_object
+        wrapper_object = yield(pyptr)
+        check_wrapper_object(wrapper_object)
+        @wrapper_object_table[key] = wrapper_object
       end
 
-      wrapper_object = yield(pyptr)
-      check_wrapper_object(wrapper_object)
-      register_wrapper_object(pyptr, wrapper_object)
-
       wrapper_object
     end
 
@@ -43,19 +88,5 @@ module PyCall
         raise TypeError, "unexpected wrapper object (expected an object extended by PyObjectWrapper)"
       end
     end
-
-    def register_wrapper_object(pyptr, wrapper_object)
-      @wrapper_object_table[pyptr.__address__] = wrapper_object.__id__
-      @wrapped_pyptr_table[wrapper_object.__id__] = pyptr.__address__
-      ObjectSpace.define_finalizer(wrapper_object, &method(:unregister_wrapper_object))
-      # TODO: weakref
-      self
-    end
-
-    def unregister_wrapper_object(wrapper_object_id)
-      pyptr_addr = @wrapped_pyptr_table.delete(wrapper_object_id)
-      @wrapper_object_table.delete(pyptr_addr) if pyptr_addr
-      self
-    end
   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,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"
@@ -38,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "launchy"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "test-unit"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2021-07-12 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
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: pycall
 email:
 - mrkn@mrkn.jp
@@ -130,15 +144,15 @@ extensions:
 - ext/pycall/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- appveyor.yml
 - bin/console
 - bin/guard
 - bin/rspec
@@ -157,6 +171,7 @@ files:
 - examples/notebooks/classifier_comparison.ipynb
 - examples/notebooks/forest_importances.ipynb
 - examples/notebooks/iruby_integration.ipynb
+- examples/notebooks/leaflet.ipynb
 - examples/notebooks/lorenz_attractor.ipynb
 - examples/notebooks/polar_axes.ipynb
 - examples/notebooks/sum_benchmarking.ipynb
@@ -171,6 +186,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
@@ -180,6 +196,7 @@ files:
 - lib/pycall/import.rb
 - lib/pycall/init.rb
 - lib/pycall/iruby_helper.rb
+- lib/pycall/iterable_wrapper.rb
 - lib/pycall/libpython.rb
 - lib/pycall/libpython/finder.rb
 - lib/pycall/libpython/pyobject_struct.rb
@@ -219,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: pycall

data/.travis.yml

@@ -1,56 +0,0 @@
-language: ruby
-
-os: linux
-
-dist: trusty
-sudo: required
-
-rvm:
-- ruby-head
-- 2.5.0
-- 2.4.3
-- 2.3.5
-
-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
-
-matrix:
-  include:
-  - os: osx
-    osx_image: xcode9
-    compiler: clang
-    rvm: 2.4.1
-    env: PYENV_VERSION=3.6.2
-  - os: osx
-    osx_image: xcode9
-    compiler: clang
-    rvm: 2.4.1
-    env: PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
-  - os: osx
-    osx_image: xcode9
-    compiler: clang
-    rvm: 2.4.1
-    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 -)"
-
-install:
-- ci/travis_install.sh
-
-before_script:
-- . ci/travis_before_script.sh
-- bundle exec rake clobber compile
-- python lib/pycall/python/investigator.py