From 148f0a6eb2710de4bbccad85e7badbd647b1b227 Mon Sep 17 00:00:00 2001 From: peshay Date: Sat, 30 Dec 2017 09:42:37 +0100 Subject: [PATCH 1/4] set branched badges --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f0e5290..016e304 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![Build Status](https://travis-ci.org/peshay/btcde.svg?branch=master)](https://travis-ci.org/peshay/btcde) -[![Codecov](https://codecov.io/gh/peshay/btcde/branch/master/graph/badge.svg)](https://codecov.io/gh/peshay/btcde/branch/master) -[![Scrutinizer](https://scrutinizer-ci.com/g/peshay/btcde/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/peshay/btcde/?branch=master) +[![Build Status](https://travis-ci.org/peshay/btcde.svg?branch=2.1)](https://travis-ci.org/peshay/btcde) +[![Codecov](https://codecov.io/gh/peshay/btcde/branch/2.1/graph/badge.svg)](https://codecov.io/gh/peshay/btcde/branch/2.1) +[![Scrutinizer](https://scrutinizer-ci.com/g/peshay/btcde/badges/quality-score.png?b=2.1)](https://scrutinizer-ci.com/g/peshay/btcde/?branch=2.1) [![Python version](https://img.shields.io/pypi/pyversions/btcde.svg)](https://pypi.python.org/pypi/btcde) -[![license](https://img.shields.io/github/license/peshay/btcde.svg)](https://github.com/peshay/btcde/blob/master/LICENSE) +[![license](https://img.shields.io/github/license/peshay/btcde.svg)](https://github.com/peshay/btcde/blob/2.1/LICENSE) [![Beerpay](https://beerpay.io/peshay/btcde/badge.svg?style=beer)](https://beerpay.io/peshay/btcde) # btcde.py From 103c7be062611be7d8d6841f8b6e90a3aafe70b5 Mon Sep 17 00:00:00 2001 From: peshay Date: Sat, 30 Dec 2017 09:43:31 +0100 Subject: [PATCH 2/4] set version 2.1 --- btcde.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/btcde.py b/btcde.py index a2b56cb..1a79bcb 100644 --- a/btcde.py +++ b/btcde.py @@ -17,7 +17,7 @@ requests_log.setLevel(logging.DEBUG) requests_log.propagate = True -__version__ = '2.0' +__version__ = '2.1' # disable unsecure SSL warning requests.packages.urllib3.disable_warnings() diff --git a/setup.py b/setup.py index 116bc2f..cbfff95 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ """Setup to install Bitcoin.de API Python Module.""" from distutils.core import setup setup(name='btcde', - version='2.0', + version='2.1', py_modules=['btcde'], install_requires=['requests', 'future'], description='API Wrapper for Bitcoin.de Trading API.', From b8d31ec2bd6e2054de0b72bca218341ff3bf19eb Mon Sep 17 00:00:00 2001 From: peshay Date: Sun, 31 Dec 2017 12:17:12 +0100 Subject: [PATCH 3/4] re-add Decimal float parser Sorry for losing this due to wrong merging. --- btcde.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/btcde.py b/btcde.py index 1a79bcb..ab24543 100644 --- a/btcde.py +++ b/btcde.py @@ -166,7 +166,7 @@ def APIConnect(self, method, params): # Handle API Errors if HandleAPIErrors(r): # get results - result = r.json() + result = r.json(parse_float=decimal.Decimal) else: result = {} except requests.exceptions.RequestException as e: From 7ef80536fac77b4ed1cd2e9aa2758bcd1e544520 Mon Sep 17 00:00:00 2001 From: peshay Date: Sun, 31 Dec 2017 12:19:15 +0100 Subject: [PATCH 4/4] change badges back to master branch --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 016e304..f0e5290 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![Build Status](https://travis-ci.org/peshay/btcde.svg?branch=2.1)](https://travis-ci.org/peshay/btcde) -[![Codecov](https://codecov.io/gh/peshay/btcde/branch/2.1/graph/badge.svg)](https://codecov.io/gh/peshay/btcde/branch/2.1) -[![Scrutinizer](https://scrutinizer-ci.com/g/peshay/btcde/badges/quality-score.png?b=2.1)](https://scrutinizer-ci.com/g/peshay/btcde/?branch=2.1) +[![Build Status](https://travis-ci.org/peshay/btcde.svg?branch=master)](https://travis-ci.org/peshay/btcde) +[![Codecov](https://codecov.io/gh/peshay/btcde/branch/master/graph/badge.svg)](https://codecov.io/gh/peshay/btcde/branch/master) +[![Scrutinizer](https://scrutinizer-ci.com/g/peshay/btcde/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/peshay/btcde/?branch=master) [![Python version](https://img.shields.io/pypi/pyversions/btcde.svg)](https://pypi.python.org/pypi/btcde) -[![license](https://img.shields.io/github/license/peshay/btcde.svg)](https://github.com/peshay/btcde/blob/2.1/LICENSE) +[![license](https://img.shields.io/github/license/peshay/btcde.svg)](https://github.com/peshay/btcde/blob/master/LICENSE) [![Beerpay](https://beerpay.io/peshay/btcde/badge.svg?style=beer)](https://beerpay.io/peshay/btcde) # btcde.py