Merge branch 'master' into fix_unevaluated

Mathics3 · Aug 3, 2024 · d645adb · d645adb
2 parents ebe1015 + b5eeb1c
commit d645adb
Show file tree

Hide file tree

Showing 422 changed files with 32,640 additions and 18,888 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,6 +6,7 @@ labels: ''
 assignees: ''
 
 ---
+*Note: If the feature is about adding or filling out existing deficiency in the Mathics3 language, please file this as an [issue](https://github.com/Mathics3/mathics-core/issues/new?assignees=&labels=&projects=&template=bug_report.md&title=).*
 
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

diff --git a/.github/workflows/consistency-checks.yml b/.github/workflows/consistency-checks.yml
@@ -1,4 +1,4 @@
-name: Mathics (Consistency Checks)
+name: Mathics3 (Consistency Checks)
 
 on:
   push:
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.10']
+        python-version: ['3.11']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

diff --git a/.github/workflows/isort-and-black-checks.yml b/.github/workflows/isort-and-black-checks.yml
@@ -9,24 +9,24 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11
       - name: Install click, black and isort
-        run: pip install 'click==8.0.4' 'black==22.3.0' 'isort==5.10.1'
+        run: pip install 'click==8.0.4' 'black==23.12.1' 'isort==5.13.2'
       - name: Run isort --check .
         run: isort --check .
-      - name: Run isort --check .
+      - name: Run black --check .
         run: black --check .
-      - name: If needed, commit black changes to the pull request
-        if: failure()
-        run: |
-          black .
-          git config --global user.name 'autoblack'
-          git config --global user.email '[email protected]'
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
-          git checkout $GITHUB_HEAD_REF
-          git commit -am "fixup: Format Python code with Black"
-          git push
+      # - name: If needed, commit black changes to the pull request
+      #   if: failure()
+      #   run: |
+      #     black .
+      #     git config --global user.name 'autoblack'
+      #     git config --global user.email '[email protected]'
+      #     git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+      #     git checkout $GITHUB_HEAD_REF
+      #     git commit -am "fixup: Format Python code with Black"
+      #     git push
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -1,37 +1,37 @@
-name: Mathics (OSX)
+name: Mathics3 (OSX)
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches: '**'
 
 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:
         os: [macOS]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.9', '3.10']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
+    - name: Install OS dependencies
       run: |
-        brew install llvm@11
+        brew install llvm@14 tesseract
         python -m pip install --upgrade pip
-        LLVM_CONFIG=/usr/local/Cellar/llvm@11/11.1.0/bin/llvm-config pip install llvmlite
-        # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
-    - name: Install Mathics with full dependencies
+    - name: Install Mathics3 with full Python dependencies
       run: |
+        # We can comment out after next Mathics-Scanner release
+        # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install Mathics-Scanner
         make develop-full
-    - name: Test Mathics
+    - name: Test Mathics3
       run: |
         make -j3 check
diff --git a/.github/workflows/ubuntu-cython.yml b/.github/workflows/ubuntu-cython.yml
@@ -1,4 +1,4 @@
-name: Mathics (ubuntu full with Cython)
+name: Mathics3 (ubuntu full with Cython)
 
 on:
   push:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ['3.11']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -22,10 +22,11 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev
+        sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev tesseract-ocr
         python -m pip install --upgrade pip
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install Mathics-Scanner
     - name: Install Mathics with full dependencies
       run: |
         make develop-full-cython

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -1,31 +1,32 @@
-name: Mathics (ubuntu)
+name: Mathics3 (ubuntu)
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches: '**'
 
 jobs:
   build:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.11', '3.8', '3.9', '3.10']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
+    - name: Install OS dependencies
+      run: |
+        sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev tesseract-ocr
+    - name: Install Mathics3 with full dependencies
       run: |
-        sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev
         python -m pip install --upgrade pip
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
-    - name: Install Mathics with full dependencies
-      run: |
+        # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install Mathics-Scanner
         make develop-full
     - name: Test Mathics
       run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: Mathics (Windows)
+name: Mathics3 (Windows)
 
 on:
   push:
@@ -12,26 +12,32 @@ jobs:
     strategy:
       matrix:
         os: [windows]
-        python-version: [3.7, 3.8]
+        # "make doctest" on MS Windows fails without showing much of a
+        # trace of where things went wrong on Python before 3.11.
+        python-version: ['3.11']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
+    - name: Install OS dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install wheel
-        choco install llvm
+        # use --force because llvm may already exist, but it also may not exist.
+        # so we will be safe here. Another possibility would be check and install
+        # conditionally.
+        choco install --force llvm
+        # choco install tesseract
         set LLVM_DIR="C:\Program Files\LLVM"
+    - name: Install Mathics3 with Python dependencies
+      run: |
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install Mathics-Scanner
         make develop-full
-    - name: Install Mathics
-      run: |
-        python setup.py install
-    - name: Test Mathics
+    - name: Test Mathics3
       # Limit pip install to a basic install *without* full dependencies.
       # Here is why:
       #   * Windows is the slowest CI build, this speeds up testing by about
@@ -40,6 +46,8 @@ jobs:
       #     we needs some CI that tests running when packages aren't available
       # So "dev" only below, not "dev,full".
       run: |
+        pip install pyocr # from full
         pip install -e .[dev]
-        set PYTEST_WORKERS="-n3"
-        make check
+        make pytest gstest
+        make doctest
+        # make check
diff --git a/.gitignore b/.gitignore
@@ -14,9 +14,10 @@
 .settings
 .vscode
 /.cache
+/.gdbinit
 /.python-version
-/Mathics3.egg-info
 /Mathics.egg-info
+/Mathics3.egg-info
 ChangeLog
 Documents/
 Homepage/
@@ -33,9 +34,9 @@ mathics/doc/tex/logo-heptatom.pdf
 mathics/doc/tex/logo-text-nodrop.pdf
 mathics/doc/tex/mathics-*.asy
 mathics/doc/tex/mathics-*.dvi
+mathics/doc/tex/mathics-*.dvi
 mathics/doc/tex/mathics-*.eps
 mathics/doc/tex/mathics-*.pdf
-mathics/doc/tex/mathics-*.dvi
 mathics/doc/tex/mathics-*.tex
 mathics/doc/tex/mathics.aux
 mathics/doc/tex/mathics.dvi

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,20 +2,20 @@ default_language_version:
   python: python
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.5.0
     hooks:
     - id: check-merge-conflict
     - id: debug-statements
       stages: [commit]
     - id: end-of-file-fixer
       stages: [commit]
 -   repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.13.2
     hooks:
       - id: isort
         stages: [commit]
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.12.1
     hooks:
     - id: black
       language_version: python3

diff --git a/AUTHORS.txt b/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