travis

foolcage · Mar 1, 2018 · 1994480 · 1994480
1 parent 92b4619
commit 1994480
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language: python
+python:
+    - "3.5"
+virtualenv:
+  system_site_packages: true
+script: pytest
diff --git a/README-en.md b/README-en.md
@@ -241,10 +241,10 @@ curl -XPOST 'localhost:9200/income_statement/doc/_search?pretty&filter_path=hits
           "disposalLossOnNonCurrentLiability": 9.01E8,
           "incomeFromChangesInFairValue": -2.56E8,
           "incomeTaxExpense": 2.2E7,
-          "OperatingTotalCosts": 3.4139E11,
+          "operatingTotalCosts": 3.4139E11,
           "assetsDevaluation": 8.75E8,
           "EPS": 1.9449E10,
-          "OperatingCosts": 9.4E7,
+          "operatingCosts": 9.4E7,
           "attributableToOwnersOfParentCompany": 1.58E8,
           "ManagingCosts": 6.402E10,
           "totalProfits": 8.403E9,

diff --git a/README.md b/README.md
@@ -246,10 +246,10 @@ curl -XPOST 'localhost:9200/income_statement/doc/_search?pretty&filter_path=hits
           "disposalLossOnNonCurrentLiability": 9.01E8,
           "incomeFromChangesInFairValue": -2.56E8,
           "incomeTaxExpense": 2.2E7,
-          "OperatingTotalCosts": 3.4139E11,
+          "operatingTotalCosts": 3.4139E11,
           "assetsDevaluation": 8.75E8,
           "EPS": 1.9449E10,
-          "OperatingCosts": 9.4E7,
+          "operatingCosts": 9.4E7,
           "attributableToOwnersOfParentCompany": 1.58E8,
           "ManagingCosts": 6.402E10,
           "totalProfits": 8.403E9,

diff --git a/docs/contract.md b/docs/contract.md
@@ -328,9 +328,9 @@ class IncomeStatement(BaseDocType):
     # 营业收入
     operatingRevenue = Float()
     # /*营业总成本*/
-    OperatingTotalCosts = Float()
+    operatingTotalCosts = Float()
     # 营业成本
-    OperatingCosts = Float()
+    operatingCosts = Float()
     # 营业税金及附加
     businessTaxesAndSurcharges = Float()
     # 销售费用

diff --git a/fooltrader/api/finance.py b/fooltrader/api/finance.py
@@ -426,9 +426,9 @@ def get_income_statement_items(security_item, start_date=None, report_period=Non
         # 营业收入
         operatingRevenue = lines[2].split()[1:-1]
         # /*营业总成本*/
-        OperatingTotalCosts = lines[4].split()[1:-1]
+        operatingTotalCosts = lines[4].split()[1:-1]
         # 营业成本
-        OperatingCosts = lines[5].split()[1:-1]
+        operatingCosts = lines[5].split()[1:-1]
         # 营业税金及附加
         businessTaxesAndSurcharges = lines[6].split()[1:-1]
         # 销售费用
@@ -504,9 +504,9 @@ def get_income_statement_items(security_item, start_date=None, report_period=Non
                 # 营业收入
                 "operatingRevenue": to_float(operatingRevenue[idx]),
                 # /*营业总成本*/
-                "OperatingTotalCosts": to_float(OperatingTotalCosts[idx]),
+                "operatingTotalCosts": to_float(operatingTotalCosts[idx]),
                 # 营业成本
-                "OperatingCosts": to_float(OperatingCosts[idx]),
+                "operatingCosts": to_float(operatingCosts[idx]),
                 # 营业税金及附加
                 "businessTaxesAndSurcharges": to_float(businessTaxesAndSurcharges[idx]),
                 # 销售费用
@@ -937,8 +937,11 @@ def get_finance_summary_items(security_item, start_date=None, report_period=None
 
 
 if __name__ == '__main__':
-    print(get_cash_flow_statement_items(
-        SecurityItem(type='stock', code='000338', exchange='sz', id='stock_sz_000338'), report_event_date='20170930'))
+    print(get_income_statement_items(
+        SecurityItem(type='stock', code='300027', exchange='sz', id='stock_sz_300027')))
+    #
+    # print(get_cash_flow_statement_items(
+    #     SecurityItem(type='stock', code='000338', exchange='sz', id='stock_sz_000338'), report_event_date='20170930'))
     # print(get_balance_sheet_items(
     #     SecurityItem(type='stock', code='000338', exchange='sz', id='stock_sz_000338'), report_event_date='20170930'))
     # print(get_income_statement_items(

diff --git a/fooltrader/datamanager/datamanager.py b/fooltrader/datamanager/datamanager.py
@@ -203,13 +203,13 @@ def crawl_stock_quote(start_code=STOCK_START_CODE, end_code=STOCK_END_CODE, craw
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument('-s', '--start_code', default='000338', help='the stock start code to be crawled')
-    parser.add_argument('-e', '--end_code', default='000338', help='the stock end code to be crawled')
+    parser.add_argument('-s', '--start_code', default='300027', help='the stock start code to be crawled')
+    parser.add_argument('-e', '--end_code', default='300027', help='the stock end code to be crawled')
 
     args = parser.parse_args()
 
     # crawl_stock_meta()
     # crawl_index_quote()
     # crawl_stock_quote(args.start_code, args.end_code)
-    # crawl_finance_data(args.start_code, args.end_code)
-    crawl_usa_stock_data()
+    crawl_finance_data(args.start_code, args.end_code)
+    # crawl_usa_stock_data()
diff --git a/fooltrader/domain/finance.py b/fooltrader/domain/finance.py
@@ -200,9 +200,9 @@ class IncomeStatement(BaseDocType):
     # 营业收入
     operatingRevenue = Float()
     # /*营业总成本*/
-    OperatingTotalCosts = Float()
+    operatingTotalCosts = Float()
     # 营业成本
-    OperatingCosts = Float()
+    operatingCosts = Float()
     # 营业税金及附加
     businessTaxesAndSurcharges = Float()
     # 销售费用