resolve conflict

Author: vgrebenschikov

.travis.yml

@@ -8,9 +8,13 @@ matrix:
   - os: linux
     python: 3.6
 install:
-- pip install -r test-requirements.txt
+- pip install -r requirements/test.txt
+- pip install -r requirements/sdk.txt
+
 script:
-- flake8 connectsdk
+- flake8 connect
+- pytest
+
 deploy:
   password:
     secure: nzWd7Fqgi/K5YKqrAPkIBkgRImWQyQgD2/qP3fYksyJnIFWNcea5T4EKqQKXIPZHh1K0cRhT7mSjIfIrQ6H3XKM/eMTAlz6pbisG2cuu4ueUBjbxHCVCkwzBPgF7+DuCJUXJ/SHyoqMnTdAQo8fb8g69/UCmnUp37YoDO1YHXIMjFVkNc6PFS7nQElXnWkvWd1SpQgA1ZdWdwBzEnIiq+L6IFeTa83PH0Schkem/vR9Ql9CmuliovNt3yHfFaeIqLUgOmsfrwOtDVs0/SkcF+Gg5tNds7DHH2TR4fHco5s8F+n4FVgv2DUPlvBbOVvUH1RiRB8hdATetUxe1cU8fT1nPdJASLWS5E4b4knGLH53+bGxqPVezHxghbVYZHPXp7yI1zWX/Wtn9MBiAo9S3f+Tf8zTk5PIjAJLG/Sdn0RX8mLn89fsslku3enH/FknwPtG+xVYSzUlrd+yzHKnqYkKJzMjsBq/F5+shmYSDlnGdGv+Ga3xZSjIoXlphO5qpxR7vrGnLMxEPJC06+mPgPZp1qfDMyrei/IAPRP8qYPC+Vnj8yclH/UyBKT66z2UEP1z5Op99fUXi3W59x2zdVaLHYniNf16UqtrE5kc7gdLvVcH+NtbO716SAbvO5ql/JsYYTmDSoWEC9KWZS+4E7p7n45c8DEieg8Q5HThWF9Y=

MANIFEST.in

@@ -0,0 +1,3 @@
+include requirements/sdk.txt
+include connect/logger/config.json
+include VERSION

README.md

@@ -1,5 +1,5 @@
 # Connect Python  SDK
-
+[![Build Status](https://travis-ci.org/ingrammicro/connect-python-sdk.svg?branch=master)](https://travis-ci.org/ingrammicro/connect-python-sdk)
 ### Getting Started
 ---
 ### Class Features

connect/__init__.py

@@ -0,0 +1,10 @@
+import resource
+
+name = 'connect'
+
+__all__ = [
+    'config',
+    'resource',
+    'models',
+    'logger',
+]

connectsdk/config.py connect/config.pyconnectsdk/config.py renamed to connect/config.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import json
 import os
 
@@ -86,9 +88,13 @@ def load_from_file(self, file):
             raise TypeError('Invalid config file `{}`\n'
                             'ERROR: {}'.format(file, str(ex)))
 
-        (api_url, api_key, products) = (configs.get('apiEndpoint'),
-                                        configs.get('apiKey'),
-                                        configs.get('products'))
+        (api_url, api_key, products) = (configs.get('apiEndpoint', ''),
+                                        configs.get('apiKey', ''),
+                                        configs.get('products', ''))
+
+        products = products.encode('utf-8') if not isinstance(products, (str, list)) else products
+        api_url = api_url.encode('utf-8') if not isinstance(api_url, str) else api_url
+        api_key = api_key.encode('utf-8') if not isinstance(api_key, str) else api_key
 
         self.check_credentials(api_url, api_key, products)
         self._set_attr(api_url, api_key, products)

connectsdk/logger/__init__.py connect/logger/__init__.pyconnectsdk/logger/__init__.py renamed to connect/logger/__init__.py

@@ -1,9 +1,11 @@
+# -*- coding: utf-8 -*-
+
 import json
 import logging
 import os
 from logging.config import dictConfig
 
-with open(os.path.join(os.path.dirname(__file__), 'config.json'), encoding="utf-8") as config_file:
+with open(os.path.join(os.path.dirname(__file__), 'config.json')) as config_file:
     config = json.load(config_file)
 
 dictConfig(config['logging'])
@@ -20,4 +22,5 @@ def decorator(self, *args, **kwargs):
         logger.debug(
             'Function `{}.{}` return: {}'.format(self.__class__.__name__, func.__name__, result))
         return result
+
     return decorator