Merge pull request #23 from adobe-apiplatform/v2

Push release 2.0rc1 to master

Author: adobeDan

.travis.yml

@@ -1,10 +1,21 @@
 language: python
 python:
-  - 2.7
-  - 3.4
-  - 3.5
+- 2.7
+- 3.4
+- 3.5
 install:
-  - pip install --upgrade pip setuptools wheel
-  - pip install -r requirements.txt
+- pip install --upgrade pip setuptools wheel
+- pip install -r requirements.txt
 script:
-  - python setup.py test
+- python setup.py test
+deploy:
+  provider: pypi
+  distributions: sdist bdist_wheel
+  user: adobeDan
+  password:
+    secure: nqS9f74jOJZnZ7FqhwpChvP4MlslIF14StxxdYrMuKs0fh6Bcz8O5DROBiEEs9OvM3+cbPkmfkg7PKkZQx4UQTQzYCPKV85YegrQW2WRcwwW3ik6NB5AELphjx3RBMA61p827m7V4vHW67j70+ITDG1joKBNzj7XfQPNma4LtBAxNPsNP9sHaZsWAUAnBvDZ9m7s3mPp2x3t+f9klxaurW7V6NvrjB47r9ln5Ry2JWxHBPKBjJ4XgVVYVQF4HmyrOzszH6xYUVS1KY6S6RUeOl8u/PwSWh3/QH0TvNmVzuZgU/dZxF0JEJbFZvh6+tVNaCcCGYlF+bXkPKbeMEnnPPvaI1RHuUbplPhNWRjVSksAJsznbvYseSg/e7yGJ6ghpsVAySqamMzrpH+U2OJ09czxv3boo9zJm/WWwg069OYkKWyUpNdjgiz0mgYb4KfVak0qhVy3qtbxju4RdCRnxIM2TXF+G/nkUpgtoSFgydgVpMbU2hjj8nonPgesWthFs9KlZocW1epyGySUVvcOcp4KuSvxS3njmA0+knWkAnCvFv7ynCkx7V7CNZvMo49HSMxNGfEs+d12MGIbfqYpIa1van8m4ApOuZ8RhVQq0ZLxVyuORqIDrG1PO7Gg/FFn4objp7e850lBML5ruoMqTmr5FFNSSBXfO/3NQa7l9RM=
+  on:
+    tags: true
+    python: "3.5"
+    repo: adobe-apiplatform/umapi-client.py
+    all_branches: true

docs/usage-instructions-v2.md

@@ -282,6 +282,7 @@ actions = (user1, user2, user3, user4)
 errors = [info for action in actions for info in action.execution_errors()]
 ```
 
-Each entry in errors would then be a dictionary giving
+Each entry in `errors` would then be a dictionary giving
 the command that failed, the target user it failed on,
 and server information about the reason for the failure.
+

setup.py

@@ -21,7 +21,7 @@
 from setuptools import setup, find_packages
 
 setup(name='umapi-client',
-      version='2.0b3',
+      version='2.0rc1',
       description='Client for the User Management API (UMAPI) from Adobe - see https://adobe.ly/2h1pHgV',
       long_description=('The User Management API (aka the UMAPI) is an Adobe-hosted network service '
                         'which provides Adobe Enterprise customers the ability to manage their users.  This '
@@ -31,6 +31,7 @@
       classifiers=[
           'Development Status :: 5 - Production/Stable',
           'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'License :: OSI Approved :: MIT License',
           'Intended Audience :: Developers',
@@ -52,7 +53,7 @@
           'pytest-runner',
       ],
       tests_require=[
-          'pytest',
+          'pytest>=3.0.5',
           'mock',
           'PyYAML',
       ],