Merge pull request #41 from Mathics3/administrivia

style kinds of things

Author: rocky

.editorconfig

@@ -0,0 +1,28 @@
+# THis is an EditorConfig file
+# https://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = tab
+indent_size = 4
+insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+
+[*.py]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab

mathicsscript/__init__.py

@@ -5,3 +5,5 @@
 Copyright 2020-2021 The Mathics Team
 """
 from mathicsscript.version import __version__
+
+__all__ = [__version__]

mathicsscript/__main__.py

@@ -61,14 +61,14 @@ def ensure_settings():
         try:
             with open(srcfn, "r") as src:
                 buffer = src.readlines()
-        except:
+        except IOError:
             print(f"'{srcfn}' was not found.")
             return ""
         try:
             with open(settings_file, "w") as dst:
-                for l in buffer:
-                    dst.write(l)
-        except:
+                for c in buffer:
+                    dst.write(c)
+        except IOError:
             print(f" '{settings_file}'  cannot be written.")
             return ""
     return settings_file
@@ -414,8 +414,8 @@ def main(
 
                 # Should we test exit code for adding to history?
                 GNU_readline.add_history(source_code.rstrip())
-                ## FIXME add this... when in Mathics core updated
-                ## shell.defintions.increment_line(1)
+                # FIXME add this... when in Mathics core updated
+                # shell.defintions.increment_line(1)
 
         except (KeyboardInterrupt):
             print("\nKeyboardInterrupt")

mathicsscript/termshell.py

@@ -7,12 +7,9 @@
 import os
 import os.path as osp
 import pathlib
-import re
 import sys
 
 from mathics_pygments.lexer import MathematicaLexer, MToken
-from mathicsscript.completion import MathicsCompleter
-from mathicsscript.version import __version__
 
 from mathics.core.expression import (
     Expression,
@@ -23,10 +20,7 @@
 )
 from mathics.core.rules import Rule
 
-from mathicsscript.bindkeys import bindings, read_inputrc
-
 from pygments import format, highlight, lex
-from pygments.styles import get_style_by_name
 from pygments.formatters.terminal import TERMINAL_COLORS
 from pygments.formatters import Terminal256Formatter
 from pygments.styles import get_all_styles
@@ -44,7 +38,7 @@
 
 from colorama import init as colorama_init
 
-## FIXME: __main__ shouldn't be needed. Fix term_background
+# FIXME: __main__ shouldn't be needed. Fix term_background
 from term_background.__main__ import is_dark_background
 
 # Set up mathicsscript configuration directory

mathicsscript/termshell_gnu.py

@@ -73,7 +73,7 @@ def __init__(
                     inputrc = "inputrc-unicode" if use_unicode else "inputrc-no-unicode"
                     try:
                         read_init_file(str(parent_dir / inputrc))
-                    except:
+                    except:  # noqa
                         pass
 
                 parse_and_bind("tab: complete")
@@ -84,7 +84,7 @@ def __init__(
                 read_history_file(HISTFILE)
             except IOError:
                 pass
-            except:
+            except:  # noqa
                 # PyPy read_history_file fails
                 pass
 
@@ -104,7 +104,7 @@ def complete_symbol_name(self, text, state):
             # any exception thrown inside the completer gets silently
             # thrown away otherwise
             print("Unhandled error in readline completion")
-        except:
+        except:  # noqa
             raise
 
     def _complete_named_characters(self, prefix, text, state):
@@ -154,5 +154,5 @@ def user_write_history_file(self):
             set_history_length(self.history_length)
             # print(f"Writing {HISTFILE}")
             write_history_file(HISTFILE)
-        except:
+        except:  # noqa
             pass

mathicsscript/termshell_prompt.py

@@ -49,7 +49,7 @@
 
 from colorama import init as colorama_init
 
-## FIXME: __main__ shouldn't be needed. Fix term_background
+# FIXME: __main__ shouldn't be needed. Fix term_background
 from term_background.__main__ import is_dark_background
 
 HISTFILE = osp.join(CONFIGDIR, "history-ptk")

rst2html.py

@@ -11,52 +11,47 @@
 
 import re
 
+
 def yield_sphinx_only_markup(lines):
     """
     :param file_inp:     a `filename` or ``sys.stdin``?
     :param file_out:     a `filename` or ``sys.stdout`?`
 
     """
     substs = [
-        ## Selected Sphinx-only Roles.
+        # Selected Sphinx-only Roles.
         #
-        (r':abbr:`([^`]+)`',        r'\1'),
-        (r':ref:`([^`]+)`',         r'`\1`_'),
-        (r':term:`([^`]+)`',        r'**\1**'),
-        (r':dfn:`([^`]+)`',         r'**\1**'),
-        (r':(samp|guilabel|menuselection):`([^`]+)`',        r'``\2``'),
-
-
-        ## Sphinx-only roles:
+        (r":abbr:`([^`]+)`", r"\1"),
+        (r":ref:`([^`]+)`", r"`\1`_"),
+        (r":term:`([^`]+)`", r"**\1**"),
+        (r":dfn:`([^`]+)`", r"**\1**"),
+        (r":(samp|guilabel|menuselection):`([^`]+)`", r"``\2``"),
+        # Sphinx-only roles:
         #        :foo:`bar`   --> foo(``bar``)
         #        :a:foo:`bar` XXX afoo(``bar``)
         #
-        #(r'(:(\w+))?:(\w+):`([^`]*)`', r'\2\3(``\4``)'),
-        (r':(\w+):`([^`]*)`', r'\1(``\2``)'),
-
-
-        ## Sphinx-only Directives.
+        # (r'(:(\w+))?:(\w+):`([^`]*)`', r'\2\3(``\4``)'),
+        (r":(\w+):`([^`]*)`", r"\1(``\2``)"),
+        # Sphinx-only Directives.
         #
-        (r'\.\. doctest',           r'code-block'),
-        (r'\.\. plot::',            r'.. '),
-        (r'\.\. seealso',           r'info'),
-        (r'\.\. glossary',          r'rubric'),
-        (r'\.\. figure::',          r'.. '),
-
-
-        ## Other
+        (r"\.\. doctest", r"code-block"),
+        (r"\.\. plot::", r".. "),
+        (r"\.\. seealso", r"info"),
+        (r"\.\. glossary", r"rubric"),
+        (r"\.\. figure::", r".. "),
+        # Other
         #
-        (r'\|version\|',              r'x.x.x'),
+        (r"\|version\|", r"x.x.x"),
     ]
 
-    regex_subs = [ (re.compile(regex, re.IGNORECASE), sub) for (regex, sub) in substs ]
+    regex_subs = [(re.compile(regex, re.IGNORECASE), sub) for (regex, sub) in substs]
 
     def clean_line(line):
         try:
             for (regex, sub) in regex_subs:
                 line = regex.sub(sub, line)
         except Exception as ex:
-            print("ERROR: %s, (line(%s)"%(regex, sub))
+            print("ERROR: %s, (line(%s)" % (regex, sub))
             raise ex
 
         return line

setup.cfg

@@ -0,0 +1,53 @@
+[bdist_wheel]
+universal = 1
+
+[metadata]
+description_file = README.rst
+
+# Recommended flake8 settings while editing zoom, we use Black for the final
+# linting/say in how code is formatted
+#
+# pip install flake8 flake8-bugbear
+#
+# This will warn/error on things that black does not fix, on purpose.
+
+# This config file MUST be ASCII to prevent weird flake8 dropouts
+
+[flake8]
+# max-line-length setting: NO we do not want everyone writing 120-character lines!
+# We are setting the maximum line length big here because there are longer
+# lines allowed by black in some cases that are forbidden by flake8. Since
+# black has the final say about code formatting issues, this setting is here to
+# make sure that flake8 doesn't fail the build on longer lines allowed by
+# black.
+max-line-length = 120
+max-complexity = 12
+select = E,F,W,C,B,B9
+ignore =
+    # E123 closing bracket does not match indentation of opening bracket's line
+    E123
+    # E203 whitespace before ':' (Not PEP8 compliant, Python Black)
+    E203
+    # E501 line too long (82 > 79 characters) (replaced by B950 from flake8-bugbear,
+    # https://github.com/PyCQA/flake8-bugbear)
+    E501
+    # W503 line break before binary operator (Not PEP8 compliant, Python Black)
+    W503
+    # W504 line break after binary operator (Not PEP8 compliant, Python Black)
+    W504
+    # C901 function too complex - since many of zz9 functions are too complex with a lot
+    # of if branching
+    C901
+    # module level import not at top of file. This is too restrictive. Can't even have a
+    # docstring higher.
+    E402
+per-file-ignores =
+    # These are config files. The `c` variable them is injected not defined.
+    pow/ansible/roles/jupyterhub/templates/jupyterhub_config*.py:F821
+    # Ignore some errors in files that are stolen from other projects to avoid lots
+    # of merge problems later .
+    pow/ansible/roles/webtier/files/supervisor_httpgroupok.py:E126,E128,E222,E225,E226,E261,E301,E302,E305,F841,E201,E202
+    silhouette/src/silhouette/gprof2dot.py:E711,E713,E741,F401
+    # Ignore undefined name errors in "expectation" test Python code.
+    # These files get exec'd in an environment that defines the variables.
+    server/tests/files/expectations/*.py:F821

test/helper.py

@@ -1,5 +1,3 @@
-from mathics.core.definitions import Definitions
-from mathics.core.evaluation import Evaluation
 from mathics.session import MathicsSession
 
 session = MathicsSession(add_builtin=True, catch_interrupt=False)