pycall 0.1.0.alpha.20170317 → 0.1.0.alpha.20170329

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82eaa5c280e2f8206627b19e57cc630938807c4d
-  data.tar.gz: 7d78f624374cf5ef65d7a292f96de5ba3fc218f0
+  metadata.gz: cc7a3092f003ffea81240b8689ec4610e11658e4
+  data.tar.gz: 980774dcb4e1193dd571bcb0b0ab89fc00d3c135
 SHA512:
-  metadata.gz: c4b46544cebf53e321c1436d20fd523d3c58a7f1d54fa64dcc92b9eb76657bd808ac1aece7be3be8bfbaa8a418b4d4686b761eb93cfacc499b9960ff97a00ab1
-  data.tar.gz: 8667a9bd1f58598db6de020c4739f14619ce4fa694d71ef50435ccaedc725536c2013b8682c205ff4fe316d51a4027d5b0487c57575457310e30db09aac32733
+  metadata.gz: 0af75af746d1d74be468f267af346267538f399f4f1a625db67542c8331c59218f058f99e3d30e29d121b291c0b49f992a6f299b9df3b2a5d63a4d752bad5e6d
+  data.tar.gz: b0c75fddc87eff596555d2625fa6b299b296e653e11834ccb0788fe3cf306278a418a44fb9748708b7e7a806c803a6dfce097a2c890d8e52c64e2998e4841f31

data/.travis.yml

@@ -10,7 +10,8 @@ rvm:
 
 env:
   - PYTHON=python
-  - PYTHON=python3
+  - PYTHON=python3 LIBPYTHON=wrong_value
+  - LIBPYTHON=/usr/lib/libpython3.2mu.so.1
 
 addons:
   apt:

data/lib/pycall/libpython.rb

@@ -31,11 +31,15 @@ module PyCall
 
       v = python_config[:VERSION]
       libprefix = FFI::Platform::LIBPREFIX
-      libs = [ "#{libprefix}python#{v}", "#{libprefix}python" ]
-      lib = python_config[:LIBRARY]
-      libs.unshift(File.basename(lib, File.extname(lib))) if lib
-      lib = python_config[:LDLIBRARY]
-      libs.unshift(lib, File.basename(lib)) if lib
+      libs = []
+      %i(INSTSONAME LDLIBRARY).each do |key|
+        lib = python_config[key]
+        libs << lib << File.basename(lib) if lib
+      end
+      if (lib = python_config[:LIBRARY])
+        libs << File.basename(lib, File.extname(lib))
+      end
+      libs << "#{libprefix}python#{v}" << "#{libprefix}python"
       libs.uniq!
 
       executable = python_config[:executable]
@@ -46,9 +50,9 @@ module PyCall
         libpaths << File.expand_path('../../lib', executable)
       end
       libpaths << python_config[:PYTHONFRAMEWORKPREFIX] if FFI::Platform.mac?
-
       exec_prefix = python_config[:exec_prefix]
       libpaths << exec_prefix << File.join(exec_prefix, 'lib')
+      libpaths.compact!
 
       unless ENV['PYTHONHOME']
         # PYTHONHOME tells python where to look for both pure python and binary modules.
@@ -69,19 +73,39 @@ module PyCall
         end
       end
 
+      # Try LIBPYTHON environment variable first.
+      if ENV['LIBPYTHON']
+        if File.file?(ENV['LIBPYTHON'])
+          begin
+            libs = ffi_lib(ENV['LIBPYTHON'])
+            return libs.first
+          rescue LoadError
+          end
+        end
+        $stderr.puts '[WARN] Ignore the wrong libpython location specified in LIBPYTHON environment variable.'
+      end
+
       # Find libpython (we hope):
       libsuffix = FFI::Platform::LIBSUFFIX
+      multiarch = python_config[:MULTIARCH] || python_config[:multiarch]
+      dir_sep = File::ALT_SEPARATOR || File::SEPARATOR
       libs.each do |lib|
         libpaths.each do |libpath|
-          next unless libpath
           # NOTE: File.join doesn't use File::ALT_SEPARATOR
-          libpath_lib = [libpath, lib].join(File::ALT_SEPARATOR || File::SEPARATOR)
-          if File.file?("#{libpath_lib}.#{libsuffix}")
-            begin
-              libs = ffi_lib("#{libpath_lib}.#{libsuffix}")
-              return libs.first
-            rescue LoadError
-              # skip load error
+          libpath_libs = [ [libpath, lib].join(dir_sep) ]
+          libpath_libs << [libpath, multiarch, lib].join(dir_sep) if multiarch
+          libpath_libs.each do |libpath_lib|
+            [
+              libpath_lib,
+              "#{libpath_lib}.#{libsuffix}"
+            ].each do |fullname|
+              next unless File.file?(fullname)
+              begin
+                libs = ffi_lib(fullname)
+                return libs.first
+              rescue LoadError
+                # skip load error
+              end
             end
           end
         end

data/lib/pycall/python/investigator.py

@@ -2,5 +2,6 @@ from distutils.sysconfig import get_config_var
 import sys
 for var in ('executable', 'exec_prefix', 'prefix'):
   print(var + ': ' + str(getattr(sys, var)))
-for var in ('VERSION', 'LIBRARY', 'LDLIBRARY', 'LIBDIR', 'PYTHONFRAMEWORKPREFIX'):
+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/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "0.1.0.alpha.20170317"
+  VERSION = "0.1.0.alpha.20170329"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.20170317
+  version: 0.1.0.alpha.20170329
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: pycall