Skip to content
Snippets Groups Projects
Verified Commit 0e5199f1 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Incorporate SPDX license data

parent 2c668398
No related branches found
No related tags found
1 merge request!1127Resolve "Missing package spdx-license-list"
Pipeline #103314 passed with warnings
......@@ -85,3 +85,6 @@ yarn.lock
# Add HTML files to avoid problems with unsupported Django templates
*.html
# Do not check/reformat generated files
aleksis/core/util/licenses.json
......@@ -19,6 +19,7 @@ Changed
~~~~~~~
* Rewrite of frontend using Vuetify
* Incorporate SPDX license list for app licenses on About page
Fixed
~~~~~
......
......@@ -9,9 +9,9 @@ from django.http import HttpRequest
from dynamic_preferences.signals import preference_updated
from license_expression import Licensing
from oauthlib.common import Request as OauthlibRequest
from spdx_license_list import LICENSES
from .core_helpers import copyright_years
from .spdx import LICENSES
if TYPE_CHECKING:
from oauth2_provider.models import AbstractApplication
......
This diff is collapsed.
import json
import os
with open(os.path.join(os.path.dirname(__file__), "licenses.json"), "r") as f:
LICENSES = json.load(f)
......@@ -96,7 +96,6 @@ django-cache-memoize = "^0.1.6"
django-haystack = "^3.1"
celery-haystack-ng = "^2.0"
django-dbbackup = "^3.3.0"
spdx-license-list = "^0.5.0"
license-expression = "^30.0"
django-reversion = "^5.0.0"
django-favicon-plus-reloaded = "^1.1.5"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment