upgrade Mathics 7

pymathics/natlang/linguistic_data.py

@@ -21,9 +21,9 @@
 from typing import Optional
 
 from mathics.builtin.atomic.strings import anchor_pattern, to_regex
-from mathics.builtin.base import MessageException
 from mathics.builtin.numbers.randomnumbers import RandomEnv
 from mathics.core.atoms import String
+from mathics.core.builtin import MessageException
 from mathics.core.convert.expression import Expression, to_expression
 from mathics.core.element import ElementsProperties
 from mathics.core.evaluation import Evaluation

pymathics/natlang/manipulate.py

@@ -5,8 +5,9 @@
 This module uses pattern.en to change the form of a word.
 
 """
-from mathics.builtin.base import Builtin
+
 from mathics.core.atoms import String
+from mathics.core.builtin import Builtin
 from mathics.core.evaluation import Evaluation
 from pattern.en import pluralize
 

pymathics/natlang/nltk.py

@@ -7,9 +7,9 @@
 from itertools import chain
 
 import nltk
-from mathics.builtin.base import Builtin, MessageException
 from mathics.builtin.codetables import iso639_3
 from mathics.core.atoms import String
+from mathics.core.builtin import Builtin, MessageException
 from mathics.core.evaluation import Evaluation
 from mathics.core.symbols import strip_context
 

pymathics/natlang/spacy.py

@@ -12,8 +12,9 @@
 from typing import Optional
 
 import spacy
-from mathics.builtin.base import Builtin
+
 from mathics.core.atoms import String
+from mathics.core.builtin import Builtin
 from mathics.core.evaluation import Evaluation
 from mathics.core.symbols import strip_context
 from mathics.core.systemsymbols import SymbolAlternatives

pymathics/natlang/textual_analysis.py

@@ -13,8 +13,9 @@
 import enchant
 import nltk
 import spacy
-from mathics.builtin.base import Builtin
+
 from mathics.core.atoms import Integer, Real, String
+from mathics.core.builtin import Builtin
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.list import ListExpression

pymathics/natlang/translation.py

@@ -17,8 +17,8 @@
 
 import langid  # see https://github.com/saffsd/langid.py
 import pycountry
-from mathics.builtin.base import Builtin
 from mathics.core.atoms import String
+from mathics.core.builtin import Builtin
 from mathics.core.evaluation import Evaluation
 from mathics.core.symbols import Symbol
 from mathics.core.systemsymbols import SymbolFailed

setup.py

@@ -53,7 +53,7 @@ def read(*rnames):
     version=__version__,
     packages=find_namespace_packages(include=["pymathics.*"]),
     install_requires=[
-        "Mathics3 >=6.1.0,<7.1.0",
+        "Mathics3>=7.0.0.dev0",
         "click>=8.0",
         "joblib>=1.0.1",
         "langid",  # replace with a supported newer package, e.g. via spacy

test/consistency-and-style/test_summary_text.py

@@ -5,8 +5,9 @@
 import pkgutil
 
 import pytest
-from mathics.builtin.base import Builtin
+
 from mathics.core.load_builtin import name_is_builtin_symbol
+from mathics.core.builtin import Builtin
 from mathics.doc.common_doc import skip_doc
 
 from pymathics.natlang import __file__ as module_initfile_path