From 6024e6f0c5478fbc9a12ae3d6580110565dc394a Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Wed, 16 Apr 2025 12:37:09 +0800 Subject: [PATCH 1/2] fix for setup.py --- .../codegen/serializers/general_serializer.py | 18 +++++++++++------- .../packaging_templates/setup.py.jinja2 | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/http-client-python/generator/pygen/codegen/serializers/general_serializer.py b/packages/http-client-python/generator/pygen/codegen/serializers/general_serializer.py index 1c23c1a37ce..39671556c40 100644 --- a/packages/http-client-python/generator/pygen/codegen/serializers/general_serializer.py +++ b/packages/http-client-python/generator/pygen/codegen/serializers/general_serializer.py @@ -17,12 +17,12 @@ from .base_serializer import BaseSerializer VERSION_MAP = { - "msrest": "0.7.1", - "isodate": "0.6.1", - "azure-mgmt-core": "1.3.2", - "azure-core": "1.30.0", - "typing-extensions": "4.6.0", - "corehttp": "1.0.0b6", + "msrest": "0.7.1", + "isodate": "0.6.1", + "azure-mgmt-core": "1.3.2", + "azure-core": "1.30.0", + "typing-extensions": "4.6.0", + "corehttp": "1.0.0b6", } MIN_PYTHON_VERSION = "3.9" @@ -34,7 +34,11 @@ class GeneralSerializer(BaseSerializer): def serialize_setup_file(self) -> str: template = self.env.get_template("packaging_templates/setup.py.jinja2") - params = {} + params = { + "VERSION_MAP": VERSION_MAP, + "MIN_PYTHON_VERSION": MIN_PYTHON_VERSION, + "MAX_PYTHON_VERSION": MAX_PYTHON_VERSION, + } params.update(self.code_model.options) return template.render(code_model=self.code_model, **params) diff --git a/packages/http-client-python/generator/pygen/codegen/templates/packaging_templates/setup.py.jinja2 b/packages/http-client-python/generator/pygen/codegen/templates/packaging_templates/setup.py.jinja2 index fef99c832bf..fd01bd84001 100644 --- a/packages/http-client-python/generator/pygen/codegen/templates/packaging_templates/setup.py.jinja2 +++ b/packages/http-client-python/generator/pygen/codegen/templates/packaging_templates/setup.py.jinja2 @@ -69,7 +69,7 @@ setup( "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", - {% for version in range(min_version, max_version) %} + {% for version in range(min_version, max_version + 1) %} "Programming Language :: Python :: 3.{{ version }}", {% endfor %} "License :: OSI Approved :: MIT License", From 42074a0477a6efb3c5a39a1e06ed9344ec11de1c Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Wed, 16 Apr 2025 12:37:40 +0800 Subject: [PATCH 2/2] fix for setup.py --- .../changes/python-fix-2024-04-16-2025-3-16-12-37-31.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .chronus/changes/python-fix-2024-04-16-2025-3-16-12-37-31.md diff --git a/.chronus/changes/python-fix-2024-04-16-2025-3-16-12-37-31.md b/.chronus/changes/python-fix-2024-04-16-2025-3-16-12-37-31.md new file mode 100644 index 00000000000..6086eefffad --- /dev/null +++ b/.chronus/changes/python-fix-2024-04-16-2025-3-16-12-37-31.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-python" +--- + +Fix for setup.py \ No newline at end of file