chore: Template upgrade

Author: pawamoy

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 0.15.11
+_commit: 0.15.23
 _src_path: gh:pawamoy/copier-pdm
 author_email: pawamoy@pm.me
 author_fullname: Timothée Mazzucotelli

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
   pull_request:
     branches:
-      - master
+      - main
 
 defaults:
   run:
@@ -25,6 +25,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
+    - name: Fetch all tags
+      run: git fetch --depth=1 --tags
+
     - name: Set up PDM
       uses: pdm-project/setup-pdm@v3
       with:
@@ -62,10 +65,10 @@ jobs:
           echo 'jobs=[
             {"os": "macos-latest"},
             {"os": "windows-latest"},
-            {"python-version": "3.8"},
             {"python-version": "3.9"},
             {"python-version": "3.10"},
-            {"python-version": "3.11"}
+            {"python-version": "3.11"},
+            {"python-version": "3.12"}
           ]' | tr -d '[:space:]' >> $GITHUB_OUTPUT
         else
           echo 'jobs=[]' >> $GITHUB_OUTPUT
@@ -82,14 +85,14 @@ jobs:
         - macos-latest
         - windows-latest
         python-version:
-        - "3.7"
         - "3.8"
         - "3.9"
         - "3.10"
         - "3.11"
+        - "3.12"
         exclude: ${{ fromJSON(needs.exclude-test-jobs.outputs.jobs) }}
-
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.python-version == '3.12' }}
 
     steps:
     - name: Checkout
@@ -99,6 +102,7 @@ jobs:
       uses: pdm-project/setup-pdm@v3
       with:
         python-version: ${{ matrix.python-version }}
+        allow-python-prereleases: true
 
     - name: Resolving dependencies
       run: pdm lock -v --no-cross-platform -G ci-tests

.gitpod.dockerfile

@@ -1,7 +1,6 @@
 FROM gitpod/workspace-full
 USER gitpod
 ENV PIP_USER=no
-ENV PYTHON_VERSIONS=
 RUN pip3 install pipx; \
     pipx install pdm; \
     pipx ensurepath

CONTRIBUTING.md

@@ -39,20 +39,19 @@ Run `make help` to see all the available actions!
 This project uses [duty](https://github.com/pawamoy/duty) to run tasks.
 A Makefile is also provided. The Makefile will try to run certain tasks
 on multiple Python versions. If for some reason you don't want to run the task
-on multiple Python versions, you can do one of the following:
-
-1. `export PYTHON_VERSIONS= `: this will run the task
-   with only the current Python version
-2. run the task directly with `pdm run duty TASK`
+on multiple Python versions, you run the task directly with `pdm run duty TASK`.
 
 The Makefile detects if a virtual environment is activated,
 so `make` will work the same with the virtualenv activated or not.
 
+If you work in VSCode,
+[see examples of tasks and run configurations](https://pawamoy.github.io/copier-pdm/work/#vscode-setup).
+
 ## Development
 
 As usual:
 
-1. create a new branch: `git checkout -b feature-or-bugfix-name`
+1. create a new branch: `git switch -c feature-or-bugfix-name`
 1. edit the code and/or the documentation
 
 **Before committing:**
@@ -138,7 +137,7 @@ git commit --fixup=SHA
 Once all the changes are approved, you can squash your commits:
 
 ```bash
-git rebase -i --autosquash master
+git rebase -i --autosquash main
 ```
 
 And force-push:

Makefile

@@ -1,6 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL := bash
 DUTY := $(if $(VIRTUAL_ENV),,pdm run) duty
+export PDM_MULTIRUN_VERSIONS ?= 3.8 3.9 3.10 3.11
 
 args = $(foreach a,$($(subst -,_,$1)_args),$(if $(value $a),$a="$($a)"))
 check_quality_args = files

docs/css/insiders.css

@@ -101,21 +101,25 @@ a.insiders {
   text-align: center;
 }
 
-.premium-sponsors .silver img {
+#silver-sponsors img {
   height: 140px;
 }
 
-.premium-sponsors .bronze img {
+#bronze-sponsors img {
   height: 140px;
 }
 
-.premium-sponsors .bronze p {
+#bronze-sponsors p {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
 }
 
-.premium-sponsors .bronze a {
+#bronze-sponsors a {
   display: block;
   flex-shrink: 0;
+}
+
+.sponsors-total {
+  font-weight: bold;
 }

docs/insiders/goals.yml

@@ -1 +1 @@
-goals: {}
+goals: {}

docs/insiders/index.md

@@ -65,10 +65,10 @@ data_source = "docs/insiders/goals.yml"
 
 <!-- ```python exec="1" session="insiders"
 print(f"""The moment you <a href="#how-to-become-a-sponsor">become a sponsor</a>, you'll get **immediate
-access to {len(completed_features)} additional features** that you can start using right away, and
+access to {len(unreleased_features)} additional features** that you can start using right away, and
 which are currently exclusively available to sponsors:\n""")
 
-for feature in completed_features:
+for feature in unreleased_features:
     feature.render(badge=True)
 ``` -->
 
@@ -115,34 +115,17 @@ You can cancel your sponsorship anytime.[^5]
     regarding your payment, and GitHub doesn't offer refunds, sponsorships are
     non-refundable.
 
-```python exec="1" session="insiders"
-print_join_sponsors_button()
-```
+[:octicons-heart-fill-24:{ .pulse } &nbsp; Join our <span id="sponsors-count"></span> awesome sponsors](https://github.com/sponsors/pawamoy){ .md-button .md-button--primary }
 
 <hr>
 <div class="premium-sponsors">
 
-<div class="bronze">
-  <b>Bronze sponsors</b>
-  <p>
-
-  <a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" title="Material for MkDocs">
-    <img alt="Material for MkDocs" src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/logo.svg" style="height: 240px;">
-  </a>
-  <a href="https://docs.pydantic.dev/latest/" target="_blank" title="Pydantic">
-    <img alt="Pydantic" src="https://github.com/pawamoy/website/assets/3999221/368ff871-8fae-40c4-9b66-781b66e12cbb" style="height: 100px;">
-  </a>
-
-  </p>
-</div>
+<div id="bronze-sponsors"></div>
 </div>
 
 <hr>
-<br>
 
-```python exec="1" session="insiders"
-print_sponsors()
-```
+<div id="sponsors"></div>
 
 <br>
 <br>
@@ -155,18 +138,9 @@ print_sponsors()
   afterwards.
 </small>
 
-## Funding
-
-```python exec="1" session="insiders"
-print(f"""
-Current funding is at **$ {human_readable_amount(current_funding)}  a month**.
-We do not have any funding goals yet.
-Stay updated by following **@pawamoy**
-on :material-mastodon:{{ .mastodon }} [Fosstodon](https://fosstodon.org/@pawamoy).
-""")
-```
+## Funding <span class="sponsors-total"></span>
 
-<!-- ### Goals
+### Goals
 
 The following section lists all funding goals. Each goal contains a list of
 features prefixed with a checkmark symbol, denoting whether a feature is
@@ -191,7 +165,7 @@ can be used by all users.
 for goal in goals.values():
     if goal.complete:
         goal.render()
-``` -->
+```
 
 ## Frequently asked questions
 
@@ -248,3 +222,6 @@ by the [ISC License][license]. However, we kindly ask you to respect our
 [billing cycle]: https://docs.github.com/en/github/setting-up-and-managing-billing-and-payments-on-github/changing-the-duration-of-your-billing-cycle
 [license]: ../license/
 [private forks]: https://docs.github.com/en/github/setting-up-and-managing-your-github-user-account/removing-a-collaborator-from-a-personal-repository
+
+<script src="../js/insiders.js"></script>
+<script>updateInsidersPage('pawamoy');</script>

docs/js/insiders.js

@@ -0,0 +1,67 @@
+function humanReadableAmount(amount) {
+    const strAmount = String(amount);
+    if (strAmount.length >= 4) {
+        return `${strAmount.slice(0, strAmount.length - 3)},${strAmount.slice(-3)}`;
+    }
+    return strAmount;
+}
+
+function getJSON(url, callback) {
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url, true);
+    xhr.responseType = 'json';
+    xhr.onload = function () {
+        var status = xhr.status;
+        if (status === 200) {
+            callback(null, xhr.response);
+        } else {
+            callback(status, xhr.response);
+        }
+    };
+    xhr.send();
+}
+
+function updateInsidersPage(author_username) {
+    const sponsorURL = `https://github.com/sponsors/${author_username}`
+    const dataURL = `https://raw.githubusercontent.com/${author_username}/sponsors/main`;
+    getJSON(dataURL + '/numbers.json', function (err, numbers) {
+        document.getElementById('sponsors-count').innerHTML = numbers.count;
+        Array.from(document.getElementsByClassName('sponsors-total')).forEach(function (element) {
+            element.innerHTML = '$ ' + humanReadableAmount(numbers.total);
+        });
+        getJSON(dataURL + '/sponsors.json', function (err, sponsors) {
+            const sponsorsElem = document.getElementById('sponsors');
+            const privateSponsors = numbers.count - sponsors.length;
+            sponsors.forEach(function (sponsor) {
+                sponsorsElem.innerHTML += `
+                    <a href="${sponsor.url}" class="sponsorship-item" title="@${sponsor.name}">
+                        <img src="${sponsor.image}&size=72">
+                    </a>
+                `;
+            });
+            if (privateSponsors > 0) {
+                sponsorsElem.innerHTML += `
+                    <a href="${sponsorURL}" class="sponsorship-item private">
+                        +${privateSponsors}
+                    </a>
+                `;
+            }
+        });
+    });
+    getJSON(dataURL + '/sponsorsBronze.json', function (err, sponsors) {
+        const bronzeSponsors = document.getElementById("bronze-sponsors");
+        if (sponsors) {
+            let html = '';
+            html += '<b>Bronze sponsors</b><p>'
+            sponsors.forEach(function (sponsor) {
+                html += `
+                    <a href="${sponsor.url}" target="_blank" title="${sponsor.name}">
+                        <img alt="${sponsor.name}" src="${sponsor.image}" style="height: ${sponsor.imageHeight}px;">
+                    </a>
+                `
+            });
+            html += '</p>'
+            bronzeSponsors.innerHTML = html;
+        }
+    });
+}

duties.py

@@ -299,6 +299,6 @@ def test(ctx: Context, match: str = "") -> None:
     py_version = f"{sys.version_info.major}{sys.version_info.minor}"
     os.environ["COVERAGE_FILE"] = f".coverage.{py_version}"
     ctx.run(
-        pytest.run("-n", "auto", "tests", config_file="config/pytest.ini", select=match),
+        pytest.run("-n", "auto", "tests", config_file="config/pytest.ini", select=match, color="yes"),
         title=pyprefix("Running tests"),
     )