apis-acdhch-default-settings 2.7.0__tar.gz → 2.8.0__tar.gz

apis_acdhch_default_settings-2.8.0/.github/workflows/linters.yml

@@ -0,0 +1,67 @@
+# SPDX-FileCopyrightText: 2024 Birger Schacht <birger.schacht@oeaw.ac.at>
+# SPDX-License-Identifier: MIT
+name: Run linters
+
+on:
+  - push
+
+jobs:
+  ruff-format:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Run ruff format
+        run: uv run --only-dev ruff format --check .
+
+  ruff-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Run ruff check
+        run: uv run --only-dev ruff check .
+
+  djlint-formatter:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Run ruff check
+        run: uv run --only-dev djlint --check  .
+
+  djlint-linter:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Run ruff check
+        run: uv run --only-dev djlint --lint .
+
+  deptry:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Run deptry
+        run: uv run --only-dev deptry .

{apis_acdhch_default_settings-2.7.0 → apis_acdhch_default_settings-2.8.0}/.github/workflows/publish.yml

@@ -16,6 +16,12 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: "3.x"
+    - name: Install gettext
+      run: sudo apt-get update && sudo apt-get -f install gettext
+    - name: Install django
+      run: python3 -m pip install django --user
+    - name: Compile messages
+      run: django-admin compilemessages
     - name: Install pypa/build
       run: >-
         python3 -m

{apis_acdhch_default_settings-2.7.0 → apis_acdhch_default_settings-2.8.0}/.gitignore

@@ -5,3 +5,4 @@
 dist
 **/__pycache__
 *.lock
+*.mo

{apis_acdhch_default_settings-2.7.0 → apis_acdhch_default_settings-2.8.0}/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.8.0](https://github.com/acdh-oeaw/apis-acdhch-default-settings/compare/v2.7.0...v2.8.0) (2025-05-16)
+
+
+### Features
+
+* **settings:** add LocaleMiddleware to the list of middlewares ([e803775](https://github.com/acdh-oeaw/apis-acdhch-default-settings/commit/e8037759d1739ad8c72e91fa1cd96debd2dba4f3))
+
+
+### Bug Fixes
+
+* **locales:** add translation for `Imprint` ([4a90552](https://github.com/acdh-oeaw/apis-acdhch-default-settings/commit/4a90552ea34cb126f496027b4cc5a376d4594ae3))
+
 ## [2.7.0](https://github.com/acdh-oeaw/apis-acdhch-default-settings/compare/v2.6.0...v2.7.0) (2025-05-13)
 
 

{apis_acdhch_default_settings-2.7.0 → apis_acdhch_default_settings-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apis-acdhch-default-settings
-Version: 2.7.0
+Version: 2.8.0
 Summary: Default settings for APIS instances at the ACDH-CH
 Project-URL: source, https://github.com/acdh-oeaw/apis-acdhch-default-settings
 Project-URL: changelog, https://github.com/acdh-oeaw/apis-acdhch-default-settings/blob/main/CHANGELOG.md
@@ -9,11 +9,13 @@ Author-email: Birger Schacht <birger.schacht@oeaw.ac.at>
 License-Expression: MIT
 License-File: LICENSE
 Requires-Python: >=3.11
+Requires-Dist: apis-core-rdf>=0.40.0
 Requires-Dist: dj-database-url<3.0,>=2.0.0
 Requires-Dist: django-allow-cidr<0.8,>=0.6
 Requires-Dist: django-auth-ldap<6.0,>=4.6.0
 Requires-Dist: django-csp<4.0,>=3.7
 Requires-Dist: django-removals<=2.0,>=1.0.5
+Requires-Dist: django>=5
 Requires-Dist: opentelemetry-distro
 Requires-Dist: opentelemetry-exporter-otlp
 Requires-Dist: opentelemetry-instrumentation-asgi
@@ -21,6 +23,7 @@ Requires-Dist: opentelemetry-instrumentation-django
 Requires-Dist: opentelemetry-instrumentation-logging
 Requires-Dist: opentelemetry-instrumentation-psycopg2
 Requires-Dist: opentelemetry-instrumentation-wsgi
+Requires-Dist: requests>=2
 Requires-Dist: whitenoise<7.0,>=5.2
 Description-Content-Type: text/markdown
 

apis_acdhch_default_settings-2.8.0/apis_acdhch_default_settings/locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-16 09:37+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: apis_acdhch_default_settings/templates/base.html
+msgid "Imprint"
+msgstr "Impressum"

{apis_acdhch_default_settings-2.7.0 → apis_acdhch_default_settings-2.8.0}/apis_acdhch_default_settings/settings.py

@@ -51,7 +51,7 @@ SPECTACULAR_SETTINGS: Dict[str, Any] = {
     "TITLE": "APIS generic API",
     "LICENSE": {"name": "MIT License", "url": "https://www.mit.edu/~amini/LICENSE.md"},
     "VERSION": "0.13",
-    "DEFAULT_GENERATOR_CLASS": 'apis_core.generic.generators.CustomSchemaGenerator'
+    "DEFAULT_GENERATOR_CLASS": "apis_core.generic.generators.CustomSchemaGenerator",
 }
 
 # django-csp settings
@@ -66,7 +66,13 @@ CSP_DEFAULT_SRC = (
     "unpkg.com",
     "*.openstreetmap.org",
 )
-CSP_IMG_SRC = ["'self'", "*.acdh.oeaw.ac.at", "data:", "*.openstreetmap.org", "cdnjs.cloudflare.com"]
+CSP_IMG_SRC = [
+    "'self'",
+    "*.acdh.oeaw.ac.at",
+    "data:",
+    "*.openstreetmap.org",
+    "cdnjs.cloudflare.com",
+]
 
 # Content Security Policy settings
 CSP_FRAME_ANCESTORS = ["https://*.pages.oeaw.ac.at/"]
@@ -102,6 +108,7 @@ MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
@@ -135,7 +142,9 @@ TEMPLATES = [
 
 # https://docs.djangoproject.com/en/stable/ref/settings/#auth-password-validators
 AUTH_PASSWORD_VALIDATORS = [
-    {"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"},
+    {
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"
+    },
     {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
     {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
     {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
@@ -143,7 +152,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/stable/ref/settings/#default-auto-field
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 # Internationalization
 # https://docs.djangoproject.com/en/stable/topics/i18n/
@@ -179,7 +188,9 @@ ALLOWED_CIDR_NETS = ["10.0.0.0/8", "127.0.0.0/8"]
 
 # https://docs.djangoproject.com/en/stable/ref/settings/#databases
 # https://github.com/jazzband/dj-database-url
-DATABASES = {'default': dj_database_url.config(default='sqlite:///db.sqlite3', conn_max_age=600)}
+DATABASES = {
+    "default": dj_database_url.config(default="sqlite:///db.sqlite3", conn_max_age=600)
+}
 
 # https://docs.djangoproject.com/en/stable/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
@@ -205,10 +216,10 @@ if os.environ.get("AUTH_LDAP_USER_LIST", False):
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,
-    'formatters': {
-       'verbose': {
-           'format': '%(asctime)s %(name)-6s %(levelname)-8s %(message)s',
-       },
+    "formatters": {
+        "verbose": {
+            "format": "%(asctime)s %(name)-6s %(levelname)-8s %(message)s",
+        },
     },
     "handlers": {
         "console": {

apis_acdhch_default_settings-2.8.0/apis_acdhch_default_settings/templates/base.html

@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block meta %}
+    {{ block.super }}
+    <meta name="monitoring" content="Icinga Check">
+{% endblock meta %}
+{% block imprint %}
+    {% url "imprint" as imprint_url %}
+    {% if imprint_url %}
+        <a href="{{ imprint_url }}">{% translate "Imprint" %}</a>
+    {% endif %}
+{% endblock imprint %}

apis_acdhch_default_settings-2.8.0/apis_acdhch_default_settings/templates/imprint.html

@@ -0,0 +1,9 @@
+{% extends basetemplate|default:"base.html" %}
+{% block title %}Imprint{% endblock %}
+{% block content %}
+    <div class="container">
+        <div class="card imprint">
+            <div class="card-body">{{ imprint|safe }}</div>
+        </div>
+    </div>
+{% endblock %}

{apis_acdhch_default_settings-2.7.0 → apis_acdhch_default_settings-2.8.0}/apis_acdhch_default_settings/urls.py

@@ -12,9 +12,7 @@ from apis_core.apis_entities.api_views import GetEntityGeneric
 urlpatterns = [
     path("apis/", include("apis_core.urls", namespace="apis")),
     path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
-    path(
-        "entity/<int:pk>/", GetEntityGeneric.as_view(), name="GetEntityGenericRoot"
-    ),
+    path("entity/<int:pk>/", GetEntityGeneric.as_view(), name="GetEntityGenericRoot"),
     path("admin/", admin.site.urls),
 ]
 urlpatterns += staticfiles_urlpatterns()

{apis_acdhch_default_settings-2.7.0 → apis_acdhch_default_settings-2.8.0}/apis_acdhch_default_settings/views.py

@@ -7,13 +7,15 @@ from django.utils.decorators import method_decorator
 from django.conf import settings
 
 
-@method_decorator(cache_page(60 * 5), name='dispatch')
+@method_decorator(cache_page(60 * 5), name="dispatch")
 class Imprint(TemplateView):
     template_name = "imprint.html"
 
     def get_context_data(self) -> str:
         ctx = super().get_context_data()
-        base_url = getattr(settings, "ACDH_IMPRINT_URL", "https://imprint.acdh.oeaw.ac.at/")
+        base_url = getattr(
+            settings, "ACDH_IMPRINT_URL", "https://imprint.acdh.oeaw.ac.at/"
+        )
         redmine_id = getattr(settings, "REDMINE_ID", os.getenv("SERVICE_ID", ""))
 
         r = requests.get(f"{base_url}{redmine_id}")

{apis_acdhch_default_settings-2.7.0 → apis_acdhch_default_settings-2.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apis-acdhch-default-settings"
-version = "2.7.0"
+version = "2.8.0"
 description = "Default settings for APIS instances at the ACDH-CH"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -20,12 +20,46 @@ dependencies = [
     "opentelemetry-exporter-otlp",
     "opentelemetry-distro",
     "django-removals>=1.0.5,<=2.0",
+    "django>=5",
+    "apis-core-rdf>=0.40.0",
+    "requests>=2",
 ]
 [project.urls]
 source = "https://github.com/acdh-oeaw/apis-acdhch-default-settings"
 changelog = "https://github.com/acdh-oeaw/apis-acdhch-default-settings/blob/main/CHANGELOG.md"
 issues = "https://github.com/acdh-oeaw/apis-acdhch-default-settings/issues"
 
+[tool.uv]
+dev-dependencies = [
+    "deptry==0.23",
+    "djlint==1.36.4",
+    "ruff==0.11.2",
+]
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+artifacts = ["**/*.mo"]
+
+[tool.hatch.build.targets.sdist]
+artifacts = ["**/*.mo"]
+
+[tool.deptry.per_rule_ignores]
+DEP002 = [
+  "django-allow-cidr",
+  "django-csp",
+  "whitenoise",
+  "django-removals",
+  "opentelemetry-instrumentation-asgi",
+  "opentelemetry-instrumentation-wsgi",
+  "opentelemetry-instrumentation-django",
+  "opentelemetry-instrumentation-logging",
+  "opentelemetry-instrumentation-psycopg2",
+  "opentelemetry-exporter-otlp",
+  "opentelemetry-distro"
+]
+
+[tool.deptry.package_module_name_map]
+apis-core-rdf = "apis_core"

apis_acdhch_default_settings-2.7.0/apis_acdhch_default_settings/templates/base.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block meta %}
-{{ block.super }}
-<meta name="monitoring" content="Icinga Check">
-{% endblock meta %}
-
-{% block imprint %}
-    {% url "imprint" as imprint_url %}
-    {% if imprint_url %}<a href="{{ imprint_url }}">{% translate "Imprint" %}</a>{% endif %}
-{% endblock imprint %}

apis_acdhch_default_settings-2.7.0/apis_acdhch_default_settings/templates/imprint.html

@@ -1,11 +0,0 @@
-{% extends basetemplate|default:"base.html" %}
-
-{% block title %}Imprint{% endblock %}
-
-{% block content %}
-  <div class="container">
-    <div class="card imprint">
-      <div class="card-body">{{ imprint|safe }}</div>
-    </div>
-  </div>
-{% endblock %}