Fix compatibility with Python3.6 and Python3.7 (#60)

* Fix ClickBaseModel.click_options is now compatible with Python3.6 and Python3.7 * Update README * Add tox configuration Co-authored-by: Simo Tumelius <[email protected]>
data-mie · Jul 14, 2022 · b5a9820 · b5a9820
1 parent a5f0b61
commit b5a9820
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,7 @@ dist/
 
 # pytest-cov
 .coverage
-cov_html/
+cov_html/
+
+# tox
+.tox/
diff --git a/README.md b/README.md
@@ -11,7 +11,13 @@
 
 ## Installation
 
-`dbt-cloud-cli` has been tested on Python 3.8 but it should work on Python>=3.6.
+`dbt-cloud-cli` has been tested with the following Python versions:
+
+* ✅ Python 3.6
+* ✅ Python 3.7
+* ✅ Python 3.8
+* ✅ Python 3.9
+* ✅ Python 3.10
 
 Installation from PyPI:
 

diff --git a/dbt_cloud/command/command.py b/dbt_cloud/command/command.py
@@ -1,4 +1,5 @@
 import click
+from collections import OrderedDict
 from mergedeep import merge
 from pydantic import validator, BaseModel, PrivateAttr
 from dbt_cloud.serde import json_to_dict
@@ -21,7 +22,7 @@ def translate_click_options(**kwargs) -> dict:
 class ClickBaseModel(BaseModel):
     @classmethod
     def click_options(cls, function, key_prefix: str = ""):
-        for key, field in reversed(cls.__fields__.items()):
+        for key, field in reversed(OrderedDict(cls.__fields__).items()):
             try:
                 is_nested_object = issubclass(field.type_, BaseModel)
             except TypeError:

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,4 +1,4 @@
 [tool.black]
 skip-string-normalization = false
 include = '\.pyi?$'
-exclude = 'venv/'
+exclude = 'venv/|.tox/'
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,9 @@
+[tox]
+envlist = py36, py37, py38, py39, p310
+[testenv]
+commands =
+  pytest
+setenv =
+    DBT_CLOUD_ACCOUNT_ID = 123456
+deps =
+    -e .[test]