From fd9f21de2ee629433962314e1af9a78af87d571a Mon Sep 17 00:00:00 2001 From: Expo laptop Crowley Date: Wed, 5 Jul 2023 12:49:30 +0200 Subject: [PATCH] more local fixups --- _deploy/xubuntu/localsettingsXubuntu.py | 4 ++-- requirements-p9d4.txt | 18 ++++++++++-------- venv-trog-crowley.sh | 6 +++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/_deploy/xubuntu/localsettingsXubuntu.py b/_deploy/xubuntu/localsettingsXubuntu.py index f2590de..8bfbdff 100644 --- a/_deploy/xubuntu/localsettingsXubuntu.py +++ b/_deploy/xubuntu/localsettingsXubuntu.py @@ -173,8 +173,8 @@ sys.path.append(str(PYTHON_PATH)) # Sanitise these to be strings as all other code is expecting strings # and we have not made the change to pathlib Path type in the other localsettings-* variants yet. -CAVEDESCRIPTIONS = os.fspath(CAVEDESCRIPTIONS) -ENTRANCEDESCRIPTIONS = os.fspath(ENTRANCEDESCRIPTIONS) +#CAVEDESCRIPTIONS = os.fspath(CAVEDESCRIPTIONS) +#ENTRANCEDESCRIPTIONS = os.fspath(ENTRANCEDESCRIPTIONS) STATIC_URL = str(STATIC_URL) + "/" MEDIA_URL = str(MEDIA_URL) + "/" diff --git a/requirements-p9d4.txt b/requirements-p9d4.txt index 85f60c1..5e290b5 100755 --- a/requirements-p9d4.txt +++ b/requirements-p9d4.txt @@ -1,19 +1,21 @@ -asgiref==3.6.0 -black==23.1.0 +asgiref==3.7.0 +beautifulsoup4==4.12.0 +black==23.3.0 click==8.1.3 -coverage==7.1.0 +coverage==7.2.0 Django==4.2 -docutils==0.19 +docutils==0.20 isort==5.12.0 mypy-extensions==1.0.0 packaging==23.0 pathspec==0.11.0 -Pillow==9.4.0 +Pillow==10.0.0 pkg_resources==0.0.0 -platformdirs==3.0.0 -pytz==2022.7 +platformdirs==3.8.0 +pytz==2023.3 ruff==0.0.245 -sqlparse==0.4.3 +soupsieve==2.4.1 +sqlparse==0.4.0 tomli==2.0.1 typing_extensions==4.7.1 Unidecode==1.3.6 diff --git a/venv-trog-crowley.sh b/venv-trog-crowley.sh index 378d002..383af05 100755 --- a/venv-trog-crowley.sh +++ b/venv-trog-crowley.sh @@ -90,7 +90,7 @@ fi echo "### Setting file permissions.. may take a while.." git config --global --add safe.directory '*' -sudo chmod -R 0777 * +#sudo chmod -R 0777 * echo "### links to expoweb, troggle etc. complete:" ls -tla @@ -136,7 +136,7 @@ cp fresh-requirements.txt ../requirements.txt mv fresh-requirements.txt $REQ cp troggle/`basename "$0"` $REQ -exit 1 + $PYTHON --version python --version echo "Django version:`django-admin --version`" @@ -159,7 +159,7 @@ echo "### Now do # Ran 85 tests in 83.492s # FAILED (failures=5) ## So you will need to run -$sudo chown -Rhv philip:philip ~/$VENAME (if your username is philip) +#$sudo chown -Rhv philip:philip ~/$VENAME (if your username is philip) # and then REBOOT (or at least, exit WSL and terminate and restart WSL) # because this chmod only takes effect then.