djaploy 1.5.2__tar.gz → 1.5.3__tar.gz

{djaploy-1.5.2 → djaploy-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.5.2
+Version: 1.5.3
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.5.2 → djaploy-1.5.3}/djaploy/infra/charts/django-app/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: django-app
 description: A Django app the way djaploy ran it (gunicorn + nginx + SQLite/media on local disk), on k3s.
 type: application
-version: 0.2.2
+version: 0.2.3

{djaploy-1.5.2 → djaploy-1.5.3}/djaploy/infra/charts/django-app/templates/configmap.yaml

@@ -57,10 +57,37 @@ data:
     {{- if and (eq .Values.database.engine "sqlite") .Values.database.sqlite.snapshotBeforeMigrate }}
     python /scripts/snapshot.py {{ .Values.database.sqlite.keepSnapshots }}
     {{- end }}
+    {{- if .Values.django.settingsModule }}
+    python /scripts/rollout.py
+    {{- else }}
+    {{- /* no settings module: let manage.py pick its default, one process per command */}}
     python {{ .Values.django.managePy }} migrate --noinput
     {{- range .Values.migrations.extraCommands }}
     python {{ $.Values.django.managePy }} {{ . }}
     {{- end }}
+    {{- end }}
+  # migrate + extraCommands in one process: Django starts once (~1 s on the
+  # node) instead of once per command.
+  rollout.py: |
+    import os
+    import shlex
+    import sys
+
+    MANAGE_PY = {{ .Values.django.managePy | quote }}
+    EXTRA_COMMANDS = {{ toJson (.Values.migrations.extraCommands | default list) }}
+
+    # What `python manage.py` does: its folder goes first on the path.
+    sys.path.insert(0, os.path.dirname(os.path.abspath(MANAGE_PY)))
+
+    import django
+    from django.core.management import call_command
+
+    django.setup()
+    print("==> migrate", flush=True)
+    call_command("migrate", interactive=False, skip_checks=False)  # system checks, as manage.py migrate
+    for command in EXTRA_COMMANDS:
+        print(f"==> {command}", flush=True)
+        call_command(*shlex.split(command))
   snapshot.py: |
     """Consistent copy of the SQLite DB before migrating (the rollback point)."""
     import glob, os, sqlite3, sys, time

djaploy-1.5.3/djaploy/version.py

@@ -0,0 +1 @@
+__version__ = "1.5.3"

{djaploy-1.5.2 → djaploy-1.5.3}/djaploy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.5.2
+Version: 1.5.3
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.5.2 → djaploy-1.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "djaploy"
-version = "1.5.2"
+version = "1.5.3"
 description = "Modular Django deployment system based on pyinfra"
 authors = [
     {name = "Johanna Mae Dimayuga", email = "johanna@techco.fi"}

{djaploy-1.5.2 → djaploy-1.5.3}/tests/test_k3s.py

@@ -108,7 +108,7 @@ class ImageRefTests(unittest.TestCase):
 
 class ChartTests(unittest.TestCase):
     def test_bundled_chart_version(self):
-        self.assertEqual(k3s.chart_version(), "0.2.2")
+        self.assertEqual(k3s.chart_version(), "0.2.3")
 
 
 class BuildModeTests(unittest.TestCase):

djaploy-1.5.2/djaploy/version.py

@@ -1 +0,0 @@
-__version__ = "1.5.2"