Adjust for Mathics 5.0.0

Author: rocky

pymathics/natlang/__main__.py

@@ -45,15 +45,16 @@
 from mathics.builtin.numbers.randomnumbers import RandomEnv
 from mathics.builtin.codetables import iso639_3
 from mathics.builtin.strings import to_regex, anchor_pattern
+from mathics.core.atoms import Integer, String, Real
 from mathics.core.expression import (
     Expression,
-    String,
-    Integer,
-    Real,
     Symbol,
     strip_context,
     string_list,
 )
+from mathics.core.listg import to_list_expression
+from mathics.core.symbols import SymbolDivide
+from mathics.core.systemsymbols import SymbolN
 
 import os
 import re
@@ -493,7 +494,7 @@ def apply(self, text, word, evaluation, options):
                 text = text.lower()
             if text in words:
                 n += 1
-        return Expression("N", Expression("Divide", n, len(doc)))
+        return Expression(SymbolN, Expression(SymbolDivide, Integer(n), Integer(len(doc))))
 
 
 class Containing(Builtin):
@@ -583,7 +584,7 @@ def apply(self, text, form, evaluation, options):
         "TextCases[text_String, form_,  OptionsPattern[%(name)s]]"
         doc = self._nlp(text.get_string_value(), evaluation, options)
         if doc:
-            return Expression("List", *[t.text for t in _cases(doc, form)])
+            return to_list_expression(*[t.text for t in _cases(doc, form)])
 
     def apply_n(self, text, form, n, evaluation, options):
         "TextCases[text_String, form_, n_Integer,  OptionsPattern[%(name)s]]"

setup.py

@@ -12,6 +12,7 @@
     print("Mathics support Python 3.6 and above; you have %d.%d" % sys.version_info[:2])
     sys.exit(-1)
 
+
 def get_srcdir():
     filename = osp.normcase(osp.dirname(osp.abspath(__file__)))
     return osp.realpath(filename)
@@ -20,6 +21,7 @@ def get_srcdir():
 def read(*rnames):
     return open(osp.join(get_srcdir(), *rnames)).read()
 
+
 # Get/set VERSION and long_description from files
 long_description = read("README.rst") + "\n"
 
@@ -44,10 +46,17 @@ def read(*rnames):
     name="pymathics-natlang",
     version=__version__,
     packages=find_namespace_packages(include=["pymathics.*"]),
-    install_requires=["Mathics3>=2.2.0", "nltk>=3.6.1", "spacy>=3.4",
-                      "llvmlite>=0.36", "joblib>=1.0.1",
-                      "click>=7.1", "six>=1.11.0",
-                      "pattern>=3.6.0", "wasabi<1.1.0,>=0.8.2"],
+    install_requires=[
+        "Mathics3 >= 5.0.0.dev0,<5.0.1",
+        "click>=7.1",
+        "joblib>=1.0.1",
+        "llvmlite>=0.36",
+        "nltk>=3.6.1",
+        "pattern>=3.6.0",
+        "six>=1.11.0",
+        "spacy>=3.4",
+        "wasabi<1.1.0,>=0.8.2",
+    ],
     zip_safe=False,
     maintainer="Mathics Group",
     long_description=long_description,