Merge pull request zenoftrading#2 from zenoftrading/dev

Dev
genom2000 · Aug 20, 2021 · f8394a4 · f8394a4
2 parents 0071f55 + 46e2b89
commit f8394a4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ yfinance
 ## Install
 
 ```
-git install git+https://github.com/zenoftrading/barloader.git
+pip install git+https://github.com/zenoftrading/barloader.git
 ```
 
 ## Usage
@@ -100,9 +100,9 @@ For fast access to tickers library get saved some tickers in file `tickers.py`
 ```
 from barloader import tickers as t
 
-bl.yf(t.usetf)
-bl.finam(t.rufutures, market='futures')
-bl.yf(t.currency, postfix=t.currency.yf_postfix)
+bl.yf(t.usetf.tickers)
+bl.finam(t.rufutures.tickers, market='futures')
+bl.yf(t.currency.tickers, postfix=t.currency.yf_postfix)
 ```
 
 Set custom start end data and interval:
@@ -113,9 +113,9 @@ from datetime import datetime
 start = datetime(2019, 1, 1)
 end = datetime(2019, 2, 1)
 interval = '1h'
-bl.yf(t.usetf, start=start, end=end, interval=interval)
-bl.finam(t.rufutures, market='futures', start=start, end=end, interval=interval)
-bl.yf(t.currency, postfix=t.currency.yf_postfix, start=start, end=end, interval=interval)
+bl.yf(t.usetf.tickers, start=start, end=end, interval=interval)
+bl.finam(t.rufutures.tickers, market='futures', start=start, end=end, interval=interval)
+bl.yf(t.currency.tickers, postfix=t.currency.yf_postfix, start=start, end=end, interval=interval)
 ```
 
 Or use short notation:
@@ -128,7 +128,7 @@ bl.start = datetime(2019, 1, 1)
 bl.end = datetime(2019, 2, 1)
 bl.interval = '1h'
 
-bl.yf(t.usetf)
-bl.finam(t.rufutures, market='futures')
-bl.yf(t.currency, postfix=t.currency.yf_postfix)
+bl.yf(t.usetf.tickers)
+bl.finam(t.rufutures.tickers, market='futures')
+bl.yf(t.currency.tickers, postfix=t.currency.yf_postfix)
 ```
diff --git a/barloader/barloader.py b/barloader/barloader.py
@@ -89,7 +89,7 @@ def yf(self, tickers, start=None, end=None, interval=None, tocsv=True, postfix=N
                 logger.info(human_filter)
                 df = yf.download(ticker, start=start, end=end, interval=interval, progress=False)
                 if tocsv: 
-                    df.tocsv(f".{os.sep}{directory}{os.sep}{human_filter}.csv")
+                    df.to_csv(f".{os.sep}{directory}{os.sep}{human_filter}.csv")
                 else:
                     tickers_list.append(df)
             except Exception as e:
@@ -158,7 +158,7 @@ def finam(self, tickers, market=None, start=None, end=None, interval=None, tocsv
                 columns = {'<DATE>': 'Date', '<OPEN>': 'Open', '<HIGH>': 'High', '<LOW>': 'Low', '<CLOSE>': 'Close', '<VOL>': 'Volume'}
                 df = df.rename(columns=columns).set_index('Date')
                 if tocsv: 
-                    df.tocsv(f".{os.sep}{directory}{os.sep}{ticker}.csv")
+                    df.to_csv(f".{os.sep}{directory}{os.sep}{ticker}.csv")
                 else:
                     tickers_list.append(df)
                 time.sleep(random.randint(3, 5))                
@@ -231,7 +231,7 @@ def binance(self, tickers, client, start=None, end=None, interval=None, tocsv=Tr
 
                 # save to file
                 if tocsv:
-                    df.tocsv(f".{os.sep}{directory}{os.sep}{ticker}.csv")
+                    df.to_csv(f".{os.sep}{directory}{os.sep}{ticker}.csv")
                 else:
                     tickers_list.append(df)
             except Exception as e:

diff --git a/setup.py b/setup.py
@@ -1,8 +1,8 @@
 from setuptools import setup
 
 setup(
-   name='History data downloader from yahoo finance, finam and binance',
-   version='0.1',
+   name='barloader',
+   version='0.2',
    description='Download history data from https://finance.yahoo.com, https://www.finam.ru and https://www.binance.com and save to dataframe or csv file',
    author='Zenoftrading',
    url='https://github.com/zenoftrading/barloader',