Fixed license reported by openapi docs to spdx

Author: mdellweg

CHANGES/+spdx-license.bugfix

@@ -0,0 +1 @@
+Use a proper spdx license identifier in the openapi docs.

README.md

@@ -11,7 +11,7 @@ Using Pulp you can:
 - Promote content through different repos in an organized way
 
 Pulp is completely free and open-source!
-- License: GPLv2+
+- License: GPL-2.0-or-later
 - Documentation: https://pulpproject.org/
 - Source: https://github.com/pulp/pulpcore/
 - Bugs: https://github.com/pulp/pulpcore/issues

pulpcore/app/settings.py

@@ -350,8 +350,9 @@
         "url": "https://pulpproject.org",
     },
     "LICENSE": {
-        "name": "GPLv2+",
         "url": "https://raw.githubusercontent.com/pulp/pulpcore/master/LICENSE",
+        "name": "GNU General Public License v2.0 or later",
+        "identifier": "GPL-2.0-or-later",
     },
 }
 

pulpcore/openapi/hooks.py

@@ -7,6 +7,11 @@ def add_info_hook(result, generator, request, **kwargs):
         "url": "https://pulpproject.org/pulp-docs/docs/assets/pulp_logo_icon.svg"
     }
 
+    if result["openapi"].split(".", maxsplit=2)[:-1] == ["3", "0"]:
+        result["info"]["license"].pop("identifier", None)
+    else:
+        result["info"]["license"].pop("url", None)
+
     # Adding plugin version config
     result["info"]["x-pulp-app-versions"] = {app.label: app.version for app in request.apps}
 

pulpcore/tests/functional/api/test_openapi_schema.py

@@ -119,3 +119,13 @@ def test_content_in_filter_is_array(pulp_openapi_schema):
             else:
                 assert False, "Couldn't find the content__in filter!"
     assert len(tested) == 2, "Couldn't test both the Publication and RepositoryVersion endpoints"
+
+
+@pytest.mark.parallel
+def test_license_version_is_valid_spdx_specifier(pulp_openapi_schema):
+    assert (
+        pulp_openapi_schema["info"]["license"]["name"] == "GNU General Public License v2.0 or later"
+    )
+    schema_version = pulp_openapi_schema["openapi"]
+    if schema_version.startswith("3.1"):
+        assert pulp_openapi_schema["info"]["license"]["identifier"] == "GPL-2.0-or-later"

pyproject.toml

@@ -13,8 +13,8 @@ readme = "README.md"
 authors = [
   {name="Pulp Team", email="pulp-list@redhat.com"},
 ]
+license = "GPL-2.0-or-later"
 classifiers=[
-  "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
   "Operating System :: POSIX :: Linux",
   "Development Status :: 5 - Production/Stable",
   "Framework :: Django",