Merge remote-tracking branch 'v2/v2' into ssl_verify

Author: vossen-adobe

.travis.yml

@@ -7,7 +7,9 @@ python:
 - 3.8
 install:
 - pip install --upgrade pip setuptools wheel
-- pip install -r requirements.txt
+- pip install -e .
+- pip install -e .[test]
+- pip install -e .[setup]
 script:
 - python setup.py test
 deploy:

requirements.txt

@@ -24,6 +24,9 @@
 with open('umapi_client/version.py') as f:
     exec(f.read(), version_namespace)
 
+test_deps = ['mock', 'pytest>=3.0.5', 'PyYAML']
+setup_deps = ['pytest-runner']
+
 setup(name='umapi-client',
       version=version_namespace['__version__'],
       description='Client for the User Management API (UMAPI) from Adobe - see https://adobe.ly/2h1pHgV',
@@ -54,12 +57,10 @@
           'six',
           'enum34;python_version<"3.4"',
       ],
-      setup_requires=[
-          'pytest-runner',
-      ],
-      tests_require=[
-          'pytest>=3.0.5',
-          'mock',
-          'PyYAML',
-      ],
+      extras_require={
+          'test': test_deps,
+          'setup': setup_deps,
+      },
+      setup_requires=setup_deps,
+      tests_require=test_deps,
       zip_safe=False)

setup.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = "2.13"
+__version__ = "2.14"