Merge pull request #25 from PredixDev/develop_rc1

Final adjustments for rc1

Author: j12y

docs/cookbook/eventhub.inc

@@ -0,0 +1,12 @@
+
+.. _eventhub-cookbook:
+
+Event Hub Recipes
+-----------------
+
+Recipes for working with Predix Python SDK and the Event Hub Service.
+
+It is expected that you first properly created and configured UAA and a client
+to work with event hub.
+
+More to come.

docs/devguide/index.rst

@@ -19,7 +19,7 @@ In your environment you can run:
 
 ::
 
-    pip install -e
+    pip install -e .
 
 This will install the library to site packages with a symlink back to the
 GitHub repository.  This will allow any changes you make to have an immediate
@@ -67,3 +67,15 @@ To build a distributable package with setuptools::
 
 The version comes from incrementing the value in *setup.py*.
 
+How-To Build Documentation
+--------------------------
+
+See setup.py for library depenencies on sphinx.
+
+Start in the docs directory::
+
+    make html
+    cd _build/html
+    python2 -m SimpleHTTPServer
+    python3 -m http.server
+

predix/app.py

@@ -4,6 +4,7 @@
 import copy
 import logging
 from cryptography.fernet import Fernet
+from builtins import bytes
 
 import predix.config
 
@@ -119,8 +120,8 @@ def _get_encrypted_manifest(self):
 
         manifest = copy.deepcopy(self.manifest)
         for var in self.manifest['env'].keys():
-            value = self.manifest['env'][var]
-            manifest['env'][var] = f.encrypt(bytes(str(value), 'utf-8')).decode('utf-8')
+            value = str(self.manifest['env'][var])
+            manifest['env'][var] = f.encrypt(bytes(value, 'utf-8')).decode('utf-8')
 
         return manifest
 
@@ -251,4 +252,4 @@ def get_eventhub(self, publish_config=None, subscribe_config=None):
         import predix.data.eventhub.client
         eventhub = predix.data.eventhub.client.Eventhub(subscribe_config=subscribe_config,
                                                         publish_config=publish_config)
-        return eventhub
+        return eventhub

setup.py

@@ -2,13 +2,15 @@
 from setuptools import setup, find_packages
 
 install_requires = [
+        "python-dateutil==2.6.0",
         "boto3",
-        "python-dateutil",
         "PyYAML",
         "requests",
         "cryptography",
         "redis",
         "sqlalchemy",
+        "six",
+        "future",
         "psycopg2",
         "websocket",
         "websocket-client"
@@ -17,13 +19,25 @@
 setup_requires = [
     ]
 
+docs_require = [
+        "sphinx",
+        "sphinx-autobuild",
+        "sphinxcontrib-httpdomain",
+        "sphinx_rtd_theme",
+        "recommonmark",
+    ]
+
+tests_require = [
+    #    "mock",    # only for Python < 3.3
+    ]
+
 long_description = 'See GitHub README.rst for more details.'
 with open('README.rst') as file:
    long_description = file.read()
 
 setup(
         name="predix",
-        version="0.x.x",
+        version="1.0.0rc1",
         author="Jayson DeLancey",
         author_email="[email protected]",
         description="Python Client SDK for Predix Services",
@@ -35,11 +49,11 @@
             },
         packages=find_packages(exclude=['test', 'test.*']),
         test_suite="test",
+        tests_require=tests_require,
         entry_points={
             'console_scripts': [
                 ]
         },
-        tests_require=[],
         keywords=['predix', 'ge', 'asset', 'analytics'],
         url="https://github.com/PredixDev/predixpy",
         classifiers=[

test/unit/data/manifest_empty_version.yml

@@ -2,5 +2,5 @@
 applications:
 - name: my-predix-app
 env:
-  PREDIXPY_VERSION: 0.0.9
+  PREDIXPY_VERSION: 1.0.0
 services: []

test/unit/test_manifest.py

@@ -24,7 +24,7 @@ def _get_test_data_file(self, filename):
 
     def test_version_written(self):
         # Verify environment variable set for version tracking
-        self.assertEqual(os.getenv('PREDIXPY_VERSION'), predix.version)
+        self.assertTrue(os.getenv('PREDIXPY_VERSION') in self.manifest_content)
 
         # Verify creating a new manifest will write version
         self.assertTrue('PREDIXPY_VERSION' in self.manifest_content)
@@ -43,7 +43,7 @@ def test_version_read(self):
         admin = predix.admin.app.Manifest(manifest_path)
 
         self.assertEqual(admin.app_name, 'my-predix-app')
-        self.assertEqual(admin.get_manifest_version(), '0.0.9')
+        self.assertEqual(admin.get_manifest_version(), '1.0.0')
 
     def test_encrypted_manifest(self):
         # Check that we are encrypting output

test/unit/test_uaa.py

@@ -4,7 +4,11 @@
 import logging
 import unittest
 
-from mock import Mock, patch
+import six
+if six.PY3:
+    from unittest.mock import Mock, patch
+else:
+    from mock import Mock, patch
 
 import predix.security.uaa