pandas 0.2.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 01ae8d45320fa67aa7d7ae6b131c777ec2cd88fb
-  data.tar.gz: 1cc5bffdfe6f376cc2bbd19c67354c70bec0dd8d
+SHA256:
+  metadata.gz: c913e79f27264bf7fc6372dab00e706736e14fd9bfdc5b7a9115aa229a26ccc7
+  data.tar.gz: b71d64bc03c8a2f2402ee0d33aca7a8646229806799472a9bb2ad955e4875696
 SHA512:
-  metadata.gz: 9b2457bd1efb1b291ff11570dd69f3ee9b95b52e4a631993833c962fd83a216e9b08afd52a2a1a41028c541a895ae3678296cd60244d263d91d601a0a8b0966a
-  data.tar.gz: 403ec721bc39c1245b1c82f1255dad2ad8462218b4d48fe30a94fbdba838bff17b124b5e731037c438fdcbdd5806878a166a9cc3dc94c28e4fe4351c5f80ae22
+  metadata.gz: 6eed3dc70cb8744495021c874c2ce22a0ffc54b51a93166b0e9bf405919dc9b9f8c0399bae1100d59808e6c299d5951e158151d5364a5dabfaf41f8160a6cad5
+  data.tar.gz: 9164bbe1b1419aadfd1e8695129aaebaf70dcbf297baf0e54a68ec0d93a458d48a59187dfac58853410558f88f85e1686f752d650bd980c5dd887ecb81f3ee9e

data/.github/workflows/ci.yml

@@ -0,0 +1,69 @@
+name: CI
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+
+jobs:
+  test:
+    name: ${{ matrix.os}} ${{ matrix.ruby }} ${{ matrix.python }}-${{ matrix.python_arch }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+        - ubuntu-latest
+        - macos-latest
+        ruby:
+        - 3.0
+        - 2.7
+        - 2.6
+        - 2.5
+        - 2.4
+        - debug
+        python:
+        - 3.8.x
+        - 3.7.x
+        - 3.6.x
+        - 2.7.x
+        python_arch:
+        - x64
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+
+    - uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python }}
+        architecture: ${{ matrix.python_arch }}
+
+    - run: sudo apt-get install libsqlite3-dev
+      if: matrix.os == 'ubuntu-latest'
+
+    - run: brew install sqlite3
+      if: matrix.os == 'macos-latest'
+
+    - run: pip install -r requirements.txt
+
+    - run: gem install bundler
+    - run: bundle install
+
+    - run: bundle exec rake
+      env:
+        PYTHON: python
+
+    - run: rake build
+    - run: gem install pkg/*.gem

data/CHANGES.md

@@ -1,5 +1,41 @@
 # The chenge history of Pandas wrapper for Ruby
 
+## 0.3.4
+
+* Add `to_a` methods in `Pandas::Series` and `Pandas::Index`
+
+* Add `length` method in `Pandas::Series` and `Pandas::Index`
+
+## 0.3.3
+
+* Support array index in `Pandas::Series#[]`
+
+* Add predicate methods for `Pandas::Index` and `Pandas::Series`
+
+* Support closed-end string ranges in `Pandas::Series#[]`
+
+* Support string array index in `Pandas::DataFrame#loc[]`
+
+* Support array index in `Pandas::DataFrame#iloc[]`
+
+## 0.3.2
+
+* Fix for pandas 1.0
+
+## 0.3.1
+
+* Fix `Pandas.read_sql_table` for passing optional parameters such as `index_col`
+
+## 0.3.0
+
+* Fix the module path of `DatetimeIndex` to support pandas < 0.20
+
+  Fixes #5
+
+  *Daniel Baark*
+
+* Support to pass an AR model class to `read_sql_table` instead of both `table_name` and `conn`
+
 ## 0.2.0
 
 * Support a connection of ActiveRecord in `read_sql_table` and `read_sql_query`

data/README.md

@@ -1,6 +1,6 @@
 # Pandas wrapper for Ruby
 
-[![Build Status](https://travis-ci.org/mrkn/pandas.rb.svg)](https://travis-ci.org/mrkn/pandas.rb)
+[![CI](https://github.com/mrkn/pandas.rb/workflows/CI/badge.svg?branch=master&event=push)](https://github.com/mrkn/pandas.rb/actions?query=workflow%3ACI)
 
 This library enables to directry call [pandas](http://pandas.pydata.org/) from Ruby language.
 This uses [pycall](https://github.com/mrkn/pycall).

data/lib/pandas.rb

@@ -1,7 +1,7 @@
 require "pandas/version"
-require "pycall"
+require "numpy"
 
-Pandas = PyCall.import_module('pandas')
+Pandas = PyCall.import_module("pandas")
 module Pandas
   VERSION = PANDAS_VERSION
   Object.send :remove_const, :PANDAS_VERSION
@@ -18,16 +18,30 @@ module Pandas
   LocIndexer = self.core.indexing._LocIndexer
   LocIndexer.__send__ :register_python_type_mapping
 
-  IXIndexer = self.core.indexing._IXIndexer
-  IXIndexer.__send__ :register_python_type_mapping
+  if self.__version__ < "1.0"
+    IXIndexer = self.core.indexing._IXIndexer
+    IXIndexer.__send__ :register_python_type_mapping
+  end
 
-  MultiIndex = self.core.indexing.MultiIndex
+  if self.__version__ >= "1.0"
+    MultiIndex = self.core.indexes.multi.MultiIndex
+  else
+    MultiIndex = self.core.indexing.MultiIndex
+  end
   MultiIndex.__send__ :register_python_type_mapping
 
-  DatetimeIndex = self.core.indexes.datetimes.DatetimeIndex
+  DatetimeIndex = if self.__version__ >= "0.20"
+                    self.core.indexes.datetimes.DatetimeIndex
+                  else
+                    self.tseries.index.DatetimeIndex
+                  end
   DatetimeIndex.__send__ :register_python_type_mapping
 
-  Index = self.core.index.Index
+  if self.__version__ >= "1.0"
+    Index = self.core.indexes.base.Index
+  else
+    Index = self.core.index.Index
+  end
   Index.__send__ :register_python_type_mapping
 
   DataFrameGroupBy = self.core.groupby.DataFrameGroupBy
@@ -38,23 +52,37 @@ module Pandas
 
   IO = self.io
 
-  def self.read_sql_table(table_name, conn, *args)
+  def self.read_sql_table(table_name, conn=nil, *args, **kwargs)
+    if conn.nil? && IO.is_activerecord_model?(table_name)
+      unless table_name.table_name
+        raise ArgumentError, "The given model does not have its table_name"
+      end
+      table_name, conn = table_name.table_name, table_name.connection
+    end
+
+    unless conn
+      raise ArgumentError, "wrong number of arguments (given 1, expected 2+)"
+    end
+
     if IO.is_activerecord_datasource?(conn)
       require 'pandas/io/active_record'
-      return IO::Helpers.read_sql_table_from_active_record(table_name, conn, *args)
+      return IO::Helpers.read_sql_table_from_active_record(table_name, conn, *args, **kwargs)
     end
     super
   end
 
-  def self.read_sql_query(query, conn, *args)
+  def self.read_sql_query(query, conn, *args, **kwargs)
     if IO.is_activerecord_datasource?(conn)
       require 'pandas/io/active_record'
-      return IO::Helpers.read_sql_query_from_active_record(query, conn, *args)
+      return IO::Helpers.read_sql_query_from_active_record(query, conn, *args, **kwargs)
     end
     super
   end
 
   require 'pandas/data_frame'
+  require 'pandas/index'
   require 'pandas/io'
+  require 'pandas/loc_indexer'
   require 'pandas/options'
+  require 'pandas/series'
 end

data/lib/pandas/data_frame.rb

@@ -2,10 +2,8 @@ require 'pandas'
 
 module Pandas
   class DataFrame
-    def [](*key)
-      if key.length == 1 && key[0].is_a?(Array)
-        key[0] = PyCall::List.new(key[0])
-      end
+    def [](key)
+      key = PyCall::List.new(key) if key.is_a?(Array)
       super
     end
   end

data/lib/pandas/index.rb

@@ -0,0 +1,29 @@
+require 'pandas'
+
+module Pandas
+  class Index
+    def monotonic?
+      is_monotonic
+    end
+
+    def monotonic_decreasing?
+      is_monotonic_decreasing
+    end
+
+    def monotonic_increasing?
+      is_monotonic_increasing
+    end
+
+    def unique?
+      is_unique
+    end
+
+    def length
+      size
+    end
+
+    def to_a
+      Array.new(length) {|i| self[i] }
+    end
+  end
+end

data/lib/pandas/io.rb

@@ -2,6 +2,12 @@ require 'pandas'
 
 module Pandas
   module IO
+    def self.is_activerecord_model?(obj)
+      return false unless defined?(::ActiveRecord)
+      return true if obj.is_a?(Class) && obj < ActiveRecord::Base
+      false
+    end
+
     def self.is_activerecord_datasource?(obj)
       return false unless defined?(::ActiveRecord)
       return true if obj.is_a?(::ActiveRecord::ConnectionAdapters::AbstractAdapter)

data/lib/pandas/loc_indexer.rb

@@ -0,0 +1,25 @@
+require 'pandas'
+
+module Pandas
+  class LocIndexer
+    def [](*keys)
+      for i in 0...keys.length
+        if keys[i].is_a? Array
+          keys[i] = PyCall::List.new(keys[i])
+        end
+      end
+      super
+    end
+  end
+
+  class IlocIndexer
+    def [](*keys)
+      for i in 0...keys.length
+        if keys[i].is_a? Array
+          keys[i] = PyCall::List.new(keys[i])
+        end
+      end
+      super
+    end
+  end
+end

data/lib/pandas/series.rb

@@ -0,0 +1,44 @@
+require 'pandas'
+
+module Pandas
+  class Series
+    def [](*key)
+      if key.length == 1
+        case key[0]
+        when Array
+          key[0] = PyCall::List.new(key[0])
+        when Range
+          case key[0].begin
+          when String
+            key[0] = key[0].begin ... key[0].end # force exclude-end
+          end
+        end
+      end
+      super
+    end
+
+    def monotonic?
+      is_monotonic
+    end
+
+    def monotonic_decreasing?
+      is_monotonic_decreasing
+    end
+
+    def monotonic_increasing?
+      is_monotonic_increasing
+    end
+
+    def unique?
+      is_unique
+    end
+
+    def length
+      size
+    end
+
+    def to_a
+      Array.new(length) {|i| self[i] }
+    end
+  end
+end

data/lib/pandas/version.rb

@@ -1 +1 @@
-PANDAS_VERSION = "0.2.0"
+PANDAS_VERSION = "0.3.4"

data/pandas.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "pycall", ">= 1.0.0"
+  spec.add_dependency "numpy"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  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 "activerecord", ">= 4.2"
   spec.add_development_dependency "sqlite3"
 end

data/requirements.txt

@@ -0,0 +1,2 @@
+pandas
+sqlalchemy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandas
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pycall
@@ -24,48 +24,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: numpy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        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: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -114,11 +128,15 @@ files:
 - data/titanic.csv
 - lib/pandas.rb
 - lib/pandas/data_frame.rb
+- lib/pandas/index.rb
 - lib/pandas/io.rb
 - lib/pandas/io/active_record.rb
+- lib/pandas/loc_indexer.rb
 - lib/pandas/options.rb
+- lib/pandas/series.rb
 - lib/pandas/version.rb
 - pandas.gemspec
+- requirements.txt
 homepage: https://github.com/mrkn/pandas.rb
 licenses:
 - MIT
@@ -138,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Pandas wrapper for Ruby

data/.travis.yml

@@ -1,34 +0,0 @@
-sudo: false
-language: ruby
-
-rvm:
-  - ruby-head
-  - 2.4.0
-  - 2.3.1
-  - 2.2.5
-  - 2.1.10
-
-addons:
-  apt:
-    packages:
-      - python3
-      - python3-dev
-      - python3-all
-      - python3-all-dev
-
-env:
-  matrix:
-  - PYTHON=python
-  - LIBPYTHON=/opt/python/3.5.3/lib/libpython3.5m.so
-
-before_install:
-  - gem update --system
-  - gem update bundler
-
-before_script:
-  - pip install pandas
-  - pip3 install numpy
-
-matrix:
-  allow_failures:
-  - env: PYTHON=python  # Ignore failed on python 2.7