chore: Update project template to sphinx-notes/cookiecutter@df339501

Author: SilverRainZ

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sphinx-notes/cookiecutter",
-  "commit": "b90eb30533478fe686ce664e50541e0f91325c16",
+  "commit": "df33950130c89d7d65d9a008716d95f99c4077c9",
   "checkout": null,
   "context": {
     "cookiecutter": {

.github/workflows/pypi.yml

@@ -0,0 +1,22 @@
+name: Publish package distributions to PyPI
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  pypi:
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/sphinxnotes-any
+    permissions:
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+    - run: pip install build twine && make dist
+    - uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/release.yml

@@ -1,29 +1,12 @@
-name: Publish New Release
+name: Publish Github Release
 
 on:
   push:
     tags:
-      - "*"
+      - "[0-9]+.[0-9]+" # MAJOR.MINOR (1.0: y, 1.0a0: n, 1.0.1: n)
 
 jobs:
-  pypi:
-    name: Publish package distributions to PyPI
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/sphinxnotes-any
-    permissions:
-      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-    - run: pip install build twine && make dist
-    - uses: pypa/gh-action-pypi-publish@release/v1
-      with: 
-        password: ${{ secrets.PYPI_API_TOKEN }}
-
   release:
-    name: Publish Github Release
     needs: [pypi]
     runs-on: ubuntu-latest
     permissions:
@@ -33,4 +16,4 @@ jobs:
       - uses: ncipollo/release-action@v1
         with:
           body: |
-            Changelog: https://sphinx.silverrainz.me/any/changelog.html#version-${{ github.ref_name }}
+            Changelog: https://sphinx.silverrainz.me/any/changelog.html

Makefile

@@ -6,6 +6,7 @@ LANG = en_US.UTF-8
 MAKE  = make
 PY    = python3
 RM    = rm -rf
+GIT   = git
 
 # Build sphinx documentation.
 .PHONY: docs
@@ -51,6 +52,10 @@ upload-test: dist
 update-template:
 	$(PY) -m cruft update
 
+.PHONY: update-template-done
+update-template-done:
+	$(GIT) commit -m "chore: Update project template to sphinx-notes/cookiecutter@$(shell jq -r '.commit' .cruft.json | head -c8)"
+
 # Update project version.
 .PHONY: bump-version
 bump-version:

README.rst

@@ -5,7 +5,6 @@
 sphinxnotes-any
 ===============
 
-
 .. |docs| image:: https://img.shields.io/github/deployments/sphinx-notes/any/github-pages
    :target: https://sphinx.silverrainz.me/any
    :alt: Documentation Status
@@ -26,8 +25,11 @@ sphinxnotes-any
 
 Sphinx domain for documenting anything.
 
-* Documentation: https://sphinx.silverrainz.me/any
-* Source: https://github.com/sphinx-notes/any
-* Changelog: https://sphinx.silverrainz.me/any/changelog.html
-* Tracker: https://github.com/sphinx-notes/any/issues
-* Download: https://pypi.org/project/sphinxnotes-any/#files
+.. INTRODUCTION START 
+   (MUST written in standard reStructuredText, without Sphinx stuff)
+
+.. INTRODUCTION END
+
+Please refer to Documentation_ for more details.
+
+.. _Documentation: https://sphinx.silverrainz.me/any

docs/changelog.rst

@@ -5,15 +5,19 @@
 Change Log
 ==========
 
+.. hint:: You may want to learn about our `Release Strategy`__
+
+   __ https://sphinx.silverrainz.me/release.html
+
 .. Example:
 
-   1.0.0
-   =====
+   1.0
+   ===
 
    .. version:: _
       :date: yyyy-mm-dd
 
-      Change log here.
+   Change log here.
 
 Version 2.x
 ===========

docs/conf.py

@@ -89,14 +89,21 @@
 extensions.append('sphinx.ext.autodoc')
 autoclass_content = 'init'
 autodoc_typehints = 'description'
-    
+
 extensions.append('sphinx.ext.intersphinx')
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
     'sphinx': ('https://www.sphinx-doc.org/en/master', None),
     'jinja': ('https://jinja.palletsprojects.com/en/latest/', None),
 }
 
+# 
+extensions.append('sphinxnotes.comboroles')
+comboroles_roles = {
+    'parsed_literal': (['literal'], True),
+}
+#
+
 # -- Eat your own dog food --------------------------------------------------
 
 # If extensions (or modules to document with autodoc) are in another directory,

docs/index.rst

@@ -1,19 +1,39 @@
 .. This file is generated from sphinx-notes/cookiecutter.
    You need to consider modifying the TEMPLATE or modifying THIS FILE.
 
-.. include:: ../README.rst
+===============
+sphinxnotes-any
+===============
+
+.. |docs| image:: https://img.shields.io/github/deployments/sphinx-notes/any/github-pages
+   :target: https://sphinx.silverrainz.me/any
+   :alt: Documentation Status
+
+.. |license| image:: https://img.shields.io/github/license/sphinx-notes/any
+   :target: https://github.com/sphinx-notes/any/blob/master/LICENSE
+   :alt: Open Source License
 
+.. |pypi| image:: https://img.shields.io/pypi/v/sphinxnotes-any.svg
+   :target: https://pypi.python.org/pypi/sphinxnotes-any
+   :alt: PyPI Package
+
+.. |download| image:: https://img.shields.io/pypi/dm/sphinxnotes-any
+   :target: https://pypi.python.org/pypi/sphinxnotes-any
+   :alt: PyPI Package Downloads
+
+|docs| |license| |pypi| |download|
+ 
 Introduction
 ============
 
-.. ADDITIONAL CONTENT START
+.. INTRODUCTION START
 
 The extension provides a domain which allows user creates directive and roles 
 to descibe, reference and index arbitrary object in documentation.
 It is a bit like :py:meth:`sphinx.application.Sphinx.add_object_type`,
 but more powerful.
 
-.. ADDITIONAL CONTENT END
+.. INTRODUCTION END
 
 Getting Started
 ===============
@@ -29,7 +49,8 @@ First, downloading extension from PyPI:
 
    $ pip install sphinxnotes-any
 
-Then, add the extension name to ``extensions`` configuration item in your conf.py_:
+Then, add the extension name to ``extensions`` configuration item in your
+:parsed_literal:`conf.py_`:
 
 .. code-block:: python
 

pyproject.toml

@@ -51,6 +51,7 @@ docs = [
     "sphinx_design",
     "sphinx_copybutton",
     "sphinxcontrib-gtagjs",
+    "sphinxnotes-comboroles",
 ]
 
 [project.urls]