diff --git a/_deploy/readme.txt b/_deploy/readme.txt index 0986324..9458223 100644 --- a/_deploy/readme.txt +++ b/_deploy/readme.txt @@ -1,3 +1,14 @@ +2024-12-15 Philip Sargent +You will need your own localsettings.py but they are all out of date in these +subdirectories except for /wsl/ . So copy that to /troggle/ and make your own +edits to make it work with your own machine and file whereabouts. + +- settings.py +is common to all configurations, +but these are different: +- localsettings.py +- dev.toml + 2023-07-17 Philip Sargent Trying to sort out configurations as we got into a bit of a mess on @@ -11,8 +22,3 @@ recently had been done on Philip's two other machines, desktop and PC, both running Ubuntu on WSL on Windows and both using venv environments, which Crowley also does. -- settings.py -is common to all configurations, -but these are all different: -- localsettings.py -- requirements.txt \ No newline at end of file diff --git a/_deploy/wsl/requirements-p11d42.txt b/_deploy/wsl/requirements-p11d42.txt deleted file mode 100644 index 7d1992c..0000000 --- a/_deploy/wsl/requirements-p11d42.txt +++ /dev/null @@ -1,21 +0,0 @@ -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 -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 -piexif diff --git a/_deploy/wsl/requirements-Dj3.2Bullseye.txt b/_deploy/wsl/using-pip/requirements-Dj3.2Bullseye.txt similarity index 100% rename from _deploy/wsl/requirements-Dj3.2Bullseye.txt rename to _deploy/wsl/using-pip/requirements-Dj3.2Bullseye.txt diff --git a/_deploy/wsl/requirements-devupgrade.txt b/_deploy/wsl/using-pip/requirements-devupgrade.txt similarity index 100% rename from _deploy/wsl/requirements-devupgrade.txt rename to _deploy/wsl/using-pip/requirements-devupgrade.txt diff --git a/requirements-keep.txt b/_deploy/wsl/using-pip/requirements-keep.txt similarity index 100% rename from requirements-keep.txt rename to _deploy/wsl/using-pip/requirements-keep.txt diff --git a/_deploy/wsl/requirements-p10d4.txt b/_deploy/wsl/using-pip/requirements-p10d4.txt similarity index 100% rename from _deploy/wsl/requirements-p10d4.txt rename to _deploy/wsl/using-pip/requirements-p10d4.txt diff --git a/_deploy/wsl/requirements-p10d5.txt b/_deploy/wsl/using-pip/requirements-p10d5.txt similarity index 100% rename from _deploy/wsl/requirements-p10d5.txt rename to _deploy/wsl/using-pip/requirements-p10d5.txt diff --git a/requirements-p11d32.txt b/_deploy/wsl/using-pip/requirements-p11d32.txt similarity index 100% rename from requirements-p11d32.txt rename to _deploy/wsl/using-pip/requirements-p11d32.txt diff --git a/requirements-p11d42.txt b/_deploy/wsl/using-pip/requirements-p11d42.txt similarity index 100% rename from requirements-p11d42.txt rename to _deploy/wsl/using-pip/requirements-p11d42.txt diff --git a/_deploy/wsl/requirements-p11d5.txt b/_deploy/wsl/using-pip/requirements-p11d5.txt similarity index 100% rename from _deploy/wsl/requirements-p11d5.txt rename to _deploy/wsl/using-pip/requirements-p11d5.txt diff --git a/requirements-p12d5.txt b/_deploy/wsl/using-pip/requirements-p12d5.txt similarity index 100% rename from requirements-p12d5.txt rename to _deploy/wsl/using-pip/requirements-p12d5.txt diff --git a/_deploy/wsl/requirements-p9d4.txt b/_deploy/wsl/using-pip/requirements-p9d4.txt similarity index 100% rename from _deploy/wsl/requirements-p9d4.txt rename to _deploy/wsl/using-pip/requirements-p9d4.txt diff --git a/_deploy/wsl/requirements3.2.txt b/_deploy/wsl/using-pip/requirements3.2.txt similarity index 100% rename from _deploy/wsl/requirements3.2.txt rename to _deploy/wsl/using-pip/requirements3.2.txt diff --git a/venv-trog-d3.sh b/_deploy/wsl/using-pip/venv-trog-d3.sh similarity index 100% rename from venv-trog-d3.sh rename to _deploy/wsl/using-pip/venv-trog-d3.sh diff --git a/venv-trog-d4.sh b/_deploy/wsl/using-pip/venv-trog-d4.sh similarity index 100% rename from venv-trog-d4.sh rename to _deploy/wsl/using-pip/venv-trog-d4.sh diff --git a/venv-trog-d5.sh b/_deploy/wsl/using-pip/venv-trog-d5.sh similarity index 100% rename from venv-trog-d5.sh rename to _deploy/wsl/using-pip/venv-trog-d5.sh diff --git a/_deploy/wsl/venv-trog-d4.sh b/_deploy/wsl/venv-trog-d4.sh deleted file mode 100644 index 5390b06..0000000 --- a/_deploy/wsl/venv-trog-d4.sh +++ /dev/null @@ -1,184 +0,0 @@ -#!/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 with all the gubbins pre-installed -# 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/venv-trog-d5.sh b/_deploy/wsl/venv-trog-d5.sh deleted file mode 100755 index 6ec82a0..0000000 --- a/_deploy/wsl/venv-trog-d5.sh +++ /dev/null @@ -1,184 +0,0 @@ -#!/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=p11d5 # 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