[cdd/{emit,parse}.py -> cdd/{emit,parser}/*.py] Expand these two files into two modules ; [.github/workflows/main.yml] Upgrade versions of dependent actions ; [{README.md,.github/workflows/main.yml}] Reflect Python 3.11 release ; [cdd/__init__.py] Bump version ; [cdd/**.py] Use new parser and emitter locations throughout codebase (including use of import_module in cdd/gen.py)

Author: SamuelMarks

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
         runs-on: ${{ matrix.os.runs-on }}
         strategy:
             matrix:
-                python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11.0-alpha - 3.11.0']
+                python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
                 os:
                     -   name: Linux
                         runs-on: ubuntu-latest
@@ -27,9 +27,9 @@ jobs:
                         runs-on: macos-latest
                         python_platform: darwin
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v3
             -   name: Set up Python ${{ matrix.python-version }}
-                uses: actions/setup-python@v2
+                uses: actions/setup-python@v4
                 with:
                     python-version: ${{ matrix.python-version }}
                     architecture: x64

README.md

@@ -1,6 +1,6 @@
 cdd-python
 ==========
-![Python version range](https://img.shields.io/badge/python-3.6%20|%203.7%20|%203.8%20|%203.9%20|%203.10%20|%203.11.0rc2-blue.svg)
+![Python version range](https://img.shields.io/badge/python-3.6%20|%203.7%20|%203.8%20|%203.9%20|%203.10%20|%203.11-blue.svg)
 ![Python implementation](https://img.shields.io/badge/implementation-cpython-blue.svg)
 [![License](https://img.shields.io/badge/license-Apache--2.0%20OR%20MIT-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Linting, testing, coverage, and release](https://github.com/offscale/cdd-python/workflows/Linting,%20testing,%20coverage,%20and%20release/badge.svg)](https://github.com/offscale/cdd-python/actions)

cdd/__init__.py

@@ -8,7 +8,7 @@
 from logging import getLogger as get_logger
 
 __author__ = "Samuel Marks"
-__version__ = "0.0.84-beta"
+__version__ = "0.0.84"
 __description__ = (
     "Open API to/fro routes, models, and tests. "
     "Convert between docstrings, classes, methods, argparse, and SQLalchemy."

cdd/ast_utils.py

@@ -177,7 +177,7 @@ def _generic_param2ast(param):
     """
     name, _param = param
     del param
-    from cdd.emitter_utils import ast_parse_fix
+    from cdd.emit.emitter_utils import ast_parse_fix
 
     annotation = ast_parse_fix(_param["typ"])
     value = set_value(None)
@@ -418,7 +418,7 @@ def _resolve_arg(action, choices, param, required, typ):
     elif _param["typ"] == "dict" or name.endswith("kwargs"):
         typ, required = "loads", not name.endswith("kwargs")
     elif _param["typ"]:
-        from cdd.emitter_utils import ast_parse_fix
+        from cdd.emit.emitter_utils import ast_parse_fix
 
         parsed_type = ast_parse_fix(_param["typ"])
         for node in walk(parsed_type):

cdd/conformance.py

@@ -8,7 +8,10 @@
 from operator import itemgetter
 from os import path
 
-from cdd import emit, parse
+import cdd.emit.argparse_function
+import cdd.emit.class_
+import cdd.emit.file
+import cdd.emit.function
 from cdd.ast_utils import RewriteAtQuery, cmp_ast, find_in_ast, get_function_type
 from cdd.pure_utils import pluralise, strip_split
 from cdd.source_transformer import ast_parse
@@ -83,9 +86,17 @@ def ground_truth(args, truth_file):
     :rtype: ```OrderedDict```
     """
     arg2parse_emit_type = {
-        "argparse_function": (parse.argparse_ast, emit.argparse_function, FunctionDef),
-        "class": (parse.class_, emit.class_, ClassDef),
-        "function": (parse.function, emit.function, FunctionDef),
+        "argparse_function": (
+            cdd.parse.argparse_function.argparse_ast,
+            cdd.emit.argparse_function.argparse_function,
+            FunctionDef,
+        ),
+        "class": (cdd.parse.class_.class_, cdd.emit.class_.class_, ClassDef),
+        "function": (
+            cdd.parse.function.function,
+            cdd.emit.function.function,
+            FunctionDef,
+        ),
     }
 
     parse_func, emit_func, type_wanted = arg2parse_emit_type[args.truth]
@@ -156,7 +167,7 @@ def _conform_filename(
     filename = path.realpath(path.expanduser(filename))
 
     if not path.isfile(filename):
-        emit.file(
+        cdd.emit.file.file(
             emit_func(
                 replacement_node_ir,
                 emit_default_doc=False,  # emit_func.__name__ == "class_"
@@ -177,7 +188,9 @@ def _conform_filename(
         **_default_options(node=original_node, search=search, type_wanted=type_wanted)()
     )
     if original_node is None:
-        emit.file(replacement_node, filename=filename, mode="a", skip_black=False)
+        cdd.emit.file.file(
+            replacement_node, filename=filename, mode="a", skip_black=False
+        )
         return filename, True
     assert len(search) > 0
 
@@ -199,7 +212,7 @@ def _conform_filename(
             "modified" if rewrite_at_query.replaced else "unchanged", filename, sep="\t"
         )
         if rewrite_at_query.replaced:
-            emit.file(parsed_ast, filename, mode="wt", skip_black=False)
+            cdd.emit.file.file(parsed_ast, filename, mode="wt", skip_black=False)
 
         replaced = rewrite_at_query.replaced
 

cdd/docstring_parsers.py

@@ -26,7 +26,7 @@
     Style,
     derive_docstring_format,
 )
-from cdd.emitter_utils import interpolate_defaults
+from cdd.emit.emitter_utils import interpolate_defaults
 from cdd.pure_utils import (
     code_quoted,
     count_iter_items,

cdd/doctrans_utils.py

@@ -17,7 +17,9 @@
 from copy import deepcopy
 from operator import attrgetter, eq
 
-from cdd import emit, parse
+import cdd.emit.docstring
+import cdd.parse.docstring
+import cdd.parse.function
 from cdd.ast_cst_utils import (
     find_cst_at_ast,
     maybe_replace_doc_str_in_function_or_class,
@@ -36,7 +38,7 @@
 )
 from cdd.cst_utils import reindent_block_with_pass_body
 from cdd.docstring_parsers import parse_docstring
-from cdd.parser_utils import ir_merge
+from cdd.parse.parser_utils import ir_merge
 from cdd.pure_utils import PY_GTE_3_8, is_ir_empty, none_types, omit_whitespace
 from cdd.source_transformer import ast_parse
 
@@ -223,7 +225,7 @@ def _get_ass_typ(self, node):
                     (
                         lambda doc_str: None
                         if doc_str is None
-                        else parse.docstring(doc_str)
+                        else cdd.parse.docstring.docstring(doc_str)
                     )(get_docstring(parent, clean=False))
                     if isinstance(parent, (ClassDef, AsyncFunctionDef, FunctionDef))
                     else {"params": OrderedDict()}
@@ -249,15 +251,15 @@ def _handle_function(self, node, original_doc_str):
         :rtype: ```Union[AsyncFunctionDef, FunctionDef]```
         """
         ir = parse_docstring(original_doc_str)
-        ir_merge(ir, parse.function(node))
+        ir_merge(ir, cdd.parse.function.function(node))
         ir["name"] = node.name
         indent_level = max(
             len(node._location), 1
         )  # function docstrings always have at least 1 indent level
         doc_str = (
             None
             if is_ir_empty(ir)
-            else emit.docstring(
+            else cdd.emit.docstring.docstring(
                 ir,
                 emit_types=not self.type_annotations,
                 emit_default_doc=False,