Skip to content

Commit 9c283fb

Browse files
committed
Update cookiecutter
1 parent 738155e commit 9c283fb

File tree

19 files changed

+134
-102
lines changed

19 files changed

+134
-102
lines changed

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,3 @@ dependencies = [
2929
[project.urls]
3030
repository = "https://github.com/pulp/{{ cookiecutter.__project_name }}"
3131
changelog = "https://github.com/pulp/{{ cookiecutter.__project_name }}/blob/main/CHANGES.md"
32-
33-
[tool.setuptools.packages.find]
34-
where = ["."]
35-
include = ["pulp_glue.*"]
36-
namespaces = true
37-
38-
[tool.setuptools.package-data]
39-
"*" = ["py.typed", "locale/*/LC_MESSAGES/*.mo"]
40-
41-
[tool.mypy]
42-
strict = true
43-
show_error_codes = true
44-
files = "pulp_glue/**/*.py"
45-
namespace_packages = true
46-
explicit_package_bases = true
47-
48-
[[tool.mypy.overrides]]
49-
module = [
50-
"schema.*",
51-
]
52-
ignore_missing_imports = true

cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pulp_glue/{{ cookiecutter.app_label }}/__init__.py renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/src/pulp_glue/{{ cookiecutter.app_label }}/__init__.py

File renamed without changes.

cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pulp_glue/{{ cookiecutter.app_label }}/context.py renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/src/pulp_glue/{{ cookiecutter.app_label }}/context.py

File renamed without changes.

cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pulp_glue/{{ cookiecutter.app_label }}/py.typed renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/src/pulp_glue/{{ cookiecutter.app_label }}/py.typed

File renamed without changes.

cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulpcore/cli/{{ cookiecutter.app_label }}/__init__.py renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/src/pulpcore/cli/{{ cookiecutter.app_label }}/__init__.py

File renamed without changes.

cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulpcore/cli/{{ cookiecutter.app_label }}/py.typed renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/src/pulpcore/cli/{{ cookiecutter.app_label }}/py.typed

File renamed without changes.

cookiecutter/ci/hooks/post_gen_project.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
# Is merging on the tool level appropriate?
2020
pyproject_toml["tool"].update(pyproject_toml_update["tool"])
2121

22+
if "dependency-groups" in pyproject_toml_update:
23+
if "dependency-groups" not in pyproject_toml:
24+
pyproject_toml["dependency-groups"]=pyproject_toml_update["dependency-groups"]
25+
else:
26+
pyproject_toml["dependency-groups"].update(pyproject_toml_update["dependency-groups"])
27+
2228
# Remove legacy tools.
2329
for tool in ["flake8", "black", "isort"]:
2430
pyproject_toml["tool"].pop(tool, None)

cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/scripts/validate_commit_message.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# /// script
22
# requires-python = ">=3.11"
33
# dependencies = [
4-
# "gitpython>=3.1.46,<3.2.0",
4+
# "pygithub>=2.8.1,<3.0.0",
55
# ]
66
# ///
77

cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,24 @@ jobs:
99
runs-on: "ubuntu-latest"
1010
steps:
1111
- uses: "actions/checkout@v5"
12-
{%- include "cache_action" %}
1312
- name: "Set up Python"
1413
uses: "actions/setup-python@v6"
1514
with:
1615
python-version: "3.14"
17-
- name: "Install python dependencies"
18-
run: |
19-
pip install build setuptools wheel
16+
- name: "Install uv"
17+
uses: "astral-sh/setup-uv@v7"
18+
with:
19+
enable-cache: true
2020
- name: "Build wheels"
2121
run: |
2222
make build
23+
touch .root
2324
- name: "Upload wheels"
2425
uses: "actions/upload-artifact@v4"
2526
with:
2627
name: "pulp_cli_packages"
2728
path: |
28-
pulp-glue{{ cookiecutter.__app_label_suffix }}/dist/
29+
.root
2930
dist/
3031
if-no-files-found: "error"
3132
retention-days: 5

cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/lint.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@ jobs:
1515
- "3.14"
1616
steps:
1717
- uses: "actions/checkout@v5"
18-
{%- include "cache_action" %}
19-
- name: "Download wheels"
20-
uses: "actions/download-artifact@v5"
21-
with:
22-
name: "pulp_cli_packages"
2318
- name: "Set up Python"
2419
uses: "actions/setup-python@v6"
2520
with:
2621
python-version: "{{ "${{ matrix.python }}" }}"
27-
- name: "Install python dependencies"
28-
run: |
29-
pip install dist/pulp_cli{{ cookiecutter.__app_label_suffix | replace ("-", "_") }}-*.whl {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/dist/pulp_glue{{ cookiecutter.__app_label_suffix | replace ("-", "_") }}-*.whl {%- endif %} -r lint_requirements.txt
22+
- name: "Install uv"
23+
uses: "astral-sh/setup-uv@v7"
24+
with:
25+
enable-cache: true
3026
- name: "Lint code"
3127
run: |
32-
make lint
28+
make uv-lint
3329
...

0 commit comments

Comments
 (0)