From dddc9564b5412cdc23c35fddaf1c46b4c6853487 Mon Sep 17 00:00:00 2001 From: Anvith Shivakumara Date: Wed, 19 Dec 2018 11:09:01 +0100 Subject: [PATCH] Add python 3 support --- appboy/client.py | 4 ++-- examples.py | 16 ++++++++-------- requirements.txt | 1 - setup.py | 18 ++++++++++++++++-- tox.ini | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 13 deletions(-) delete mode 100644 requirements.txt create mode 100644 tox.ini diff --git a/appboy/client.py b/appboy/client.py index b42f909..f1b4e25 100644 --- a/appboy/client.py +++ b/appboy/client.py @@ -102,10 +102,10 @@ def __create_request(self, payload, request_type): except RequestException as e: # handle all requests HTTP exceptions - response = {'client_error': e.message} + response = {'client_error': str(e)} except Exception as e: # handle all exceptions which can be on API side - response = {'client_error': (e.message + '. Response: ' + r.text)} + response = {'client_error': (str(e) + '. Response: ' + r.text)} if 'success' not in response: response['success'] = False diff --git a/examples.py b/examples.py index 9acfbdd..c15a97e 100644 --- a/examples.py +++ b/examples.py @@ -17,11 +17,11 @@ ) if r['success']: # do our magic here - print 'Success!' - print r + print('Success!') + print(r) else: - print r['client_error'] - print r['errors'] + print(r['client_error']) + print(r['errors']) # For delete users by external_id or appboy_id r = client.user_delete( @@ -30,8 +30,8 @@ ) if r['success']: # do our magic here - print 'Success!' - print r + print('Success!') + print(r) else: - print r['client_error'] - print r['errors'] + print(r['client_error']) + print(r['errors']) diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index da3fa4c..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -requests==2.21.0 diff --git a/setup.py b/setup.py index 86a2157..5bfc4c7 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,15 @@ NAME = "appboy-client" VERSION = "0.0.1" -REQUIRES = [] +REQUIRES = [ + 'requests==2.21.0', +] + +EXTRAS = { + 'dev': [ + 'tox', + ], +} setup( name=NAME, @@ -12,5 +20,11 @@ author_email="azh@hellofresh.com", keywords=["HelloFresh", "Appboy"], install_requires=REQUIRES, - packages=find_packages() + extras_require=EXTRAS, + packages=find_packages(exclude=('tests',)), + classifiers=[ + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.7', + ], ) diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..cc7afef --- /dev/null +++ b/tox.ini @@ -0,0 +1,32 @@ +[tox] +envlist = style, unit-27, unit-37 + +# Configs +[pytest] +addopts = -p no:warnings + +# Local Unit +[testenv:unit] +deps = + codecov + mock + pytest + pytest-cov + pytest-mock +commands = + pytest tests + +[testenv:unit-27] +basepython = python2.7 +deps = {[testenv:unit]deps} +commands = {[testenv:unit]commands} + +[testenv:unit-37] +basepython = python3.7 +deps = {[testenv:unit]deps} +commands = {[testenv:unit]commands} + +# Codestyle +[testenv:style] +deps = flake8 +commands = flake8 --max-line-length=120 appboy \ No newline at end of file