Merge pull request #40 from cloudblue/bump_markdown_renderer_and_drop_py36_support

bump markdown renderer to 2.0 and drop support for python 3.6

Author: Francesco Faraone

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
     steps:
     - name: Checkout
       uses: actions/checkout@v2

.github/workflows/deploy.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.x'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

README.md

@@ -17,11 +17,8 @@ play with the CloudBlue Connect API using a python REPL like [jupyter](https://j
 
 ## Install
 
-`Connect Python OpenAPI Client` requires python 3.6 or later and has the following dependencies:
+`Connect Python OpenAPI Client` requires python 3.7 or later.
 
-* connect-markdown-renderer>=1,<2
-* pyyaml>=5,<6
-* requests>=2,<3
 
 `Connect Python OpenAPI Client` can be installed from [pypi.org](https://pypi.org/project/connect-openapi-client/) using pip:
 

connect/client/help_formatter.py

@@ -5,9 +5,19 @@
 #
 import inflect
 
-from cmr import render
-
-from connect.client.models import Action, Collection, NS, Resource, ResourceSet
+from connect.client.models import (
+    Action,
+    AsyncAction,
+    AsyncCollection,
+    AsyncNS,
+    AsyncResource,
+    AsyncResourceSet,
+    Collection,
+    NS,
+    Resource,
+    ResourceSet,
+)
+from connect.utils.terminal.markdown import render
 
 
 _COL_HTTP_METHOD_TO_METHOD = {
@@ -186,19 +196,19 @@ def format(self, obj):
         if not self._specs:
             return render('**No OpenAPI specs available.**')
 
-        if isinstance(obj, NS):
+        if isinstance(obj, (NS, AsyncNS)):
             return self.format_ns(obj)
 
-        if isinstance(obj, Collection):
+        if isinstance(obj, (Collection, AsyncCollection)):
             return self.format_collection(obj)
 
-        if isinstance(obj, Resource):
+        if isinstance(obj, (Resource, AsyncResource)):
             return self.format_resource(obj)
 
-        if isinstance(obj, Action):
+        if isinstance(obj, (Action, AsyncAction)):
             return self.format_action(obj)
 
-        if isinstance(obj, ResourceSet):
+        if isinstance(obj, (ResourceSet, AsyncResourceSet)):
             return self.format_resource_set(obj)
 
         return self.format_client()