Merge pull request #4 from sown/2023-12-28-maintenance

2023 12 28 maintenance
sown · Dec 28, 2023 · b3415db · b3415db
2 parents 542a05c + 720b7d2
commit b3415db
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 14 deletions.
diff --git a/.env.example b/.env.example
@@ -1,9 +1,12 @@
 SECRET_KEY=django-insecure-rT1fjisdfhsdfsiof3fsdfjs9d0fwqe78(UO-X^FPe
 
-OIDC_RP_CLIENT_ID=YourClientIdHere
-OIDC_RP_CLIENT_SECRET=YourClientSecretHere
+SSO_OIDC_CONFIGURATION_URL=https://sso.example.com/.well-known/openid-configuration
+SSO_OIDC_CLIENT_ID=YourClientIdHere
+SSO_OIDC_CLIENT_SECRET=YourClientSecretHere
 SSO_STAFF_GROUP_NAME=kmicms:staff
 SSO_SUPERUSER_GROUP_NAME=kmicms:superuser
 
 DISCORD_APP_CLIENT_ID=123
-DISCORD_APP_CLIENT_SECRET=secret
+DISCORD_APP_CLIENT_SECRET=secret
+
+NETBOX_API_TOKEN=abc
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python: [3.9, "3.10", "3.11", "3.12"]
+        python: ["3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python }}

diff --git a/README.md b/README.md
@@ -25,6 +25,17 @@ You need to create a `.env` file containing the secrets:
 
 ```
 SECRET_KEY=django-insecure-rT1fjisdfhsdfsiof3fsdfjs9d0fwqe78(UO-X^FPe
+
+SSO_OIDC_CONFIGURATION_URL=https://sso.example.com/.well-known/openid-configuration
+SSO_OIDC_CLIENT_ID=YourClientIdHere
+SSO_OIDC_CLIENT_SECRET=YourClientSecretHere
+SSO_STAFF_GROUP_NAME=kmicms:staff
+SSO_SUPERUSER_GROUP_NAME=kmicms:superuser
+
+DISCORD_APP_CLIENT_ID=123
+DISCORD_APP_CLIENT_SECRET=secret
+
+NETBOX_API_TOKEN=abc
 ```
 
 There is an example of this file: `.env.example`

diff --git a/kmicms/core/templatetags/brand.py b/kmicms/core/templatetags/brand.py
@@ -24,7 +24,7 @@ def static_for_brand(parser: Any, token: Any) -> str:
 
     Usage::
 
-        {% static path [as varname] %}
+        {% static_for_brand path [as varname] %}
 
     Examples::
 

diff --git a/kmicms/kmicms/settings.py b/kmicms/kmicms/settings.py
@@ -14,9 +14,9 @@
 BASE_DIR = os.path.dirname(PROJECT_DIR)
 
 # Validate Python version
-if parse_version(platform.python_version()) < parse_version("3.9.0"):  # pragma: nocover
+if parse_version(platform.python_version()) < parse_version("3.10.0"):  # pragma: nocover
     raise RuntimeError(
-        f"SOWN CMS requires Python 3.9 or higher (current: Python {platform.python_version()})",
+        f"KMI-CMS requires Python 3.10 or higher (current: Python {platform.python_version()})",
     )
 
 #
@@ -231,9 +231,6 @@
 # https://docs.djangoproject.com/en/4.2/topics/i18n/
 
 USE_I18N = True
-
-USE_L10N = True
-
 USE_TZ = True
 
 MESSAGE_TAGS = {
@@ -262,7 +259,14 @@
 # ManifestStaticFilesStorage is recommended in production, to prevent outdated
 # JavaScript / CSS assets being served from cache (e.g. after a Wagtail upgrade).
 # See https://docs.djangoproject.com/en/4.2/ref/contrib/staticfiles/#manifeststaticfilesstorage
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
 
 STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = "/static/"

diff --git a/kmicms/pyproject.toml b/kmicms/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.ruff]
-target-version = "py39"
+target-version = "py310"
 line-length = 120
 
 select = [

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -42,7 +42,7 @@ coverage[toml]==7.3.2
     # via pytest-cov
 crispy-bootstrap5==2023.10
     # via -r requirements.txt
-cryptography==41.0.5
+cryptography==41.0.6
     # via
     #   -r requirements.txt
     #   authlib

diff --git a/requirements.txt b/requirements.txt
@@ -22,7 +22,7 @@ charset-normalizer==3.3.2
     # via requests
 crispy-bootstrap5==2023.10
     # via -r requirements.in
-cryptography==41.0.5
+cryptography==41.0.6
     # via authlib
 defusedxml==0.7.1
     # via willow
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ def static_for_brand(parser: Any, token: Any) -> str: @@
         Usage::
-            {% static path [as varname] %}
+            {% static_for_brand path [as varname] %}
         Examples::
@@ Expand Down @@