@typespec/http-client-python 0.7.0 → 0.7.1

package/generator/pygen.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ setup.py
 pygen/__init__.py
 pygen/_version.py
 pygen/black.py
-pygen/m2r.py
 pygen/utils.py
 pygen.egg-info/PKG-INFO
 pygen.egg-info/SOURCES.txt

package/generator/pygen.egg-info/requires.txt

@@ -1,7 +1,6 @@
 black==24.8.0
 docutils>=0.20.1
 Jinja2==3.1.3
-m2r2==0.3.3.post2
 PyYAML==6.0.1
 tomli==2.0.1
 setuptools==69.5.1

package/generator/setup.py

@@ -51,7 +51,6 @@ setup(
         "black==24.8.0",
         "docutils>=0.20.1",
         "Jinja2==3.1.3",
-        "m2r2==0.3.3.post2",
         "PyYAML==6.0.1",
         "tomli==2.0.1",
         "setuptools==69.5.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -66,6 +66,7 @@
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
+    "marked": "^15.0.6",
     "pyodide": "0.26.2",
     "semver": "~7.6.2",
     "tsx": "~4.19.1"

package/generator/build/lib/pygen/m2r.py

@@ -1,65 +0,0 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-"""An MD to RST plugin.
-"""
-import logging
-from typing import Any, Dict, Set, Union
-
-import m2r2
-
-from . import YamlUpdatePlugin
-from .utils import parse_args
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class GeneratorRenderer(m2r2.RestRenderer):
-    """Redefine the concept of inline HTML in the renderer, we don't want to define a new format
-    in the description/summary.
-    """
-
-    def inline_html(self, html: str) -> str:
-        """Do not render inline HTML with a role definition."""
-        return r"\ :code:`{}`".format(html)
-
-
-class M2R(YamlUpdatePlugin):
-    """A plugin to convert any description and summary from MD to RST."""
-
-    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
-        """Convert in place the YAML str."""
-        self._convert_docstring_no_cycles(yaml_data, set())
-
-    def _convert_docstring_no_cycles(self, yaml_data: Union[Dict[str, Any], str], node_list: Set[int]) -> None:
-        """Walk the YAML tree to convert MD to RST."""
-        if id(yaml_data) in node_list:
-            return
-        node_list.add(id(yaml_data))
-
-        if isinstance(yaml_data, list):
-            for elt in yaml_data:
-                self._convert_docstring_no_cycles(elt, node_list)
-        elif isinstance(yaml_data, dict):
-            for key, value in yaml_data.items():
-                if key in ["description", "summary"]:
-                    yaml_data[key] = self.convert_to_rst(value)
-                    continue
-                self._convert_docstring_no_cycles(value, node_list)
-
-    @staticmethod
-    def convert_to_rst(string_to_convert: str) -> str:
-        """Convert that string from MD to RST."""
-        try:
-            return m2r2.convert(string_to_convert, renderer=GeneratorRenderer()).strip()
-        except Exception:  # pylint: disable=broad-except
-            return string_to_convert
-
-
-if __name__ == "__main__":
-    # CADL pipeline will call this
-    args, unknown_args = parse_args()
-    M2R(output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args).process()

package/generator/pygen/m2r.py

@@ -1,65 +0,0 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-"""An MD to RST plugin.
-"""
-import logging
-from typing import Any, Dict, Set, Union
-
-import m2r2
-
-from . import YamlUpdatePlugin
-from .utils import parse_args
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class GeneratorRenderer(m2r2.RestRenderer):
-    """Redefine the concept of inline HTML in the renderer, we don't want to define a new format
-    in the description/summary.
-    """
-
-    def inline_html(self, html: str) -> str:
-        """Do not render inline HTML with a role definition."""
-        return r"\ :code:`{}`".format(html)
-
-
-class M2R(YamlUpdatePlugin):
-    """A plugin to convert any description and summary from MD to RST."""
-
-    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
-        """Convert in place the YAML str."""
-        self._convert_docstring_no_cycles(yaml_data, set())
-
-    def _convert_docstring_no_cycles(self, yaml_data: Union[Dict[str, Any], str], node_list: Set[int]) -> None:
-        """Walk the YAML tree to convert MD to RST."""
-        if id(yaml_data) in node_list:
-            return
-        node_list.add(id(yaml_data))
-
-        if isinstance(yaml_data, list):
-            for elt in yaml_data:
-                self._convert_docstring_no_cycles(elt, node_list)
-        elif isinstance(yaml_data, dict):
-            for key, value in yaml_data.items():
-                if key in ["description", "summary"]:
-                    yaml_data[key] = self.convert_to_rst(value)
-                    continue
-                self._convert_docstring_no_cycles(value, node_list)
-
-    @staticmethod
-    def convert_to_rst(string_to_convert: str) -> str:
-        """Convert that string from MD to RST."""
-        try:
-            return m2r2.convert(string_to_convert, renderer=GeneratorRenderer()).strip()
-        except Exception:  # pylint: disable=broad-except
-            return string_to_convert
-
-
-if __name__ == "__main__":
-    # CADL pipeline will call this
-    args, unknown_args = parse_args()
-    M2R(output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args).process()

package/generator/test/generic_mock_api_tests/unittests/test_m2r.py

@@ -1,10 +0,0 @@
-# ------------------------------------
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-# ------------------------------------
-from pygen.m2r import M2R
-
-
-def test_inline_html():
-    des = "Format: <MajorVersion>.<MinorVersion>.<Patch>"
-    M2R.convert_to_rst(des) == r"Format: \ :code:`<MajorVersion>`.\ :code:`<MinorVersion>`.\ :code:`<Patch>`"