@autorest/python 6.13.5 → 6.13.7

package/autorest/codegen/serializers/builder_serializer.py

@@ -1431,9 +1431,12 @@ class _PagingOperationSerializer(
                     "})",
                 ]
             )
-            retval.append(
-                f'_next_request_params["api-version"] = {api_version_param.full_client_name}'
+            api_version = (
+                "self._api_version"
+                if self.code_model.options["multiapi"] and builder.group_name
+                else api_version_param.full_client_name
             )
+            retval.append(f'_next_request_params["api-version"] = {api_version}')
             query_str = ", params=_next_request_params"
             next_link_str = "urllib.parse.urljoin(next_link, _parsed_next_link.path)"
         except StopIteration:

package/autorest/postprocess/__init__.py

@@ -52,7 +52,7 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             env_builder = EnvBuilder(with_pip=True)
             self.venv_context = env_builder.ensure_directories(venv_path)
         else:
-            env_builder = ExtendedEnvBuilder(with_pip=True)
+            env_builder = ExtendedEnvBuilder(with_pip=True, upgrade_deps=True)
             env_builder.create(venv_path)
             self.venv_context = env_builder.context
             python_run(

package/autorest/postprocess/venvtools.py

@@ -20,7 +20,10 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
 
     def __init__(self, *args, **kwargs):
         self.context = None
-        super(ExtendedEnvBuilder, self).__init__(*args, **kwargs)
+        if sys.version_info < (3, 9, 0):
+            # Not supported on Python 3.8, and we don't need it
+            kwargs.pop("upgrade_deps", None)
+        super().__init__(*args, **kwargs)
 
     def ensure_directories(self, env_dir):
         self.context = super(ExtendedEnvBuilder, self).ensure_directories(env_dir)
@@ -34,6 +37,7 @@ def create(
     symlinks=False,
     with_pip=False,
     prompt=None,
+    upgrade_deps=False,
 ):
     """Create a virtual environment in a directory."""
     builder = ExtendedEnvBuilder(
@@ -42,6 +46,7 @@ def create(
         symlinks=symlinks,
         with_pip=with_pip,
         prompt=prompt,
+        upgrade_deps=upgrade_deps,
     )
     builder.create(env_dir)
     return builder.context

package/install.py

@@ -6,7 +6,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import sys
-if not sys.version_info >= (3, 7, 0):
+if not sys.version_info >= (3, 8, 0):
     raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 try:
@@ -32,13 +32,12 @@ _ROOT_DIR = Path(__file__).parent
 
 def main():
     venv_path = _ROOT_DIR / "venv"
-    venv_prexists = venv_path.exists()
 
-    if venv_prexists:
+    if venv_path.exists():
         env_builder = venv.EnvBuilder(with_pip=True)
         venv_context = env_builder.ensure_directories(venv_path)
     else:
-        env_builder = ExtendedEnvBuilder(with_pip=True)
+        env_builder = ExtendedEnvBuilder(with_pip=True, upgrade_deps=True)
         env_builder.create(venv_path)
         venv_context = env_builder.context
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.13.5",
+  "version": "6.13.7",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {

package/prepare.py

@@ -6,7 +6,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import sys
-if not sys.version_info >= (3, 7, 0):
+if not sys.version_info >= (3, 8, 0):
     raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 from pathlib import Path

package/start.py

@@ -6,7 +6,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import sys
-if not sys.version_info >= (3, 7, 0):
+if not sys.version_info >= (3, 8, 0):
     raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 from pathlib import Path
@@ -23,7 +23,10 @@ def main():
 
     assert venv_prexists  # Otherwise install was not done
 
-    env_builder = venv.EnvBuilder(with_pip=True)
+    if sys.version_info < (3, 9, 0):
+        env_builder = venv.EnvBuilder(with_pip=True)
+    else:
+        env_builder = venv.EnvBuilder(with_pip=True, upgrade_deps=True)
     venv_context = env_builder.ensure_directories(venv_path)
     python_run(venv_context, "autorest.jsonrpc.server", command=sys.argv[1:])
 

package/venvtools.py

@@ -21,6 +21,9 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
 
     def __init__(self, *args, **kwargs):
         self.context = None
+        if sys.version_info < (3, 9, 0):
+            # Not supported on Python 3.8, and we don't need it
+            kwargs.pop("upgrade_deps", None)
         super().__init__(*args, **kwargs)
 
     def ensure_directories(self, env_dir):
@@ -29,11 +32,11 @@ class ExtendedEnvBuilder(venv.EnvBuilder):
 
 
 def create(env_dir, system_site_packages=False, clear=False,
-                    symlinks=False, with_pip=False, prompt=None):
+                    symlinks=False, with_pip=False, prompt=None, upgrade_deps=False):
     """Create a virtual environment in a directory."""
     builder = ExtendedEnvBuilder(system_site_packages=system_site_packages,
                                  clear=clear, symlinks=symlinks, with_pip=with_pip,
-                                 prompt=prompt)
+                                 prompt=prompt, upgrade_deps=upgrade_deps)
     builder.create(env_dir)
     return builder.context
 
@@ -44,7 +47,7 @@ def create_venv_with_package(packages):
     packages should be an iterable of pip version instructio (e.g. package~=1.2.3)
     """
     with tempfile.TemporaryDirectory() as tempdir:
-        myenv = create(tempdir, with_pip=True)
+        myenv = create(tempdir, with_pip=True, upgrade_deps=True)
         pip_call = [
             myenv.env_exe,
             "-m",