From 9393ef5c10aa9b503063461ac64ef3c0565e5db4 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 5 Nov 2025 17:09:26 +0800 Subject: [PATCH 1/2] fix poetry 2 httpx dependencies --- .../src/main/resources/python/pyproject.mustache | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python/pyproject.mustache b/modules/openapi-generator/src/main/resources/python/pyproject.mustache index eaa40ba035f6..6cd7936be558 100644 --- a/modules/openapi-generator/src/main/resources/python/pyproject.mustache +++ b/modules/openapi-generator/src/main/resources/python/pyproject.mustache @@ -61,10 +61,13 @@ requires-python = ">=3.9" dependencies = [ "urllib3 (>=2.1.0,<3.0.0)", "python-dateutil (>=2.8.2)", -{{#async}} +{{#httpx}} + "httpx (>=0.28.1)", +{{/httpx}} +{{#asyncio}} "aiohttp (>=3.8.4)", "aiohttp-retry (>=2.8.3)", -{{/async}} +{{/asyncio}} {{#tornado}} "tornado (>=4.2,<5)", {{/tornado}} From 464988550c0a5f1aa6a005cc0397bd11c7513345 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 5 Nov 2025 17:10:26 +0800 Subject: [PATCH 2/2] use poetry 2 for tests --- bin/configs/python-httpx.yaml | 2 +- .../petstore/python-httpx/pyproject.toml | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/bin/configs/python-httpx.yaml b/bin/configs/python-httpx.yaml index 3928bfc0425a..afc0b04ee9c0 100644 --- a/bin/configs/python-httpx.yaml +++ b/bin/configs/python-httpx.yaml @@ -6,7 +6,7 @@ library: httpx additionalProperties: packageName: petstore_api mapNumberTo: float - poetry1: true + poetry1: false nameMappings: _type: underscore_type type_: type_with_underscore diff --git a/samples/openapi3/client/petstore/python-httpx/pyproject.toml b/samples/openapi3/client/petstore/python-httpx/pyproject.toml index be0496a95898..6ed9055b00f6 100644 --- a/samples/openapi3/client/petstore/python-httpx/pyproject.toml +++ b/samples/openapi3/client/petstore/python-httpx/pyproject.toml @@ -1,25 +1,32 @@ -[tool.poetry] +[project] name = "petstore_api" version = "1.0.0" description = "OpenAPI Petstore" -authors = ["OpenAPI Generator Community "] -license = "Apache-2.0" +authors = [ + {name = "OpenAPI Generator Community",email = "team@openapitools.org"}, +] +license = { text = "Apache-2.0" } readme = "README.md" -repository = "https://github.com/GIT_USER_ID/GIT_REPO_ID" keywords = ["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"] -include = ["petstore_api/py.typed"] +requires-python = ">=3.9" + +dependencies = [ + "urllib3 (>=2.1.0,<3.0.0)", + "python-dateutil (>=2.8.2)", + "httpx (>=0.28.1)", + "pem (>=19.3.0)", + "pycryptodome (>=3.9.0)", + "pydantic (>=2)", + "typing-extensions (>=4.7.1)", +] + +[project.urls] +Repository = "https://github.com/GIT_USER_ID/GIT_REPO_ID" -[tool.poetry.dependencies] -python = "^3.9" -urllib3 = ">= 2.1.0, < 3.0.0" -python-dateutil = ">= 2.8.2" -httpx = ">= 0.28.1" -pem = ">= 19.3.0" -pycryptodome = ">= 3.9.0" -pydantic = ">= 2" -typing-extensions = ">= 4.7.1" +[tool.poetry] +requires-poetry = ">=2.0" -[tool.poetry.dev-dependencies] +[tool.poetry.group.dev.dependencies] pytest = ">= 7.2.1" pytest-cov = ">= 2.8.1" tox = ">= 3.9.0"