Merge pull request #19 from hellofresh/feature/python-3

Add support to python 3.7

Author: anvth

.travis.yml

@@ -1,14 +1,15 @@
 language: python
+sudo: required
+dist: xenial
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
 
 install:
-  - make build
+  - make setup
 
 script:
-  - make test
-  - codecov
+  - make test-unit

Makefile

@@ -1,17 +1,30 @@
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  test       to run unit tests"
-	@echo "  build      to install requirements for development"
+	@echo "  setup      to install requirements for development"
+	@echo "  build      to create a build directory for deployment"
 
-build: requirements test-requirements
+build:
+	@printf "$(OK_COLOR)==> Building$(NO_COLOR)\n"
+	@mkdir -p "${BUILD_DIR}"
+	@for SOURCE in crossengage setup.py; do \
+		cp -r "$${SOURCE}" "${BUILD_DIR}/$${SOURCE}"; \
+	done
 
-test: unittests
+setup: clean virtualenv requirements test-requirements
 
-unittests:
-	PYTHONPATH=$(CURDIR) nosetests -d -w tests -v --with-coverage --cover-package ./crossengage
+test-unit:
+	. $(CURDIR)/env/bin/activate; \
+	tox
+
+virtualenv:
+	virtualenv $(CURDIR)/env
+
+clean:
+	rm -rf $(CURDIR)/env
 
 requirements:
-	pip install -r requirements.txt
+	$(CURDIR)/env/bin/python setup.py develop
 
 test-requirements:
-	pip install -r test-requirements.txt
+	$(CURDIR)/env/bin/pip install tox

README.md

@@ -39,7 +39,7 @@ Library supports next methods:
 
 ### How to install
 
-Make sure you have Python 2.7.11+ installed and run:
+Make sure you have Python 2.7.11+ or Python 3.4+ installed and run:
 
 ```
 $ git clone git@github.com:hellofresh/crossengage-python-client.git
@@ -66,9 +66,9 @@ response = client.update_user(user={
 })
 
 if response['success']:
-    print 'Create / Update Successful!'
+    print('Create / Update Successful!')
 else:
-    print response['errors']
+    print(response['errors'])
 
 ```
 For more examples, check `examples.py`.
@@ -77,4 +77,4 @@ For more examples, check `examples.py`.
 
 To run the unit tests, make sure you have the [nose](http://nose.readthedocs.org/) module instaled and run the following from the repository root directory:
 
-`$ make build && make test`
+`$ make setup && make test`

crossengage/client.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import json
 import logging
 
@@ -6,6 +8,7 @@
 
 from crossengage.utils import update_dict
 
+
 class CrossengageClient(object):
     """
     Client for Crossengage public API. Support create_user, update_user, delete_user, create_attribute,

examples.py

@@ -14,9 +14,9 @@
 })
 
 if response['success']:
-    print 'Create / Update Successful!'
+    print('Create / Update Successful!')
 else:
-    print response['errors']
+    print(response['errors'])
 
 # 2. Bulk create - update
 user1 = {
@@ -43,17 +43,17 @@
 response = client.update_users_bulk(users=users)
 for data in response['updated']:
     if data['success']:
-        print 'BULK #' + data['id'] + ' success'
+        print('BULK #' + data['id'] + ' success')
     else:
-        print 'BULK #' + data['id'] + ' FAIL'
-        print data['errors']
+        print('BULK #' + data['id'] + ' FAIL')
+        print(data['errors'])
 
 # 3. Delete user
 response = client.delete_user(user={'id': '1'})
 if response['status_code'] == 204:
-    print '#1 Deleted successful!'
+    print('#1 Deleted successful!')
 else:
-    print 'Something went wrong via DELETE request'
+    print('Something went wrong via DELETE request')
 
 # 4. Trying to update with invalid field, API should return error
 response = client.update_user(user={
@@ -68,25 +68,25 @@
 })
 
 if response['success']:
-    print '# 1 Updated with invalid fields successful!'
+    print('# 1 Updated with invalid fields successful!')
 else:
-    print response['errors']
+    print(response['errors'])
 
 # 5. Add new user attributes
 response = client.add_user_attribute('silos', client.ATTRIBUTE_ARRAY, client.ATTRIBUTE_STRING)
 
 if response['success']:
-    print 'Added user attribute `silos` successful!'
+    print('Added user attribute `silos` successful!')
 else:
-    print response['errors']
+    print(response['errors'])
 
 # 6. List user attributes
 response = client.list_user_attributes(offset=37, limit=10)
 if response['status_code'] == 200:
-    print 'Got list user attributes successful!'
-    print response['attributes']
+    print('Got list user attributes successful!')
+    print(response['attributes'])
 else:
-    print response['errors']
+    print(response['errors'])
 
 # 7. Add nested attribute
-print client.add_nested_user_attribute('nested_attribute', 'main_attribute', client.ATTRIBUTE_STRING)
+print(client.add_nested_user_attribute('nested_attribute', 'main_attribute', client.ATTRIBUTE_STRING))

requirements.txt

@@ -1,16 +1,32 @@
 from setuptools import setup, find_packages
 
 NAME = "crossengage-client"
-VERSION = "1.1.1"
+VERSION = "1.2.0"
 
-REQUIRES = []
+REQUIRES = [
+    'requests==2.20.1',
+]
+
+EXTRAS = {
+    'dev': [
+        'tox',
+    ],
+}
 
 setup(
     name=NAME,
     version=VERSION,
-    description="Crossengage python client",
+    description="Crossengage Python Client",
     author_email="azh@hellofresh.com",
     keywords=["HelloFresh", "Crossengage", "CRM"],
     install_requires=REQUIRES,
-    packages=find_packages()
+    extras_require=EXTRAS,
+    packages=find_packages(exclude=('tests',)),
+    license='MIT',
+    classifiers=[
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.7',
+    ],
 )

setup.py

@@ -2,6 +2,7 @@
 
 from crossengage.utils import update_dict
 
+
 class TestUtils(unittest.TestCase):
 
     def test_update_dict(self):
@@ -11,4 +12,3 @@ def test_update_dict(self):
 
         self.assertEqual(dict(a=1, b=2), old_dict)
         self.assertEqual(dict(a=2, b=3, c=4), new_dict)
-

test-requirements.txt

@@ -0,0 +1,22 @@
+[tox]
+envlist = style, unit
+
+# Configs
+[pytest]
+addopts = -p no:warnings
+
+# Local Unit
+[testenv:unit]
+deps =
+    codecov
+    mock
+    pytest
+    pytest-cov
+    pytest-mock
+commands =
+    pytest tests
+
+# Codestyle
+[testenv:style]
+deps = flake8
+commands = flake8 --max-line-length=120 crossengage