Merge branch 'master' into fixldots

Author: mmatera

Makefile

@@ -4,12 +4,19 @@
 # These comments before the targets start with #:
 # remake --tasks to shows the targets and the comments
 
+DOCKER_COMPOSE ?= docker-compose
+DOCKER_COMPOSE_FILE =
 GIT2CL ?= admin-tools/git2cl
 PYTHON ?= python3
 PIP ?= pip3
 RM  ?= rm
 
-.PHONY: all build check clean develop dist doc doc-data gstest pytest test djangotest rmChangeLog
+.PHONY: all build \
+   check clean \
+   develop dist doc doc-data djangotest docker \
+   gstest pytest \
+   rmChangeLog \
+   test
 
 #: Default target - same as "develop"
 all: develop
@@ -22,6 +29,10 @@ build:
 develop:
 	$(PIP) install -e .
 
+#: Build docker image
+docker-image:
+	$(DOCKER_COMPOSE) $(DOCKER_COMPOSE_FILE) build
+
 #: Install mathics
 install:
 	$(PYTHON) setup.py install

admin-tools/make-dist.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-PACKAGE=mathics
+PACKAGE=mathicsscript
 
 # FIXME put some of the below in a common routine
 function finish {

app/requirements-mathicsscript.txt

@@ -1,4 +1,4 @@
 mathics
 colorama
 pygments
-git+https://github.com/Mathics3/mathicsscript
+mathicsscript

mathics/builtin/patterns.py

@@ -206,6 +206,7 @@ def apply_levelspec(self, expr, rules, ls, evaluation, options):
             return result
         except InvalidLevelspecError:
             evaluation.message('General', 'level', ls)
+
         except PatternError:
             evaluation.message('Replace','reps', rules)