pyminimal: rework

da-liii · web-flow · commit 25798885f7cd · 2023-12-30T20:23:11.000+08:00
diff --git a/3rdparty/python/black.lock b/3rdparty/python/black.lock
diff --git a/3rdparty/python/default.lock b/3rdparty/python/default.lock
@@ -1,14 +1,18 @@
 // This lockfile was autogenerated by Pants. To regenerate, run:
 //
-//    ./pants generate-lockfiles --resolve=python-default
+//    pants generate-lockfiles --resolve=python-default
 //
 // --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
 // {
-//   "version": 2,
+//   "version": 3,
 //   "valid_for_interpreter_constraints": [
 //     "CPython>=3.7"
 //   ],
-//   "generated_with_requirements": []
+//   "generated_with_requirements": [],
+//   "manylinux": "manylinux2014",
+//   "requirement_constraints": [],
+//   "only_binary": [],
+//   "no_binary": []
 // }
 // --- END PANTS LOCKFILE METADATA ---
 
@@ -18,14 +22,10 @@
   "allow_wheels": true,
   "build_isolation": true,
   "constraints": [],
-  "locked_resolves": [
-    {
-      "locked_requirements": [],
-      "platform_tag": null
-    }
-  ],
+  "locked_resolves": [],
   "path_mappings": {},
-  "pex_version": "2.1.102",
+  "pex_version": "2.1.137",
+  "pip_version": "23.1.2",
   "prefer_older_binary": false,
   "requirements": [],
   "requires_python": [
diff --git a/3rdparty/python/isort.lock b/3rdparty/python/isort.lock
diff --git a/BUILD.pants b/BUILD.pants
@@ -2,7 +2,7 @@ pex_binary(
     name="pyminimal",
     entry_point="plugins/pyminimal.py",
     dependencies=[
-        "plugins/pyminimal.py",
+        "plugins/pyminimal.py:sources",
         "tmpy:sources",
     ],
 )
@@ -58,3 +58,9 @@ pex_binary(
     dependencies=["tmpy:sources", "tmpy/sympy:sources"],
     resolve="sympy_req",
 )
+
+python_requirement(
+    name="black",
+    requirements=["black==22.1.0", "click<8.1"],
+    resolve="black",
+)
diff --git a/README.md b/README.md
@@ -20,7 +20,12 @@ bin/lint
 bin/format
 
 # For other GNU TeXmacs distributions like Mogan Research
-TEXMACS_HOME_PATH=~/.Xmacs ./pants run cli:install -- pymarkup
+# you can make a symbol link
+
+# macOS
+ln -s $HOME/.TeXmacs/plugins $HOME/Library/Application\ Support/XmacsLabs/
+# Linux
+ln -s $HOME/.TeXmacs/plugins $HOME/.local/share/XmacsLabs/
 ```
 ## Contributing
 Please report bugs to the GNU TeXmacs [forum](http://forum.texmacs.cn/c/devel/pluginsinpython) for this project.
diff --git a/cli/install.py b/cli/install.py
@@ -22,8 +22,8 @@ def install(name):
         print(f"Removing existing {str(plugin)}")
         shutil.rmtree(str(plugin))
 
-    print(f"Packaging: ./pants package //:{name}")
-    subprocess.run(["./pants", "package", f"//:{name}"])
+    print(f"Packaging: pants package //:{name}")
+    subprocess.run(["pants", "package", f"//:{name}"])
 
     print(f"Installing: {str(plugin)}")
     shutil.copytree(f"plugins/{name}", str(plugin))
diff --git a/pants.toml b/pants.toml
@@ -7,10 +7,7 @@ concurrent = true
 
 backend_packages = [
   "pants.backend.python",
-  "pants.backend.python.lint.docformatter",
   "pants.backend.python.lint.black",
-  "pants.backend.python.lint.flake8",
-  "pants.backend.python.lint.isort",
 ]
 
 [source]
@@ -33,8 +30,8 @@ enable_resolves = true
 [python.resolves]
   sympy_req = "3rdparty/python/sympy.lock"
   python-default = "3rdparty/python/default.lock"
-  isort = "3rdparty/python/isort.lock"
+  black= "3rdparty/python/black.lock"
 
-[isort]
-args = ["--profile black", "--order-by-type"]
-install_from_resolve = "isort"
+[black]
+  install_from_resolve = "black"
+  requirements= ["//:black"]
diff --git a/plugins/BUILD.pants b/plugins/BUILD.pants
@@ -4,4 +4,4 @@ python_requirement(
     resolve="sympy_req",
 )
 
-python_sources()
+python_sources(name="sources", resolve="python-default")
diff --git a/plugins/graphviz.py b/plugins/graphviz.py
@@ -8,13 +8,23 @@
 # It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE
 # in the root directory or <http://www.gnu.org/licenses/gpl-3.0.html>.
 
-from tmpy.graph.graphviz import Graphviz
 from tmpy.protocol import DATA_COMMAND, flush_prompt, flush_verbatim
 
+from tmpy.graph.graphviz import Graphviz
+
 graphs = list(
     map(
         lambda x: Graphviz(x),
-        ["dot", "neato", "twopi", "circo", "fdp", "sfdp", "patchwork", "osage"],
+        [
+            "dot",
+            "neato",
+            "twopi",
+            "circo",
+            "fdp",
+            "sfdp",
+            "patchwork",
+            "osage",
+        ],
     )
 )
 graph_names = list(map(lambda x: x.name, graphs))
@@ -62,7 +72,9 @@ def unigraph(text):
         if text.startswith("%"):
             unigraph(text)
         elif text == "help":
-            flush_verbatim("[help, " + ", ".join(str(x) for x in graph_names) + "]\n")
+            flush_verbatim(
+                "[help, " + ", ".join(str(x) for x in graph_names) + "]\n"
+            )
             current.greet()
         elif text in graph_names:
             current = graphs[graph_names.index(text)]
diff --git a/plugins/pyminimal/progs/init-pyminimal.scm b/plugins/pyminimal/progs/init-pyminimal.scm
@@ -13,12 +13,18 @@
 
 (define (python-launcher)
   (if (url-exists? "$TEXMACS_HOME_PATH/plugins/pyminimal")
-      (string-append "python3 " (getenv "TEXMACS_HOME_PATH")
-                     "/plugins/pyminimal/bin/pyminimal.pex")
-      (string-append "python3 " (getenv "TEXMACS_PATH")
-                     "/plugins/pyminimal/bin/pyminimal.pex")))
+      (string-append "python3 "
+       (string-quote
+        (url->string
+         (string->url
+          "$TEXMACS_HOME_PATH/plugins/pyminimal/bin/pyminimal.pex"))))
+      (string-append "python3 "
+       (string-quote
+        (url->string
+         (string->url
+          "$TEXMACS_PATH/plugins/pyminimal/bin/pyminimal.pex"))))))
 
 (plugin-configure pyminimal
-  (:require (url-exists-in-path? "python"))
+  (:require (url-exists-in-path? "python3"))
   (:launch ,(python-launcher))
   (:session "PyMinimal"))
diff --git a/plugins/python.py b/plugins/python.py
@@ -72,14 +72,18 @@ def compile_help(text):
         out["help"] = 'No help for "%s": %s' % (text, e)
 
     try:
-        out["src"] = eval("getsource(%s)" % text, my_globals, {"getsource": getsource})
+        out["src"] = eval(
+            "getsource(%s)" % text, my_globals, {"getsource": getsource}
+        )
     except Exception as e:
         out["src"] = 'No code available for "%s": %s' % (text, e)
 
     try:
         # Todo: strip docstring from code
         out["file"] = eval(
-            "getsourcefile(%s)" % text, my_globals, {"getsourcefile": getsourcefile}
+            "getsourcefile(%s)" % text,
+            my_globals,
+            {"getsourcefile": getsourcefile},
         )
     except Exception as e:
         out["file"] = 'Unable to access the code for "%s": %s' % (text, e)
@@ -145,7 +149,8 @@ def my_eval(code, p_globals):
         if len(line) > 1:
             out = compile_help(line[:-1])
             flush_command(
-                "(tmpy-open-help %s %s %s)" % (out["help"], out["src"], out["file"])
+                "(tmpy-open-help %s %s %s)"
+                % (out["help"], out["src"], out["file"])
             )
         else:
             flush_verbatim('Type a name before the "?" to see the help')
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,4 @@
+[tool.black]
+line-length = 79
+target-version = ['py310']
+max-line-length = 79
diff --git a/tmpy/BUILD.pants b/tmpy/BUILD.pants
@@ -1,4 +1,3 @@
 python_sources(
-    name="sources",
-    resolve="sympy_req",
+    name="sources", resolve=parametrize("sympy_req", "python-default")
 )
diff --git a/tmpy/completion.py b/tmpy/completion.py
@@ -38,10 +38,16 @@ def find_completion_candidates(cmpl_str, my_globals):
 
     if py_ver == 3:
         haystack = (
-            list(my_globals.keys()) + dir(my_globals["__builtins__"]) + keyword.kwlist
+            list(my_globals.keys())
+            + dir(my_globals["__builtins__"])
+            + keyword.kwlist
         )
     else:
-        haystack = my_globals.keys() + dir(my_globals["__builtins__"]) + keyword.kwlist
+        haystack = (
+            my_globals.keys()
+            + dir(my_globals["__builtins__"])
+            + keyword.kwlist
+        )
 
     dot = cmpl_str.rfind(".")
     offset = None
@@ -72,9 +78,13 @@ def find_completion_candidates(cmpl_str, my_globals):
                 haystack = do_module_hierarchy(type(mod_name), r_str)
 
     if py_ver == 3:
-        return offset, [x for x in haystack if x.find(cmpl_str[dot + 1 :]) == 0]
+        return offset, [
+            x for x in haystack if x.find(cmpl_str[dot + 1 :]) == 0
+        ]
     else:
-        return offset, filter(lambda x: x.find(cmpl_str[dot + 1 :]) == 0, haystack)
+        return offset, filter(
+            lambda x: x.find(cmpl_str[dot + 1 :]) == 0, haystack
+        )
 
 
 def name_char(c):
diff --git a/tmpy/graph/graph.py b/tmpy/graph/graph.py
@@ -102,7 +102,9 @@ def main_loop(self):
     def get_tmp_dir(self):
         dir = "graph_" + self.name + "_" + str(os.getpid())
         if platform.system() == "Windows":
-            return os.getenv("TEXMACS_HOME_PATH") + "\\system\\tmp\\" + dir + "\\"
+            return (
+                os.getenv("TEXMACS_HOME_PATH") + "\\system\\tmp\\" + dir + "\\"
+            )
         else:
             return os.getenv("TEXMACS_HOME_PATH") + "/system/tmp/" + dir + "/"
 
diff --git a/tmpy/graph/graphviz.py b/tmpy/graph/graphviz.py
@@ -12,9 +12,10 @@
 import sys
 from subprocess import PIPE, Popen
 
-from tmpy.graph.graph import Graph
 from tmpy.protocol import flush_file, flush_verbatim
 
+from tmpy.graph.graph import Graph
+
 
 class Graphviz(Graph):
     def __init__(self, name):
diff --git a/tmpy/protocol.py b/tmpy/protocol.py
@@ -93,7 +93,9 @@ def get_plugin_path(name):
     the_home_path = (
         os.getenv("TEXMACS_HOME_PATH").replace("\\", "/") + "/plugins/" + name
     )
-    the_sys_path = os.getenv("TEXMACS_PATH").replace("\\", "/") + "/plugins/" + name
+    the_sys_path = (
+        os.getenv("TEXMACS_PATH").replace("\\", "/") + "/plugins/" + name
+    )
     if exists(the_home_path):
         return the_home_path
     else:
diff --git a/tmpy/sympy/main.py b/tmpy/sympy/main.py
@@ -53,7 +53,8 @@ def flush_output(data):
 # Session start
 ###############################################################################
 flush_verbatim(
-    "SymPy %s under Python %s\n" % (sympy.__version__, platform.python_version())
+    "SymPy %s under Python %s\n"
+    % (sympy.__version__, platform.python_version())
 )
 flush_verbatim("Please see the documentation in Help -> Plugins -> SymPy\n")
 flush_prompt(">>> ")

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ python_requirement(`
`4`	`4`	`resolve="sympy_req",`
`5`	`5`	`)`
`6`	`6`
`7`		`-python_sources()`
	`7`	`+python_sources(name="sources", resolve="python-default")`