Merge branch 'x-editable-bs5' into 'v5.x'

Draft: Bundle a BS5 Fork of X-Editable

See merge request allianceauth/allianceauth!1650

.pre-commit-config.yaml

@@ -25,13 +25,13 @@ exclude: |
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.0
+    rev: v0.11.4
     hooks:
       # Run the linter, and only the linter
       - id: ruff
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.23.1
+    rev: 1.24.0
     hooks:
       - id: django-upgrade
         args: [--target-version=5.1]
@@ -73,7 +73,7 @@ repos:
       - id: check-executables-have-shebangs
       - id: end-of-file-fixer
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 3.2.0
+    rev: 3.2.1
     hooks:
       - id: editorconfig-checker
   - repo: https://github.com/igorshubovych/markdownlint-cli
@@ -97,6 +97,6 @@ repos:
     hooks:
       - id: tox-ini-fmt
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.24
+    rev: v0.24.1
     hooks:
       - id: validate-pyproject

allianceauth/static/allianceauth/js/bootstrap5-editable/1.5.4/LICENSE-MIT

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Vitaliy Potapov
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

allianceauth/static/allianceauth/js/bootstrap5-editable/1.5.4/README

@@ -0,0 +1,3 @@
+<https://github.com/melisoftspa/x-editable/tree/develop/dist/bootstrap5-editable/css>
+
+Fork of <https://github.com/vitalets/x-editable>

allianceauth/templates/bundles/x-editable-js.html

@@ -1,3 +1,4 @@
-<!-- Start X-editable JS from cdnjs -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.1/bootstrap3-editable/js/bootstrap-editable.min.js" integrity="sha512-Mvqhe3YIUElH6VT0CFmUeRgYMrLvCGd2mvYCnJOf2nL9FvRBK74qRgTn7u0zSqA5cHiGxy83bwuhl1ASbS9M/w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<!-- End X-editable JS from cdnjs -->
+<!-- Start x-editable JS from staticfiles -->
+<!-- x-editable is unmaintained, the fork is not published - bundled not using a CDN -->
+<link rel="stylesheet" href="{% static 'allianceauth/js/bootstrap5-editable/1.5.4/js/bootstrap-editable.min.js' %}"  integrity="OvX5TR23tk2l8aoWeUHpqHHYL6nb2vVoNv8BhL7Yg/4HnuvXriSGUGMF2PKvcy33bb6CJcK/9ni+507tx4Z9uQ==" crossorigin="anonymous" referrerpolicy="no-referrer">
+<!-- End x-editable JS from staticfiles -->

allianceauth/templates/bundles/x-editable.css.html

@@ -1,3 +1,4 @@
-<!-- Start X-editable CSS from cdnjs -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.1/bootstrap3-editable/css/bootstrap-editable.css" integrity="sha512-e0rbO6UJET0zDdXOHjwc6D44UpeKumn7cU7XR/fa4S0/Jso0bZqcCqlIF6mtvcimMbf846mkv8aSWFnTwABr/g==" crossorigin="anonymous" referrerpolicy="no-referrer">
-<!-- End X-editable CSS from cdnjs -->
+<!-- Start X-editable CSS from staticfiles -->
+<!-- x-editable is unmaintained, the fork is not published - bundled not using a CDN -->
+<link rel="stylesheet" href="{% static 'allianceauth/js/bootstrap5-editable/1.5.4/css/bootstrap-editable.min.css' %}"  integrity="Mu96gHfWyyPAd7OwJLJqA3qNs1J+zYb51/A/OLGO5vtp54C0XrLoZXLqemoQCIAUSUUQY67dsRvkWnGHsPzNjA==" crossorigin="anonymous" referrerpolicy="no-referrer">
+<!-- End X-editable CSS from staticfiles -->

docker/conf/celery.py

@@ -14,6 +14,10 @@ app = Celery('myauth')
 # Celery startup if it is unavailable.
 app.conf.broker_connection_retry_on_startup = True
 
+# Set a hard task execution time of 5 minutes before celery will cold restart
+app.conf.worker_soft_shutdown_timeout = 300
+app.conf.worker_enable_soft_shutdown_on_idle = True
+
 # Using a string here means the worker don't have to serialize
 # the configuration object to child processes.
 app.config_from_object('django.conf:settings')

docker/docker-compose.yml

@@ -89,8 +89,8 @@ services:
     container_name: allianceauth_gunicorn
     <<: [*allianceauth-base]
     entrypoint: ["gunicorn", "myauth.wsgi", "--bind=0.0.0.0:8000", "--workers=3", "--timeout=120", "--max-requests=500", "--max-requests-jitter=50"]
-    ports:
-      - 8000:8000
+    expose:
+      - 8000
 
   allianceauth_beat:
     container_name: allianceauth_worker_beat

pyproject.toml

@@ -40,7 +40,7 @@ dynamic = [
 dependencies = [
     "bcrypt",
     "beautifulsoup4",
-    "celery>=5.4,<6",
+    "celery>=5.5,<6",
     "celery-once>=3.0.1",
     "django>=5.1,<5.2",
     "django-bootstrap-form",