charty 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac796ba17aeb9a82a312d7099c898a2350abaf34c3fad80ea1afd1483de1797
-  data.tar.gz: 8001339bd86377ab3693cc2eeb0a826c04c4ea4e08d58e3a10e99849a273cd58
+  metadata.gz: '06027692f65a7836ddd08d860a3801a0ec9f48d3b57d87ed6b0ed13df1921236'
+  data.tar.gz: 5d8bf785d75f7e7ce8f3c3f5139ee1da836132c0a044af1f80fa0ad63d144514
 SHA512:
-  metadata.gz: 3679334bb56834f7fb1067878c60e7601375e05d6adf63e566eb2cd3847a7ce1423bb27d0104f666854c8343840706a8e14dcc12bc8420ae062b8144d3f6ebc2
-  data.tar.gz: f4bbec96ae815cd758b67a993355fe5e42a10b91d7ef351e63570ec84fa618e65e4c2df4006f2d3431738c8b82b6a5dcf74d79a9b4ce005f89f18fd2ae88d31d
+  metadata.gz: 75ec27779ae41243a4fd31905cb0e5ad240dcccfff11be14ef30b32b2cd67147e3244f2ae1ee44035babbb13320d378eb2ce7f5260fb401c9d389198cb3f1228
+  data.tar.gz: 0b2dc4eb561c51f5fe3f300c0a051a7b7d31793fc7eb302bf5894c1522547fe28fd8faf570df2be9713189fe6ad3ea30c889be0e2b51a2731fb29c88a6016f8f

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -18,31 +18,34 @@ jobs:
       fail-fast: false
       matrix:
         os:
+        - ubuntu-latest
         - ubuntu-20.04
-        - ubuntu-18.04
         ruby:
+        - 3.3
+        - 3.2
+        - 3.1
         - "3.0"
         - 2.7
         - 2.6
         include:
-        - { os: ubuntu-20.04 , ruby: head }
+        - { os: ubuntu-latest , ruby: debug }
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: runner.os == 'Linux'
       with:
         path: ~/.cache/red-datasets
         key: ${{ runner.os }}-${{ hashFiles('lib/**') }}
         restore-keys: ${{ runner.os }}-
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: |
         runner.os == 'macOS'
       with:
@@ -51,7 +54,7 @@ jobs:
         key: ${{ runner.os }}-${{ hashFiles('lib/**') }}
         restore-keys: ${{ runner.os }}-
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: |
         runner.os == 'Windows'
       with:
@@ -62,6 +65,9 @@ jobs:
 
     - run: sudo apt install build-essential libsqlite3-dev
 
+    - run: npm install playwright@latest
+    - run: ./node_modules/.bin/playwright install
+
     - run: bundle install --jobs 4 --retry 3 --without "nmatrix python"
 
     - run: bundle exec rake

data/.github/workflows/nmatrix.yml

@@ -24,21 +24,21 @@ jobs:
         - 2.6
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: runner.os == 'Linux'
       with:
         path: ~/.cache/red-datasets
         key: ${{ runner.os }}-${{ hashFiles('lib/**') }}
         restore-keys: ${{ runner.os }}-
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: |
         runner.os == 'macOS'
       with:
@@ -47,7 +47,7 @@ jobs:
         key: ${{ runner.os }}-${{ hashFiles('lib/**') }}
         restore-keys: ${{ runner.os }}-
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: |
         runner.os == 'Windows'
       with:
@@ -58,6 +58,9 @@ jobs:
 
     - run: sudo apt install build-essential libsqlite3-dev
 
+    - run: npm install playwright@latest
+    - run: ./node_modules/.bin/playwright install
+
     - run: bundle install --jobs 4 --retry 3 --without "numo python"
 
     - run: bundle exec rake

data/.github/workflows/pycall.yml

@@ -19,22 +19,21 @@ jobs:
       fail-fast: false
       matrix:
         os:
+        - ubuntu-latest
         - ubuntu-20.04
-        - ubuntu-18.04
         ruby:
-        - "3.0"
-        - 2.7
-        - 2.6
+        - 3.3
+        - 3.2
+        - 3.1
         python:
         - 3.x
-        - 2.x
         python_architecture:
         - x64
         include:
-        - { os: ubuntu-20.04 , ruby: head , python: 3.x , python_architecture: x64 }
+        - { os: ubuntu-latest , ruby: debug , python: 3.x , python_architecture: x64 }
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
@@ -42,19 +41,19 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
 
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_architecture }}
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: runner.os == 'Linux'
       with:
         path: ~/.cache/red-datasets
         key: ${{ runner.os }}-${{ hashFiles('lib/**') }}
         restore-keys: ${{ runner.os }}-
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: |
         runner.os == 'macOS'
       with:
@@ -63,7 +62,7 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('lib/**') }}
           restore-keys: ${{ runner.os }}-
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       if: |
         runner.os == 'Windows'
       with:
@@ -74,6 +73,9 @@ jobs:
 
     - run: sudo apt install build-essential libsqlite3-dev
 
+    - run: npm install playwright@latest
+    - run: ./node_modules/.bin/playwright install
+
     - run: pip install --user matplotlib pandas
 
     - run: bundle install --jobs 4 --retry 3 --without "nmatrix numo"

data/Gemfile

@@ -5,6 +5,13 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in charty.gemspec
 gemspec
 
+group :activerecord do
+  gem "activerecord"
+  # This must be synchronized with `gem "sqlite", "..."` in
+  # lib/active_record/connection_adapters/sqlite3_adapter.rb.
+  gem "sqlite3", "~> 1.4"
+end
+
 group :cruby do
   gem "enumerable-statistics"
 end

data/charty.gemspec

@@ -39,8 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "daru"
   spec.add_development_dependency "matrix" # need for daru on Ruby > 3.0
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "iruby", ">= 0.7.0"
   spec.add_development_dependency "csv"
 end

data/lib/charty/backends/plotly.rb

@@ -309,8 +309,8 @@ module Charty
 
         groups = (0 ... x.length).group_by do |i|
           key = {}
-          key[:color] = color[i] unless color.nil?
-          key[:style] = style[i] unless style.nil?
+          key[:color] = color.iloc(i) unless color.nil?
+          key[:style] = style.iloc(i) unless style.nil?
           key
         end
 

data/lib/charty/linspace.rb

@@ -8,13 +8,17 @@ module Charty
     end
 
     def each(&block)
-      step = (@range.end - @range.begin).to_r / (@num_step - 1)
-      (@num_step - 1).times do |i|
-        block.call(@range.begin + i * step)
-      end
+      if @num_step == 1
+        block.call(@range.begin)
+      else
+        step = (@range.end - @range.begin).to_r / (@num_step - 1)
+        (@num_step - 1).times do |i|
+          block.call(@range.begin + i * step)
+        end
 
-      unless @range.exclude_end?
-        block.call(@range.end)
+        unless @range.exclude_end?
+          block.call(@range.end)
+        end
       end
     end
   end

data/lib/charty/plotters/abstract_plotter.rb

@@ -185,7 +185,7 @@ module Charty
         elsif vector.categorical?
           :categorical
         else
-          case vector[0]
+          case vector.iloc(0)
           when true, false
             boolean_type
           else

data/lib/charty/plotters/histogram_plotter.rb

@@ -209,8 +209,11 @@ module Charty
           observations = sub_data[data_variable].drop_na.to_a
           params = {}
           params[:weights] = sub_data[:weights].to_a if sub_data.column?(:weights)
-          params[:edges] = common_bin_edges if common_bin_edges
-          hist = Statistics.histogram(observations, bins, **params)
+          hist = if common_bin_edges
+                   Statistics.histogram(observations, edges: common_bin_edges, **params)
+                 else
+                   Statistics.histogram(observations, bins, **params)
+                 end
 
           name = sub_vars[:color]
           backend.univariate_histogram(hist, name, data_variable, stat,

data/lib/charty/table_adapters/pandas_adapter.rb

@@ -90,13 +90,14 @@ module Charty
       end
 
       def []=(key, values)
+        all_slice = PyCall::Slice.new(nil)
         case values
         when Charty::Vector
           case values.adapter
           when Charty::VectorAdapters::PandasSeriesAdapter
-            @data[key] = values.adapter.data
+            @data.loc[all_slice, key] = values.adapter.data
           else
-            @data[key] = values.to_a
+            @data.loc[all_slice, key] = values.to_a
           end
         else
           orig_values = values
@@ -104,7 +105,7 @@ module Charty
           if values.nil?
             raise ArgumentError, "`values` must be convertible to Array"
           end
-          @data[key] = values
+          @data.loc[all_slice, key] = values
         end
         return values
       end
@@ -203,6 +204,17 @@ module Charty
         end
 
         def [](key)
+          key = case key
+                when PyCall::Tuple
+                  key
+                else
+                  key = Array(key)
+                  if key.length == 1 && key[0].is_a?(Integer)
+                    key[0]
+                  else
+                    PyCall::Tuple.new(*key)
+                  end
+                end
           Charty::Table.new(@groupby.get_group(key))
         end
       end

data/lib/charty/vector.rb

@@ -34,6 +34,7 @@ module Charty
 
     alias size length
 
+    def_delegators :adapter, :iloc
     def_delegators :adapter, :to_a
     def_delegators :adapter, :each
     def_delegators :adapter, :empty?

data/lib/charty/vector_adapters/pandas_adapter.rb

@@ -61,6 +61,10 @@ module Charty
         data.equals(Pandas::Series.new(other, index: data.index))
       end
 
+      def iloc(i)
+        data.iloc[i]
+      end
+
       def [](key)
         case key
         when Charty::Vector

data/lib/charty/vector_adapters/vector_adapter.rb

@@ -34,7 +34,8 @@ module Charty
                      :uniq,
                      :unique_values,
                      :values_at,
-                     :where
+                     :where,
+                     :iloc
 
       def compare_data_equality(other)
         if other.is_a?(self.class)

data/lib/charty/vector_adapters.rb

@@ -57,6 +57,8 @@ module Charty
         end
       end
 
+      def_delegator :data, :[], :iloc
+
       def_delegators :data, :[], :[]=
       def_delegators :data, :each, :to_a, :empty?
 
@@ -148,7 +150,7 @@ module Charty
         when Charty::Vector
           where(key)
         else
-          super(key_to_loc(key))
+          iloc(key_to_loc(key))
         end
       end
 

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.2.11"
+  VERSION = "0.2.13"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: charty
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - youchan
 - mrkn
 - 284km
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-colors
@@ -166,34 +166,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  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'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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'
 - !ruby/object:Gem::Dependency
   name: iruby
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +203,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/nmatrix.yml"
 - ".github/workflows/pycall.yml"
@@ -360,7 +333,7 @@ homepage: https://github.com/red-data-tools/charty
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -375,8 +348,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.23
-signing_key: 
+rubygems_version: 3.5.10
+signing_key:
 specification_version: 4
 summary: Visualizing your data in a simple way.
 test_files: []