pro commit.

README.md

@@ -1,6 +1,8 @@
 TuShare
 
 
+Tushare Pro版已发布，请访问新的官网了解和查询数据接口！ [https://tushare.pro](https://tushare.pro)
+
 TuShare是实现对股票/期货等金融数据从**数据采集**、**清洗加工** 到 **数据存储**过程的工具，满足金融量化分析师和学习数据分析的人在数据获取方面的需求，它的特点是数据覆盖范围广，接口调用简单,响应快速。
 
 ![](http://tushare.org/_images/main_pic_min.png)
@@ -181,12 +183,20 @@ Quick Start
 
 更多文档
 ========
+
+[https://tushare.pro](https://tushare.pro)
+
 [http://tushare.org/](http://tushare.org/ "TuShare Docs")
 
 
 Change Logs
 -----------
 
+1.2.12 2018/08/10
+====
+
+- 发布Pro版第一稿
+- 发布Pro网站，[https://tushare.pro](https://tushare.pro)
 
 1.0.5 2017/11/12
 ======

requirements.txt

@@ -1,3 +1,5 @@
 pandas>=0.18.0
 requests>=2.0.0
 lxml>=3.8.0
+simplejson>=3.16.0
+msgpack>=0.5.6

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import codecs
 import os
-import tushare
+
 
 def read(fname):
     return codecs.open(os.path.join(os.path.dirname(__file__), fname)).read()
@@ -63,21 +63,28 @@ def read(fname):
 """
 
 def read_install_requires():
-    with open('requirements.txt', 'r') as f:
-        res = f.readlines()
-    res = list(map(lambda s: s.replace('\n', ''), res))
-    return res
+    reqs = [
+            'pandas>=0.18.0',
+            'requests>=2.0.0',
+            'lxml>=3.8.0',
+            'simplejson>=3.16.0',
+            'msgpack>=0.5.6',
+            'pyzmq>=16.0.0'
+            ]
+    return reqs
+
 
 setup(
     name='tushare',
-    version=tushare.__version__,
+    version=read('tushare/VERSION.txt'),
     description='A utility for crawling historical and Real-time Quotes data of China stocks',
 #     long_description=read("READM.rst"),
     long_description = long_desc,
     author='Jimmy Liu',
     author_email='[email protected]',
     license='BSD',
     url='http://tushare.org',
+    install_requires=read_install_requires(),
     keywords='Global Financial Data',
     classifiers=['Development Status :: 4 - Beta',
     'Programming Language :: Python :: 2.6',
@@ -88,5 +95,6 @@ def read_install_requires():
     'Programming Language :: Python :: 3.5',
     'License :: OSI Approved :: BSD License'],
     packages=find_packages(),
-    package_data={'': ['*.csv']},
+    include_package_data=True,
+    package_data={'': ['*.csv', '*.txt']},
 )

tushare/VERSION.txt

@@ -0,0 +1 @@
+1.2.12

tushare/__init__.py

@@ -1,6 +1,8 @@
 # -*- coding:utf-8 -*- 
+import codecs
+import os
 
-__version__ = '1.2.4'
+__version__ = codecs.open(os.path.join(os.path.dirname(__file__), 'VERSION.txt')).read()
 __author__ = 'Jimmy Liu'
 
 """
@@ -73,6 +75,12 @@
                                   shibor_ma_data, lpr_data,
                                   lpr_ma_data)
 
+
+"""
+for tushare pro api
+"""
+from tushare.pro.data_pro import pro_api
+
 """
 for LHB
 """
@@ -103,8 +111,6 @@
 """
 from tushare.trader.trader import TraderAPI
 
-from tushare.stock.minsdata import TsData
-
 """
 for futures API
 """
@@ -128,4 +134,6 @@
 from tushare.coins.market import (coins_tick, coins_bar,
                                   coins_snapshot, coins_trade)
 
-from tushare.util.conns import (get_apis, close_apis)
+from tushare.util.conns import (get_apis, close_apis)
+
+from tushare.util.upass import (get_token, set_token)