Revise for 4.0.0 release

docker/Dockerfile
   we now use llvm12
   more recent asymptote and gv are copied into /usr/local/bin
   for now we'll copy in the mathics.pdf

dmathicsscript:
   we pass through more environment variables ...
   for setting outside write directory $APP_DATADIR and
   $PWD

entrypoint.sh will copy System django DB path to MATHICS_DJANGO_DB_PATH
if the latter is empty.

Author: rocky

docker/Dockerfile

@@ -19,11 +19,10 @@ RUN apt-get install -qq apt-utils
 # Leave out inkscape  for now.
 
 # inxi and mesa-utils might be optional
-# npm puls in nodejs, but we'll be explicit.
-# llvm-11 and llvm-11-dev might work?
+# npm pulls in nodejs, but we'll be explicit.
 
 # Install lots of packages
-RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-10 llvm-10-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-numpy python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended nodejs npm xserver-xorg-video-all libgl1-mesa-glx libgl1-mesa-dri mesa-utils evince
+RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-12 llvm-12-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-numpy python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended nodejs npm xserver-xorg-video-all libgl1-mesa-glx libgl1-mesa-dri mesa-utils evince
 
 RUN pip install --no-cache-dir -r requirements.txt
 COPY requirements-mathicsscript.txt ./
@@ -32,20 +31,37 @@ RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
 ################
 # Mathics core #
 ################
-RUN pip install "Mathics3[full]>=3.1.0"
+RUN pip install "Mathics3[full]>=4.0.0"
+
+# We need newer versions of Asymptote and GhostScript for bulding the PDF
+COPY ubuntu-bin/gs /usr/local/bin/
+
+# We would need to copy over a *full asy distribution*
+# COPY ubuntu-bin/asy /usr/local/bin/
+
+# For now, until we package TeX sources skip building PDF and just copy it
+# to the place entrypoint.sh expects it.
+COPY tex-images/mathics.pdf /usr/src/app/data/mathics.pdf
 
 #####################
 # Mathics Pymathics #
 #####################
 
-RUN pip install pymathics-natlang
 RUN pip install pymathics-graph
 
+# natlang installs spacy so this should come first
+RUN pip install pymathics-natlang
+RUN ${PYTHON} -m spacy download en
+RUN ${PYTHON} -m nltk.downloader wordnet omw
+
 ##################
 # Mathicsscript  #
 ##################
 
-RUN ${PYTHON} -m pip install -e mathicsscript[full]
+# prompt toolkit needs an IPython that is newer than what got
+# implicitly installed above
+RUN ${PYTHON} -m pip install 'ipython<8.0,>=7.23.1'
+RUN ${PYTHON} -m pip install mathicsscript[full]
 
 RUN ${PYTHON} -m nltk.downloader wordnet omw
 RUN ${PYTHON} -m spacy download en

docker/Dockerfile-dev

@@ -19,11 +19,10 @@ RUN apt-get install -qq apt-utils
 # Leave out inkscape  for now.
 
 # inxi and mesa-utils might be optional
-# npm puls in nodejs, but we'll be explicit.
-# llvm-11 and llvm-11-dev might work?
+# npm pulls in nodejs, but we'll be explicit.
 
 # Install lots of packages
-RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-10 llvm-10-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-numpy python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended nodejs npm xserver-xorg-video-all libgl1-mesa-glx libgl1-mesa-dri mesa-utils evince
+RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-12 llvm-12-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-numpy python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended nodejs npm xserver-xorg-video-all libgl1-mesa-glx libgl1-mesa-dri mesa-utils evince
 
 RUN pip install --no-cache-dir -r requirements.txt
 COPY requirements-mathicsscript.txt ./
@@ -32,7 +31,7 @@ RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
 ################
 # Mathics core #
 ################
-# RUN pip install "Mathics3[full]>=3.1.0"
+# RUN pip install "Mathics3[full]>=4.0.0"
 RUN pip install git+git://github.com/mathics/Mathics.git#egg=Mathics3[full]
 
 RUN git clone https://github.com/mathics/Mathics.git

docker/Dockerfile-dev+debug

@@ -19,11 +19,10 @@ RUN apt-get install -qq apt-utils
 # Leave out inkscape  for now.
 
 # inxi and mesa-utils might be optional
-# npm puls in nodejs, but we'll be explicit.
-# llvm-11 and llvm-11-dev might work?
+# npm pulls in nodejs, but we'll be explicit.
 
 # Install lots of packages
-RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-10 llvm-10-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-numpy python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended nodejs npm xserver-xorg-video-all libgl1-mesa-glx libgl1-mesa-dri mesa-utils evince
+RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-12 llvm-12-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-numpy python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended nodejs npm xserver-xorg-video-all libgl1-mesa-glx libgl1-mesa-dri mesa-utils evince
 
 RUN pip install --no-cache-dir -r requirements.txt
 COPY requirements-mathicsscript.txt ./
@@ -32,7 +31,7 @@ RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
 ################
 # Mathics core #
 ################
-# RUN pip install "Mathics3[full]>=3.1.0"
+# RUN pip install "Mathics3[full]>=4.0.0"
 RUN pip install git+git://github.com/mathics/Mathics.git#egg=Mathics3[full]
 
 RUN git clone https://github.com/mathics/Mathics.git

docker/entrypoint.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+DJANGO_DOC_HTML_DATA_PATH="/usr/local/lib/python3.8/dist-packages/mathics_django/doc/doc_html_data.pcl"
+MATHICS_DJANGO_SYSTEM_DB_PATH="/usr/src/app/.local/var/mathics/mathics.sqlite"
+
 export PATH=/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/src/app/.local/bin
 
 script_cmd="${ENTRYPOINT_COMMAND:-$(basename $0)}"
@@ -69,6 +72,10 @@ case $mathics_mode in
 	echo "~~~~ app/data has been mounted to $MATHICS_HOME/data ~~~~"
 	if [[ -n $MATHICS_DJANGO_DB_PATH ]]; then
 	    echo "~~~~ SQLite data (worksheets, user info) will be stored in $MATHICS_DJANGO_DB_PATH ~~~~"
+		if [[ ! -s $MATHICS_DJANGO_DB_PATH ]] && [[ -n $MATHICS_DJANGO_SYSTEM_DB_PATH ]]; then
+			echo "~~~~ Copying internal SQLite data (worksheets, user info) to location specified in \$MATHICS_DJANGO_DB_PATH"
+			cp -vp $MATHICS_DJANGO_SYSTEM_DB_PATH $MATHICS_DJANGO_DB_PATH
+		fi
 	else
 	    echo "~~~~ SQLite data (worksheets, user info) will be stored in $MATHICS_HOME/data/mathics.sqlite"
 	fi

docker/tex-images/.gitignore

@@ -0,0 +1 @@
+/mathics.pdf

docker/ubuntu-bin/asy

@@ -5,4 +5,4 @@
 # well as importing into Python. That's why there is no
 # space around "=" below.
 # fmt: off
-__version__="3.1.1.dev0"  # noqa
+__version__="4.0.0.dev0"  # noqa

docker/ubuntu-bin/gs

@@ -5,14 +5,22 @@ if [ -n "$DEBUG" ]; then
 fi
 
 # Allow customization using POSIX environment variables:
+APP_DATADIR=${APP_DATADIR:-/tmp}
 DOCKER=${DOCKER:-docker}
 TAG=${TAG:-latest}
 
+# TODO: allow setting:
+#	XDG_CONFIG_HOME \
+#	CONFIG_HOME \
+#	CONFIGDIR \
+#	MATHICSSCRIPT_HISTSIZE \
+#	MATHICSSCRIPT_HISTFILE \
+
 MATHICS_IMAGE=${MATHICS_IMAGE:-mathicsorg/mathics:${TAG}}
 
 for arg in $@ ; do
     case "$arg" in
-        -u | --upgrade | upgrade)
+        -u | -U | --upgrade | upgrade)
 			$DOCKER pull $MATHICS_IMAGE
 			exit $?
 		;;
@@ -33,7 +41,6 @@ else
     style="--style colorful"
 fi
 
-
 XAUTH=${XAUTH:-$HOME/.Xauthority}
 touch $XAUTH
 
@@ -49,7 +56,8 @@ $DOCKER run \
 	--tty \
 	--interactive \
 	--network=host \
-	--volume "/tmp:/usr/src/app/data" \
+	--volume="$PWD":/app \
+	--volume "${APP_DATADIR}:/usr/src/app/data" \
 	$DEVICE \
-        $MATHICS_IMAGE \
+    $MATHICS_IMAGE \
 	--mode cli -- $style $@

mathics_omnibus/version.py

@@ -4,31 +4,34 @@ if [ -n "$DEBUG" ]; then
     set -x
 fi
 
+# Allow customization using POSIX environment variables:
+APP_DATADIR=${APP_DATADIR:-/tmp}
+DOCKER=${DOCKER:-docker}
+MATHICS_DJANGO_DB=${MATHICS_DJANGO_DB:-"mathics.sqlite"}
+MATHICS_DJANGO_DB_PATH=${MATHICS_DJANGO_DB_PATH:-/usr/src/app/.local/var/mathics/${MATHICS_DJANGO_DB}}
 TAG=${TAG:-latest}
+
 MATHICS_IMAGE=${MATHICS_IMAGE:-mathicsorg/mathics:${TAG}}
 
 for arg in "$@" ; do
     case "$arg" in
-        -u | | -U | --upgrade | upgrade)
+        -u | -U | --upgrade | upgrade)
 			$DOCKER pull $MATHICS_IMAGE
 			exit $?
 		;;
     esac
 done
 
-# Allow customization using POSIX environment variables:
-DOCKER=${DOCKER:-docker}
-MATHICS_DJANGO_DB=${MATHICS_DJANGO_DB:-"mathics.sqlite"}
-MATHICS_DJANGO_DB_PATH=${MATHICS_DJANGO_DB_PATH:-/usr/src/app/.local/var/mathics/${MATHICS_DJANGO_DB}}
-
-$DOCKER run -it \
-  --name mathics-web \
-  --rm \
-  --env="DISPLAY" \
-  --env "MATHICS_DJANGO_DB_PATH=$MATHICS_DJANGO_DB_PATH" \
-  --workdir=/app \
-  --volume="$PWD":/app \
-  --volume="/tmp/.X11-unix:/tmp/.X11-unix:rw" \
-  --volume="/tmp:/usr/src/app/data" \
-  -p 8000:8000 $MATHICS_IMAGE \
-  --mode ui -- $@
+$DOCKER run \
+		-it \
+		--name mathics-django \
+		--rm \
+		--env="DISPLAY" \
+		--env "MATHICS_DJANGO_DB_PATH=$MATHICS_DJANGO_DB_PATH" \
+		--workdir=/app \
+		--volume="$PWD":/app \
+		--volume="/tmp/.X11-unix:/tmp/.X11-unix:rw" \
+		--volume="${APP_DATADIR}:/usr/src/app/data" \
+		-p 8000:8000 \
+		$MATHICS_IMAGE \
+		--mode ui -- $@