Merge remote-tracking branch 'origin/master' into evaluation_as_in_cli

.github/workflows/osx.yml

@@ -9,8 +9,8 @@ on:
 jobs:
   build:
     env:
-      LDFLAGS: "-L/usr/local/opt/llvm@11/lib"
-      CPPFLAGS: "-I/usr/local/opt/llvm@11/include"
+      LDFLAGS: "-L/usr/local/opt/llvm@14/lib"
+      CPPFLAGS: "-I/usr/local/opt/llvm@14/include"
     runs-on: macos-latest
     strategy:
       matrix:
@@ -24,7 +24,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install OS dependencies
       run: |
-        brew install llvm tesseract
+        brew install llvm@14 tesseract
         python -m pip install --upgrade pip
     - name: Install Mathics3 with full Python dependencies
       run: |

AUTHORS.txt

@@ -36,6 +36,8 @@ Additional contributions were made by:
 - Pablo Emilio Escobar Gaviria @GarkGarcia
 - Rocky Bernstein @rocky
 - Tiago Cavalcante Trindade @TiagoCavalcante
+- Li Xiang @Li-Xiang-Ideal
+- Kevin Cao @kejcao
 
 Thanks to the authors of all projects that are used in Mathics:
 - Django

CHANGES.rst

@@ -8,9 +8,11 @@ New Builtins
 ++++++++++++
 
 
-* `Elements`
-* `RealAbs` and `RealSign`
-* `RealValuedNumberQ`
+* ``Elements``
+* ``ConjugateTranspose``
+* ``LeviCivitaTensor``
+* ``RealAbs`` and ``RealSign``
+* ``RealValuedNumberQ``
 
 
 Compatibility

FUTURE.rst

@@ -2,9 +2,11 @@
 
 .. contents::
 
-The following 2023 road map that appears the 6.0.0 hasn't gone through enough discussion. This provisional.
-Check the github repository for updates.
 
+2024 Roadmap
+============
+
+To be decided...
 
 2023 Roadmap
 ============

SYMBOLS_MANIFEST.txt

@@ -574,6 +574,7 @@ System`LessEqual
 System`LetterCharacter
 System`LetterNumber
 System`LetterQ
+System`LeviCivitaTensor
 System`Level
 System`LevelQ
 System`LightBlue

admin-tools/make-dist.sh

@@ -25,7 +25,8 @@ for pyversion in $PYVERSIONS; do
 	exit $?
     fi
     rm -fr build
-    python setup.py bdist_egg
+    # PYPI no longer supports eggs
+    # python setup.py bdist_egg
     python setup.py bdist_wheel
 done
 

mathics/builtin/arithmetic.py

@@ -958,14 +958,6 @@ class Sum(IterationFunction, SympyFunction):
     Verify algebraic identities:
     >> Sum[x ^ 2, {x, 1, y}] - y * (y + 1) * (2 * y + 1) / 6
      = 0
-
-
-    ## Issue #302
-    ## The sum should not converge since the first term is 1/0.
-    #> Sum[i / Log[i], {i, 1, Infinity}]
-     = Sum[i / Log[i], {i, 1, Infinity}]
-    #> Sum[Cos[Pi i], {i, 1, Infinity}]
-     = Sum[Cos[i Pi], {i, 1, Infinity}]
     """
 
     summary_text = "discrete sum"

mathics/builtin/distance/clusters.py

@@ -35,6 +35,7 @@
 )
 from mathics.eval.nevaluator import eval_N
 from mathics.eval.parts import walk_levels
+from mathics.eval.tensors import get_default_distance
 
 
 class _LazyDistances(LazyDistances):
@@ -139,8 +140,6 @@ def _cluster(self, p, k, mode, evaluation, options, expr):
             options, "DistanceFunction", evaluation
         )
         if distance_function_string == "Automatic":
-            from mathics.builtin.tensors import get_default_distance
-
             distance_function = get_default_distance(dist_p)
             if distance_function is None:
                 name_of_builtin = strip_context(self.get_name())
@@ -462,8 +461,6 @@ def eval(
             options, "DistanceFunction", evaluation
         )
         if distance_function_string == "Automatic":
-            from mathics.builtin.tensors import get_default_distance
-
             distance_function = get_default_distance(dist_p)
             if distance_function is None:
                 evaluation.message(