Skip to content

Commit

Permalink
Merge pull request #11 from sinhrks/v002
Browse files Browse the repository at this point in the history
REL: v0.0.2
  • Loading branch information
sinhrks committed Feb 13, 2015
2 parents 46164ba + fff64df commit 8d3e119
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ include MANIFEST.in
include LICENSE
include RELEASE.md
include README.rst
include requirements.txt
include setup.py
6 changes: 6 additions & 0 deletions japandas/io/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

from __future__ import unicode_literals

import time

import numpy as np
import pandas as pd
import pandas.io.data as web
Expand All @@ -12,6 +14,9 @@
_ohlc_columns_en = ['Open', 'High', 'Low', 'Close', 'Volume', 'Adj Close']


_SLEEP_TIME = 0.5


def get_quote_yahoojp(code, start=None, end=None, interval='d', en=False):
base = 'http://info.finance.yahoo.co.jp/history/?code={0}.T&{1}&{2}&tm={3}&p={4}'
start, end = web._sanitize_dates(start, end)
Expand All @@ -30,6 +35,7 @@ def get_quote_yahoojp(code, start=None, end=None, interval='d', en=False):
break
results.append(tables[1])
p += 1
time.sleep(_SLEEP_TIME)
result = pd.concat(results, ignore_index=True)

if en:
Expand Down
2 changes: 1 addition & 1 deletion japandas/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = '0.0.2dev'
version = '0.0.2'
11 changes: 9 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# required modules for test and doc build
REQUIREMENTS_TEST = 'requirements_test.txt'

VERSION = '0.0.2dev'
VERSION = '0.0.2'

def read(fname):
# file must be read as utf-8 in py3 to avoid to be bytes
Expand Down Expand Up @@ -40,5 +40,12 @@ def write_version_py(filename=None):
url='http://japandas.readthedocs.org',
license = 'BSD',
packages=find_packages(),
install_requires=list(read(REQUIREMENTS).splitlines()))
package_data = {
'japandas.tseries': ['data/*.pkl'],
},

install_requires=['setuptools', 'pandas >= 0.15.0']
# list(read(REQUIREMENTS).splitlines())
)


0 comments on commit 8d3e119

Please sign in to comment.