[cdd/tests/test_sqlalchemy/test_parse_sqlalchemy_utils.py] Increase t…

…est coverage ; [cdd/__init__.py] Bump version ; [.github/workflows/main.yml] Test coverage for 3.6 also ; use `python -m pip` everywhere over `pip`
offscale · Mar 15, 2024 · c4fe8e2 · c4fe8e2
1 parent 8d83ccb
commit c4fe8e2
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,10 +37,19 @@ jobs:
             run: |
                 python -m pip install --upgrade pip
                 python -m pip install --upgrade setuptools wheel
-                pip install -r requirements.txt
+                python -m pip install -r requirements.txt
         -   name: Test with unittest
             run: |
                 python setup.py test
+        -   name: Test coverage
+            run: |
+                python -m pip install codecov coverage
+                coverage run -m unittest discover
+                env
+                bash <(curl --proto '=https' --tlsv1.2 -sSf https://codecov.io/bash)
+            env:
+                CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+            if: matrix.os.name == 'Linux' && github.ref == 'refs/heads/master'
     test:
         name: ${{ matrix.os.name }} ${{ matrix.python-version }}
         runs-on: ${{ matrix.os.runs-on }}
@@ -68,24 +77,24 @@ jobs:
                 run: |
                     python -m pip install --upgrade pip
                     python -m pip install --upgrade setuptools wheel
-                    pip install -r requirements.txt
+                    python -m pip install -r requirements.txt
             -   name: Test with unittest
                 run: |
                     python setup.py test
 
             -   name: Lint with flake8
                 run: |
-                    pip install flake8
+                    python -m pip install flake8
                     flake8 . --count --select=$(printf '%s,' {A..Z}) --ignore='F811,W503,E203' --show-source --max-complexity=13 --max-line-length=119 --statistics
                 if: matrix.python-version == '3.8' && matrix.os.name == 'Linux' && github.ref == 'refs/heads/master'
             -   name: Check formatted with black
                 run: |
-                    pip install black
+                    python -m pip install black
                     python -m black . --check --extend-exclude 'cdd/tests/mocks/cstify.py'
                 if: matrix.python-version == '3.8' && matrix.os.name == 'Linux' && github.ref == 'refs/heads/master'
             -   name: Doc coverage
                 run: |
-                    pip install interrogate
+                    python -m pip install interrogate
                     interrogate -e 'cdd/tests/mocks/cstify.py' --generate-badge '.github/doccoverage.svg'
                     sed -i 's/interrogate/doc coverage/g; s/data-doc c/data-doc-c/g' .github/doccoverage.svg
                     # Setup git config
@@ -103,7 +112,7 @@ jobs:
                 if: matrix.python-version == '3.8' && matrix.os.name == 'Linux' && github.ref == 'refs/heads/master'
             -   name: Test coverage
                 run: |
-                    pip install codecov coverage
+                    python -m pip install codecov coverage
                     coverage run -m unittest discover
                     env
                     bash <(curl --proto '=https' --tlsv1.2 -sSf https://codecov.io/bash)
@@ -112,7 +121,7 @@ jobs:
                 if: (matrix.python-version == '3.8' || matrix.python-version == '3.12') && matrix.os.name == 'Linux' && github.ref == 'refs/heads/master'
             -   name: PyPi release
                 run: |
-                    pip install twine
+                    python -m pip install twine
                     python setup.py sdist bdist_wheel
                     python -m twine upload --repository pypi dist/*
                 env:

diff --git a/cdd/__init__.py b/cdd/__init__.py
@@ -9,7 +9,7 @@
 from logging import getLogger as get_logger
 
 __author__ = "Samuel Marks"  # type: str
-__version__ = "0.0.99rc35"  # type: str
+__version__ = "0.0.99rc36"  # type: str
 __description__ = (
     "Open API to/fro routes, models, and tests. "
     "Convert between docstrings, classes, methods, argparse, pydantic, and SQLalchemy."

diff --git a/cdd/tests/test_sqlalchemy/test_parse_sqlalchemy_utils.py b/cdd/tests/test_sqlalchemy/test_parse_sqlalchemy_utils.py
@@ -7,6 +7,7 @@
 from unittest import TestCase
 
 from cdd.shared.ast_utils import set_value
+from cdd.shared.pure_utils import pp
 from cdd.sqlalchemy.utils.parse_utils import (
     column_call_name_manipulator,
     column_call_to_param,
@@ -88,6 +89,27 @@ def test_column_call_to_param_fk(self) -> None:
         self.assertEqual(gold_name, gen_name)
         self.assertDictEqual(gold_param, gen_param)
 
+    def test_column_call_to_param_from_ast_construct(self) -> None:
+        """
+        Tests that `parse.sqlalchemy.utils.column_call_to_param` works with AST construct
+        """
+        node_with_func_call = deepcopy(node_fk_call)
+        node_with_func_call.args[-1].func.id = "Foo"
+        gen_name, gen_param = column_call_to_param(node_with_func_call)
+        gold_name, gold_param = (
+            lambda _name: (
+                _name,
+                {
+                    "x_typ": deepcopy(
+                        intermediate_repr_node_pk["params"][_name]["x_typ"]
+                    ),
+                    "typ": "Foo('element.element_id')",
+                },
+            )
+        )("primary_element")
+        self.assertEqual(gold_name, gen_name)
+        self.assertDictEqual(gold_param, gen_param)
+
     def test_get_pk_and_type(self) -> None:
         """
         Tests get_pk_and_type