Merge CI/CD changes (#2)

* first draft

* update PYTHONPATH

* remove mock.assert_called_once()

* set env vars

* removed 3.7

* removed old doc link

* initial draft

* deploy to github pages

* added stages

* order stages

* debug

* build doc

* set python version for sphinx

* added before_deploy step

* set doc dir

* debug

* cleanup stages

* add .nojekyll

* added 3.7

* cache pip packages

* test pypi

* fixed dict ordering issue

* added description

* added url

* 0.9.1

* trigger build

* secure password

* codecov

* fixed pypi url

* 0.9.3.  deploy tagged releases only

* updated codecov.  added GitHub Releases

* install requirements for codecov

* remove unnecessary test steps

* zip source

* debug

* v0.9.5

* upload documentation

* deploy on tags

* deploy on tags

* fix doc deployment

* skip deploy cleanup

* separate deployment steps

* fix file upload

* cleanup

Author: jlwalke2

.gitignore

@@ -0,0 +1,62 @@
+## Editor temporary/working/backup files
+.#*
+*\#*\#
+[#]*#
+*~
+*$
+*.bak
+*.old
+*.log
+*.nfs*
+*.swo
+*.swp
+*.pdb
+.project
+.pydevproject
+.settings
+.idea
+.pytest_cache
+.vagrant
+.noseids
+.ipynb_checkpoints
+.tags
+*.iml
+
+## Python files
+# setup.py working directory
+build
+# setup.py dist directory
+dist
+# Egg metadata
+*.egg-info
+.eggs
+.pypirc
+
+## tox testing tool
+.tox
+# rope
+.ropeproject
+# wheel files
+*.whl
+**/wheelhouse/*
+# coverage
+.coverage
+swat.egg-info/
+__pycache__/
+_stats.txt
+cover/
+test-reports/
+.pytest_cache
+
+## OS generated files
+.directory
+.gdb_history
+.DS_Store
+ehthumbs.db
+Icon?
+Thumbs.db
+
+## Documentation generated files
+doc/build
+doc/source/generated
+doc/_build

.travis.yml

@@ -0,0 +1,79 @@
+dist: xenial  # Currently required for Python 3.7
+language: python
+cache: pip
+
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.7"
+# 3.6 handled during code coverage
+
+env:
+  - PYTHONPATH=$PYTHONPATH:./src
+
+install:
+  - pip install -r test_requirements.txt
+
+script:
+  - pytest
+
+jobs:
+  include:
+    - stage: upload codecov results
+      python: 3.6
+      install:
+        - pip install pytest pytest-cov codecov
+        - pip install -r test_requirements.txt
+      script:
+        - pytest --cov=./
+        - codecov
+
+    - stage: create release
+      if: tag is present
+      python: 3.6
+      install: pip install sphinx
+      script:
+        - sphinx-build -Ean -b html -j auto -D todo_include_todos=0 ./doc ./doc/_build/html
+        - pushd ./doc/_build/html ; zip -r ../../../${TRAVIS_TAG}-doc.zip . ; popd
+      deploy:
+        provider: releases
+        skip_cleanup: true
+        api_key: $GITHUB_TOKEN
+        file: ${TRAVIS_TAG}-doc.zip
+        draft: true
+        on:
+          tags: true
+
+    - stage: upload documentation
+      if: tag is present
+      python: 3.6
+      install: pip install sphinx
+      script:
+        - sphinx-build -Ean -b html -j auto -D todo_include_todos=0 ./doc ./doc/_build/html
+        - touch ./doc/_build/html/.nojekyll
+      deploy:
+        provider: pages
+        skip_cleanup: true
+        github_token: $GITHUB_TOKEN
+        keep_history: false
+        local_dir: ./doc/_build/html
+        on:
+          tags: true
+
+    - stage: deploy to pypi (test)
+      if: tag is present
+      script: # Cancel out default script
+        -
+      deploy:
+        provider: pypi
+        server: https://test.pypi.org/legacy/
+        user:
+          secure: uHXdHqYzzi/2Gc9/8kP4nBKAf2zgIOri1bHWnmgNoBNhWJuma4MWMuMUCzQU+QbrMvOiOm+EZRz1+rBXDOsqa7T+22OZRMBIUFfc3BG5ItYm8DXOUznWLy2/32yQngEohpYwnZuzvS3zUbVZ94a9m0qWjRi+4JHQhh8EKANeGbByBNwPBFh9ysbM8Vl7jiM0LUPinO1OtgPIiDqzP5Zm6Vxnhh7ZlR6wPUs87yPrHKBAUiZkXBNrVr4f/3cY+PrxRtvptVH5SmuApz3oJFl54XavJPYwVNlnEddk8KATpNIVtpq4E9arn/ptvacsiO2QmxxET7Sp3IJ6Uzl/nFDdYIg/yaID0zHBfViy/0pdC6P6aylTS4iqO33gNS4cp2wrNQe424v2YkgRkPNX5wxkCZtwtZsIUiPMLnD2RMTgQdfbDgF+yQ/WOwgDapcoa3HYHLajfNzzGF3bW4hLdc6w7xer/LyhGQ/FxUClg4TrfwXErQ6DU+BPl+MSZEKw3B3nxtEpsX6yzJkKcx4xmrHj9W/WJk5zicjGq7LH+zTJia6Yl4Rr/IMtgfUruZhqRwIT5pOTnDYnroFfZH6/TbpAhC33iGlmr5Td1Fmrrc56Isj7eQH6J1zhH8oy4ZkN2ZqcyT3KxQwDdE9lNJvUHhTZlAYvoO1QvvzS/4dTWPqNxKc=
+        password:
+          secure: wTwws6xBoptSsNP4Yr5/W1yRfOLmrQynnyQGmAFAlr3t9Xkf56fNLPhLN54Q3zLP+au9pb8OzNqAu2fbwXuS/rj+M/Jqy8JLICeyivVN4UNnYfc4ICJYJUk6Y1w16brzJDtVO0WuGLsR6ENp6JBBzMglCfgjGIU3zYv/bSUz0NZudXJKl03pBNQA/EFEmjqcotkSwTLcRnuYjKZvoROsH4MAgHdVz28MpzeAFRTaqJZ/u3hV6aG3BAQIezSOyDuWB4iymgh+6svxgLyTmmCgdvaS+IVT5pKSKIyv22WG8HdGMJG6FAGsHbREdpSOx2Y7Sn1gM0+AJeKH0okxCB299B2/7zcO/T9vjqV6JH8fmM+Utm3oj5LLse8ckQnVeQDAZlUgsEs4hul5V2LkvUrKklO6yaJrUnUBTBHSe08axw/LxhFhYSBPc87VqlG1bjvberLOw3FB/5BaObYFOH2KOetNJ4cIscFQvNFBQ0ZP36qrmwwa4h4YlUIRRY9ZMivPFuuTevcloKer4423/HaTi7CZU26niBma9UuORdIbc2YDLRc/DIztGBaTp7ZwNXlFfVZ8jkXYHov4aU5xKoehPFLcko1Ltii9BpH8Rv1b7GW09G3QPpB9Mx3RuG9GFQgvkD6nZI/hpyXooBphklPzG88m6EmzfGsojJlDqoPExJs=
+        distributions: sdist bdist_wheel
+        on:
+          tags: true
+
+

README.md

@@ -1,3 +1,7 @@
+<a href="https://www.python.org/">
+    <img src="https://img.shields.io/badge/Python-3+-blue.svg?&style=for-the-badge&colorA=254f73" alt="Python Version">
+</a>
+
 # sasctl
 
 ## Overview
@@ -39,8 +43,6 @@ pip install git+https://github.com/sassoftware/python-sasctl
 
 ## Getting Started
 
-Read the full documentation here: [http://xeno.glpages.sas.com/python-sasctl](http://xeno.glpages.sas.com/python-sasctl)
-
 Once the sasctl package has been installed and you have a SAS Viya server to connect to, 
 the first step is to establish a session:
 ```

setup.py

@@ -19,13 +19,24 @@ def read_dunder(name):
         raise RuntimeError('Unable to find __%s__ in __init__.py' % name)
 
 
+def get_file(filename):
+    with open(filename, 'r') as f:
+        return f.read()
+
 setup(
     name='sasctl',
+    description='SAS Viya REST Client',
+    long_description=get_file('README.md'),
+    long_description_content_type='text/markdown',
     version=read_dunder('version'),
     author=read_dunder('author'),
+    url='https://github.com/sassoftware/python-sasctl/',
     packages=find_packages(where="src"),
     package_dir={"": "src"},
-    install_requires = ['requests', 'six >= 1.11'],
+    install_requires=[
+        'requests',
+        'six >= 1.11'
+    ],
     extras_require = {
         'swat': ['swat'],
         'kerberos': ['kerberos ; platform_system != "Windows"',

src/sasctl/__init__.py

@@ -4,7 +4,7 @@
 # Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = '0.9'
+__version__ = '0.9.6'
 __author__ = 'SAS'
 __credits__ = ['Lucas De Paula, Peter Tobac, Jon Walker']
 __license__ = 'Apache 2.0'

tests/unit/test_core.py

@@ -17,7 +17,7 @@ def test_request():
 
         resp = request('GET', 'example.com', session=mock_sess)
 
-    mock_sess.request.assert_called_once()
+    assert mock_sess.request.call_count == 1
     assert isinstance(resp, RestObj)
     assert hasattr(resp, '_headers')
 
@@ -41,7 +41,7 @@ def test_list_items():
 
         resp = list_items()
 
-    request.assert_called_once()
+    assert request.call_count == 1
     assert [RestObj()] == resp
 
 
@@ -56,7 +56,7 @@ def test_get_item_by_dict():
         resp = get_item(target)
 
     assert target == resp
-    request.assert_not_called()
+    assert request.call_count == 0
 
 
 def test_get_item_by_name():
@@ -86,8 +86,8 @@ def test_get_item_by_id():
             request.return_value = target
             resp = get_item(12345)
 
-    is_uuid.assert_called_once()
-    request.assert_called_once()
+    assert is_uuid.call_count == 1
+    assert request.call_count == 1
     assert target == resp
 
 
@@ -107,7 +107,7 @@ def test_update_item():
 
         target._headers = {'etag': 'abcd'}
         resp = update_item(target)
-    request.assert_called_once()
+    assert request.call_count == 1
     assert ('put', '/widget/12345') == request.call_args[0]
     assert target == resp
 

tests/unit/test_microanalytic_score.py

@@ -27,7 +27,7 @@ def test_create_python_module():
                             "    return out1, out2"))
         create_module(source=source)
 
-        post.assert_called_once()
+        assert post.call_count == 1
         json = post.call_args[1].get('json', {})
         assert 'text/x-python' == json['type']
         assert 'public' == json['scope']

tests/unit/test_model_management.py

@@ -56,7 +56,7 @@ def test_create_performance_definition():
                 get_project.return_value['predictionVariable'] = 'predicted'
                 _ = mm.create_performance_definition('model', 'TestLibrary', 'TestData')
 
-            post.assert_called_once()
+            assert post.call_count == 1
             url, data = post.call_args
 
             assert PROJECT['id'] == data['json']['projectId']

tests/unit/test_model_repository.py

@@ -46,7 +46,7 @@ def test_create_model():
                                 tool=target['tool'],
                                 is_champion=target['champion'],
                                 properties=dict(custom1=123, custom2='somevalue'))
-            post.assert_called_once()
+            assert post.call_count == 1
             url, data = post.call_args
 
             # dict isn't guaranteed to preserve order
@@ -69,7 +69,7 @@ def test_create_model():
             get_project.return_value = {'id': PROJECT_ID}
             _ = mr.create_model(copy.deepcopy(target), PROJECT_NAME, description='Updated Model')
             target['description'] = 'Updated Model'
-            post.assert_called_once()
+            assert post.call_count == 1
             url, data = post.call_args
 
             # dicts don't preserve order so property order may not match

tests/unit/test_restobj.py

@@ -34,7 +34,8 @@ def test_restobj():
 def test_repr():
     d = dict(a=1, b=2)
 
-    assert str(d) in repr(RestObj(d))
+    assert "'a': 1" in repr(RestObj(d))
+    assert "'b': 2" in repr(RestObj(d))
 
 
 def test_str():