Merge pull request #24 from Mathics3/rc1

Release candidate 1.2.0

Author: rocky

.github/workflows/osx.yml

@@ -24,7 +24,6 @@ jobs:
         brew install llvm@9
         python -m pip install --upgrade pip
         LLVM_CONFIG=/usr/local/Cellar/llvm@9/9.0.1_2/bin/llvm-config pip install llvmlite
-        python -m pip install -e git://github.com/mathics/Mathics.git#egg=Mathics3
     - name: Install mathicsscript
       run: |
         make

.gitignore

@@ -21,6 +21,8 @@
 /.cache
 /.coverage
 /.eggs
+./mathicsscript/inputrc-no-unicode
+./mathicsscript/inputrc-unicode
 /.mypy_cache
 /.pytest_cache
 /.python-version

Makefile

@@ -9,13 +9,13 @@ PYTHON ?= python3
 PIP ?= pip3
 RM  ?= rm
 
-.PHONY: all build check clean develop dist doc pytest sdist test rmChangeLog
+.PHONY: all build check clean inputrc develop dist doc pytest sdist test rmChangeLog
 
 #: Default target - same as "develop"
 all: develop
 
 #: build everything needed to install
-build:
+build: inputrc
 	$(PYTHON) ./setup.py build
 
 #: Set up to run from the source tree
@@ -31,20 +31,31 @@ runner:
 	watchgod mathicsscript.__main__.main
 
 #: Install mathicsscript
-install:
+install: inputrc
 	$(PYTHON) setup.py install
 
 #: Run tests. You can set environment variable "o" for pytest options
-check:
+check: inputrc
 	py.test test $o
 
+inputrc: mathicsscript/inputrc-unicode mathicsscript/inputrc-no-unicode
+
+mathicsscript/inputrc-unicode:
+	@echo "# GNU Readline input unicode translations\n# Autogenerated from mathics_scanner.generate.rl_inputrc on $$(date)\n" > $@
+	$(PYTHON) -m mathics_scanner.generate.rl_inputrc inputrc-unicode >> $@
+
+mathicsscript/inputrc-no-unicode:
+	@echo "# GNU Readline input ASCII translations\n# Autogenerated from mathics_scanner.generate.rl_inputrc on $$(date)\n" > $@
+	$(PYTHON) -m mathics_scanner.generate.rl_inputrc inputrc-no-unicode >> $@
+
 # Check StructuredText long description formatting
 check-rst:
 	$(PYTHON) setup.py --long-description | ./rst2html.py > mathicsscript.html
 
 #: Remove derived files
 clean:
 	@find . -name "*.pyc" -type f -delete
+	@rm mathicsscript/inputrc-no-unicode mathicsscript/inputrc-unicode || true
 
 #: Remove ChangeLog
 rmChangeLog:

NEWS.md

@@ -1,4 +1,11 @@
-2.0.0
+1.2.0
+-----
+
+* All escape sequence for unicode and letter names added for GNU Readline
+* Use Mathics Scanner package
+* Support XDG-style configuration files
+
+1.1.2
 -----
 
 * Fix ``Settings`$ShowFullForm`` now that we use Mathics supports Booleans better

admin-tools/make-dist.sh

@@ -32,7 +32,6 @@ for pyversion in $PYVERSIONS; do
     python setup.py bdist_egg
     python setup.py bdist_wheel
     python setup.py bdist_wheel --universal
-    mv -v dist/${PACKAGE}-$VERSION-{py2.py3,py$first_two}-none-any.whl
 done
 
 python ./setup.py sdist

mathicsscript/.gitignore

@@ -0,0 +1,2 @@
+/inputrc-no-unicode
+/inputrc-unicode

mathicsscript/__init__.py

@@ -2,6 +2,6 @@
 """
 mathicsscript is a command-line interface to Mathics.
 
-Copyright 2020 The Mathics Team
+Copyright 2020-2021 The Mathics Team
 """
 from mathicsscript.version import __version__