Harmonize python client dependency versions (#19694)

Co-authored-by: Pascal Bachor <bachorp@users.noreply.github.com>

modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache

@@ -26,15 +26,21 @@ This python library package is generated without supporting files like setup.py
 
 To be able to use it, you will need these dependencies in your own package that uses this library:
 
-* urllib3 >= 1.25.3
+* urllib3 >= 1.25.3, < 3.0.0
-* python-dateutil
+* python-dateutil >= 2.8.2
 {{#asyncio}}
-* aiohttp
+* aiohttp >= 3.8.4
+* aiohttp-retry >= 2.8.3
 {{/asyncio}}
 {{#tornado}}
-* tornado>=4.2,<5
+* tornado >= 4.2, < 5
 {{/tornado}}
-* pydantic
+{{#hasHttpSignatureMethods}}
+* pem >= 19.3.0
+* pycryptodome >= 3.9.0
+{{/hasHttpSignatureMethods}}
+* pydantic >= 2
+* typing-extensions >= 4.7.1
 
 ## Getting Started
 

modules/openapi-generator/src/main/resources/python/gitlab-ci.mustache

@@ -14,9 +14,6 @@ stages:
    - pip install -r test-requirements.txt
    - pytest --cov={{{packageName}}}
 
-pytest-3.7:
-  extends: .pytest
-  image: python:3.7-alpine
 pytest-3.8:
   extends: .pytest
   image: python:3.8-alpine
@@ -29,3 +26,6 @@ pytest-3.10:
 pytest-3.11:
   extends: .pytest
   image: python:3.11-alpine
+pytest-3.12:
+  extends: .pytest
+  image: python:3.12-alpine

modules/openapi-generator/src/main/resources/python/pyproject.mustache

@@ -12,21 +12,21 @@ include = ["{{packageName}}/py.typed"]
 [tool.poetry.dependencies]
 python = "^3.8"
 
-urllib3 = ">= 1.25.3"
+urllib3 = ">= 1.25.3 < 3.0.0"
-python-dateutil = ">=2.8.2"
+python-dateutil = ">= 2.8.2"
 {{#asyncio}}
 aiohttp = ">= 3.8.4"
 aiohttp-retry = ">= 2.8.3"
 {{/asyncio}}
 {{#tornado}}
-tornado = ">=4.2,<5"
+tornado = ">=4.2 <5"
 {{/tornado}}
 {{#hasHttpSignatureMethods}}
 pem = ">= 19.3.0"
 pycryptodome = ">= 3.9.0"
 {{/hasHttpSignatureMethods}}
-pydantic = ">=2"
+pydantic = ">= 2"
-typing-extensions = ">=4.7.1"
+typing-extensions = ">= 4.7.1"
 
 [tool.poetry.dev-dependencies]
 pytest = ">=7.2.1"

modules/openapi-generator/src/main/resources/python/requirements.mustache

@@ -1,12 +1,15 @@
-python_dateutil >= 2.5.3
-setuptools >= 21.0.0
 urllib3 >= 1.25.3, < 3.0.0
-pydantic >= 2
+python_dateutil >= 2.8.2
-typing-extensions >= 4.7.1
 {{#asyncio}}
-aiohttp >= 3.0.0
+aiohttp >= 3.8.4
 aiohttp-retry >= 2.8.3
 {{/asyncio}}
+{{#tornado}}
+tornado = ">= 4.2, < 5"
+{{/tornado}}
 {{#hasHttpSignatureMethods}}
+pem >= 19.3.0
 pycryptodome >= 3.9.0
 {{/hasHttpSignatureMethods}}
+pydantic >= 2
+typing-extensions >= 4.7.1

modules/openapi-generator/src/main/resources/python/setup.mustache

@@ -12,23 +12,23 @@ from setuptools import setup, find_packages  # noqa: H301
 # http://pypi.python.org/pypi/setuptools
 NAME = "{{{projectName}}}"
 VERSION = "{{packageVersion}}"
-PYTHON_REQUIRES = ">=3.7"
+PYTHON_REQUIRES = ">= 3.8"
 {{#apiInfo}}
 {{#apis}}
 {{#-last}}
 REQUIRES = [
     "urllib3 >= 1.25.3, < 3.0.0",
-    "python-dateutil",
+    "python-dateutil >= 2.8.2",
 {{#asyncio}}
-    "aiohttp >= 3.0.0",
+    "aiohttp >= 3.8.4",
     "aiohttp-retry >= 2.8.3",
 {{/asyncio}}
 {{#tornado}}
-    "tornado>=4.2,<5",
+    "tornado>=4.2, < 5",
 {{/tornado}}
 {{#hasHttpSignatureMethods}}
-    "pem>=19.3.0",
+    "pem >= 19.3.0",
-    "pycryptodome>=3.9.0",
+    "pycryptodome >= 3.9.0",
 {{/hasHttpSignatureMethods}}
     "pydantic >= 2",
     "typing-extensions >= 4.7.1",

modules/openapi-generator/src/main/resources/python/test-requirements.mustache

@@ -1,5 +1,5 @@
-pytest~=7.1.3
+pytest >= 7.2.1
-pytest-cov>=2.8.1
+tox >= 3.9.0
-pytest-randomly>=3.12.0
+flake8 >= 4.0.0
-mypy>=1.4.1
+types-python-dateutil >= 2.8.19.14
-types-python-dateutil>=2.8.19
+mypy >= 1.5

modules/openapi-generator/src/main/resources/python/travis.mustache

@@ -1,13 +1,13 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "3.7"
   - "3.8"
   - "3.9"
   - "3.10"
   - "3.11"
+  - "3.12"
   # uncomment the following if needed
-  #- "3.11-dev"  # 3.11 development branch
+  #- "3.12-dev"  # 3.12 development branch
   #- "nightly"  # nightly build
 # command to install dependencies
 install:

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.gitlab-ci.yml

@@ -14,9 +14,6 @@ stages:
    - pip install -r test-requirements.txt
    - pytest --cov=openapi_client
 
-pytest-3.7:
-  extends: .pytest
-  image: python:3.7-alpine
 pytest-3.8:
   extends: .pytest
   image: python:3.8-alpine
@@ -29,3 +26,6 @@ pytest-3.10:
 pytest-3.11:
   extends: .pytest
   image: python:3.11-alpine
+pytest-3.12:
+  extends: .pytest
+  image: python:3.12-alpine

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.travis.yml

@@ -1,13 +1,13 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "3.7"
   - "3.8"
   - "3.9"
   - "3.10"
   - "3.11"
+  - "3.12"
   # uncomment the following if needed
-  #- "3.11-dev"  # 3.11 development branch
+  #- "3.12-dev"  # 3.12 development branch
   #- "nightly"  # nightly build
 # command to install dependencies
 install:

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml

@@ -12,10 +12,10 @@ include = ["openapi_client/py.typed"]
 [tool.poetry.dependencies]
 python = "^3.8"
 
-urllib3 = ">= 1.25.3"
+urllib3 = ">= 1.25.3 < 3.0.0"
-python-dateutil = ">=2.8.2"
+python-dateutil = ">= 2.8.2"
-pydantic = ">=2"
+pydantic = ">= 2"
-typing-extensions = ">=4.7.1"
+typing-extensions = ">= 4.7.1"
 
 [tool.poetry.dev-dependencies]
 pytest = ">=7.2.1"

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/requirements.txt

@@ -1,5 +1,4 @@
-python_dateutil >= 2.5.3
-setuptools >= 21.0.0
 urllib3 >= 1.25.3, < 3.0.0
+python_dateutil >= 2.8.2
 pydantic >= 2
 typing-extensions >= 4.7.1

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.py

@@ -23,10 +23,10 @@ from setuptools import setup, find_packages  # noqa: H301
 # http://pypi.python.org/pypi/setuptools
 NAME = "openapi-client"
 VERSION = "1.0.0"
-PYTHON_REQUIRES = ">=3.7"
+PYTHON_REQUIRES = ">= 3.8"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 3.0.0",
-    "python-dateutil",
+    "python-dateutil >= 2.8.2",
     "pydantic >= 2",
     "typing-extensions >= 4.7.1",
 ]

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test-requirements.txt

@@ -1,5 +1,5 @@
-pytest~=7.1.3
+pytest >= 7.2.1
-pytest-cov>=2.8.1
+tox >= 3.9.0
-pytest-randomly>=3.12.0
+flake8 >= 4.0.0
-mypy>=1.4.1
+types-python-dateutil >= 2.8.19.14
-types-python-dateutil>=2.8.19
+mypy >= 1.5

samples/client/echo_api/python/.gitlab-ci.yml

@@ -14,9 +14,6 @@ stages:
    - pip install -r test-requirements.txt
    - pytest --cov=openapi_client
 
-pytest-3.7:
-  extends: .pytest
-  image: python:3.7-alpine
 pytest-3.8:
   extends: .pytest
   image: python:3.8-alpine
@@ -29,3 +26,6 @@ pytest-3.10:
 pytest-3.11:
   extends: .pytest
   image: python:3.11-alpine
+pytest-3.12:
+  extends: .pytest
+  image: python:3.12-alpine

samples/client/echo_api/python/.travis.yml

@@ -1,13 +1,13 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "3.7"
   - "3.8"
   - "3.9"
   - "3.10"
   - "3.11"
+  - "3.12"
   # uncomment the following if needed
-  #- "3.11-dev"  # 3.11 development branch
+  #- "3.12-dev"  # 3.12 development branch
   #- "nightly"  # nightly build
 # command to install dependencies
 install:

samples/client/echo_api/python/pyproject.toml

@@ -12,10 +12,10 @@ include = ["openapi_client/py.typed"]
 [tool.poetry.dependencies]
 python = "^3.8"
 
-urllib3 = ">= 1.25.3"
+urllib3 = ">= 1.25.3 < 3.0.0"
-python-dateutil = ">=2.8.2"
+python-dateutil = ">= 2.8.2"
-pydantic = ">=2"
+pydantic = ">= 2"
-typing-extensions = ">=4.7.1"
+typing-extensions = ">= 4.7.1"
 
 [tool.poetry.dev-dependencies]
 pytest = ">=7.2.1"

samples/client/echo_api/python/requirements.txt

@@ -1,5 +1,4 @@
-python_dateutil >= 2.5.3
-setuptools >= 21.0.0
 urllib3 >= 1.25.3, < 3.0.0
+python_dateutil >= 2.8.2
 pydantic >= 2
 typing-extensions >= 4.7.1

samples/client/echo_api/python/setup.py

@@ -23,10 +23,10 @@ from setuptools import setup, find_packages  # noqa: H301
 # http://pypi.python.org/pypi/setuptools
 NAME = "openapi-client"
 VERSION = "1.0.0"
-PYTHON_REQUIRES = ">=3.7"
+PYTHON_REQUIRES = ">= 3.8"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 3.0.0",
-    "python-dateutil",
+    "python-dateutil >= 2.8.2",
     "pydantic >= 2",
     "typing-extensions >= 4.7.1",
 ]

samples/client/echo_api/python/test-requirements.txt

@@ -1,5 +1,5 @@
-pytest~=7.1.3
+pytest >= 7.2.1
-pytest-cov>=2.8.1
+tox >= 3.9.0
-pytest-randomly>=3.12.0
+flake8 >= 4.0.0
-mypy>=1.4.1
+types-python-dateutil >= 2.8.19.14
-types-python-dateutil>=2.8.19
+mypy >= 1.5

samples/openapi3/client/petstore/python-aiohttp/.gitlab-ci.yml

@@ -14,9 +14,6 @@ stages:
    - pip install -r test-requirements.txt
    - pytest --cov=petstore_api
 
-pytest-3.7:
-  extends: .pytest
-  image: python:3.7-alpine
 pytest-3.8:
   extends: .pytest
   image: python:3.8-alpine
@@ -29,3 +26,6 @@ pytest-3.10:
 pytest-3.11:
   extends: .pytest
   image: python:3.11-alpine
+pytest-3.12:
+  extends: .pytest
+  image: python:3.12-alpine

samples/openapi3/client/petstore/python-aiohttp/.travis.yml

@@ -1,13 +1,13 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "3.7"
   - "3.8"
   - "3.9"
   - "3.10"
   - "3.11"
+  - "3.12"
   # uncomment the following if needed
-  #- "3.11-dev"  # 3.11 development branch
+  #- "3.12-dev"  # 3.12 development branch
   #- "nightly"  # nightly build
 # command to install dependencies
 install:

samples/openapi3/client/petstore/python-aiohttp/pyproject.toml

@@ -12,14 +12,14 @@ include = ["petstore_api/py.typed"]
 [tool.poetry.dependencies]
 python = "^3.8"
 
-urllib3 = ">= 1.25.3"
+urllib3 = ">= 1.25.3 < 3.0.0"
-python-dateutil = ">=2.8.2"
+python-dateutil = ">= 2.8.2"
 aiohttp = ">= 3.8.4"
 aiohttp-retry = ">= 2.8.3"
 pem = ">= 19.3.0"
 pycryptodome = ">= 3.9.0"
-pydantic = ">=2"
+pydantic = ">= 2"
-typing-extensions = ">=4.7.1"
+typing-extensions = ">= 4.7.1"
 
 [tool.poetry.dev-dependencies]
 pytest = ">=7.2.1"

samples/openapi3/client/petstore/python-aiohttp/requirements.txt

@@ -1,8 +1,8 @@
-python_dateutil >= 2.5.3
-setuptools >= 21.0.0
 urllib3 >= 1.25.3, < 3.0.0
+python_dateutil >= 2.8.2
+aiohttp >= 3.8.4
+aiohttp-retry >= 2.8.3
+pem >= 19.3.0
+pycryptodome >= 3.9.0
 pydantic >= 2
 typing-extensions >= 4.7.1
-aiohttp >= 3.0.0
-aiohttp-retry >= 2.8.3
-pycryptodome >= 3.9.0

samples/openapi3/client/petstore/python-aiohttp/setup.py

@@ -22,14 +22,14 @@ from setuptools import setup, find_packages  # noqa: H301
 # http://pypi.python.org/pypi/setuptools
 NAME = "petstore-api"
 VERSION = "1.0.0"
-PYTHON_REQUIRES = ">=3.7"
+PYTHON_REQUIRES = ">= 3.8"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 3.0.0",
-    "python-dateutil",
+    "python-dateutil >= 2.8.2",
-    "aiohttp >= 3.0.0",
+    "aiohttp >= 3.8.4",
     "aiohttp-retry >= 2.8.3",
-    "pem>=19.3.0",
+    "pem >= 19.3.0",
-    "pycryptodome>=3.9.0",
+    "pycryptodome >= 3.9.0",
     "pydantic >= 2",
     "typing-extensions >= 4.7.1",
 ]

samples/openapi3/client/petstore/python-aiohttp/test-requirements.txt

@@ -1,5 +1,5 @@
-pytest~=7.1.3
+pytest >= 7.2.1
-pytest-cov>=2.8.1
+tox >= 3.9.0
-pytest-randomly>=3.12.0
+flake8 >= 4.0.0
-mypy>=1.4.1
+types-python-dateutil >= 2.8.19.14
-types-python-dateutil>=2.8.19
+mypy >= 1.5

samples/openapi3/client/petstore/python/.gitlab-ci.yml

@@ -14,9 +14,6 @@ stages:
    - pip install -r test-requirements.txt
    - pytest --cov=petstore_api
 
-pytest-3.7:
-  extends: .pytest
-  image: python:3.7-alpine
 pytest-3.8:
   extends: .pytest
   image: python:3.8-alpine
@@ -29,3 +26,6 @@ pytest-3.10:
 pytest-3.11:
   extends: .pytest
   image: python:3.11-alpine
+pytest-3.12:
+  extends: .pytest
+  image: python:3.12-alpine

samples/openapi3/client/petstore/python/.travis.yml

@@ -1,13 +1,13 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "3.7"
   - "3.8"
   - "3.9"
   - "3.10"
   - "3.11"
+  - "3.12"
   # uncomment the following if needed
-  #- "3.11-dev"  # 3.11 development branch
+  #- "3.12-dev"  # 3.12 development branch
   #- "nightly"  # nightly build
 # command to install dependencies
 install:

samples/openapi3/client/petstore/python/pyproject.toml

@@ -12,12 +12,12 @@ include = ["petstore_api/py.typed"]
 [tool.poetry.dependencies]
 python = "^3.8"
 
-urllib3 = ">= 1.25.3"
+urllib3 = ">= 1.25.3 < 3.0.0"
-python-dateutil = ">=2.8.2"
+python-dateutil = ">= 2.8.2"
 pem = ">= 19.3.0"
 pycryptodome = ">= 3.9.0"
-pydantic = ">=2"
+pydantic = ">= 2"
-typing-extensions = ">=4.7.1"
+typing-extensions = ">= 4.7.1"
 
 [tool.poetry.dev-dependencies]
 pytest = ">=7.2.1"

samples/openapi3/client/petstore/python/requirements.txt

@@ -1,6 +1,6 @@
-python_dateutil >= 2.5.3
-setuptools >= 21.0.0
 urllib3 >= 1.25.3, < 3.0.0
+python_dateutil >= 2.8.2
+pem >= 19.3.0
+pycryptodome >= 3.9.0
 pydantic >= 2
 typing-extensions >= 4.7.1
-pycryptodome >= 3.9.0

samples/openapi3/client/petstore/python/setup.py

@@ -22,12 +22,12 @@ from setuptools import setup, find_packages  # noqa: H301
 # http://pypi.python.org/pypi/setuptools
 NAME = "petstore-api"
 VERSION = "1.0.0"
-PYTHON_REQUIRES = ">=3.7"
+PYTHON_REQUIRES = ">= 3.8"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 3.0.0",
-    "python-dateutil",
+    "python-dateutil >= 2.8.2",
-    "pem>=19.3.0",
+    "pem >= 19.3.0",
-    "pycryptodome>=3.9.0",
+    "pycryptodome >= 3.9.0",
     "pydantic >= 2",
     "typing-extensions >= 4.7.1",
 ]

samples/openapi3/client/petstore/python/test-requirements.txt

@@ -1,5 +1,5 @@
-pytest~=7.1.3
+pytest >= 7.2.1
-pytest-cov>=2.8.1
+tox >= 3.9.0
-pytest-randomly>=3.12.0
+flake8 >= 4.0.0
-mypy>=1.4.1
+types-python-dateutil >= 2.8.19.14
-types-python-dateutil>=2.8.19
+mypy >= 1.5