summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os-trog.sh14
-rw-r--r--requirements-p10d4.txt17
-rw-r--r--venv-trog.sh3
3 files changed, 26 insertions, 8 deletions
diff --git a/os-trog.sh b/os-trog.sh
index c6ff0e0..6d32ab7 100644
--- a/os-trog.sh
+++ b/os-trog.sh
@@ -6,24 +6,25 @@ 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
+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
+sudo apt install python3.10-venv -y
+sudo apt install python3.11-venv python3.11-dev -y
# this installs a shed-load of other stuff: binutils etc.sudo apt install survex-aven
+sudo apt install openssh-server -y
+# sudo apt install sftp -y
sudo apt install git openssh-client -y
# On a clean debian 11 (bullseye) installation with Xfce & ssh,
- #on ubuntu 20.04:
+ #on ubuntu 20.04 and 22.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
-
+ # this is why we install openssh-server because it includes it.
# On Ubuntu 20.04, with python10, the pip install fails.
# So you need to get the pip from source
@@ -47,7 +48,6 @@ sudo apt install git openssh-client -y
sudo python -m pip install --upgrade pip
-sudo apt install sftp -y
# Go to https://expo.survex.com/handbook/troggle/troglaptop.html#dbtools
diff --git a/requirements-p10d4.txt b/requirements-p10d4.txt
new file mode 100644
index 0000000..aafb7f6
--- /dev/null
+++ b/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/venv-trog.sh b/venv-trog.sh
index 42fac41..2133bef 100644
--- a/venv-trog.sh
+++ b/venv-trog.sh
@@ -27,6 +27,7 @@ echo ## Using requirements.txt :
cat requirements.txt
echo ##
+
$PYTHON --version
# NOTE that when using a later or earlier verison of python, you MUST also
@@ -166,5 +167,5 @@ $sudo chown -Rhv philip:philip ~/$VENAME (if your username is philip)
'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.
+ echo '### No valid expofiles directory on /mnt/d . Fix this before any tests will work.'
fi \ No newline at end of file