go back to using the "or any later version" clause of GPLv3

I think arguments that "Such new versions will be similar in spirit to
the present version", in my own reading and readings such as in
https://www.draketo.de/software/gpl-or-later, convince me for now that
it is acceptable to allow the "or later" for compatibility and future
problem's sake

Signed-off-by: Brian S. Stephan <bss@incorporeal.org>

.reuse/dep5

@@ -1,24 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: incorporeal-cms
-Upstream-Contact: Brian S. Stephan <bss@incorporeal.org>
-Source: https://git.incorporeal.org/bss/incorporeal-cms
-
-# Trivial files
-Files: .gitignore .gitattributes
-Copyright: © 2020 Brian S. Stephan <bss@incorporeal.org>
-License: GPL-3.0-only
-
-# High level repo docs
-Files: *.md
-Copyright: © 2020 Brian S. Stephan <bss@incorporeal.org>
-License: GPL-3.0-only
-
-# Test data
-Files: tests/instance/*
-Copyright: © 2020 Brian S. Stephan <bss@incorporeal.org>
-License: GPL-3.0-only
-
-# Python packaging, scaffolding, and errata
-Files: MANIFEST.in pyproject.toml tox.ini requirements/*
-Copyright: © 2020 Brian S. Stephan <bss@incorporeal.org>
-License: GPL-3.0-only

README.md

@@ -54,17 +54,16 @@ out and discuss issues and features and whatnot.
 
 Written by and copyright (C) 2025 Brian S. Stephan (bss@incorporeal.org).
 
-This program is free software: you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General
-it under the terms of the GNU General Public License as published by
+Public License as published by the Free Software Foundation, either version 3 of the License, or (at your
-the Free Software Foundation, version 3 of the License.
+option) any later version.
 
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+more details.
-GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU General Public License along with this program.  If not, see
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
 ### Content Output
 

REUSE.toml

@@ -0,0 +1,28 @@
+version = 1
+SPDX-PackageName = "incorporeal-cms"
+SPDX-PackageSupplier = "Brian S. Stephan <bss@incorporeal.org>"
+SPDX-PackageDownloadLocation = "https://git.incorporeal.org/bss/incorporeal-cms"
+
+[[annotations]]
+path = [".gitignore", ".gitattributes"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "© 2020 Brian S. Stephan <bss@incorporeal.org>"
+SPDX-License-Identifier = "GPL-3.0-or-later"
+
+[[annotations]]
+path = "**.md"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "© 2020 Brian S. Stephan <bss@incorporeal.org>"
+SPDX-License-Identifier = "GPL-3.0-or-later"
+
+[[annotations]]
+path = "tests/instance/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "© 2020 Brian S. Stephan <bss@incorporeal.org>"
+SPDX-License-Identifier = "GPL-3.0-or-later"
+
+[[annotations]]
+path = ["MANIFEST.in", "pyproject.toml", "tox.ini", "requirements/**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "© 2020 Brian S. Stephan <bss@incorporeal.org>"
+SPDX-License-Identifier = "GPL-3.0-or-later"

incorporealcms/__init__.py

@@ -1,7 +1,7 @@
 """An application for running my Markdown-based sites.
 
 SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import json
 import logging

incorporealcms/config.py

@@ -1,7 +1,7 @@
 """Default configuration.
 
 SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 
 

incorporealcms/error_pages.py

@@ -1,7 +1,7 @@
 """Process the error page templates.
 
 SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import os
 

incorporealcms/feed.py

@@ -7,7 +7,7 @@ under pages/ (which may make sense for a blog) if they want, but could just
 as well be pages/foo content.
 
 SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import logging
 import os

incorporealcms/markdown.py

@@ -5,7 +5,7 @@ as is, but .md files need to be processed with a Markdown parser, so a lot of th
 is our tweaks and customizations for pages my way.
 
 SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import datetime
 import logging

incorporealcms/mdx/__init__.py

@@ -1,5 +1,5 @@
 """Markdown extensions.
 
 SPDX-FileCopyrightText: © 2021 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """

incorporealcms/mdx/figures.py

@@ -1,7 +1,7 @@
 """Create generic figures with captions.
 
 SPDX-FileCopyrightText: © 2022 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import re
 from xml.etree.ElementTree import SubElement  # nosec B405

incorporealcms/mdx/pydot.py

@@ -1,7 +1,7 @@
 """Serve dot diagrams inline.
 
 SPDX-FileCopyrightText: © 2021 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import base64
 import logging

incorporealcms/ssg.py

@@ -1,7 +1,7 @@
 """Build an instance as a static site suitable for serving via e.g. Nginx.
 
 SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import argparse
 import logging

incorporealcms/static/css/base.css

@@ -1,6 +1,6 @@
 /*
  * SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 html {

incorporealcms/static/css/dark.css

@@ -1,6 +1,6 @@
 /*
  * SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 /* common styling via the base.css, used in light and dark */

incorporealcms/static/css/light.css

@@ -1,6 +1,6 @@
 /*
  * SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 /* common styling via the base.css, used in light and dark */

incorporealcms/static/css/plain.css

@@ -1,6 +1,6 @@
 /*
  * SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 /* specify almost no styling, just fix some image and nav rendering */

incorporealcms/static/js/style_switcher.js

@@ -5,7 +5,7 @@
  * of my CMS, so I want to keep it around even in the static site.
  *
  * SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-only
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 /**

incorporealcms/templates/400.html

@@ -1,6 +1,6 @@
 {#
 SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 #}
 {% extends "base.html" %}
 

incorporealcms/templates/404.html

@@ -1,6 +1,6 @@
 {#
 SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 #}
 {% extends "base.html" %}
 

incorporealcms/templates/500.html

@@ -1,6 +1,6 @@
 {#
 SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 #}
 {% extends "base.html" %}
 

incorporealcms/templates/base-wide.html

@@ -1,6 +1,6 @@
 {#
 SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 #}
 {% extends "base.html" %}
 {% block site_class %}class="site-wrap site-wrap-double-width"{% endblock %}

incorporealcms/templates/base.html

@@ -1,6 +1,6 @@
 <!doctype html>{#
 SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 #}
 <html lang="en">
 <title>{{ title }}</title>

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "incorporeal-cms"
 description = "A lightweight static site generator for Markdown-based sites."
 readme = "README.md"
-license = {text = "GPL-3.0-only"}
+license = {text = "GPL-3.0-or-later"}
 authors = [
 	{name = "Brian S. Stephan", email = "bss@incorporeal.org"},
 ]
@@ -16,7 +16,7 @@ dynamic = ["version"]
 classifiers = [
 	"Framework :: Flask",
 	"Programming Language :: Python :: 3",
-	"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+	"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
 	"Operating System :: OS Independent",
 	"Topic :: Text Processing :: Markup :: Markdown",
 ]

tests/functional_markdown_tests.py

@@ -1,7 +1,7 @@
 """Test graphviz functionality.
 
 SPDX-FileCopyrightText: © 2021 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import os
 import tempfile

tests/test_commands.py

@@ -1,7 +1,7 @@
 """Test command line invocations.
 
 SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import os
 import tempfile

tests/test_factory.py

@@ -1,7 +1,7 @@
 """Test basic configuration stuff.
 
 SPDX-FileCopyrightText: © 2020 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import os
 

tests/test_feed.py

@@ -1,7 +1,7 @@
 """Test the feed methods.
 
 SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import os
 import tempfile

tests/test_markdown.py

@@ -1,7 +1,7 @@
 """Test the conversion of Markdown pages.
 
 SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import os
 from unittest.mock import patch

tests/test_ssg.py

@@ -1,7 +1,7 @@
 """Test the high level SSG operations.
 
 SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
-SPDX-License-Identifier: GPL-3.0-only
+SPDX-License-Identifier: GPL-3.0-or-later
 """
 import os
 import tempfile