Merge pull request #1508 from mathics/settings-cleanup

Settings cleanup

Author: rocky

mathics/doc/tex/Makefile

@@ -6,14 +6,16 @@ LATEXMK ?= latexmk
 BASH ?= /bin/bash
 #-quiet
 
+DOC_DATA_PCL ?= $(HOME)/.local/var/mathics/doc_data.pcl
+
 #: Default target: Make everything
 all doc texdoc: mathics.pdf
 
-doc-data doc_tex_data.pcl:
+doc-data $(DOC_DATA_PCL):
 	(cd ../.. && $(PYTHON) docpipeline.py --output --keep-going)
 
 #: Build mathics PDF
-mathics.pdf: mathics.tex documentation.tex logo-text-nodrop.pdf logo-heptatom.pdf doc_tex_data.pcl
+mathics.pdf: mathics.tex documentation.tex logo-text-nodrop.pdf logo-heptatom.pdf $(DOC_DATA_PCL)
 	$(LATEXMK) --verbose -f -pdf -pdflatex="$(XETEX) -halt-on-error" mathics
 
 #: Build test PDF
@@ -26,7 +28,7 @@ logo-heptatom.pdf logo-text-nodrop.pdf:
 	(cd .. && $(BASH) ./images.sh)
 
 #: The build of the documentation which is derived from docstrings in the Python code
-documentation.tex: doc_tex_data.pcl
+documentation.tex: $(DOC_DATA_PCL)
 	$(PYTHON) ./doc2latex.py
 
 #: Same as mathics.pdf
@@ -38,6 +40,6 @@ clean:
 	rm -f test-mathics.aux test-mathics.idx test-mathics.log test-mathics.mtc test-mathics.mtc* test-mathics.out test-mathics.toc || true
 	rm -f mathics.fdb_latexmk mathics.ilg mathics.ind mathics.maf mathics.pre || true
 	rm -f mathics_*.* || true
-	rm -f mathics-*.* documentation.tex doc_tex_data.pcl || true
+	rm -f mathics-*.* documentation.tex doc_data.pcl || true
 	rm -f mathics.pdf mathics.dvi data_tex_data.pcl test-mathics.pdf test-mathics.dvi || true
 	rm -f mathics-test.pdf mathics-test.dvi || true

mathics/doc/tex/README.rst

@@ -24,13 +24,13 @@ Here is a flow of the data::
 
     doc/documentation/*.mdoc --+
                                |
-    bultins/*.py  -------------+--> doc/tex/doc_tex_data.pcl ---> documentation.tex -+
-                   docpipeline.py                          doc2latex.py              |
-                                                                                     |
-    doc/images/*.svg -------------> doc/tex/log*.pdf --------------------------------+------------------------------> mathics.pdf
-                     images.sh                                                       |  latexmk,xetex,asyptote,gv
-                                                                                     |
-    doc/tex/mathics.tex -------------------------------------------------------------+
+    bultins/*.py  -------------+--> doc_tex_data.pcl ---> documentation.tex -+
+                   docpipeline.py                  doc2latex.py              |
+                                                                             |
+    doc/images/*.svg -------------> doc/tex/log*.pdf ------------------------+------------------------------> mathics.pdf
+                     images.sh                                               |  latexmk,xetex,asyptote,gv
+                                                                             |
+    doc/tex/mathics.tex -----------------------------------------------------+
 
 A GNU Makefile in this directory has been created to manage the complicated workflow above.
 

mathics/settings.py

@@ -9,16 +9,10 @@
 
 DEBUG = True
 
-# set only to True in DEBUG mode
-DEBUG_MAIL = True
-PROPAGATE_EXCEPTIONS = True
-DISPLAY_EXCEPTIONS = True
 DEBUG_PRINT = False
 
-LOG_QUERIES = False
-
 # Either None (no timeout) or a positive integer.
-# unix only
+# Unix only
 TIMEOUT = None
 
 # specifies a maximum recursion depth is safe for all Python environments
@@ -29,9 +23,6 @@
 # historically 10000 was used on public mathics servers
 MAX_STORED_SIZE = 10000
 
-ADMINS = (("Admin", "[email protected]"),)
-MANAGERS = ADMINS
-
 ROOT_DIR = pkg_resources.resource_filename("mathics", "")
 if sys.platform.startswith("win"):
     DATA_DIR = os.environ["APPDATA"].replace(os.sep, "/") + "/Python/Mathics/"
@@ -40,26 +31,17 @@
 # if not path.exists(DATA_DIR):
 #    os.makedirs(DATA_DIR)
 
+# Location of internal document data.
+# NOTE: Storing this in JSON if possible would be preferable and faster
+DOC_DATA_PATH = os.path.join(DATA_DIR, "doc_data.pcl")
+
 DOC_DIR = os.path.join(ROOT_DIR, "doc/documentation/")
-DOC_DATA_PATH = os.path.join(ROOT_DIR, "doc/tex/doc_tex_data.pcl")
 DOC_LATEX_FILE = os.path.join(ROOT_DIR, "doc/tex/documentation.tex")
 
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = "Europe/Vienna"
 
 # Set this True if you prefer 12 hour time to be the default
 TIME_12HOUR = False
 
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = "en-us"
-
-SITE_ID = 1
-
 # Leave this True unless you have specific reason for not permitting
 # users to access local files
 ENABLE_FILES_MODULE = True