Skip to content
Snippets Groups Projects
Verified Commit 4dc9fc73 authored by Nik | Klampfradler's avatar Nik | Klampfradler Committed by magicfelix
Browse files

Incorporate SPDX license data

parent d313c0f1
No related branches found
No related tags found
No related merge requests found
# Byte-compiled / optimized / DLL files
*$py.class
*.py[cod]
__pycache__/
# Distribution / packaging
*.egg
*.egg-info/
.Python
.eggs/
.installed.cfg
build/
develop-eggs/
dist/
downloads/
eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
# Installer logs
pip-delete-this-directory.txt
pip-log.txt
# Translations
*.mo
*.pot
# Django stuff:
*.log
local_settings.py
# pyenv
.python-version
# Environments
.env
.venv
ENV/
env/
venv/
# Editors
*~
DEADJOE
\#*#
# IntelliJ
.idea
.idea/
# Database
db.sqlite3
# Sphinx
docs/_build/
# TeX
*.aux
# Generated files
/node_modules/
/static/
/whoosh_index/
poetry.lock
.coverage
.mypy_cache/
.tox/
htmlcov/
maintenance_mode_state.txt
media/
package-lock.json
yarn.lock
# VSCode
.vscode/
.history/
*.code-workspace
/cache
# Add HTML files to avoid problems with unsupported Django templates
*.html
# Do not check/reformat generated files
aleksis/core/util/licenses.json
...@@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file. ...@@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_, The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_. and this project adheres to `Semantic Versioning`_.
Unreleased
----------------------
Fixed
~~~~~
* Incorporate SPDX license list for app licenses on About page because
spdx-license-list dependency vanished.
`2.10.2`_ - 2022-08-25 `2.10.2`_ - 2022-08-25
---------------------- ----------------------
......
...@@ -9,9 +9,9 @@ from django.http import HttpRequest ...@@ -9,9 +9,9 @@ from django.http import HttpRequest
from dynamic_preferences.signals import preference_updated from dynamic_preferences.signals import preference_updated
from license_expression import Licensing from license_expression import Licensing
from oauthlib.common import Request as OauthlibRequest from oauthlib.common import Request as OauthlibRequest
from spdx_license_list import LICENSES
from .core_helpers import copyright_years from .core_helpers import copyright_years
from .spdx import LICENSES
if TYPE_CHECKING: if TYPE_CHECKING:
from oauth2_provider.models import AbstractApplication 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" ...@@ -96,7 +96,6 @@ django-cache-memoize = "^0.1.6"
django-haystack = "^3.1" django-haystack = "^3.1"
celery-haystack-ng = "^2.0" celery-haystack-ng = "^2.0"
django-dbbackup = "^3.3.0" django-dbbackup = "^3.3.0"
spdx-license-list = "^0.5.0"
license-expression = "^30.0" license-expression = "^30.0"
django-reversion = "^5.0.0" django-reversion = "^5.0.0"
django-favicon-plus-reloaded = "^1.1.5" 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