Last fixes for v1.0.

* Use consistent version numbering everywhere (now at 1.0)
* Move to new release of umapi-client with user-agent capabilities
* Set user-agent to user-sync/1.0 (or whatever the version is)
* Update to latest version of User Sync Guide (source .docx and PDF)

Author: adobeDan

docs/User Sync Guide.docx

@@ -1,4 +1,4 @@
 pycrypto
 PyYAML
 psutil
-umapi-client>=2.0.1
+umapi-client>=2.0.2

docs/User Sync Guide.pdf

@@ -1,3 +1,6 @@
+[aliases]
+test=nosetests
+
 [nosetests]
 verbosity=3
 with-doctest=1

docs/User Sync_Guide_2017-01-29.pdf

@@ -20,8 +20,12 @@
 
 from setuptools import setup
 
+version_namespace = {}
+with open('user_sync/version.py') as f:
+    exec(f.read(), version_namespace)
+
 setup(name='user-sync',
-      version='1.0rc1',
+      version=version_namespace['__version__'],
       description='Application for synchronizing customer directories with the Adobe Enterprise Admin Console',
       classifiers=[
           'Development Status :: 5 - Production/Stable',
@@ -39,7 +43,7 @@
           'pycrypto',
           'python-ldap==2.4.25',
           'PyYAML',
-          'umapi-client>=2',
+          'umapi-client>=2.0.2',
           'psutil',
       ],
       setup_requires=['nose>=1.0'],
@@ -52,4 +56,4 @@
               'user_sync = user_sync.app:main'
           ]
       },
-)
+      zip_safe=False)

misc/build/requirements.txt

@@ -18,3 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from .version import __version__

setup.cfg

@@ -32,8 +32,7 @@
 import user_sync.rules
 import user_sync.connector.directory
 import user_sync.connector.dashboard
-
-APP_VERSION = "1.0rc1"
+from user_sync.version import __version__ as APP_VERSION
 
 LOG_STRING_FORMAT = '%(asctime)s %(process)d %(levelname)s %(name)s - %(message)s'
 LOG_DATE_FORMAT ='%Y-%m-%d %H:%M:%S'

setup.py

@@ -18,14 +18,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import helper
 import json
-import jwt
 import logging
 
+import jwt
 import umapi_client
 
+import helper
+import user_sync.config
+import user_sync.helper
 import user_sync.identity_type
+from user_sync.version import __version__ as APP_VERSION
 
 try:
     from jwt.contrib.algorithms.pycrypto import RSAAlgorithm
@@ -86,7 +89,8 @@ def __init__(self, name, caller_options):
             ims_host=ims_host,
             ims_endpoint_jwt=server_options['ims_endpoint_jwt'],
             user_management_endpoint=um_endpoint,
-            test_mode=options['test_mode']
+            test_mode=options['test_mode'],
+            user_agent="user-sync/" + APP_VERSION
         )
         logger.info('API initialized on: %s', um_endpoint)
 

user_sync/__init__.py

@@ -0,0 +1,21 @@
+# Copyright (c) 2016-2017 Adobe Systems Incorporated.  All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+__version__ = '1.0'