matplotlib 0.1.0.alpha.20170311 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95a6ad2151fb6e66094399b36f7cc6786fcbd67a
-  data.tar.gz: c9c0b297ad01c6fe1f773ea2ce831731ba4c35c4
+SHA256:
+  metadata.gz: 16136e1e95a540d319e3bad7168e37ee5d6207ce8cdd029becc8586cdb696873
+  data.tar.gz: d9d5286651db26478890d6e33673b2740fb600a7f9f92190502914438486138e
 SHA512:
-  metadata.gz: 14640bf62fe74e99d65fac51e9fed03f7cbebb5468c378c30796c8d9acfc8747cd65388e22e1275709788ce3123609b4012e8df187490a4bfc183323b4437381
-  data.tar.gz: 1a8f6630b4bc2da2aa857225377d562d481cdc87408b666894f61e1e3eaf2b12b51d160f6497430ac4fad2e7b3c2cfe7db3f8feda46d7ff7d7101b5768500a55
+  metadata.gz: bf5e6af1f4683a8f547b2371779bbb9e5441f05f8a4cca3b2e5c7f16a628fa1a92e204038125bdf700bf7e922181590a357732140ca9623d30a09885f2efa345
+  data.tar.gz: 9f07a63560098806d0c570915daa39bde833713be2568d0bbee79fcd4cd93fa43d8670fc1386ec5b2f03471027c674efecb66cfebe26307f1e108fbe5d6508b1

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in matplotlib.gemspec
 gemspec
-
-gem 'pycall', github: 'mrkn/pycall'

data/README.md

@@ -1,8 +1,7 @@
 # Matplotlib
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/matplotlib`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+This library enables to directly call [matplotlib](https://matplotlib.org/) from Ruby language.
+This is built on top of [pycall](https://github.com/mrkn/pycall).
 
 ## Installation
 
@@ -18,11 +17,35 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install matplotlib
+    $ gem install --pre matplotlib
 
 ## Usage
 
-TODO: Write usage instructions here
+### Using pyplot in irb console or standalone scripts
+
+Example usage:
+
+    require 'matplotlib/pyplot'
+    plt = Matplotlib::Pyplot
+
+    xs = [*1..100].map {|x| (x - 50) * Math::PI / 100.0 }
+    ys = xs.map {|x| Math.sin(x) }
+
+    plt.plot(xs, ys)
+    plt.show()
+
+### IRuby integration
+
+`matplotlib/iruby` provides integration between IRuby notebook and matplotlib.
+This functionality can be enabled by calling `Matplotlib::IRuby.activate`.
+
+    require 'matplotlib/iruby'
+    Matplotlib::IRuby.activate
+
+`matplotlib/iruby` also loads `matplotlib/pyplot`, so you can use `Matplotlib::Pyplot` module without explicitly requiring `matplotlib/pyplot`.
+And this introduces a post execution hook which put figures that are created in a cell just below the execution result of the cell.
+
+See ipynb files in [examples](examples) to see example usages.
 
 ## Development
 
@@ -38,4 +61,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/mrkn/m
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/matplotlib.rb

@@ -1,41 +1,26 @@
-require "matplotlib/version"
-require 'pycall/import'
+require 'matplotlib/version'
+require 'pycall'
 
-module Matplotlib
-  @matplotlib = PyCall.import_module('matplotlib')
-  PyCall.dir(@matplotlib).each do |name|
-    obj = PyCall.getattr(@matplotlib, name)
-    next unless obj.kind_of?(PyCall::PyObject) || obj.kind_of?(PyCall::PyObjectWrapper)
-    next unless PyCall.callable?(obj)
-
-    define_singleton_method(name) do |*args, **kwargs|
-      obj.(*args, **kwargs)
-    end
-  end
+Matplotlib = PyCall.import_module('matplotlib')
 
-  class << self
-    def __pyobj__
-      @matplotlib
-    end
-
-    def method_missing(name, *args, **kwargs)
-      return super unless PyCall.hasattr?(@matplotlib, name)
-      PyCall.getattr(@matplotlib, name)
-    end
-  end
+module Matplotlib
+  VERSION = MATPLOTLIB_VERSION
+  Object.class_eval { remove_const :MATPLOTLIB_VERSION }
 
   # FIXME: MacOSX backend is unavailable via pycall.
   #        I don't know why it is.
-  if Matplotlib.get_backend() == 'MacOSX'
-    Matplotlib.use('TkAgg')
+  if get_backend == 'MacOSX'
+    use('TkAgg')
   end
 
   class Error < StandardError
   end
 end
 
+require 'matplotlib/axis'
 require 'matplotlib/axes'
 require 'matplotlib/polar_axes'
 require 'matplotlib/figure'
+require 'matplotlib/spines'
 
-PyCall.append_sys_path(File.expand_path('../matplotlib/python', __FILE__))
+PyCall.sys.path.insert(0, File.expand_path('../matplotlib/python', __FILE__))

data/lib/matplotlib/axes.rb

@@ -1,6 +1,4 @@
 module Matplotlib
-  class Axes
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.axes').Axes
-  end
+  Axes = PyCall.import_module('matplotlib.axes').Axes
+  Axes.__send__ :register_python_type_mapping
 end

data/lib/matplotlib/axes_3d.rb

@@ -1,6 +1,4 @@
 module Matplotlib
-  class Axes3D
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('mpl_toolkits.mplot3d').Axes3D
-  end
+  Axes3D = PyCall.import_module('mpl_toolkits.mplot3d').Axes3D
+  Axes3D.__send__ :register_python_type_mapping
 end

data/lib/matplotlib/axis.rb

@@ -0,0 +1,16 @@
+module Matplotlib
+  Axis = PyCall.import_module('matplotlib.axis')
+  module Axis
+    XTick = self.XTick
+    XTick.__send__ :register_python_type_mapping
+
+    YTick = self.YTick
+    YTick.__send__ :register_python_type_mapping
+
+    XAxis = self.XAxis
+    XAxis.__send__ :register_python_type_mapping
+
+    YAxis = self.YAxis
+    YAxis.__send__ :register_python_type_mapping
+  end
+end

data/lib/matplotlib/figure.rb

@@ -1,28 +1,4 @@
 module Matplotlib
-  class Figure
-    include PyCall::PyObjectWrapper
-
-    @__pyobj__ = PyCall.import_module('matplotlib.figure').Figure
-
-    PyCall.dir(@__pyobj__).each do |name|
-      obj = PyCall.getattr(@__pyobj__, name)
-      next unless obj.kind_of?(PyCall::PyObject) || obj.kind_of?(PyCall::PyObjectWrapper)
-      next unless PyCall.callable?(obj)
-
-      define_method(name) do |*args, **kwargs|
-        PyCall.getattr(__pyobj__, name).(*args, **kwargs)
-      end
-    end
-
-    class << self
-      attr_reader :__pyobj__
-
-      def method_missing(name, *args, **kwargs)
-        return super unless PyCall.hasattr?(__pyobj__, name)
-        PyCall.getattr(__pyobj__, name)
-      end
-    end
-
-    PyCall::Conversions.python_type_mapping(__pyobj__, self)
-  end
+  Figure = PyCall.import_module('matplotlib.figure').Figure
+  Figure.__send__ :register_python_type_mapping
 end

data/lib/matplotlib/iruby.rb

@@ -1,4 +1,4 @@
-require 'pycall'
+require 'matplotlib'
 
 module Matplotlib
   module IRuby
@@ -61,17 +61,20 @@ module Matplotlib
         rescue SystemExit
           content[:payload] << { source: :ask_exit }
         rescue Exception => e
-          content = error_message(e)
+          content = error_content(e)
           @session.send(:publish, :error, content)
         end
 
+        unless result.nil? || msg[:content]['silent']
+          @session.send(:publish, :execute_result,
+                        data: ::IRuby::Display.display(result),
+                        metadata: {},
+                        execution_count: @execution_count)
+        end
+
         trigger_event(:post_execute)
 
         @session.send(:reply, :execute_reply, content)
-        @session.send(:publish, :execute_result,
-                      data: ::IRuby::Display.display(result),
-                      metadata: {},
-                      execution_count: @execution_count) unless result.nil? || msg[:content]['silent']
       end
     end
 
@@ -85,17 +88,18 @@ module Matplotlib
     }.freeze
 
     module Helper
+      BytesIO = PyCall.import_module('io').BytesIO
+
       def register_formats
-        bytes_io = PyCall.import_module('io').BytesIO
         type { Figure }
         AGG_FORMATS.each do |mime, format|
           format mime do |fig|
-            unless fig.canvas.get_supported_filetypes.().has_key?(format)
+            unless fig.canvas.get_supported_filetypes.has_key?(format)
               raise Error, "Unable to display a figure in #{format} format"
             end
-            io = bytes_io.()
-            fig.canvas.print_figure.(io, format: format, bbox_inches: 'tight')
-            io.getvalue.()
+            io = BytesIO.new
+            fig.canvas.print_figure(io, format: format, bbox_inches: 'tight')
+            io.getvalue
           end
         end
       end
@@ -119,7 +123,7 @@ module Matplotlib
         nbagg: :nbAgg,
         notebook: :nbAgg,
         agg: :agg,
-        inline: 'module://ruby.matplotlib.backend_inline',
+        inline: 'module://matplotlib_rb.backend_inline',
       }.freeze
 
       BACKEND_GUI_MAP = Hash[GUI_BACKEND_MAP.select {|k, v| v }].freeze
@@ -210,13 +214,24 @@ module Matplotlib
         # Temporally monky-patching IRuby kernel to enable flushing and closing figures.
         # TODO: Make this feature a pull-request for sciruby/iruby.
         kernel = ::IRuby::Kernel.instance
-        kernel.extend HookExtension
+        kernel.extend HookExtension unless kernel.respond_to?(:events)
         if backend == GUI_BACKEND_MAP[:inline]
-          kernel.register_event(:post_execute, method(:flush_figures))
+          if kernel.respond_to?(:register_event)
+            kernel.register_event(:post_execute, method(:flush_figures))
+          else
+            @post_execute_func = kernel.events.register(:post_execute, &method(:flush_figures))
+          end
+
           # TODO: save original rcParams and overwrite rcParams with IRuby-specific configuration
           new_backend_name = :inline
         else
-          kernel.unregister_event(:post_execute, method(:flush_figures))
+          if kernel.respond_to?(:unregister_event)
+            kernel.unregister_event(:post_execute, method(:flush_figures))
+          elsif @post_execute_func
+            kernel.events.unregister(:post_execute, @post_execute_func)
+            @post_execute_func = nil
+          end
+
           # TODO: restore saved original rcParams
           new_backend_name = :not_inline
         end
@@ -237,17 +252,14 @@ module Matplotlib
       # @param [true, false] close  If true, a `plt.close('all')` call is automatically issued after sending all the figures.
       def show_figures(close=false)
         _pylab_helpers = PyCall.import_module('matplotlib._pylab_helpers')
-        gcf = PyCall.getattr(_pylab_helpers, :Gcf)
+        gcf = _pylab_helpers.Gcf
         kernel = ::IRuby::Kernel.instance
-        gcf.get_all_fig_managers.().each do |fig_manager|
+        gcf.get_all_fig_managers.each do |fig_manager|
           data = ::IRuby::Display.display(fig_manager.canvas.figure)
-          kernel.session.send(:publish, :execute_result,
-                              data: data,
-                              metadata: {},
-                              execution_count: kernel.instance_variable_get(:@execution_count))
+          kernel.session.send(:publish, :display_data, data: data, metadata: {})
         end
       ensure
-        unless gcf.get_all_fig_managers.().none?
+        unless gcf.get_all_fig_managers.nil?
           Matplotlib::Pyplot.close('all')
         end
       end

data/lib/matplotlib/polar_axes.rb

@@ -1,6 +1,4 @@
 module Matplotlib
-  class PolarAxes
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.projections.polar').PolarAxes
-  end
+  PolarAxes = PyCall.import_module('matplotlib.projections.polar').PolarAxes
+  PolarAxes.__send__ :register_python_type_mapping
 end

data/lib/matplotlib/pyplot.rb

@@ -1,27 +1,11 @@
 require 'matplotlib'
 
 module Matplotlib
+  Pyplot = PyCall.import_module('matplotlib.pyplot')
   module Pyplot
-    @pyplot = PyCall.import_module('matplotlib.pyplot')
-    PyCall.dir(@pyplot).each do |name|
-      obj = PyCall.getattr(@pyplot, name)
-      next unless obj.kind_of?(PyCall::PyObject) || obj.kind_of?(PyCall::PyObjectWrapper)
-      next unless PyCall.callable?(obj)
-
-      define_singleton_method(name) do |*args, **kwargs|
-        obj.(*args, **kwargs)
-      end
-    end
-
-    class << self
-      def __pyobj__
-        @pyplot
-      end
-
-      def method_missing(name, *args, **kwargs)
-        return super unless PyCall.hasattr?(@pyplot, name)
-        PyCall.getattr(@pyplot, name)
-      end
+    def self.xkcd(scale: 1, length: 100, randomness: 2, &block)
+      ctx = super(scale: scale, length: length, randomness: randomness)
+      PyCall.with(ctx, &block)
     end
   end
 end

data/lib/matplotlib/spines.rb

@@ -0,0 +1,4 @@
+module Matplotlib
+  Spine = PyCall.import_module('matplotlib.spines').Spine
+  Spine.__send__ :register_python_type_mapping
+end

data/lib/matplotlib/version.rb

@@ -1,3 +1 @@
-module Matplotlib
-  VERSION = "0.1.0.alpha.20170311"
-end
+MATPLOTLIB_VERSION = "1.2.0"

data/matplotlib.gemspec

@@ -5,7 +5,7 @@ require 'matplotlib/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "matplotlib"
-  spec.version       = Matplotlib::VERSION
+  spec.version       = MATPLOTLIB_VERSION
   spec.authors       = ["Kenta Murata"]
   spec.email         = ["mrkn@mrkn.jp"]
 
@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "pycall", ">= 0.1.0.alpha.20170311"
+  spec.add_dependency "pycall", ">= 1.0.0"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", ">= 1.17.2"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matplotlib
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.20170311
+  version: 1.2.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pycall
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha.20170311
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha.20170311
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.2
 - !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: 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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -96,20 +96,18 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- examples/classifier_comparison.ipynb
-- examples/forest_importances.ipynb
-- examples/iruby_integration.ipynb
-- examples/lorenz_attractor.ipynb
 - examples/noisy_sin.rb
-- examples/polar_axes.ipynb
 - lib/matplotlib.rb
 - lib/matplotlib/axes.rb
 - lib/matplotlib/axes_3d.rb
+- lib/matplotlib/axis.rb
 - lib/matplotlib/figure.rb
 - lib/matplotlib/iruby.rb
 - lib/matplotlib/polar_axes.rb
 - lib/matplotlib/pyplot.rb
-- lib/matplotlib/python/ruby/matplotlib/backend_inline.py
+- lib/matplotlib/python/matplotlib_rb/__init__.py
+- lib/matplotlib/python/matplotlib_rb/backend_inline.py
+- lib/matplotlib/spines.rb
 - lib/matplotlib/version.rb
 - matplotlib.gemspec
 homepage: https://github.com/mrkn/matplotlib.rb
@@ -127,12 +125,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.6.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: matplotlib wrapper for Ruby