summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x_deploy/SnowWhite/pre-run.sh8
-rw-r--r--databaseReset.py12
-rw-r--r--deprecations.txt38
3 files changed, 54 insertions, 4 deletions
diff --git a/_deploy/SnowWhite/pre-run.sh b/_deploy/SnowWhite/pre-run.sh
index ab13800..d5f094e 100755
--- a/_deploy/SnowWhite/pre-run.sh
+++ b/_deploy/SnowWhite/pre-run.sh
@@ -1,7 +1,7 @@
#! /bin/bash
# Do these before final testing, *not* just before pushing:
-# Need to be in an ALREADY activated venv
-PYTHON="python"
+# Changed to use uv not pip, requires manage.py to have uv structured uv comment in it.
+PYTHON="uv run"
echo "** Run inspectdb:"
$PYTHON manage.py inspectdb > troggle-inspectdb.py
@@ -30,7 +30,7 @@ echo "** Now running test suite"
# $PYTHON manage.py test -v 1
echo ""
-echo `tail -1 lines-of-python.txt` non-comment lines of python. But core/utils.py has 28,000 lines of numbers.
+echo `tail -1 lines-of-python.txt` non-comment lines of python.
echo `tail -1 lines-of-templates.txt` non-comment lines of HTML templates.
-echo '** If you have an error running manage.py, maybe you are not in an activated venv ?' \ No newline at end of file
+echo '** If you have an error running manage.py, maybe you are not in an activated venv ? or your manage.py is not managed by uv properly ?' \ No newline at end of file
diff --git a/databaseReset.py b/databaseReset.py
index 8790b58..d7b2c91 100644
--- a/databaseReset.py
+++ b/databaseReset.py
@@ -1,3 +1,15 @@
+#!/usr/bin/env python
+# /// script
+# requires-python = ">=3.13"
+# dependencies = [
+# "bs4",
+# "cryptography",
+# "django",
+# "piexif",
+# "pillow",
+# "unidecode",
+# ]
+# ///
import json
import locale
import os
diff --git a/deprecations.txt b/deprecations.txt
index e69de29..452954e 100644
--- a/deprecations.txt
+++ b/deprecations.txt
@@ -0,0 +1,38 @@
+Traceback (most recent call last):
+ File "/home/philip/expo/troggle/manage.py", line 34, in <module>
+ execute_from_command_line(sys.argv)
+ ~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/core/management/__init__.py", line 442, in execute_from_command_line
+ utility.execute()
+ ~~~~~~~~~~~~~~~^^
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/core/management/__init__.py", line 416, in execute
+ django.setup()
+ ~~~~~~~~~~~~^^
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/__init__.py", line 24, in setup
+ apps.populate(settings.INSTALLED_APPS)
+ ~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/apps/registry.py", line 91, in populate
+ app_config = AppConfig.create(entry)
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/apps/config.py", line 123, in create
+ mod = import_module(mod_path)
+ File "/home/philip/.local/share/uv/python/cpython-3.13.1-linux-x86_64-gnu/lib/python3.13/importlib/__init__.py", line 88, in import_module
+ return _bootstrap._gcd_import(name[level:], package, level)
+ ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "<frozen importlib._bootstrap>", line 1387, in _gcd_import
+ File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
+ File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
+ File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
+ File "<frozen importlib._bootstrap_external>", line 1026, in exec_module
+ File "<frozen importlib._bootstrap>", line 488, in _call_with_frames_removed
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/contrib/auth/apps.py", line 8, in <module>
+ from .checks import check_middleware, check_models_permissions, check_user_model
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/contrib/auth/checks.py", line 9, in <module>
+ from .management import _get_builtin_permissions
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/contrib/auth/management/__init__.py", line 10, in <module>
+ from django.contrib.contenttypes.management import create_contenttypes
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/contrib/contenttypes/management/__init__.py", line 2, in <module>
+ from django.db import DEFAULT_DB_ALIAS, IntegrityError, migrations, router, transaction
+ File "/home/philip/expo/troggle/.venv/lib/python3.13/site-packages/django/db/migrations/__init__.py", line 1, in <module>
+ from .migration import Migration, swappable_dependency # NOQA
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ModuleNotFoundError: No module named 'django.db.migrations.migration'