summaryrefslogtreecommitdiffstats
path: root/_deploy/wsl/using-pip
diff options
context:
space:
mode:
Diffstat (limited to '_deploy/wsl/using-pip')
-rw-r--r--_deploy/wsl/using-pip/requirements-Dj3.2Bullseye.txt12
-rw-r--r--_deploy/wsl/using-pip/requirements-devupgrade.txt20
-rwxr-xr-x_deploy/wsl/using-pip/requirements-keep.txt44
-rw-r--r--_deploy/wsl/using-pip/requirements-p10d4.txt17
-rw-r--r--_deploy/wsl/using-pip/requirements-p10d5.txt9
-rw-r--r--_deploy/wsl/using-pip/requirements-p11d32.txt3
-rw-r--r--_deploy/wsl/using-pip/requirements-p11d42.txt21
-rw-r--r--_deploy/wsl/using-pip/requirements-p11d5.txt21
-rwxr-xr-x_deploy/wsl/using-pip/requirements-p12d5.txt20
-rwxr-xr-x_deploy/wsl/using-pip/requirements-p9d4.txt21
-rw-r--r--_deploy/wsl/using-pip/requirements3.2.txt17
-rw-r--r--_deploy/wsl/using-pip/venv-trog-d3.sh184
-rw-r--r--_deploy/wsl/using-pip/venv-trog-d4.sh184
-rwxr-xr-x_deploy/wsl/using-pip/venv-trog-d5.sh190
14 files changed, 763 insertions, 0 deletions
diff --git a/_deploy/wsl/using-pip/requirements-Dj3.2Bullseye.txt b/_deploy/wsl/using-pip/requirements-Dj3.2Bullseye.txt
new file mode 100644
index 0000000..6b515f7
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-Dj3.2Bullseye.txt
@@ -0,0 +1,12 @@
+asgiref==3.3.4
+confusable-homoglyphs==3.2.0
+coverage==5.5
+Django==3.2.12
+docutils==0.14
+gunicorn==20.1.0
+Pillow==9.0.1
+pytz==2019.1
+reportlab==3.6.8
+sqlparse==0.2.4
+typing-extensions==3.7.4.3
+Unidecode==1.0.23
diff --git a/_deploy/wsl/using-pip/requirements-devupgrade.txt b/_deploy/wsl/using-pip/requirements-devupgrade.txt
new file mode 100644
index 0000000..19fe6d8
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-devupgrade.txt
@@ -0,0 +1,20 @@
+# Philip bleeding edge config
+asgiref==3.6.0
+beautifulsoup4==4.12.2
+black==23.1.0
+click==8.1.3
+coverage==7.1.0
+Django==4.2
+docutils==0.19
+isort==5.12.0
+mypy-extensions==1.0.0
+packaging==23.0
+pathspec==0.11.0
+Pillow==9.4.0
+platformdirs==3.0.0
+pytz==2022.7
+ruff==0.0.245
+soupsieve==2.4.1
+sqlparse==0.4.3
+Unidecode==1.3.6
+piexif==1.1.3 \ No newline at end of file
diff --git a/_deploy/wsl/using-pip/requirements-keep.txt b/_deploy/wsl/using-pip/requirements-keep.txt
new file mode 100755
index 0000000..a497cf9
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-keep.txt
@@ -0,0 +1,44 @@
+For debian bullseye (10)
+python3-django (3.2.12)
+tinymce (from where?)
+mariadb-server
+apache2
+libapache2-mod-wsgi-py3
+
+
+python3-django-registration ?
+Django==1.7
+django-extensions==2.2.9
+django-registration==2.0
+django-tinymce==2.0.1
+six==1.14.0
+Unidecode==1.1.1 python3-unidecode
+Pillow==7.1.2 python3-willow
+
+asgiref==3.7.2
+attrs==22.2.0
+beautifulsoup4==4.12.2
+black==23.11.0
+bs4==0.0.1
+click==8.1.3
+colorama==0.4.6
+coverage==6.5.0
+Django==5.0
+docutils==0.20
+interrogate==1.5.0
+isort==5.11.4
+mypy-extensions==0.4.3
+packaging==23.2
+pathspec==0.10.3
+piexif==1.1.3
+Pillow==10.1.0
+platformdirs==2.6.2
+py==1.11.0
+pytz==2022.6
+ruff==0.1.0
+soupsieve==2.5
+sqlparse==0.4.0
+tabulate==0.9.0
+toml==0.10.2
+typing_extensions==4.4.0
+Unidecode==1.3.6
diff --git a/_deploy/wsl/using-pip/requirements-p10d4.txt b/_deploy/wsl/using-pip/requirements-p10d4.txt
new file mode 100644
index 0000000..aafb7f6
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-p10d4.txt
@@ -0,0 +1,17 @@
+asgiref==3.6.0
+black==23.1.0
+click==8.1.3
+coverage==7.1.0
+Django==4.2
+docutils==0.19
+isort==5.12.0
+mypy-extensions==1.0.0
+packaging==23.0
+pathspec==0.11.0
+Pillow==9.4.0
+platformdirs==3.0.0
+pytz==2022.7
+ruff==0.0.245
+sqlparse==0.4.3
+tomli==2.0.1
+Unidecode==1.3.6
diff --git a/_deploy/wsl/using-pip/requirements-p10d5.txt b/_deploy/wsl/using-pip/requirements-p10d5.txt
new file mode 100644
index 0000000..604ffcd
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-p10d5.txt
@@ -0,0 +1,9 @@
+asgiref==3.5.2
+coverage==6.5.0
+Django==3.2.16
+docutils==0.19
+Pillow==9.3.0
+pytz==2022.6
+sqlparse==0.4.3
+typing_extensions==4.4.0
+Unidecode==1.3.6
diff --git a/_deploy/wsl/using-pip/requirements-p11d32.txt b/_deploy/wsl/using-pip/requirements-p11d32.txt
new file mode 100644
index 0000000..987f2ed
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-p11d32.txt
@@ -0,0 +1,3 @@
+asgiref==3.8.1
+Django==5.1b1
+sqlparse==0.5.1
diff --git a/_deploy/wsl/using-pip/requirements-p11d42.txt b/_deploy/wsl/using-pip/requirements-p11d42.txt
new file mode 100644
index 0000000..aa64d29
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-p11d42.txt
@@ -0,0 +1,21 @@
+asgiref==3.6.0
+beautifulsoup4==4.12.0
+black==23.1.0
+chardet==5.1.0
+click==8.1.0
+coverage==7.1.0
+deptry==0.12.0
+Django==4.2
+docutils==0.19
+isort==5.12.0
+mypy-extensions==1.0.0
+packaging==23.0
+pathspec==0.11.0
+piexif==1.1.3
+Pillow==9.4.0
+platformdirs==3.0.0
+pytz==2022.7
+ruff==0.0.245
+soupsieve==2.5
+sqlparse==0.4.0
+Unidecode==1.3.0
diff --git a/_deploy/wsl/using-pip/requirements-p11d5.txt b/_deploy/wsl/using-pip/requirements-p11d5.txt
new file mode 100644
index 0000000..ee1d50c
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-p11d5.txt
@@ -0,0 +1,21 @@
+# to be used with pre-release Djangi install which installs other stuff too
+beautifulsoup4==4.12
+piexif==1.1
+black==23.1
+chardet==5.1
+click==8.1
+coverage==7.1
+deptry==0.12
+docutils==0.19
+isort==5.12
+mypy-extensions==1.0
+packaging==23.0
+pathspec==0.11
+Pillow==9.4.0
+platformdirs==3.0
+pytz==2022.7
+ruff==0.0.245
+setuptools==67.7
+soupsieve==2.5
+Unidecode==1.3
+piexif==1.1
diff --git a/_deploy/wsl/using-pip/requirements-p12d5.txt b/_deploy/wsl/using-pip/requirements-p12d5.txt
new file mode 100755
index 0000000..4b76edb
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-p12d5.txt
@@ -0,0 +1,20 @@
+Pillow==10.2
+Unidecode==1.3.8
+asgiref==3.6
+beautifulsoup4==4.12
+black==24.2
+chardet==5.2
+click==8.1
+coverage==7
+deptry==0.12.0
+docutils==0.20
+isort==5
+mypy-extensions==1.0
+packaging==23
+pathspec==0.12
+platformdirs==4
+pytz==2024.1
+ruff==0.2
+soupsieve==2.5
+sqlparse
+piexif
diff --git a/_deploy/wsl/using-pip/requirements-p9d4.txt b/_deploy/wsl/using-pip/requirements-p9d4.txt
new file mode 100755
index 0000000..5e290b5
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements-p9d4.txt
@@ -0,0 +1,21 @@
+asgiref==3.7.0
+beautifulsoup4==4.12.0
+black==23.3.0
+click==8.1.3
+coverage==7.2.0
+Django==4.2
+docutils==0.20
+isort==5.12.0
+mypy-extensions==1.0.0
+packaging==23.0
+pathspec==0.11.0
+Pillow==10.0.0
+pkg_resources==0.0.0
+platformdirs==3.8.0
+pytz==2023.3
+ruff==0.0.245
+soupsieve==2.4.1
+sqlparse==0.4.0
+tomli==2.0.1
+typing_extensions==4.7.1
+Unidecode==1.3.6
diff --git a/_deploy/wsl/using-pip/requirements3.2.txt b/_deploy/wsl/using-pip/requirements3.2.txt
new file mode 100644
index 0000000..47beb3d
--- /dev/null
+++ b/_deploy/wsl/using-pip/requirements3.2.txt
@@ -0,0 +1,17 @@
+asgiref==3.3.4
+confusable-homoglyphs==3.2.0
+Django==3.2
+docutils==0.14
+gunicorn==20.1.0
+Pillow==5.4.1
+sqlparse==0.2.4
+typing-extensions==3.7.4.3
+Unidecode==1.0.23
+mariadb==1.0.11
+mysql-connector-python==8.0.29
+mysqlclient==2.1.0
+Pillow==9.1.0
+pytz==2022.5
+asgiref==3.5.0
+gunicorn==20.1.0
+
diff --git a/_deploy/wsl/using-pip/venv-trog-d3.sh b/_deploy/wsl/using-pip/venv-trog-d3.sh
new file mode 100644
index 0000000..ede077e
--- /dev/null
+++ b/_deploy/wsl/using-pip/venv-trog-d3.sh
@@ -0,0 +1,184 @@
+#!/bin/bash
+# footled lots to make this work with python 3.10 & 3.11 and WSL1 and WSL2 on Ubuntu 22.04
+# Run this in a terminal in the troggle directory: 'bash venv-trog.sh'
+echo '-- Run this in a terminal in the real troggle directory: "bash venv-trog.sh"'
+
+# Expects an Ubuntu 22.04 (or 20.04) relatively clean install.
+# If you have not already installed these on your clean Ubuntu install DO THIS FIRST
+# use the script os-trog.sh
+
+# If you are using Debian, then stick with the default version of python
+# If you are using Ubuntu, then it is easy to use a later version of python, e.g. 3.11
+
+# NOW we set up troggle
+PYTHON=python3.11
+VENAME=p11d32 # python3.x and django 4.2
+echo "** You are logged in as `id -u -n`"
+echo "The 50MB pip cache will be in /home/`id -u -n`/.cache/"
+echo "The 150MB venv will created in /home/`id -u -n`/$VENAME/"
+TROGDIR=$(cd $(dirname $0) && pwd)
+echo "-- Troggle folder (this script location): ${TROGDIR}"
+
+REQUIRE=requirements-$VENAME.txt
+
+if [ -d $REQUIRE ]; then
+ echo "-- No ${REQUIRE} found. You should be in the /troggle/ folder. Copy it from your most recent installation."
+ exit 1
+fi
+echo ## Using $REQUIRE :
+cat $REQUIRE
+echo ##
+
+
+$PYTHON --version
+
+# NOTE that when using a later or earlier verison of python, you MUST also
+# use the allowed version of Pillow, see https://pillow.readthedocs.io/en/latest/installation.html
+
+# NOW set up link from expo user folder
+# needed for WSL2
+echo Creating links from Linux filesystem user
+# These links only need making once, for many venv
+cd ~
+
+if [ ! -d $VENAME ]; then
+ echo "## Creating venv $VENAME. (If this fails with a pip error, you need to ensure you have python3.11-venv installed and/or use a Ubuntu window)"
+ $PYTHON -m venv $VENAME
+else
+ echo "## /$VENAME/ already exists ! Delete it first."
+ exit 1
+fi
+
+ # Activate the virtual env and see what the default packages are
+echo "### Activating $VENAME"
+
+cd $VENAME
+echo "-- now in: ${PWD}"
+ls -tlarg
+source bin/activate
+echo $VIRTUAL_ENV
+if [ -d ~/$VENAME/bin ]; then
+ echo "### Activating."
+else
+ echo "## ~/$VENAME/bin does not exist. FAILed to create venv properly."
+ exit 1
+fi
+ # update local version of pip, more recent than OS version
+ # debian bullseye installs pip 20.3.4 which barfs, we want >22.0.3
+
+ # update local version of setuptools, more recent than OS version, needed for packages without wheels
+
+echo "### installing later version of pip inside $VENAME"
+$PYTHON -m pip install --upgrade pip
+$PYTHON -m pip install --upgrade setuptools
+
+PIP=pip
+
+$PIP list > original-pip.list
+$PIP freeze >original.txt
+
+# we are in /home/$USER/$VENAME/
+ln -s ${TROGDIR} troggle
+ln -s ${TROGDIR}/../expoweb expoweb
+ln -s ${TROGDIR}/../loser loser
+ln -s ${TROGDIR}/../drawings drawings
+#ln -s ${TROGDIR}/../expofiles expofiles
+
+# fudge for philip's machine
+if [ ! -d /mnt/d/EXPO ]; then
+ sudo mkdir /mnt/d
+ sudo mount -t drvfs D: /mnt/d
+fi
+
+if [ -d ${TROGDIR}/../expofiles ]; then
+ ln -s ${TROGDIR}/../expofiles expofiles
+else
+ ln -s /mnt/d/EXPO/expofiles expofiles
+fi
+
+echo "### Setting file permissions.. may take a while.."
+git config --global --add safe.directory '*'
+sudo chmod -R 777 *
+
+echo "### links to expoweb, troggle etc. complete:"
+ls -tla
+echo "###"
+echo "### now installing ${TROGDIR}/${REQUIRE}"
+echo "###"
+cat ${TROGDIR}/${REQUIRE}
+
+# NOW THERE IS A PERMISSIONS FAILURE THAT DIDN'T HAPPEN BEFORE
+# seen on wsl2 as well as wsl1
+# which ALSO ruins EXISTING permissions !
+# Guessing it is to do with pip not liking non-standard py 3.11 installation on Ubuntu 22.04
+
+read -p "Press any key to resume ..."
+$PIP install -r ${TROGDIR}/${REQUIRE}
+echo "### install from ${TROGDIR}/${REQUIRE} completed."
+echo '### '
+
+$PIP install --pre django
+
+$PIP freeze > $REQUIRE
+# so that we can track requirements more easily with git
+# because we do not install these with pip, but they are listed by the freeze command
+# Now find out what we actually installed by subtracting the stuff venv installed anyway
+sort original.txt > 1
+sort $REQUIRE >2
+comm -3 1 2 --check-order | awk '{ print $1}'>fresh-$REQUIRE
+rm 1
+rm 2
+
+# cp $REQUIRE requirements-$VENAME.txt
+cp $REQUIRE troggle/$REQUIRE
+
+$PIP list > installed-pip.list
+$PIP list -o > installed-pip-o.list
+
+REQ=installation-record
+mkdir $REQ
+
+mv original.txt $REQ
+mv $REQUIRE $REQ
+mv original-pip.list $REQ
+mv installed-pip.list $REQ
+mv installed-pip-o.list $REQ
+cp fresh-$REQUIRE ../$REQUIRE
+mv fresh-$REQUIRE $REQ
+cp troggle/`basename "$0"` $REQ
+
+
+$PYTHON --version
+python --version
+echo "Django version:`django-admin --version`"
+
+echo "### Now do
+ '[sudo service mysql start]'
+ '[sudo service mariadb restart]'
+ '[sudo mysql_secure_installation]'
+ 'cd ~/$VENAME'
+ 'source bin/activate'
+ 'cd troggle'
+ 'django-admin'
+ 'python manage.py check'
+## this tests if you have set up ssh correcting. Refer to documentation https://expo.survex.com/handbook/computing/keyexchange.html
+## you need to follow the Linux instructions.
+ 'ssh expo@expo.survex.com'
+
+## the next tests will fail unless ~/expofiles is set correctly to a folder on your machine
+## the tests may ALSO fail because of ssh and permissions errors
+
+## So you will need to run
+$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.
+
+ 'python manage.py test -v 2'
+ './pre-run.sh' (runs the tests again)
+
+ 'python databaseReset.py reset $VENAME'
+ 'python manage.py runserver 0.0.0.0:8000 (and allow access when the firewall window pops up)'
+ "
+# if [ ! -d /mnt/d/expofiles ]; then
+ # echo '### No valid expofiles directory on /mnt/d . Fix this before any tests will work.'
+# fi \ No newline at end of file
diff --git a/_deploy/wsl/using-pip/venv-trog-d4.sh b/_deploy/wsl/using-pip/venv-trog-d4.sh
new file mode 100644
index 0000000..97e99b7
--- /dev/null
+++ b/_deploy/wsl/using-pip/venv-trog-d4.sh
@@ -0,0 +1,184 @@
+#!/bin/bash
+# footled lots to make this work with python 3.10 & 3.11 and WSL1 and WSL2 on Ubuntu 22.04
+# Run this in a terminal in the troggle directory: 'bash venv-trog.sh'
+echo '-- Run this in a terminal in the real troggle directory: "bash venv-trog.sh"'
+
+# Expects an Ubuntu 22.04 (or 20.04) relatively clean install.
+# If you have not already installed these on your clean Ubuntu install DO THIS FIRST
+# use the script os-trog.sh
+
+# If you are using Debian, then stick with the default version of python
+# If you are using Ubuntu, then it is easy to use a later version of python, e.g. 3.11
+
+# NOW we set up troggle
+PYTHON=python3.11
+VENAME=p11d42 # python3.x and django 4.2
+echo "** You are logged in as `id -u -n`"
+echo "The 50MB pip cache will be in /home/`id -u -n`/.cache/"
+echo "The 150MB venv will created in /home/`id -u -n`/$VENAME/"
+TROGDIR=$(cd $(dirname $0) && pwd)
+echo "-- Troggle folder (this script location): ${TROGDIR}"
+
+REQUIRE=requirements-$VENAME.txt
+
+if [ -d $REQUIRE ]; then
+ echo "-- No ${REQUIRE} found. You should be in the /troggle/ folder. Copy it from your most recent installation."
+ exit 1
+fi
+echo ## Using $REQUIRE :
+cat $REQUIRE
+echo ##
+
+
+$PYTHON --version
+
+# NOTE that when using a later or earlier verison of python, you MUST also
+# use the allowed version of Pillow, see https://pillow.readthedocs.io/en/latest/installation.html
+
+# NOW set up link from expo user folder
+# needed for WSL2
+echo Creating links from Linux filesystem user
+# These links only need making once, for many venv
+cd ~
+
+if [ ! -d $VENAME ]; then
+ echo "## Creating venv $VENAME. (If this fails with a pip error, you need to ensure you have python3.11-venv installed and/or use a Ubuntu window)"
+ $PYTHON -m venv $VENAME
+else
+ echo "## /$VENAME/ already exists ! Delete it first."
+ exit 1
+fi
+
+ # Activate the virtual env and see what the default packages are
+echo "### Activating $VENAME"
+
+cd $VENAME
+echo "-- now in: ${PWD}"
+ls -tlarg
+source bin/activate
+echo $VIRTUAL_ENV
+if [ -d ~/$VENAME/bin ]; then
+ echo "### Activating."
+else
+ echo "## ~/$VENAME/bin does not exist. FAILed to create venv properly."
+ exit 1
+fi
+ # update local version of pip, more recent than OS version
+ # debian bullseye installs pip 20.3.4 which barfs, we want >22.0.3
+
+ # update local version of setuptools, more recent than OS version, needed for packages without wheels
+
+echo "### installing later version of pip inside $VENAME"
+$PYTHON -m pip install --upgrade pip
+$PYTHON -m pip install --upgrade setuptools
+
+PIP=pip
+
+$PIP list > original-pip.list
+$PIP freeze >original.txt
+
+# we are in /home/$USER/$VENAME/
+ln -s ${TROGDIR} troggle
+ln -s ${TROGDIR}/../expoweb expoweb
+ln -s ${TROGDIR}/../loser loser
+ln -s ${TROGDIR}/../drawings drawings
+#ln -s ${TROGDIR}/../expofiles expofiles
+
+# fudge for philip's machine
+if [ ! -d /mnt/d/EXPO ]; then
+ sudo mkdir /mnt/d
+ sudo mount -t drvfs D: /mnt/d
+fi
+
+if [ -d ${TROGDIR}/../expofiles ]; then
+ ln -s ${TROGDIR}/../expofiles expofiles
+else
+ ln -s /mnt/d/EXPO/expofiles expofiles
+fi
+
+echo "### Setting file permissions.. may take a while.."
+git config --global --add safe.directory '*'
+sudo chmod -R 777 *
+
+echo "### links to expoweb, troggle etc. complete:"
+ls -tla
+echo "###"
+echo "### now installing ${TROGDIR}/${REQUIRE}"
+echo "###"
+cat ${TROGDIR}/${REQUIRE}
+
+# NOW THERE IS A PERMISSIONS FAILURE THAT DIDN'T HAPPEN BEFORE
+# seen on wsl2 as well as wsl1
+# which ALSO ruins EXISTING permissions !
+# Guessing it is to do with pip not liking non-standard py 3.11 installation on Ubuntu 22.04
+
+read -p "Press any key to resume ..."
+$PIP install -r ${TROGDIR}/${REQUIRE}
+echo "### install from ${TROGDIR}/${REQUIRE} completed."
+echo '### '
+
+$PIP install --pre django
+
+$PIP freeze > $REQUIRE
+# so that we can track requirements more easily with git
+# because we do not install these with pip, but they are listed by the freeze command
+# Now find out what we actually installed by subtracting the stuff venv installed anyway
+sort original.txt > 1
+sort $REQUIRE >2
+comm -3 1 2 --check-order | awk '{ print $1}'>fresh-$REQUIRE
+rm 1
+rm 2
+
+# cp $REQUIRE requirements-$VENAME.txt
+cp $REQUIRE troggle/$REQUIRE
+
+$PIP list > installed-pip.list
+$PIP list -o > installed-pip-o.list
+
+REQ=installation-record
+mkdir $REQ
+
+mv original.txt $REQ
+mv $REQUIRE $REQ
+mv original-pip.list $REQ
+mv installed-pip.list $REQ
+mv installed-pip-o.list $REQ
+cp fresh-$REQUIRE ../$REQUIRE
+mv fresh-$REQUIRE $REQ
+cp troggle/`basename "$0"` $REQ
+
+
+$PYTHON --version
+python --version
+echo "Django version:`django-admin --version`"
+
+echo "### Now do
+ '[sudo service mysql start]'
+ '[sudo service mariadb restart]'
+ '[sudo mysql_secure_installation]'
+ 'cd ~/$VENAME'
+ 'source bin/activate'
+ 'cd troggle'
+ 'django-admin'
+ 'python manage.py check'
+## this tests if you have set up ssh correcting. Refer to documentation https://expo.survex.com/handbook/computing/keyexchange.html
+## you need to follow the Linux instructions.
+ 'ssh expo@expo.survex.com'
+
+## the next tests will fail unless ~/expofiles is set correctly to a folder on your machine
+## the tests may ALSO fail because of ssh and permissions errors
+
+## So you will need to run
+$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.
+
+ 'python manage.py test -v 2'
+ './pre-run.sh' (runs the tests again)
+
+ 'python databaseReset.py reset $VENAME'
+ 'python manage.py runserver 0.0.0.0:8000 (and allow access when the firewall window pops up)'
+ "
+# if [ ! -d /mnt/d/expofiles ]; then
+ # echo '### No valid expofiles directory on /mnt/d . Fix this before any tests will work.'
+# fi \ No newline at end of file
diff --git a/_deploy/wsl/using-pip/venv-trog-d5.sh b/_deploy/wsl/using-pip/venv-trog-d5.sh
new file mode 100755
index 0000000..68d9424
--- /dev/null
+++ b/_deploy/wsl/using-pip/venv-trog-d5.sh
@@ -0,0 +1,190 @@
+#!/bin/bash
+# footled lots to make this work with python 3.10 & 3.11 and WSL1 and WSL2 on Ubuntu 22.04
+# Run this in a terminal in the troggle directory: 'bash venv-trog.sh'
+echo '-- Run this in a terminal in the real troggle directory: "bash venv-trog.sh"'
+
+# Expects an Ubuntu 22.04 (or 20.04) relatively clean install.
+# If you have not already installed these on your clean Ubuntu install DO THIS FIRST
+# use the script os-trog.sh
+
+# If you are using Debian, then stick with the default version of python
+# If you are using Ubuntu, then it is easy to use a later version of python, e.g. 3.12
+
+# NOW we set up troggle
+PYTHON=python3.12
+VENAME=p12d5 # python3.x and django version
+echo "** You are logged in as `id -u -n`"
+echo "The 50MB pip cache will be in /home/`id -u -n`/.cache/"
+echo "The 150MB venv will created in /home/`id -u -n`/$VENAME/"
+TROGDIR=$(cd $(dirname $0) && pwd)
+echo "-- Troggle folder (this script location): ${TROGDIR}"
+
+if [[ "${VENAME:(-1)}" == 5 ]]; then
+ echo "The variable '$VENAME' ends in 5."
+else
+ echo "The variable '$VENAME' does not end in 5."
+fi
+
+REQUIRE=requirements-$VENAME.txt
+
+if [ -d $REQUIRE ]; then
+ echo "-- No ${REQUIRE} found. You should be in the /troggle/ folder. Copy it from your most recent installation."
+ exit 1
+fi
+echo ## Using $REQUIRE :
+cat $REQUIRE
+echo ##
+
+
+$PYTHON --version
+
+# NOTE that when using a later or earlier verison of python, you MUST also
+# use the allowed version of Pillow, see https://pillow.readthedocs.io/en/latest/installation.html
+
+# NOW set up link from expo user folder
+# needed for WSL2
+echo Creating links from Linux filesystem user
+# These links only need making once, for many venv
+cd ~
+
+if [ ! -d $VENAME ]; then
+ echo "## Creating venv $VENAME. (If this fails with a pip error, you need to ensure you have python3.12-venv installed and/or use a Ubuntu window)"
+ $PYTHON -m venv $VENAME
+else
+ echo "## /$VENAME/ already exists ! Delete it first."
+ exit 1
+fi
+
+ # Activate the virtual env and see what the default packages are
+echo "### Activating $VENAME"
+
+cd $VENAME
+echo "-- now in: ${PWD}"
+ls -tlarg
+source bin/activate
+echo $VIRTUAL_ENV
+if [ -d ~/$VENAME/bin ]; then
+ echo "### Activating."
+else
+ echo "## ~/$VENAME/bin does not exist. FAILed to create venv properly."
+ exit 1
+fi
+ # update local version of pip, more recent than OS version
+ # debian bullseye installs pip 20.3.4 which barfs, we want >22.0.3
+
+ # update local version of setuptools, more recent than OS version, needed for packages without wheels
+
+echo "### installing later version of pip inside $VENAME"
+$PYTHON -m pip install --upgrade pip
+$PYTHON -m pip install --upgrade setuptools
+
+$PYTHON -m pip list > original-pip.list
+$PYTHON -m pip freeze >original.txt
+
+# we are in /home/$USER/$VENAME/
+ln -s ${TROGDIR} troggle
+ln -s ${TROGDIR}/../expoweb expoweb
+ln -s ${TROGDIR}/../loser loser
+ln -s ${TROGDIR}/../drawings drawings
+#ln -s ${TROGDIR}/../expofiles expofiles
+
+# fudge for philip's machine
+if [ ! -d /mnt/d/EXPO ]; then
+ sudo mkdir /mnt/d
+ sudo mount -t drvfs D: /mnt/d
+fi
+
+if [ -d ${TROGDIR}/../expofiles ]; then
+ ln -s ${TROGDIR}/../expofiles expofiles
+else
+ ln -s /mnt/d/EXPO/expofiles expofiles
+fi
+
+echo "### Setting file permissions.. may take a while.."
+git config --global --add safe.directory '*'
+sudo chmod -R 777 *
+
+echo "### links to expoweb, troggle etc. complete:"
+ls -tla
+echo "###"
+echo "### now installing ${TROGDIR}/${REQUIRE}"
+echo "###"
+cat ${TROGDIR}/${REQUIRE}
+cp -f ${TROGDIR}/${REQUIRE} ${TROGDIR}/${REQUIRE}.orig
+
+read -p "Press any key to resume ..."
+$PYTHON -m pip install -r ${TROGDIR}/${REQUIRE}
+echo "### install from ${TROGDIR}/${REQUIRE} completed."
+echo '### '
+
+# this installs pre-release django 5.0
+if [[ "${VENAME:(-1)}" == 5 ]]; then
+ echo "### Installing pre-release version of Django"
+ $PYTHON -m pip install --pre django
+fi
+
+$PYTHON -m pip freeze > $REQUIRE.freeze
+# so that we can track requirements more easily with git
+# because we do not install these with pip, but they are listed by the freeze command
+# Now find out what we actually installed by subtracting the stuff venv installed anyway
+sort original.txt > 1
+sort $REQUIRE.freeze >2
+comm -3 1 2 --check-order | awk '{ print $1}'>fresh-$REQUIRE
+rm 1
+rm 2
+
+# cp $REQUIRE requirements-$VENAME.txt
+cp $REQUIRE troggle/$REQUIRE
+
+$PYTHON -m pip list > installed-pip.list
+$PYTHON -m pip list -o > installed-pip-o.list
+
+REQ=installation-record
+mkdir $REQ
+
+mv $REQUIRE.freeze $REQ
+mv original.txt $REQ
+mv $REQUIRE $REQ
+mv original-pip.list $REQ
+mv installed-pip.list $REQ
+mv installed-pip-o.list $REQ
+# cp fresh-$REQUIRE ../$REQUIRE
+mv fresh-$REQUIRE $REQ
+cp troggle/`basename "$0"` $REQ
+
+
+
+$PYTHON --version
+python --version
+echo "Django version:`django-admin --version`"
+
+echo "### Now do
+ '[sudo service mysql start]'
+ '[sudo service mariadb restart]'
+ '[sudo mysql_secure_installation]'
+ 'cd ~/$VENAME'
+ 'source bin/activate'
+ 'cd troggle'
+ 'django-admin'
+ 'python manage.py check'
+## this tests if you have set up ssh correcting. Refer to documentation https://expo.survex.com/handbook/computing/keyexchange.html
+## you need to follow the Linux instructions.
+ 'ssh expo@expo.survex.com'
+
+## the next tests will fail unless ~/expofiles is set correctly to a folder on your machine
+## the tests may ALSO fail because of ssh and permissions errors
+
+## So you will need to run
+$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.
+
+ 'python manage.py test -v 2'
+ './pre-run.sh' (runs the tests again)
+
+ 'python databaseReset.py reset $VENAME'
+ 'python manage.py runserver 0.0.0.0:8000 (and allow access when the firewall window pops up)'
+ "
+# if [ ! -d /mnt/d/expofiles ]; then
+ # echo '### No valid expofiles directory on /mnt/d . Fix this before any tests will work.'
+# fi