diff --git a/requirements.txt b/requirements.txt index e160b2d..0691869 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -asgiref==3.3.4 +asgiref==3.5.0 confusable-homoglyphs==3.2.0 -coverage==5.5 -Django==2.2.25 -docutils==0.14 +coverage==6.3.2 +Django==3.2.12 +docutils==0.18.1 gunicorn==20.1.0 -pytz==2019.1 -sqlparse==0.2.4 -typing-extensions==3.7.4.3 -Unidecode==1.0.23 +pytz==2021.3 +sqlparse==0.4.2 +typing-extensions==4.1.1 +Unidecode==1.3.3 diff --git a/urls.py b/urls.py index 6f592ee..1aaa303 100644 --- a/urls.py +++ b/urls.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.conf.urls import url, include, re_path +from django.urls import include, re_path from django.views.generic.base import RedirectView from django.views.generic.edit import UpdateView from django.views.generic.list import ListView @@ -61,7 +61,7 @@ else: # see https://docs.djangoproject.com/en/dev/topics/auth/default/ # The URLs provided by include('django.contrib.auth.urls') are: - +# # accounts/login/ [name='login'] # accounts/logout/ [name='logout'] # accounts/password_change/ [name='password_change'] @@ -71,8 +71,6 @@ else: # accounts/reset/// [name='password_reset_confirm'] # accounts/reset/done/ [name='password_reset_complete'] -# these worked in Django 2.2.24 but failed in .25 even though we include django.contrib.auth - trogglepatterns = [ path('expofiles/', include(expofilesurls)), # intercepted by Apache, if it is running. path('expofiles', include(expofilesurls)), # curious interaction with the include() here, not just a slash problem. diff --git a/venv-trog.sh b/venv-trog.sh index 0c88ba9..73ecc42 100644 --- a/venv-trog.sh +++ b/venv-trog.sh @@ -1,5 +1,6 @@ #!/bin/bash # Run this in a terminal in the troggle directory: 'bash venv-trog.sh' +echo 'Run this in a terminal in the troggle directory: "bash venv-trog.sh"' # Expects an Ubuntu 20.04 relatively clean install. # Running using SQLite 3.31.1 2020-01-27 19:55:54 @@ -10,11 +11,18 @@ # sudo apt install python3-pip # sudo apt install python3.9 +# On a clean debian 11 (bullseye) installation with Xfce & ssh, +# as debian does not install everything that ubuntu does, you need: +# sudo usermod -a -G sudo expo # to put expo in sudoers group, re-login required +# sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 +# sudo apt install python3-pip +# sudo apt piinstall python3-venv + # copy this file and requirements.txt into the directory above where you want to install the VENV -VENAME=p39 # python3.9 and django 2.22.25 +VENAME=d4 # python3.9 and django 4 if [ -d requirements.txt ]; then - echo "No requirements.txt found. Copy it here from your most recent installation." + echo "No requirements.txt found. Copy it from your most recent installation." exit 1 fi @@ -31,7 +39,11 @@ fi echo "### Activating $VENAME" cd $VENAME source bin/activate -PIP=bin/pip + # update local version of pip, more recent than OS version + # debian bullseye installs pip 20.3.4 which barfs, we want >22.0.3 +python -m pip install --upgrade pip + +PIP=pip $PIP list > original-pip.list $PIP freeze >original.txt