Add glue pyproject updates to cookiecutter

Author: mdellweg

cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pyproject.toml

@@ -38,13 +38,6 @@ namespaces = true
 [tool.setuptools.package-data]
 "*" = ["py.typed", "locale/*/LC_MESSAGES/*.mo"]
 
-[tool.black]
-line-length = 100
-
-[tool.isort]
-profile = "black"
-line_length = 100
-
 [tool.mypy]
 strict = true
 show_error_codes = true

cookiecutter/ci/hooks/post_gen_project.py

@@ -4,23 +4,27 @@
 
 import tomlkit
 
-# Merge pyproject.toml.update into pyproject.toml
-with open("pyproject.toml", "r") as fp:
-    pyproject_toml = tomlkit.load(fp)
+for base_path in [
+    ".",
+    "pulp-glue{{ cookiecutter.__app_label_suffix }}",
+]:
+    # Merge pyproject.toml.update into pyproject.toml
+    with open(os.path.join(base_path, "pyproject.toml"), "r") as fp:
+        pyproject_toml = tomlkit.load(fp)
 
-with open("pyproject.toml.update", "r") as fp:
-    pyproject_toml_update = tomlkit.load(fp)
+    with open(os.path.join(base_path, "pyproject.toml.update"), "r") as fp:
+        pyproject_toml_update = tomlkit.load(fp)
 
-# TODO How deep is your merge?
-# Is merging on the tool level appropriate?
-pyproject_toml["tool"].update(pyproject_toml_update["tool"])
+    # TODO How deep is your merge?
+    # Is merging on the tool level appropriate?
+    pyproject_toml["tool"].update(pyproject_toml_update["tool"])
 
-# Remove legacy tools.
-for tool in ["flake8", "black", "isort"]:
-    pyproject_toml["tool"].pop(tool, None)
+    # Remove legacy tools.
+    for tool in ["flake8", "black", "isort"]:
+        pyproject_toml["tool"].pop(tool, None)
 
-with open("pyproject.toml", "w") as fp:
-    tomlkit.dump(pyproject_toml, fp)
+    with open(os.path.join(base_path, "pyproject.toml"), "w") as fp:
+        tomlkit.dump(pyproject_toml, fp)
 
 # Remove unwanted files
 
@@ -31,6 +35,8 @@
     {%- if not cookiecutter.glue %}
     "pulp-glue{{ cookiecutter.__app_label_suffix }}",
     "CHANGES/pulp-glue{{ cookiecutter.__app_label_suffix }}",
+    {%- else %}
+    "pulp-glue{{ cookiecutter.__app_label_suffix }}/pyproject.toml.update",
     {%- endif %}
     {%- if not cookiecutter.app_label or not cookiecutter.glue %}
     ".ci/scripts/check_cli_dependencies.py",

cookiecutter/ci/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pyproject.toml.update

@@ -0,0 +1,37 @@
+{#
+  This file is not templated for itself, but it is used to update sections in pyproject.toml.
+#}
+
+[tool.setuptools.packages.find]
+# This section is managed by the cookiecutter templates.
+where = ["."]
+include = ["pulp_glue.*"]
+namespaces = true
+
+[tool.setuptools.package-data]
+# This section is managed by the cookiecutter templates.
+"*" = ["py.typed"{% if cookiecutter.translations %}, "locale/*/LC_MESSAGES/*.mo"{% endif %}]
+
+[tool.ruff]
+# This section is managed by the cookiecutter templates.
+line-length = 100
+
+[tool.ruff.lint]
+# This section is managed by the cookiecutter templates.
+extend-select = ["I"]
+
+[tool.mypy]
+# This section is managed by the cookiecutter templates.
+strict = true
+warn_unused_ignores = false
+show_error_codes = true
+files = "pulp_glue/**/*.py, tests/**/*.py"
+namespace_packages = true
+explicit_package_bases = true
+
+[[tool.mypy.overrides]]
+# This section is managed by the cookiecutter templates.
+module = [
+  "schema.*",
+]
+ignore_missing_imports = true

pulp-glue/pulp_glue/common/context.py

@@ -8,6 +8,7 @@
 from contextlib import ExitStack
 
 from packaging.specifiers import SpecifierSet
+
 from pulp_glue.common.exceptions import (
     NotImplementedFake,
     OpenAPIError,

pulp-glue/pulp_glue/common/openapi.py

@@ -14,6 +14,7 @@
 import requests
 import urllib3
 from multidict import CIMultiDict, MutableMultiMapping
+
 from pulp_glue.common import __version__
 from pulp_glue.common.exceptions import (
     OpenAPIError,

pulp-glue/pyproject.toml

@@ -35,29 +35,37 @@ repository = "https://github.com/pulp/pulp-cli"
 changelog = "https://pulpproject.org/pulp-cli/changes/"
 
 [tool.setuptools.packages.find]
+# This section is managed by the cookiecutter templates.
 where = ["."]
 include = ["pulp_glue.*"]
 namespaces = true
 
 [tool.setuptools.package-data]
+# This section is managed by the cookiecutter templates.
 "*" = ["py.typed", "locale/*/LC_MESSAGES/*.mo"]
 
-[tool.black]
-line-length = 100
-
-[tool.isort]
-profile = "black"
-line_length = 100
 
 [tool.mypy]
+# This section is managed by the cookiecutter templates.
 strict = true
+warn_unused_ignores = false
 show_error_codes = true
 files = "pulp_glue/**/*.py, tests/**/*.py"
 namespace_packages = true
 explicit_package_bases = true
 
 [[tool.mypy.overrides]]
+# This section is managed by the cookiecutter templates.
 module = [
   "schema.*",
 ]
 ignore_missing_imports = true
+
+[tool.ruff]
+# This section is managed by the cookiecutter templates.
+line-length = 100
+
+[tool.ruff.lint]
+# This section is managed by the cookiecutter templates.
+extend-select = ["I"]
+

pulp-glue/tests/conftest.py

@@ -3,6 +3,7 @@
 import typing as t
 
 import pytest
+
 from pulp_glue.common.context import PulpContext
 from pulp_glue.common.openapi import BasicAuthProvider, OpenAPI
 

pulp-glue/tests/test_api_quirks.py

@@ -1,6 +1,7 @@
 from copy import deepcopy
 
 import pytest
+
 from pulp_glue.common.context import _REGISTERED_API_QUIRKS, PulpContext
 
 pytestmark = pytest.mark.glue

pulp-glue/tests/test_auth_provider.py

@@ -1,9 +1,10 @@
 import typing as t
 
 import pytest
+from requests.auth import AuthBase
+
 from pulp_glue.common.exceptions import OpenAPIError
 from pulp_glue.common.openapi import AuthProviderBase
-from requests.auth import AuthBase
 
 pytestmark = pytest.mark.glue
 

pulp-glue/tests/test_authentication.py

@@ -1,6 +1,7 @@
 import typing as t
 
 import pytest
+
 from pulp_glue.common.authentication import OAuth2ClientCredentialsAuth
 
 pytestmark = pytest.mark.glue