diff --git a/os-trog.sh b/os-trog.sh new file mode 100644 index 0000000..3c5dd36 --- /dev/null +++ b/os-trog.sh @@ -0,0 +1,70 @@ +#!/bin/bash +# Run this in a terminal in the troggle directory: 'bash os-trog.sh' +# On WSL, do Shift-click in the file explorer on the troggle folder to open a Linux command line +# 'Open Linux shell here' +echo 'Run this in a terminal in the troggle directory: "bash venv-trog.sh"' +cat /etc/os-release +# Expects an Ubuntu 22.04 relatively clean install. + +sudo apt install python-is-python3 -y +python --version : ensure python is an alias for python3 not python2.7 +sudo apt update -y +sudo apt dist-upgrade -y +sudo apt autoremove -y +sudo apt install sqlite3 -y +sudo apt install python3-pip -y + +# this installs a shed-load of other stuff: binutils etc.sudo apt install survex-aven +sudo apt install git openssh-client -y +# On a clean debian 11 (bullseye) installation with Xfce & ssh, + + #on ubuntu 20.04: + #Package sftp is not available, but is referred to by another package. + #This may mean that the package is missing, has been obsoleted, or + #is only available from another source + #E: Package 'sftp' has no installation candidate + + +# On Ubuntu 20.04, with python10, the pip install fails. +# So you need to get the pip from source +# sudo curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10 +# but really you should be using 22.04 +# and also, isf using debian, +# sudo python3.10 -m pip install -U virtualenv + +# as debian does not install everything that ubuntu does, you need: +sudo useradd expo +sudo usermod -a -G sudo expo # to put expo in sudoers group, re-login required +sudo apt install python3-venv -y +sudo apt install python3-dev -y + +# default since 22.04 +# sudo apt install python3.10 +sudo apt install python3.10-venv -y +sudo apt install python3.10-dev -y +sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.10 1 + +sudo apt install mariadb-server -y +sudo apt install libmariadb-dev -y + +sudo python -m pip install --upgrade pip + +sudo apt install sftp -y +echo '###' +echo '### NOW INSTALLING tunnel and therion, go and have a cup of tea. Or a 3-course meal.' +echo '###' +sudo apt install tunnelx therion -y + +# Go to https://expo.survex.com/handbook/troggle/troglaptop.html#dbtools +# sudo service mysql start + +git config --global user.email "you@example.com" +git config --global user.name "Your Name" + +echo '###' +echo '### Currently set version of python' +python --version + +echo '###' +echo '### Now YOU have to configure the git settings for YOURSELF (not "expo")' + diff --git a/requirements.txt b/requirements.txt index c822f94..7bc9707 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,17 @@ -asgiref==3.6.0 -black==23.1.0 +asgiref==3.7 +black==23.3 click==8.1.3 -coverage==7.1.0 +coverage==7.2 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 -platformdirs==3.0.0 -pytz==2022.7 +pathspec==0.11 +Pillow==10.0 +platformdirs==3.8 +pytz==2023.3 ruff==0.0.245 -sqlparse==0.4.3 +sqlparse==0.4 Unidecode==1.3.6 beautifulsoup4==4.12