xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle

Browse Source
This commit is contained in:
Martin Green 2023-07-05 13:19:11 +01:00
commit 067fcd9892
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_deploy/xubuntu/localsettingsXubuntu.py
View File

@ -173,8 +173,8 @@ sys.path.append(str(PYTHON_PATH))
# Sanitise these to be strings as all other code is expecting strings # 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. # and we have not made the change to pathlib Path type in the other localsettings-* variants yet.
CAVEDESCRIPTIONS = os.fspath(CAVEDESCRIPTIONS) #CAVEDESCRIPTIONS = os.fspath(CAVEDESCRIPTIONS)
ENTRANCEDESCRIPTIONS = os.fspath(ENTRANCEDESCRIPTIONS) #ENTRANCEDESCRIPTIONS = os.fspath(ENTRANCEDESCRIPTIONS)
STATIC_URL = str(STATIC_URL) + "/" STATIC_URL = str(STATIC_URL) + "/"
MEDIA_URL = str(MEDIA_URL) + "/" MEDIA_URL = str(MEDIA_URL) + "/"

18
requirements-p9d4.txt
View File

@ -1,19 +1,21 @@
asgiref==3.6.0 asgiref==3.7.0
black==23.1.0 beautifulsoup4==4.12.0
black==23.3.0
click==8.1.3 click==8.1.3
coverage==7.1.0 coverage==7.2.0
Django==4.2 Django==4.2
docutils==0.19 docutils==0.20
isort==5.12.0 isort==5.12.0
mypy-extensions==1.0.0 mypy-extensions==1.0.0
packaging==23.0 packaging==23.0
pathspec==0.11.0 pathspec==0.11.0
Pillow==9.4.0 Pillow==10.0.0
pkg_resources==0.0.0 pkg_resources==0.0.0
platformdirs==3.0.0 platformdirs==3.8.0
pytz==2022.7 pytz==2023.3
ruff==0.0.245 ruff==0.0.245
sqlparse==0.4.3 soupsieve==2.4.1
sqlparse==0.4.0
tomli==2.0.1 tomli==2.0.1
typing_extensions==4.7.1 typing_extensions==4.7.1
Unidecode==1.3.6 Unidecode==1.3.6

9
venv-trog-crowley.sh
View File

@ -90,7 +90,7 @@ fi
echo "### Setting file permissions.. may take a while.." echo "### Setting file permissions.. may take a while.."
git config --global --add safe.directory '*' git config --global --add safe.directory '*'
sudo chmod -R 0777 * #sudo chmod -R 0777 *
echo "### links to expoweb, troggle etc. complete:" echo "### links to expoweb, troggle etc. complete:"
ls -tla ls -tla
@ -136,7 +136,7 @@ cp fresh-requirements.txt ../requirements.txt
mv fresh-requirements.txt $REQ mv fresh-requirements.txt $REQ
cp troggle/`basename "$0"` $REQ cp troggle/`basename "$0"` $REQ
exit 1
$PYTHON --version $PYTHON --version
python --version python --version
echo "Django version:`django-admin --version`" echo "Django version:`django-admin --version`"
@ -159,12 +159,11 @@ echo "### Now do
# Ran 85 tests in 83.492s # Ran 85 tests in 83.492s
# FAILED (failures=5) # FAILED (failures=5)
## So you will need to run ## 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) # and then REBOOT (or at least, exit WSL and terminate and restart WSL)
# because this chmod only takes effect then. # because this chmod only takes effect then.
'python manage.py test -v 2' './pre-run.sh' (runs the migrations and then the tests)
'./pre-run.sh' (runs the tests again)
'python databaseReset.py reset $VENAME' 'python databaseReset.py reset $VENAME'
'python manage.py runserver 0.0.0.0:8000 (and allow access when the firewall window pops up)' 'python manage.py runserver 0.0.0.0:8000 (and allow access when the firewall window pops up)'