Skip to content

Commit

Permalink
Merge branch 'release/4.15.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
revilwang committed Aug 12, 2020
2 parents 65d593a + e37291a commit 5376c69
Show file tree
Hide file tree
Showing 113 changed files with 12,799 additions and 8,922 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ coverage.xml
*,cover
.hypothesis/
venv/
.venv/
.python-version
.pytest_cache

# Translations
*.mo
Expand Down
33 changes: 33 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# ref: https://docs.gitlab.com/ee/ci/README.html

stages:
- test

.nosetest:
stage: test
script:
- pip install -r requirements.txt
- pip install -r test-requirements.txt
- pytest --cov=gate_api

nosetest-2.7:
extends: .nosetest
image: python:2.7-alpine
nosetest-3.3:
extends: .nosetest
image: python:3.3-alpine
nosetest-3.4:
extends: .nosetest
image: python:3.4-alpine
nosetest-3.5:
extends: .nosetest
image: python:3.5-alpine
nosetest-3.6:
extends: .nosetest
image: python:3.6-alpine
nosetest-3.7:
extends: .nosetest
image: python:3.7-alpine
nosetest-3.8:
extends: .nosetest
image: python:3.8-alpine
23 changes: 0 additions & 23 deletions .openapi-generator-ignore

This file was deleted.

1 change: 0 additions & 1 deletion .openapi-generator/VERSION

This file was deleted.

11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ python:
- "3.3"
- "3.4"
- "3.5"
#- "3.5-dev" # 3.5 development branch
#- "nightly" # points to the latest development branch e.g. 3.6-dev
- "3.6"
- "3.7"
- "3.8"
# command to install dependencies
install: "pip install -r requirements.txt"
install:
- "pip install -r requirements.txt"
- "pip install -r test-requirements.txt"
# command to run tests
script: nosetests
script: pytest --cov=gate_api
215 changes: 120 additions & 95 deletions README.md

Large diffs are not rendered by default.

31 changes: 16 additions & 15 deletions docs/BatchOrder.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# BatchOrder

Batch order details
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**text** | **str** | User defined information. If not empty, must follow the rules below: 1. prefixed with `t-` 2. no longer than 16 bytes without `t-` prefix 3. can only include 0-9, A-Z, a-z, underscore(_), hyphen(-) or dot(.) | [optional]
**text** | **str** | User defined information. If not empty, must follow the rules below: 1. prefixed with `t-` 2. no longer than 28 bytes without `t-` prefix 3. can only include 0-9, A-Z, a-z, underscore(_), hyphen(-) or dot(.) | [optional]
**succeeded** | **bool** | Whether order succeeds | [optional]
**label** | **str** | Error label, empty string if order succeeds | [optional]
**message** | **str** | Detailed error message, empty string if order succeeds | [optional]
**id** | **str** | Order ID | [optional]
**create_time** | **str** | Order creation time | [optional]
**update_time** | **str** | Order last modification time | [optional]
**status** | **str** | Order status - `open`: to be filled - `closed`: filled - `cancelled`: cancelled | [optional]
**id** | **str** | Order ID | [optional] [readonly]
**create_time** | **str** | Order creation time | [optional] [readonly]
**update_time** | **str** | Order last modification time | [optional] [readonly]
**status** | **str** | Order status - `open`: to be filled - `closed`: filled - `cancelled`: cancelled | [optional] [readonly]
**currency_pair** | **str** | Currency pair | [optional]
**type** | **str** | Order type. limit - limit order | [optional] [default to 'limit']
**account** | **str** | Account type. spot - use spot account; margin - use margin account | [optional] [default to 'spot']
Expand All @@ -19,16 +20,16 @@ Name | Type | Description | Notes
**price** | **str** | Order price | [optional]
**time_in_force** | **str** | Time in force - gtc: GoodTillCancelled - ioc: ImmediateOrCancelled, taker only - poc: PendingOrCancelled, makes a post-only order that always enjoys a maker fee | [optional] [default to 'gtc']
**auto_borrow** | **bool** | Used in margin trading(i.e. `account` is `margin`) to allow automatic loan of insufficient part if balance is not enough. | [optional]
**left** | **str** | Amount left to fill | [optional]
**fill_price** | **str** | Total filled in quote currency. Deprecated in favor of `filled_total` | [optional]
**filled_total** | **str** | Total filled in quote currency | [optional]
**fee** | **str** | Fee deducted | [optional]
**fee_currency** | **str** | Fee currency unit | [optional]
**point_fee** | **str** | Point used to deduct fee | [optional]
**gt_fee** | **str** | GT used to deduct fee | [optional]
**gt_discount** | **bool** | Whether GT fee discount is used | [optional]
**rebated_fee** | **str** | Rebated fee | [optional]
**rebated_fee_currency** | **str** | Rebated fee currency unit | [optional]
**left** | **str** | Amount left to fill | [optional] [readonly]
**fill_price** | **str** | Total filled in quote currency. Deprecated in favor of `filled_total` | [optional] [readonly]
**filled_total** | **str** | Total filled in quote currency | [optional] [readonly]
**fee** | **str** | Fee deducted | [optional] [readonly]
**fee_currency** | **str** | Fee currency unit | [optional] [readonly]
**point_fee** | **str** | Point used to deduct fee | [optional] [readonly]
**gt_fee** | **str** | GT used to deduct fee | [optional] [readonly]
**gt_discount** | **bool** | Whether GT fee discount is used | [optional] [readonly]
**rebated_fee** | **str** | Rebated fee | [optional] [readonly]
**rebated_fee_currency** | **str** | Rebated fee currency unit | [optional] [readonly]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
1 change: 1 addition & 0 deletions docs/CancelOrder.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# CancelOrder

Info of order to be cancelled
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
Expand Down
1 change: 1 addition & 0 deletions docs/CancelOrderResult.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# CancelOrderResult

Order cancellation result
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
Expand Down
1 change: 1 addition & 0 deletions docs/Contract.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Contract

Futures contract details
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
Expand Down
1 change: 1 addition & 0 deletions docs/CurrencyPair.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# CurrencyPair

Spot currency pair
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
Expand Down
Loading

0 comments on commit 5376c69

Please sign in to comment.