@autorest/python 5.12.5 → 5.14.0

package/autorest/codegen/templates/service_client.py.jinja2

@@ -7,7 +7,7 @@
 {{ imports }}
 
 {{ serializer.class_definition(async_mode) }}
-    """{{ code_model.description }}
+    """{{ op_tools.wrap_string(code_model.description, "\n") | indent }}
 
     {{ op_tools.serialize_with_wrap(serializer.property_descriptions(async_mode), "\n ") | indent }}
     {{ serializer.init_signature_and_response_type_annotation(async_mode) | indent }}

package/autorest/codegen/templates/setup.py.jinja2

@@ -1,34 +1,93 @@
-{% set name = code_model.options["package_name"] or code_model.class_name %}
-{% set azure_mgmt_core_import = ', "azure-mgmt-core<2.0.0,>=1.2.1"' if code_model.options["azure_arm"] else "" %}
 # coding=utf-8
-{{ code_model.options['license_header'] }}
+{{ license_header }}
 # coding: utf-8
-
+{% if package_mode %}
+import os
+import re
+{% endif -%}
 from setuptools import setup, find_packages
 
-NAME = "{{ name|lower }}"
-VERSION = "{{ code_model.options.get('package_version', '0.0.0') }}"
+{% set package_name_render = package_name or code_model.class_name %}
+
+PACKAGE_NAME = "{{ package_name_render|lower }}"
+{% if package_mode -%}
+PACKAGE_PPRINT_NAME = "{{ package_pprint_name }}"
+
+# a-b-c => a/b/c
+package_folder_path = PACKAGE_NAME.replace("-", "/")
 
-# To install the library, run the following
-#
-# python setup.py install
-#
-# prerequisite: setuptools
-# http://pypi.python.org/pypi/setuptools
+# Version extraction inspired from 'requests'
+with open(os.path.join(package_folder_path, "_version.py"), "r") as fd:
+    version = re.search(
+        r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE
+    ).group(1)
 
-REQUIRES = ["msrest>=0.6.21", "azure-core<2.0.0,>=1.20.1"{{ azure_mgmt_core_import }}]
+if not version:
+    raise RuntimeError("Cannot find version information")
+{% set description = "Microsoft %s Client Library for Python"|format(package_pprint_name) %}
+{% set author_email = "azpysdkhelp@microsoft.com" %}
+{% set url = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk" %}
+{% else %}
+version = "{{ code_model.options['package_version'] }}"
+{% set description = "%s"|format(package_name_render) %}
+{% set long_description = code_model.description %}
+{% set author_email = "" %}
+{% set url = "" %}
+{% endif -%}
 
 setup(
-    name=NAME,
-    version=VERSION,
-    description="{{ name }}",
-    author_email="",
-    url="",
-    keywords=["Swagger", "{{ code_model.class_name }}"],
-    install_requires=REQUIRES,
+    name=PACKAGE_NAME,
+    version=version,
+    description="{{ description }}",
+    {% if package_mode %}
+    long_description=open("README.md", "r").read(),
+    long_description_content_type="text/markdown",
+    license="MIT License",
+    author="Microsoft Corporation",
+    {% endif %}
+    author_email="{{ author_email }}",
+    url="{{ url }}",
+    keywords="azure, azure sdk",
+    {% if package_mode %}
+    classifiers=[
+        "Development Status :: {{ dev_status }}",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "License :: OSI Approved :: MIT License",
+    ],
+    zip_safe=False,
+    packages=find_packages(
+        exclude=[
+            "tests",
+            # Exclude packages that will be covered by PEP420 or nspkg
+            {%- for pkgutil_name in pkgutil_names %}
+            "{{ pkgutil_name }}",
+            {%- endfor %}
+        ]
+    ),
+    {% else %}
     packages=find_packages(),
     include_package_data=True,
+    {% endif %}
+    install_requires=[
+        "{{ dependency_msrest }}",
+        {% if azure_arm %}
+        "{{ dependency_azure_mgmt_core }}",
+        {% else %}
+        "{{ dependency_azure_core }}",
+        {% endif %}
+    ],
+    {% if package_mode %}
+    python_requires=">=3.6",
+    {% else %}
     long_description="""\
     {{ code_model.description }}
     """
+    {% endif %}
 )

package/autorest/namer/name_converter.py

@@ -373,7 +373,7 @@ class NameConverter:
             # check to see if name is reserved for the type of name we are converting
             pad_string = cast(PadType, pad_string)
             # there are some private variables, such as grouped parameters
-            # that are private. We still want to escape them for LLC
+            # that are private. We still want to escape them for DPG
             name_prefix = ""
             if name[0] == "_":
                 # i am private

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/python",
-    "version": "5.12.5",
+    "version": "5.14.0",
     "description": "The Python extension for generators in AutoRest.",
     "scripts": {
         "prepare": "node run-python3.js prepare.py",
@@ -27,7 +27,7 @@
         "@azure-tools/extension": "~3.2.1"
     },
     "devDependencies": {
-        "@microsoft.azure/autorest.testserver": "^3.1.11"
+        "@microsoft.azure/autorest.testserver": "^3.3.20"
     },
     "files": [
         "autorest/**/*.py",

package/run-python3.js

@@ -18,12 +18,6 @@ async function runPython3(scriptName, debug = "") {
 }
 
 runPython3(...process.argv.slice(2)).catch(err => {
-  const error = err.toString();
-
-  // Python script errors are already written out via stderr so don't
-  // write them twice.  Write out all other errors to stderr.
-  if (!error.startsWith("Error: Command failed")) {
-    console.error(error);
-  }
+  console.error(err.toString());
   process.exit(1);
 });

package/venvtools.py

@@ -62,13 +62,13 @@ def python_run(venv_context, module, command=None, *, additional_dir=".", error_
             venv_context.env_exe,
             "-m", module
         ] + (command if command else [])
-        print("Executing: {}".format(" ".join(cmd_line)), file=sys.stderr)
+        print("Executing: {}".format(" ".join(cmd_line)))
         subprocess.run(
             cmd_line,
             cwd=_ROOT_DIR / additional_dir,
             check=True,
         )
     except subprocess.CalledProcessError as err:
-        print(err, file=sys.stderr)
+        print(err)
         if not error_ok:
             sys.exit(1)