Merge branch 'master' of github.com:mathics/Mathics

Author: rocky

.gitignore

@@ -6,12 +6,16 @@
 *.py[cod]
 *.so
 .coverage
+.idea/
 .mypy_cache
 .project
 .pydevproject
 .settings
 .vscode
+/.cache
 /.python-version
+/Mathics3.egg-info
+ChangeLog
 Documents/
 Homepage/
 Mathics.egg-info/
@@ -21,16 +25,15 @@ _Database_/
 build/
 dist/
 mathics/Makefile
-ChangeLog
 mathics/doc/tex/data
 mathics/doc/tex/documentation.tex
 mathics/doc/tex/images/
 mathics/doc/tex/logo-heptatom.pdf
 mathics/doc/tex/logo-text-nodrop.pdf
 mathics/doc/tex/mathics-*.asy
+mathics/doc/tex/mathics-*.dvi
 mathics/doc/tex/mathics-*.eps
 mathics/doc/tex/mathics-*.pdf
-mathics/doc/tex/mathics-*.dvi
 mathics/doc/tex/mathics-*.tex
 mathics/doc/tex/mathics.aux
 mathics/doc/tex/mathics.dvi
@@ -46,12 +49,9 @@ mathics/doc/tex/mathics.out
 mathics/doc/tex/mathics.pdf
 mathics/doc/tex/mathics.pre
 mathics/doc/tex/mathics.toc
-
 mathics/doc/xml/
 mathics/web/db/mathics.sqlite
-mathics/web/media/pdf/
 mathics/web/media/doc/classes.pdf
 mathics/web/media/doc/classes.png
+mathics/web/media/pdf/
 tmp
-
-.idea/

CHANGES.rst

@@ -1,6 +1,9 @@
 CHANGES
 =======
 
+So we can get onto PyPI, the PyPI install name has changed from Mathics to Mathics3.
+
+
 1.1.0
 -----
 

Makefile

@@ -18,6 +18,16 @@ RM  ?= rm
    rmChangeLog \
    test
 
+SANDBOX	?=
+ifeq ($(OS),Windows_NT)
+	SANDBOX = t
+else
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S),Darwin)
+		SANDBOX = t
+	endif
+endif
+
 #: Default target - same as "develop"
 all: develop
 
@@ -66,7 +76,7 @@ doc-data mathics/doc/tex/data: mathics/builtin/*.py mathics/doc/documentation/*.
 
 #: Run tests that appear in docstring in the code.
 doctest:
-	$(PYTHON) mathics/test.py $o
+	SANDBOX=$(SANDBOX) $(PYTHON) mathics/test.py $o
 
 #: Run Django tests
 djangotest:

admin-tools/.gitignore

@@ -0,0 +1 @@
+/.python-version

admin-tools/check-versions.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+function finish {
+  cd $owd
+}
+
+# FIXME put some of the below in a common routine
+owd=$(pwd)
+trap finish EXIT
+
+cd $(dirname ${BASH_SOURCE[0]})
+if ! source ./pyenv-versions ; then
+    exit $?
+fi
+
+for version in $PYVERSIONS; do
+    echo --- $version ---
+    if ! pyenv local $version ; then
+	exit $?
+    fi
+    make clean && pip install -e .
+    if ! make check; then
+	exit $?
+    fi
+    echo === $version ===
+done

docker-compose.yml

@@ -2,7 +2,7 @@ version: '2'
 
 services:
     mathics:
-        build: ./app
+        build: ./docker
         image: mathicsorg/mathics:latest
 
         volumes:

app/Dockerfile docker/Dockerfileapp/Dockerfile renamed to docker/Dockerfile

@@ -12,10 +12,13 @@ COPY requirements.txt ./
 RUN apt-get update
 RUN apt-get install -qq liblapack-dev llvm-dev gfortran
 RUN pip install --no-cache-dir -r requirements.txt
-# RUN python -m nltk.downloader wordnet omw
 COPY requirements-mathicsscript.txt ./
 RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
 
+RUN pip install pymathics-natlang
+RUN python -m nltk.downloader wordnet omw
+RUN python -m spacy download en
+
 EXPOSE 8000
 
 RUN groupadd mathics && \