move to latexgit_py 0.8.17 to properly handle virtual environments

Author: thomasWeise

make.sh

@@ -10,6 +10,8 @@ set -o errexit   # set -e : exit the script if any statement returns a non-true
 
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Welcome to the book building script."
 
+argument="${1:-}"  # get command line argument, if any
+
 currentDir="$(pwd)"
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We are working in directory: '$currentDir'."
 scriptDir="$currentDir/scripts"
@@ -22,22 +24,27 @@ rm -rf "$currentDir/website" || true
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We setup a virtual environment in a temp directory."
 venvDir="$(mktemp -d)"
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Got temp dir '$venvDir', now creating environment in it."
-python3 -m venv --system-site-packages "$venvDir"
+python3 -m venv --upgrade-deps --copies "$venvDir"
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Activating virtual environment in '$venvDir'."
-. "$venvDir/bin/activate"
+source "$venvDir/bin/activate"
 export PYTHON_INTERPRETER="$venvDir/bin/python3"
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Setting python interpreter to '$PYTHON_INTERPRETER'."
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We install all required Python packages from requirements.txt to virtual environment in '$venvDir'."
-pip install --no-input --timeout 360 --retries 100 -r requirements.txt
+"$PYTHON_INTERPRETER" -m pip install --no-input --timeout 360 --retries 100 -r requirements.txt
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Finished installing the requirements, now printing all installed packages."
 pip freeze
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Finished printing all installed packages."
 
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We now execute the pdflatex compiler script."
 "$scriptDir/pdflatex.sh" "book.tex"
 
-echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We now execute the website building script."
-"$scriptDir/website.sh"
+if [ "$argument" == "--no-website" ]; then
+    echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Website generation has been disabled."
+else
+    echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We now execute the website building script."
+    "$scriptDir/website.sh"
+    echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Website has been generated."
+fi
 
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Deactivating virtual environment."
 deactivate

requirements.txt

@@ -6,13 +6,13 @@
 # You can find it at https://thomasweise.github.io/latexgit_py,
 # https://github.com/thomasWeise/latexgit_py, or at
 # https://pypi.org/project/latexgit.
-latexgit == 0.8.14
+latexgit == 0.8.17
 
 # minify_html is needed to minify html output.
 minify_html == 0.15.0
 
 # for converting the additional markdown files to HTML
-markdown == 3.6
+markdown == 3.7
 
 # for converting files to HTML
 Pygments == 2.18.0

scripts/dependencyVersions.sh

@@ -11,6 +11,11 @@ set -o errexit   # set -e : exit the script if any statement returns a non-true
 # get the script directory
 scriptDir="$(dirname "$0")"
 
+if [[ $(declare -p PYTHON_INTERPRETER) != declare\ ?x* ]]; then
+  # We have to find it by ourselves.
+  export PYTHON_INTERPRETER="$(readlink -f "$(which python3)")"
+fi
+
 # see https://unix.stackexchange.com/questions/6345
 if [ -f /etc/os-release ]; then
     # freedesktop.org and systemd
@@ -63,13 +68,13 @@ fi
 echo ""
 
 # Print the python version.
-pythonVersion="$(python3 --version 2>&1 | sed -n 's/.*Python\s*\([.0-9]*\)/\1/p')" || true
+pythonVersion="$("$PYTHON_INTERPRETER" --version 2>&1 | sed -n 's/.*Python\s*\([.0-9]*\)/\1/p')" || true
 pythonVersion="$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -e 's/[[:space:]][[:space:]][[:space:]]*/ /g' -e 's/\.*$//'<<<"${pythonVersion}")" || true
 if [ -n "$pythonVersion" ]; then
     echo "python: $pythonVersion"
 fi
 
-latexgitPyVersion="$(pip freeze 2>&1 | grep latexgit | sed -n 's/.*==*\([.0-9]*\)/\1/p')" || true
+latexgitPyVersion="$("$PYTHON_INTERPRETER" -m pip freeze 2>&1 | grep latexgit | sed -n 's/.*==*\([.0-9]*\)/\1/p')" || true
 latexgitPyVersion="$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -e 's/[[:space:]][[:space:]][[:space:]]*/ /g' -e 's/\.*$//'<<<"${latexgitPyVersion}")" || true
 if [ -n "$latexgitPyVersion" ]; then
     echo "latexgit_py: $latexgitPyVersion"
@@ -81,7 +86,7 @@ if [ -n "$latexgitTexVersion" ]; then
     echo "latexgit_tex: $latexgitTexVersion"
 fi
 
-pycommonsVersion="$(pip freeze | grep pycommons | sed -n 's/.*==*\([.0-9]*\)/\1/p')" || true
+pycommonsVersion="$("$PYTHON_INTERPRETER" -m pip freeze | grep pycommons | sed -n 's/.*==*\([.0-9]*\)/\1/p')" || true
 pycommonsVersion="$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -e 's/[[:space:]][[:space:]][[:space:]]*/ /g' -e 's/\.*$//'<<<"${pycommonsVersion}")" || true
 if [ -n "$pycommonsVersion" ]; then
     echo "pycommons: $pycommonsVersion"