Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest tushare including pro api #1

Merged
merged 95 commits into from
Dec 12, 2019

Commits on Jan 14, 2017

  1. financail statements

    thippo committed Jan 14, 2017
    Configuration menu
    Copy the full SHA
    e8a8a02 View commit details
    Browse the repository at this point in the history
  2. Update __init__.py

    thippo committed Jan 14, 2017
    Configuration menu
    Copy the full SHA
    97e6b91 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2017

  1. 0.6.8

    jimmysoa committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    46243f4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    30f1295 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #270 from thippo/master

    添加3个新函数(可获取指定股票公司历史所有的财务报表数据)
    jimmysoa committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    9005d27 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    29152f3 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2017

  1. Merge pull request #272 from chuihero/master

    增加获取黄金和外汇储备,get_gold_and_foreign_reserves()
    jimmysoa committed Jan 17, 2017
    Configuration menu
    Copy the full SHA
    30573d4 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2017

  1. 新增动态写word插件

    jimmysoa committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    843132c View commit details
    Browse the repository at this point in the history
  2. 新增动态写word插件

    jimmysoa committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    7234ea9 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2017

  1. get_today_all #301

    jimmysoa committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    42fa8f9 View commit details
    Browse the repository at this point in the history
  2. README

    jimmysoa committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    97928f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2017

  1. #303 fixed get_k_data

    jimmysoa committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    99fe5ce View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2017

  1. get_k_data bug fixed.

    jimmysoa committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    e75dce5 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. 0.7.3

    jimmysoa committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    a099a47 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2017

  1. 0.7.4

    jimmysoa committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    ee46f41 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. README UPDATE

    jimmysoa committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    33937e4 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2017

  1. trading bug fixed

    jimmysoa committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    f72bb15 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2017

  1. 修正ts.get_k_data

    #例如ts.get_k_data(code='601206',start='2015-11-01'),如果不加这个判断,会抛异常说data没有date属性(因为data为空DataFrame)
    实际上你不需要抛异常,只用把这个空的df返回即可
    Suckhard committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    9a7a56b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #348 from Suckhard/patch-1

    修正ts.get_k_data
    jimmysoa committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    0f19588 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. get_today_all bug fixed

    jimmysoa committed May 16, 2017
    Configuration menu
    Copy the full SHA
    b95f063 View commit details
    Browse the repository at this point in the history
  2. README.md update

    jimmysoa committed May 16, 2017
    Configuration menu
    Copy the full SHA
    e97437a View commit details
    Browse the repository at this point in the history
  3. for sorting func

    jimmysoa committed May 16, 2017
    Configuration menu
    Copy the full SHA
    c37466d View commit details
    Browse the repository at this point in the history

Commits on May 23, 2017

  1. 0.7.8 update

    jimmysoa committed May 23, 2017
    Configuration menu
    Copy the full SHA
    d102758 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2017

  1. get_tick_data update

    jimmysoa committed May 27, 2017
    Configuration menu
    Copy the full SHA
    6512e36 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f09a40 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. add future cons.

    xiaoluffy committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    0a0e7fb View commit details
    Browse the repository at this point in the history
  2. create domestic.py

    xiaoluffy committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    f113d2c View commit details
    Browse the repository at this point in the history
  3. fix path.

    xiaoluffy committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    e71975a View commit details
    Browse the repository at this point in the history
  4. Merge pull request #386 from xiaoluffy/master

    添加获取国内期货日数据功能
    jimmysoa committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    d45552c View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2017

  1. Update domestic.py

    fix issue.
    xiaoluffy committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    d238faa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    74de60a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dde2dd5 View commit details
    Browse the repository at this point in the history
  4. feat(get_k_data): 补全300行业指数, 000915 000916

    feat(get_k_data): 补全300行业指数, 000915 000916
    hardywu committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    b01264b View commit details
    Browse the repository at this point in the history
  5. Merge pull request #390 from hardywu/patch-1

    feat(get_k_data): 补全300行业指数, 000915 000916
    jimmysoa committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    7ded1ee View commit details
    Browse the repository at this point in the history
  6. Merge pull request #387 from xiaoluffy/master

    Update domestic.py
    jimmysoa committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    9b6cbb9 View commit details
    Browse the repository at this point in the history
  7. domestic.py update

    jimmysoa committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    39cffb8 View commit details
    Browse the repository at this point in the history
  8. fix datetime issue.

    xiaoluffy committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    c90bedb View commit details
    Browse the repository at this point in the history
  9. add urllib.error

    xiaoluffy committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    e6263c5 View commit details
    Browse the repository at this point in the history
  10. Update domestic.py

    xiaoluffy committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    bfcabf6 View commit details
    Browse the repository at this point in the history
  11. Update domestic.py

    xiaoluffy committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    5818cfe View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2017

  1. Configuration menu
    Copy the full SHA
    bd404c8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #393 from xiaoluffy/master

    fix issue of datetime and imports.
    jimmysoa committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    c3e709c View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2017

  1. update caixin news

    TsingJyujing committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    c01bcc8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #396 from TsingJyujing/master

    Update Caixin news
    jimmysoa committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    c31addb View commit details
    Browse the repository at this point in the history
  3. Fix bug of "Now Time"

    TsingJyujing committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    c16e230 View commit details
    Browse the repository at this point in the history
  4. No commit message

    TsingJyujing committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    20b6e4f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #398 from TsingJyujing/master

    Update caixin news and fix "nowtime" variable missing.
    jimmysoa committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    4127c66 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. Merge pull request #382 from AntonyBonn/master

    fix issue #380,新股吧这个问题是因为新股吧页面中加了广告
    raymondmars committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    3d0d9b3 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. add portal for option

    xiaoluffy committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    55ee67a View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. Merge pull request #400 from xiaoluffy/master

    add portal for option
    jimmysoa committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    50d5bf8 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2017

  1. 0.8.2

    jimmysoa committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    2dfd473 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2017

  1. add

    yutiansut committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    9970523 View commit details
    Browse the repository at this point in the history
  2. modify requirements

    yutiansut committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    6f0156c View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2017

  1. Merge pull request #416 from yutiansut/master

    add install_requirements
    jimmysoa committed Jul 6, 2017
    Configuration menu
    Copy the full SHA
    6373ff1 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2017

  1. Configuration menu
    Copy the full SHA
    5e4d117 View commit details
    Browse the repository at this point in the history
  2. #版本号

    yutiansut committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    ebfee02 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2017

  1. Merge pull request #423 from yutiansut/master

    因为凤凰网的hs300的SZ399300数据出错,把hs300的代码换成了000300
    jimmysoa committed Jul 16, 2017
    Configuration menu
    Copy the full SHA
    1989ff9 View commit details
    Browse the repository at this point in the history
  2. CODE MERGE

    jimmysoa committed Jul 16, 2017
    Configuration menu
    Copy the full SHA
    cdfa035 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b5585c7 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2017

  1. fix #433 补全获取股票行业分类数据

    将后续页面的数据加上后, 新浪行业数据还是会比实际的股票数少, 估计是新浪那边股票分类不全
    algony-tony committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    f52b07b View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2017

  1. v0.8.6

    jimmysoa committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    00a33c0 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2017

  1. Configuration menu
    Copy the full SHA
    835ff7c View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2017

  1. 0.8.8

    jimmysoa committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    cf48087 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2017

  1. 0.9.0 http bug fixed.

    jimmysoa committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    8eec2d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2017

  1. Configuration menu
    Copy the full SHA
    93ac9e1 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2017

  1. v0.9.2

    jimmysoa committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    6563f43 View commit details
    Browse the repository at this point in the history
  2. bitcoin data

    jimmysoa committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    bea6778 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2017

  1. fix ts.cap_tops exception

    qytz committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    62146ee View commit details
    Browse the repository at this point in the history
  2. 修复函数get_czce_daily异常错误信息

    错误信息如下:
    /usr/bin/python2.7 /home/byhankswang/open-source-projects/tushare/test_unittest.py
    Traceback (most recent call last):
      File "/home/byhankswang/open-source-projects/tushare/test_unittest.py", line 64, in <module>
        df = dc.get_czce_daily(date="20170926", type="future")
      File "/home/byhankswang/open-source-projects/tushare/tushare/futures/domestic.py", line 156, in get_czce_daily
        if html.find(u'您的访问出错了') >= 0 or html.find('无期权每日行情交易记录') >= 0:
    UnicodeDecodeError: 'ascii' codec can't decode byte 0xe6 in position 0: ordinal not in range(128)
    
    Process finished with exit code 1
    byhankswang committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    69a9c91 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #487 from byhankswang/master

    修复函数get_czce_daily异常错误信息
    jimmysoa committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    87db129 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #486 from qytz/master

    fix ts.cap_tops exception
    jimmysoa committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    3a77ad2 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2017

  1. Merge pull request #434 from algony-tony/master

    fix #433 补全获取股票行业分类数据
    jimmysoa committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    3bd28ba View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2017

  1. v1.0.5

    jimmysoa committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    d0b5833 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64f21a9 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2017

  1. Configuration menu
    Copy the full SHA
    9d0695a View commit details
    Browse the repository at this point in the history
  2. Merge pull request #565 from heamon7/master

    修复 get_nav_open 接口一次请求全部数据时报错 HTTP Error 500: Internal Server Error
    jimmysoa committed Dec 25, 2017
    Configuration menu
    Copy the full SHA
    94337e9 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2018

  1. Configuration menu
    Copy the full SHA
    248747a View commit details
    Browse the repository at this point in the history

Commits on May 28, 2018

  1. Merge pull request #670 from liaocyintl/master

    增加20种常用的技术指标算法
    jimmysoa committed May 28, 2018
    Configuration menu
    Copy the full SHA
    73c49f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. Update domestic.py

    中金所csv文件有些数据缺失 导致如处理2018-01-19日文件时报错
    MetalworkColossus committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    12f73ea View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. Merge pull request #680 from MetalworkColossus/patch-2

    Update domestic.py
    jimmysoa committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    faa7719 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2018

  1. 修改get_sina_dd 方法

    ejungon committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    1360788 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2018

  1. Merge pull request #699 from tigersean/master

    修改get_sina_dd 方法
    jimmysoa committed Jul 8, 2018
    Configuration menu
    Copy the full SHA
    e89edd8 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2018

  1. version reset

    jimmysoa committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    0c34048 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of https://github.com/waditu/tushare

    # Conflicts:
    #	.gitignore
    #	setup.py
    #	tushare/__init__.py
    #	tushare/stock/classifying.py
    #	tushare/stock/cons.py
    #	tushare/stock/reference.py
    #	tushare/stock/trading.py
    jimmysoa committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    1ba215f View commit details
    Browse the repository at this point in the history
  3. init file update

    jimmysoa committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    6698674 View commit details
    Browse the repository at this point in the history
  4. version update.

    jimmysoa committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    c6010ae View commit details
    Browse the repository at this point in the history
  5. code update.

    jimmysoa committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    9b46dcd View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. pro commit.

    jimmysoa committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    b4be269 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2018

  1. 1.2.15

    jimmysoa committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    9eda43d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2018

  1. v1.2.16 update

    jimmysoa committed Nov 16, 2018
    Configuration menu
    Copy the full SHA
    9aa05f8 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2018

  1. 1.2.7 commit

    jimmysoa committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    ecae7f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. update for v1.2.18

    jimmysoa committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    88ba192 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2019

  1. Configuration menu
    Copy the full SHA
    8bb5f2d View commit details
    Browse the repository at this point in the history
  2. Add .idea in .gitignore

    wangzili committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    5b70e7f View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2019

  1. Merge pull request #908 from wangzili/wangzili

    添加多种指标,并且结果与同花顺校验过
    jimmysoa committed Jan 26, 2019
    Configuration menu
    Copy the full SHA
    d897221 View commit details
    Browse the repository at this point in the history