Skip to content

Commit bbe3319

Browse files
committed
Merge branch 'main' of github.com:pawamoy/copier-uv
2 parents 8916318 + f95f257 commit bbe3319

24 files changed

+97
-864
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
git config --global user.email "dev@pawamoy.fr"
3838
git config --global user.name "Timothée Mazzucotelli"
3939
- name: Setup Python
40-
uses: actions/setup-python@v5
40+
uses: actions/setup-python@v6
4141
with:
42-
python-version: "3.12"
42+
python-version: "3.13"
4343
- name: Setup uv
4444
uses: astral-sh/setup-uv@v5
4545
- name: Test licenses
@@ -48,20 +48,16 @@ jobs:
4848
test-project:
4949
strategy:
5050
matrix:
51-
os:
52-
- ubuntu-latest
53-
- macos-latest
54-
- windows-latest
5551
python-version:
56-
- "3.9"
5752
- "3.10"
5853
- "3.11"
5954
- "3.12"
6055
- "3.13"
6156
- "3.14"
57+
- "3.15"
6258

63-
runs-on: ${{ matrix.os }}
64-
continue-on-error: ${{ matrix.python-version == '3.14'}}
59+
runs-on: ubuntu-latest
60+
continue-on-error: ${{ matrix.python-version == '3.15'}}
6561

6662
steps:
6763
- name: Checkout
@@ -77,7 +73,7 @@ jobs:
7773
git config --global user.name "Timothée Mazzucotelli"
7874
7975
- name: Setup Python
80-
uses: actions/setup-python@v5
76+
uses: actions/setup-python@v6
8177
with:
8278
python-version: ${{ matrix.python-version }}
8379
allow-prereleases: true

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
fetch-depth: 0
1717
fetch-tags: true
1818
- name: Setup Python
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
21-
python-version: "3.12"
21+
python-version: "3.13"
2222
- name: Setup uv
2323
uses: astral-sh/setup-uv@v5
2424
- name: Prepare release notes

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,30 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

88
<!-- insertion marker -->
9+
## [1.6.0](https://github.com/mkdocstrings/handler-template/releases/tag/1.6.0) - 2025-11-10
10+
11+
<small>[Compare with 1.5.1](https://github.com/mkdocstrings/handler-template/compare/1.5.1...1.6.0)</small>
12+
13+
### Merge upstream
14+
15+
#### Bug Fixes
16+
17+
- Fix tagging commit when signed commits are enabled? ([f1f0950](https://github.com/pawamoy/copier-uv/commit/f1f095096134da1dbd0f1d138303938db7b81405) by Timothée Mazzucotelli).
18+
- Always force docs deployment ([c41b8fe](https://github.com/pawamoy/copier-uv/commit/c41b8fe3e80aef11539191ad903d2b8d3f8419fd) by Timothée Mazzucotelli).
19+
- Use specific version of artifact ([91b5c99](https://github.com/pawamoy/copier-uv/commit/91b5c99eb81bcdb826a04cbc7ab61c2042a09552) by Timothée Mazzucotelli).
20+
21+
#### Features
22+
23+
- Automate sponsors update in README ([7ab74bd](https://github.com/pawamoy/copier-uv/commit/7ab74bda37e88600207c899fd28fa0f94f335422) by Timothée Mazzucotelli).
24+
25+
#### Code Refactoring
26+
27+
- Remove Insiders-related contents ([79737bf](https://github.com/pawamoy/copier-uv/commit/79737bff38ac2e3d8e0aa98a80a2742627db3506) by Timothée Mazzucotelli).
28+
- Remove match parameter on test duty, since we can pass `-k` directly ([ca104e4](https://github.com/pawamoy/copier-uv/commit/ca104e43275bf60020550c57bcfec92d755a1f11) by Timothée Mazzucotelli).
29+
- Remove support for Python 3.9, add support for Python 3.14, add testing for Python 3.15 ([946ca5a](https://github.com/pawamoy/copier-uv/commit/946ca5a172c51bcd0e64aa93c990327f453a8110) by Timothée Mazzucotelli).
30+
- Use Python 3.13 in non-matrix jobs ([9256040](https://github.com/pawamoy/copier-uv/commit/925604062ba14b901b3791182b3fe260a96ea888) by Timothée Mazzucotelli).
31+
- Upgrade setup-python action to v6 ([86a942d](https://github.com/pawamoy/copier-uv/commit/86a942d8c7ac134d35ef9fc741ce9113fd75e77e) by Timothée Mazzucotelli).
32+
933
## [1.5.1](https://github.com/mkdocstrings/handler-template/releases/tag/1.5.1) - 2025-10-09
1034

1135
<small>[Compare with 1.5.0](https://github.com/mkdocstrings/handler-template/compare/1.5.0...1.5.1)</small>

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ release:
3030
@test -n "$(version)" || { echo "error: usage: make release version=x.y.z" >&2; exit 1; }
3131
@git add CHANGELOG.md
3232
@git commit -m "docs: Update changelog for version $(version)"
33-
@git tag $(version)
33+
@git tag -m "" -a $(version)
3434
@git push
3535
@git push --tags
3636

copier.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ _jinja_extensions:
1515
- extensions.py:ContextUpdater
1616
_skip_if_exists:
1717
- CHANGELOG.md
18-
- docs/insiders/changelog.md
1918

2019
# PROMPT --------------------------------
2120
language:
@@ -127,26 +126,3 @@ python_package_import_name:
127126
type: str
128127
help: Your handler import name (for `import mkdocstrings_handlers.NAME` in Python code)
129128
default: "{{ language | slugify('_') }}"
130-
131-
insiders:
132-
type: bool
133-
help: Does this project have an Insiders version?
134-
default: false
135-
136-
insiders_repository_name:
137-
type: str
138-
help: Your Insiders repository name
139-
default: "{{ repository_name }}"
140-
when: "{{ insiders }}"
141-
142-
insiders_email:
143-
type: str
144-
help: The email to use for Insiders-related questions
145-
default: "{{ author_email }}"
146-
when: "{{ insiders }}"
147-
148-
public_release:
149-
type: bool
150-
help: Is this project already released publicly?
151-
default: false
152-
when: "{{ insiders }}"

project/.github/workflows/ci.yml.jinja

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434
- macos-latest
3535
- windows-latest
3636
python-version:
37-
- "3.9"
38-
- "3.13"
37+
- "3.10"
38+
- "3.14"
3939
include:
40-
- os: ubuntu-latest
41-
python-version: "3.10"
4240
- os: ubuntu-latest
4341
python-version: "3.11"
4442
- os: ubuntu-latest
4543
python-version: "3.12"
44+
- os: ubuntu-latest
45+
python-version: "3.13"
4646

4747
runs-on: {% raw %}${{ matrix.os }}{% endraw %}
4848

@@ -54,7 +54,7 @@ jobs:
5454
fetch-tags: true
5555

5656
- name: Setup Python
57-
uses: actions/setup-python@v5
57+
uses: actions/setup-python@v6
5858
with:
5959
python-version: {% raw %}${{ matrix.python-version }}{% endraw %}
6060

@@ -81,68 +81,36 @@ jobs:
8181

8282
- name: Store objects inventory for tests
8383
uses: actions/upload-artifact@v4
84+
if: {% raw %}${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.13' }}{% endraw %}
8485
with:
8586
name: objects.inv
8687
path: site/objects.inv
8788

88-
{% if insiders -%}
89-
exclude-test-jobs:
90-
runs-on: ubuntu-latest
91-
outputs:
92-
jobs: {% raw %}${{ steps.exclude-jobs.outputs.jobs }}{% endraw %}
93-
steps:
94-
- id: exclude-jobs
95-
run: |
96-
if ${{ "{{" }} github.repository_owner == '{{ author_username }}-insiders' {{ "}}" }}; then
97-
echo 'jobs=[
98-
{"os": "macos-latest"},
99-
{"os": "windows-latest"},
100-
{"python-version": "3.10"},
101-
{"python-version": "3.11"},
102-
{"python-version": "3.12"},
103-
{"python-version": "3.13"},
104-
{"python-version": "3.14"}
105-
]' | tr -d '[:space:]' >> $GITHUB_OUTPUT
106-
else
107-
echo 'jobs=[
108-
{"os": "macos-latest", "resolution": "lowest-direct"},
109-
{"os": "windows-latest", "resolution": "lowest-direct"}
110-
]' | tr -d '[:space:]' >> $GITHUB_OUTPUT
111-
fi
112-
113-
{% endif -%}
11489
tests:
11590

11691
needs:
11792
- quality
118-
{% if insiders -%}
119-
- exclude-test-jobs
120-
{% endif -%}
12193
strategy:
12294
matrix:
12395
os:
12496
- ubuntu-latest
12597
- macos-latest
12698
- windows-latest
12799
python-version:
128-
- "3.9"
129100
- "3.10"
130101
- "3.11"
131102
- "3.12"
132103
- "3.13"
133104
- "3.14"
105+
- "3.15"
134106
resolution:
135107
- highest
136108
- lowest-direct
137-
{%- if insiders %}
138-
exclude: {% raw %}${{ fromJSON(needs.exclude-test-jobs.outputs.jobs) }}{% endraw %}
139-
{%- else %}
140109
exclude:
141110
- os: macos-latest
142111
resolution: lowest-direct
143112
- os: windows-latest
144113
resolution: lowest-direct
145-
{%- endif %}
146114
runs-on: {% raw %}${{ matrix.os }}{% endraw %}
147115
continue-on-error: true
148116

@@ -154,7 +122,7 @@ jobs:
154122
fetch-tags: true
155123

156124
- name: Setup Python
157-
uses: actions/setup-python@v5
125+
uses: actions/setup-python@v6
158126
with:
159127
python-version: {% raw %}${{ matrix.python-version }}{% endraw %}
160128
allow-prereleases: true

project/.github/workflows/release.yml.jinja

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,15 @@ jobs:
1515
fetch-depth: 0
1616
fetch-tags: true
1717
- name: Setup Python
18-
uses: actions/setup-python@v5
18+
uses: actions/setup-python@v6
1919
with:
20-
python-version: "3.12"
20+
python-version: "3.13"
2121
- name: Setup uv
2222
uses: astral-sh/setup-uv@v5
23-
{%- if insiders %}
24-
- name: Build dists
25-
if: github.repository_owner == '{{ author_username }}-insiders'
26-
run: uv tool run --from build pyproject-build
27-
- name: Upload dists artifact
28-
uses: actions/upload-artifact@v4
29-
if: github.repository_owner == '{{ author_username }}-insiders'
30-
with:
31-
name: {{ repository_name }}-insiders
32-
path: ./dist/*
33-
- name: Prepare release notes
34-
if: github.repository_owner != '{{ author_username }}-insiders'
35-
run: uv tool run git-changelog --release-notes > release-notes.md
36-
- name: Create release with assets
37-
uses: softprops/action-gh-release@v2
38-
if: github.repository_owner == '{{ author_username }}-insiders'
39-
with:
40-
files: ./dist/*
41-
- name: Create release
42-
uses: softprops/action-gh-release@v2
43-
if: github.repository_owner != '{{ author_username }}-insiders'
44-
with:
45-
body_path: release-notes.md
46-
{%- else %}
4723
- name: Prepare release notes
4824
run: uv tool run git-changelog --release-notes > release-notes.md
4925
- name: Create release
5026
uses: softprops/action-gh-release@v2
5127
with:
5228
body_path: release-notes.md
53-
{%- endif %}
29+
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Update sponsors
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
jobs:
13+
update-readme:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
- name: Update README and create PR
19+
uses: pawamoy/readme-insert@main
20+
with:
21+
markup-url: https://pawamoy.github.io/sponsors.txt
22+
start-marker: '<!-- sponsors-start -->'
23+
end-marker: '<!-- sponsors-end -->'
24+
commit-message: 'chore: Update sponsors section in README'
25+
pr-title: 'chore: Update sponsors section in README'
26+
pr-body: 'This PR updates the sponsors section in the README file.'

project/README.md.jinja

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
# {{ project_name }}
22

3-
{% if repository_provider == "github.com" and (not insiders or public_release) -%}
3+
{% if repository_provider == "github.com" -%}
44
[![ci](https://github.com/{{ repository_namespace }}/{{ repository_name }}/workflows/ci/badge.svg)](https://github.com/{{ repository_namespace }}/{{ repository_name }}/actions?query=workflow%3Aci)
55
{% endif -%}
66
[![documentation](https://img.shields.io/badge/docs-mkdocs-708FCC.svg?style=flat)](https://{{ repository_namespace }}.{{ repository_provider[:-4] }}.io/{{ repository_name }}/)
7-
{% if not insiders or public_release -%}
87
[![pypi version](https://img.shields.io/pypi/v/{{ python_package_distribution_name }}.svg)](https://pypi.org/project/{{ python_package_distribution_name }}/)
9-
{% endif -%}
108
[![gitter](https://img.shields.io/badge/matrix-chat-4DB798.svg?style=flat)](https://app.gitter.im/#/room/#{{ repository_name }}:gitter.im)
119

1210
{{ project_description }}
1311

1412
## Installation
1513

16-
{% if not insiders or public_release -%}
1714
```bash
1815
pip install {{ python_package_distribution_name }}
1916
```
@@ -25,6 +22,10 @@ With [`uv`](https://docs.astral.sh/uv/):
2522
uv tool install {{ python_package_distribution_name }}
2623
```
2724
{%- endif -%}
28-
{%- else -%}
29-
This project is available to sponsors only, through my Insiders program. See Insiders [explanation](https://{{ repository_namespace }}.github.io/{{ repository_name }}/insiders/) and [installation instructions](https://{{ repository_namespace }}.github.io/{{ repository_name }}/insiders/installation/).
30-
{%- endif %}
25+
26+
{% if author_username == "pawamoy" %}
27+
## Sponsors
28+
29+
<!-- sponsors-start -->
30+
<!-- sponsors-end -->
31+
{% endif %}

project/config/pytest_39.ini.jinja

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)