Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ccxt-dev/ccxt
Browse files Browse the repository at this point in the history
  • Loading branch information
kroitor committed Oct 18, 2017
2 parents fb9ae9a + d0f8903 commit 944c128
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/ccxt.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class DDoSProtection extends NetworkError {}
class RequestTimeout extends NetworkError {}
class ExchangeNotAvailable extends NetworkError {}

$version = '1.9.184';
$version = '1.9.185';

$curl_errors = array (
0 => 'CURLE_OK',
Expand Down
2 changes: 1 addition & 1 deletion ccxt.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const CryptoJS = require ('crypto-js')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.9.184'
const version = '1.9.185'

//-----------------------------------------------------------------------------
// platform detection
Expand Down
2 changes: 1 addition & 1 deletion ccxt.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class DDoSProtection extends NetworkError {}
class RequestTimeout extends NetworkError {}
class ExchangeNotAvailable extends NetworkError {}

$version = '1.9.184';
$version = '1.9.185';

$curl_errors = array (
0 => 'CURLE_OK',
Expand Down
2 changes: 1 addition & 1 deletion ccxt/async/exchanges.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ccxt/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
SOFTWARE.
"""

__version__ = '1.9.184'
__version__ = '1.9.185'
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.9.184",
"version": "1.9.185",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 85+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down
3 changes: 2 additions & 1 deletion test/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ def test_symbol(exchange, symbol):
test_ticker(exchange, symbol)

if exchange.id == 'coinmarketcap':
dump(green(exchange.fetchGlobal()))
response = exchange.fetchGlobal()
dump(green(response))
else:
test_order_book(exchange, symbol)
test_trades(exchange, symbol)
Expand Down

0 comments on commit 944c128

Please sign in to comment.