From 57c17719584b52de48b5a44c230c9515c34010f5 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Wed, 20 Nov 2024 11:47:44 +0100 Subject: [PATCH 1/3] Bump build dependencies Signed-off-by: Leandro Lucarella --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3c089b67..c76e9b65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ # Copyright © 2023 Frequenz Energy-as-a-Service GmbH [build-system] -requires = ["setuptools == 68.1.0", "setuptools_scm[toml] == 8.1.0"] +requires = ["setuptools == 75.5.0", "setuptools_scm[toml] == 8.1.0"] build-backend = "setuptools.build_meta" [project] From 22ce6e192800e9a2bed308350b672d644a23fbef Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Wed, 20 Nov 2024 13:05:22 +0100 Subject: [PATCH 2/3] Bump most dependencies in the template Signed-off-by: Leandro Lucarella --- RELEASE_NOTES.md | 2 +- .../pyproject.toml | 36 +++++++++---------- .../actor/frequenz-actor-test/pyproject.toml | 34 +++++++++--------- .../api/frequenz-api-test/pyproject.toml | 30 ++++++++-------- .../app/frequenz-app-test/pyproject.toml | 34 +++++++++--------- .../lib/frequenz-test-python/pyproject.toml | 32 ++++++++--------- .../model/frequenz-model-test/pyproject.toml | 34 +++++++++--------- 7 files changed, 101 insertions(+), 101 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 9190bdad..043765dc 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -23,7 +23,7 @@ * API projects don't include the `google-common-protos` dependency by default. * API projects updated the `grpcio` dependency to `1.66.1`. * API projects updated the `frequenz-api-common` dependency to `0.6`. -* Update the SDK dependency to `1.0.0rc901`. +* Bump most of the dependencies. * Change `edit_uri` default branch to v0.x.x in mkdocs.yml. * Added a new default option `asyncio_default_fixture_loop_scope = "function"` for `pytest-asyncio` as not providing a value is deprecated. * The migration script is now written in Python, so it should be (hopefully) more compatible with different OSes. diff --git a/cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml b/cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml index 56a43e38..9a42c784 100644 --- a/cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml +++ b/cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "setuptools == 70.1.1", + "setuptools == 75.5.0", "setuptools_scm[toml] == 8.1.0", "frequenz-repo-config[{{cookiecutter.type}}] == 0.10.0", {%- if cookiecutter.type == "api" %} @@ -44,11 +44,11 @@ requires-python = ">= 3.11, < 4" # TODO(cookiecutter): Remove and add more dependencies if appropriate {%- if cookiecutter.type in ("app", "actor", "model") %} dependencies = [ - "typing-extensions == 4.6.1", + "typing-extensions == 4.12.2", # Make sure to update the version for cross-referencing also in the # mkdocs.yml file when changing the version here (look for the config key # plugins.mkdocstrings.handlers.python.import) - "frequenz-sdk >= 1.0.0rc901, < 1.0.0rc1000", + "frequenz-sdk >= 1.0.0rc1300, < 1.0.0rc1400", ] {%- elif cookiecutter.type == "api" %} dependencies = [ @@ -64,7 +64,7 @@ dependencies = [ ] {%- else %} dependencies = [ - "typing-extensions >= 4.5.0, < 5", + "typing-extensions >= 4.12.2, < 5", ] {%- endif %} dynamic = ["version"] @@ -76,23 +76,23 @@ email = "{{cookiecutter.author_email}}" # TODO(cookiecutter): Remove and add more optional dependencies if appropriate [project.optional-dependencies] dev-flake8 = [ - "flake8 == 7.1.0", + "flake8 == 7.1.1", "flake8-docstrings == 1.7.0", "flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml - "pydoclint == 0.5.3", + "pydoclint == 0.5.9", "pydocstyle == 6.3.0", ] -dev-formatting = ["black == 24.4.2", "isort == 5.13.2"] +dev-formatting = ["black == 24.10.0", "isort == 5.13.2"] dev-mkdocs = [ - "Markdown == 3.6.0", - "black == 24.4.2", - "mike == 2.1.2", + "Markdown == 3.7", + "black == 24.10.0", + "mike == 2.1.3", "mkdocs-gen-files == 0.5.0", "mkdocs-literate-nav == 0.6.1", - "mkdocs-macros-plugin == 1.0.5", - "mkdocs-material == 9.5.27", - "mkdocstrings[python] == 0.26.1", - "mkdocstrings-python == 1.11.1", + "mkdocs-macros-plugin == 1.3.7", + "mkdocs-material == 9.5.45", + "mkdocstrings[python] == 0.27.0", + "mkdocstrings-python == 1.12.2", "frequenz-repo-config[{{cookiecutter.type}}] == 0.10.0", ] dev-mypy = [ @@ -100,12 +100,12 @@ dev-mypy = [ {%- if cookiecutter.type == "api" %} "grpc-stubs == 1.53.0.2", {%- endif %} - "types-Markdown == 3.6.0.20240316", + "types-Markdown == 3.7.0.20240822", # For checking the noxfile, docs/ script, and tests "{{cookiecutter.pypi_package_name}}[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-noxfile = [ - "nox == 2024.4.15", + "nox == 2024.10.9", "frequenz-repo-config[{{cookiecutter.type}}] == 0.10.0", ] dev-pylint = [ @@ -114,8 +114,8 @@ dev-pylint = [ "{{cookiecutter.pypi_package_name}}[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-pytest = [ - "pytest == 8.2.2", - "pylint == 3.2.5", # We need this to check for the examples + "pytest == 8.3.3", + "pylint == 3.3.1", # We need this to check for the examples "frequenz-repo-config[extra-lint-examples] == 0.10.0", {%- if cookiecutter.type != "api" %} "pytest-mock == 3.14.0", diff --git a/tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml b/tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml index a8cee941..fc8a8daf 100644 --- a/tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml +++ b/tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "setuptools == 70.1.1", + "setuptools == 75.5.0", "setuptools_scm[toml] == 8.1.0", "frequenz-repo-config[actor] == 0.10.0", ] @@ -28,11 +28,11 @@ classifiers = [ requires-python = ">= 3.11, < 4" # TODO(cookiecutter): Remove and add more dependencies if appropriate dependencies = [ - "typing-extensions == 4.6.1", + "typing-extensions == 4.12.2", # Make sure to update the version for cross-referencing also in the # mkdocs.yml file when changing the version here (look for the config key # plugins.mkdocstrings.handlers.python.import) - "frequenz-sdk >= 1.0.0rc901, < 1.0.0rc1000", + "frequenz-sdk >= 1.0.0rc1300, < 1.0.0rc1400", ] dynamic = ["version"] @@ -43,33 +43,33 @@ email = "floss@frequenz.com" # TODO(cookiecutter): Remove and add more optional dependencies if appropriate [project.optional-dependencies] dev-flake8 = [ - "flake8 == 7.1.0", + "flake8 == 7.1.1", "flake8-docstrings == 1.7.0", "flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml - "pydoclint == 0.5.3", + "pydoclint == 0.5.9", "pydocstyle == 6.3.0", ] -dev-formatting = ["black == 24.4.2", "isort == 5.13.2"] +dev-formatting = ["black == 24.10.0", "isort == 5.13.2"] dev-mkdocs = [ - "Markdown == 3.6.0", - "black == 24.4.2", - "mike == 2.1.2", + "Markdown == 3.7", + "black == 24.10.0", + "mike == 2.1.3", "mkdocs-gen-files == 0.5.0", "mkdocs-literate-nav == 0.6.1", - "mkdocs-macros-plugin == 1.0.5", - "mkdocs-material == 9.5.27", - "mkdocstrings[python] == 0.26.1", - "mkdocstrings-python == 1.11.1", + "mkdocs-macros-plugin == 1.3.7", + "mkdocs-material == 9.5.45", + "mkdocstrings[python] == 0.27.0", + "mkdocstrings-python == 1.12.2", "frequenz-repo-config[actor] == 0.10.0", ] dev-mypy = [ "mypy == 1.9.0", - "types-Markdown == 3.6.0.20240316", + "types-Markdown == 3.7.0.20240822", # For checking the noxfile, docs/ script, and tests "frequenz-actor-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-noxfile = [ - "nox == 2024.4.15", + "nox == 2024.10.9", "frequenz-repo-config[actor] == 0.10.0", ] dev-pylint = [ @@ -78,8 +78,8 @@ dev-pylint = [ "frequenz-actor-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-pytest = [ - "pytest == 8.2.2", - "pylint == 3.2.5", # We need this to check for the examples + "pytest == 8.3.3", + "pylint == 3.3.1", # We need this to check for the examples "frequenz-repo-config[extra-lint-examples] == 0.10.0", "pytest-mock == 3.14.0", "pytest-asyncio == 0.24.0", diff --git a/tests_golden/integration/test_cookiecutter_generation/api/frequenz-api-test/pyproject.toml b/tests_golden/integration/test_cookiecutter_generation/api/frequenz-api-test/pyproject.toml index 4f943ce6..07a7a5c1 100644 --- a/tests_golden/integration/test_cookiecutter_generation/api/frequenz-api-test/pyproject.toml +++ b/tests_golden/integration/test_cookiecutter_generation/api/frequenz-api-test/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "setuptools == 70.1.1", + "setuptools == 75.5.0", "setuptools_scm[toml] == 8.1.0", "frequenz-repo-config[api] == 0.10.0", # We need to pin the protobuf, grpcio and grpcio-tools dependencies to make @@ -54,34 +54,34 @@ email = "floss@frequenz.com" # TODO(cookiecutter): Remove and add more optional dependencies if appropriate [project.optional-dependencies] dev-flake8 = [ - "flake8 == 7.1.0", + "flake8 == 7.1.1", "flake8-docstrings == 1.7.0", "flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml - "pydoclint == 0.5.3", + "pydoclint == 0.5.9", "pydocstyle == 6.3.0", ] -dev-formatting = ["black == 24.4.2", "isort == 5.13.2"] +dev-formatting = ["black == 24.10.0", "isort == 5.13.2"] dev-mkdocs = [ - "Markdown == 3.6.0", - "black == 24.4.2", - "mike == 2.1.2", + "Markdown == 3.7", + "black == 24.10.0", + "mike == 2.1.3", "mkdocs-gen-files == 0.5.0", "mkdocs-literate-nav == 0.6.1", - "mkdocs-macros-plugin == 1.0.5", - "mkdocs-material == 9.5.27", - "mkdocstrings[python] == 0.26.1", - "mkdocstrings-python == 1.11.1", + "mkdocs-macros-plugin == 1.3.7", + "mkdocs-material == 9.5.45", + "mkdocstrings[python] == 0.27.0", + "mkdocstrings-python == 1.12.2", "frequenz-repo-config[api] == 0.10.0", ] dev-mypy = [ "mypy == 1.9.0", "grpc-stubs == 1.53.0.2", - "types-Markdown == 3.6.0.20240316", + "types-Markdown == 3.7.0.20240822", # For checking the noxfile, docs/ script, and tests "frequenz-api-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-noxfile = [ - "nox == 2024.4.15", + "nox == 2024.10.9", "frequenz-repo-config[api] == 0.10.0", ] dev-pylint = [ @@ -90,8 +90,8 @@ dev-pylint = [ "frequenz-api-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-pytest = [ - "pytest == 8.2.2", - "pylint == 3.2.5", # We need this to check for the examples + "pytest == 8.3.3", + "pylint == 3.3.1", # We need this to check for the examples "frequenz-repo-config[extra-lint-examples] == 0.10.0", ] dev = [ diff --git a/tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/pyproject.toml b/tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/pyproject.toml index 909dd9d1..d9d6efa2 100644 --- a/tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/pyproject.toml +++ b/tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "setuptools == 70.1.1", + "setuptools == 75.5.0", "setuptools_scm[toml] == 8.1.0", "frequenz-repo-config[app] == 0.10.0", ] @@ -27,11 +27,11 @@ classifiers = [ requires-python = ">= 3.11, < 4" # TODO(cookiecutter): Remove and add more dependencies if appropriate dependencies = [ - "typing-extensions == 4.6.1", + "typing-extensions == 4.12.2", # Make sure to update the version for cross-referencing also in the # mkdocs.yml file when changing the version here (look for the config key # plugins.mkdocstrings.handlers.python.import) - "frequenz-sdk >= 1.0.0rc901, < 1.0.0rc1000", + "frequenz-sdk >= 1.0.0rc1300, < 1.0.0rc1400", ] dynamic = ["version"] @@ -42,33 +42,33 @@ email = "floss@frequenz.com" # TODO(cookiecutter): Remove and add more optional dependencies if appropriate [project.optional-dependencies] dev-flake8 = [ - "flake8 == 7.1.0", + "flake8 == 7.1.1", "flake8-docstrings == 1.7.0", "flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml - "pydoclint == 0.5.3", + "pydoclint == 0.5.9", "pydocstyle == 6.3.0", ] -dev-formatting = ["black == 24.4.2", "isort == 5.13.2"] +dev-formatting = ["black == 24.10.0", "isort == 5.13.2"] dev-mkdocs = [ - "Markdown == 3.6.0", - "black == 24.4.2", - "mike == 2.1.2", + "Markdown == 3.7", + "black == 24.10.0", + "mike == 2.1.3", "mkdocs-gen-files == 0.5.0", "mkdocs-literate-nav == 0.6.1", - "mkdocs-macros-plugin == 1.0.5", - "mkdocs-material == 9.5.27", - "mkdocstrings[python] == 0.26.1", - "mkdocstrings-python == 1.11.1", + "mkdocs-macros-plugin == 1.3.7", + "mkdocs-material == 9.5.45", + "mkdocstrings[python] == 0.27.0", + "mkdocstrings-python == 1.12.2", "frequenz-repo-config[app] == 0.10.0", ] dev-mypy = [ "mypy == 1.9.0", - "types-Markdown == 3.6.0.20240316", + "types-Markdown == 3.7.0.20240822", # For checking the noxfile, docs/ script, and tests "frequenz-app-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-noxfile = [ - "nox == 2024.4.15", + "nox == 2024.10.9", "frequenz-repo-config[app] == 0.10.0", ] dev-pylint = [ @@ -77,8 +77,8 @@ dev-pylint = [ "frequenz-app-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-pytest = [ - "pytest == 8.2.2", - "pylint == 3.2.5", # We need this to check for the examples + "pytest == 8.3.3", + "pylint == 3.3.1", # We need this to check for the examples "frequenz-repo-config[extra-lint-examples] == 0.10.0", "pytest-mock == 3.14.0", "pytest-asyncio == 0.24.0", diff --git a/tests_golden/integration/test_cookiecutter_generation/lib/frequenz-test-python/pyproject.toml b/tests_golden/integration/test_cookiecutter_generation/lib/frequenz-test-python/pyproject.toml index 4a91ef03..9b3dbc77 100644 --- a/tests_golden/integration/test_cookiecutter_generation/lib/frequenz-test-python/pyproject.toml +++ b/tests_golden/integration/test_cookiecutter_generation/lib/frequenz-test-python/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "setuptools == 70.1.1", + "setuptools == 75.5.0", "setuptools_scm[toml] == 8.1.0", "frequenz-repo-config[lib] == 0.10.0", ] @@ -28,7 +28,7 @@ classifiers = [ requires-python = ">= 3.11, < 4" # TODO(cookiecutter): Remove and add more dependencies if appropriate dependencies = [ - "typing-extensions >= 4.5.0, < 5", + "typing-extensions >= 4.12.2, < 5", ] dynamic = ["version"] @@ -39,33 +39,33 @@ email = "floss@frequenz.com" # TODO(cookiecutter): Remove and add more optional dependencies if appropriate [project.optional-dependencies] dev-flake8 = [ - "flake8 == 7.1.0", + "flake8 == 7.1.1", "flake8-docstrings == 1.7.0", "flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml - "pydoclint == 0.5.3", + "pydoclint == 0.5.9", "pydocstyle == 6.3.0", ] -dev-formatting = ["black == 24.4.2", "isort == 5.13.2"] +dev-formatting = ["black == 24.10.0", "isort == 5.13.2"] dev-mkdocs = [ - "Markdown == 3.6.0", - "black == 24.4.2", - "mike == 2.1.2", + "Markdown == 3.7", + "black == 24.10.0", + "mike == 2.1.3", "mkdocs-gen-files == 0.5.0", "mkdocs-literate-nav == 0.6.1", - "mkdocs-macros-plugin == 1.0.5", - "mkdocs-material == 9.5.27", - "mkdocstrings[python] == 0.26.1", - "mkdocstrings-python == 1.11.1", + "mkdocs-macros-plugin == 1.3.7", + "mkdocs-material == 9.5.45", + "mkdocstrings[python] == 0.27.0", + "mkdocstrings-python == 1.12.2", "frequenz-repo-config[lib] == 0.10.0", ] dev-mypy = [ "mypy == 1.9.0", - "types-Markdown == 3.6.0.20240316", + "types-Markdown == 3.7.0.20240822", # For checking the noxfile, docs/ script, and tests "frequenz-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-noxfile = [ - "nox == 2024.4.15", + "nox == 2024.10.9", "frequenz-repo-config[lib] == 0.10.0", ] dev-pylint = [ @@ -74,8 +74,8 @@ dev-pylint = [ "frequenz-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-pytest = [ - "pytest == 8.2.2", - "pylint == 3.2.5", # We need this to check for the examples + "pytest == 8.3.3", + "pylint == 3.3.1", # We need this to check for the examples "frequenz-repo-config[extra-lint-examples] == 0.10.0", "pytest-mock == 3.14.0", "pytest-asyncio == 0.24.0", diff --git a/tests_golden/integration/test_cookiecutter_generation/model/frequenz-model-test/pyproject.toml b/tests_golden/integration/test_cookiecutter_generation/model/frequenz-model-test/pyproject.toml index 7705032b..37b5cc84 100644 --- a/tests_golden/integration/test_cookiecutter_generation/model/frequenz-model-test/pyproject.toml +++ b/tests_golden/integration/test_cookiecutter_generation/model/frequenz-model-test/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "setuptools == 70.1.1", + "setuptools == 75.5.0", "setuptools_scm[toml] == 8.1.0", "frequenz-repo-config[model] == 0.10.0", ] @@ -28,11 +28,11 @@ classifiers = [ requires-python = ">= 3.11, < 4" # TODO(cookiecutter): Remove and add more dependencies if appropriate dependencies = [ - "typing-extensions == 4.6.1", + "typing-extensions == 4.12.2", # Make sure to update the version for cross-referencing also in the # mkdocs.yml file when changing the version here (look for the config key # plugins.mkdocstrings.handlers.python.import) - "frequenz-sdk >= 1.0.0rc901, < 1.0.0rc1000", + "frequenz-sdk >= 1.0.0rc1300, < 1.0.0rc1400", ] dynamic = ["version"] @@ -43,33 +43,33 @@ email = "floss@frequenz.com" # TODO(cookiecutter): Remove and add more optional dependencies if appropriate [project.optional-dependencies] dev-flake8 = [ - "flake8 == 7.1.0", + "flake8 == 7.1.1", "flake8-docstrings == 1.7.0", "flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml - "pydoclint == 0.5.3", + "pydoclint == 0.5.9", "pydocstyle == 6.3.0", ] -dev-formatting = ["black == 24.4.2", "isort == 5.13.2"] +dev-formatting = ["black == 24.10.0", "isort == 5.13.2"] dev-mkdocs = [ - "Markdown == 3.6.0", - "black == 24.4.2", - "mike == 2.1.2", + "Markdown == 3.7", + "black == 24.10.0", + "mike == 2.1.3", "mkdocs-gen-files == 0.5.0", "mkdocs-literate-nav == 0.6.1", - "mkdocs-macros-plugin == 1.0.5", - "mkdocs-material == 9.5.27", - "mkdocstrings[python] == 0.26.1", - "mkdocstrings-python == 1.11.1", + "mkdocs-macros-plugin == 1.3.7", + "mkdocs-material == 9.5.45", + "mkdocstrings[python] == 0.27.0", + "mkdocstrings-python == 1.12.2", "frequenz-repo-config[model] == 0.10.0", ] dev-mypy = [ "mypy == 1.9.0", - "types-Markdown == 3.6.0.20240316", + "types-Markdown == 3.7.0.20240822", # For checking the noxfile, docs/ script, and tests "frequenz-model-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-noxfile = [ - "nox == 2024.4.15", + "nox == 2024.10.9", "frequenz-repo-config[model] == 0.10.0", ] dev-pylint = [ @@ -78,8 +78,8 @@ dev-pylint = [ "frequenz-model-test[dev-mkdocs,dev-noxfile,dev-pytest]", ] dev-pytest = [ - "pytest == 8.2.2", - "pylint == 3.2.5", # We need this to check for the examples + "pytest == 8.3.3", + "pylint == 3.3.1", # We need this to check for the examples "frequenz-repo-config[extra-lint-examples] == 0.10.0", "pytest-mock == 3.14.0", "pytest-asyncio == 0.24.0", From 58c31fbeb8568b974177bfb3f89da4236b4765fb Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Wed, 20 Nov 2024 13:40:08 +0100 Subject: [PATCH 3/3] Split dependencies for app and actor/model Actors and models are libraries, so they should provide ranges of dependencies, but apps should always have their dependencies pinned. Signed-off-by: Leandro Lucarella --- .../{{cookiecutter.github_repo_name}}/pyproject.toml | 12 ++++++++++-- .../actor/frequenz-actor-test/pyproject.toml | 2 +- .../app/frequenz-app-test/pyproject.toml | 2 +- .../model/frequenz-model-test/pyproject.toml | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml b/cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml index 9a42c784..8dbd7958 100644 --- a/cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml +++ b/cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml @@ -42,14 +42,22 @@ classifiers = [ ] requires-python = ">= 3.11, < 4" # TODO(cookiecutter): Remove and add more dependencies if appropriate -{%- if cookiecutter.type in ("app", "actor", "model") %} +{%- if cookiecutter.type in ("actor", "model") %} dependencies = [ - "typing-extensions == 4.12.2", + "typing-extensions >= 4.12.2, < 5", # Make sure to update the version for cross-referencing also in the # mkdocs.yml file when changing the version here (look for the config key # plugins.mkdocstrings.handlers.python.import) "frequenz-sdk >= 1.0.0rc1300, < 1.0.0rc1400", ] +{%- elif cookiecutter.type == "app" %} +dependencies = [ + "typing-extensions == 4.12.2", + # Make sure to update the version for cross-referencing also in the + # mkdocs.yml file when changing the version here (look for the config key + # plugins.mkdocstrings.handlers.python.import) + "frequenz-sdk == 1.0.0rc1300", +] {%- elif cookiecutter.type == "api" %} dependencies = [ "frequenz-api-common >= 0.6.2, < 0.7.0", diff --git a/tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml b/tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml index fc8a8daf..632c2e77 100644 --- a/tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml +++ b/tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml @@ -28,7 +28,7 @@ classifiers = [ requires-python = ">= 3.11, < 4" # TODO(cookiecutter): Remove and add more dependencies if appropriate dependencies = [ - "typing-extensions == 4.12.2", + "typing-extensions >= 4.12.2, < 5", # Make sure to update the version for cross-referencing also in the # mkdocs.yml file when changing the version here (look for the config key # plugins.mkdocstrings.handlers.python.import) diff --git a/tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/pyproject.toml b/tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/pyproject.toml index d9d6efa2..5274acad 100644 --- a/tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/pyproject.toml +++ b/tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/pyproject.toml @@ -31,7 +31,7 @@ dependencies = [ # Make sure to update the version for cross-referencing also in the # mkdocs.yml file when changing the version here (look for the config key # plugins.mkdocstrings.handlers.python.import) - "frequenz-sdk >= 1.0.0rc1300, < 1.0.0rc1400", + "frequenz-sdk == 1.0.0rc1300", ] dynamic = ["version"] diff --git a/tests_golden/integration/test_cookiecutter_generation/model/frequenz-model-test/pyproject.toml b/tests_golden/integration/test_cookiecutter_generation/model/frequenz-model-test/pyproject.toml index 37b5cc84..d0e4bef8 100644 --- a/tests_golden/integration/test_cookiecutter_generation/model/frequenz-model-test/pyproject.toml +++ b/tests_golden/integration/test_cookiecutter_generation/model/frequenz-model-test/pyproject.toml @@ -28,7 +28,7 @@ classifiers = [ requires-python = ">= 3.11, < 4" # TODO(cookiecutter): Remove and add more dependencies if appropriate dependencies = [ - "typing-extensions == 4.12.2", + "typing-extensions >= 4.12.2, < 5", # Make sure to update the version for cross-referencing also in the # mkdocs.yml file when changing the version here (look for the config key # plugins.mkdocstrings.handlers.python.import)