Merge branch 'master' into track-api-changes

.github/workflows/osx.yml

@@ -24,9 +24,10 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install OS dependencies
       run: |
-        brew install llvm@11 tesseract enchant mysql
+        brew install llvm tesseract enchant mysql
         python -m pip install --upgrade pip
-        LLVM_CONFIG=/usr/local/Cellar/llvm@11/11.1.0/bin/llvm-config pip install llvmlite
+        # LLVM_CONFIG=/usr/local/Cellar/llvm@11/11.1.0/bin/llvm-config pip install llvmlite
+        pip install llvmlite
         pip install pytest
         # Can comment out when next Mathics core and Mathics-scanner are released
         # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]

.github/workflows/ubuntu.yml

@@ -25,8 +25,10 @@ jobs:
         python -m pip install pytest
         # Can comment out when next Mathics3 core and Mathics-scanner are released
         # 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-core#egg=Mathics3[full]
-        (cd src/mathics3 && bash ./admin-tools/make-op-tables.sh)
+        # python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
+        git clone --branch fixes_for_the_new_module_organization https://github.com/Mathics3/mathics-core
+        (cd mathics-core && pip3 install -e .[full])
+        (cd mathics-core && bash ./admin-tools/make-op-tables.sh) 
         # python -m pip install Mathics3[full]
     - name: install pymathics natlang
       run: |

README.rst

@@ -16,7 +16,7 @@ Example Session
    In[3]= WordFrequency["Apple Tree and apple", "apple", IgnoreCase -> True]
    Out[3]= 0.5
    In[4] = TextCases["I was in London last year.", "Pronoun"]
-   Out[3]= {I}
+   Out[4]= {I}
 
 More examples can be found in the `test file <https://github.com/Mathics3/pymathics-natlang/blob/master/test/test_natlang.py>`_.
 

test/consistency-and-style/test_summary_text.py

@@ -6,7 +6,9 @@
 
 import pytest
 
-from pymathics.graph import __file__ as module_initfile_path
+from mathics.core.load_builtin import name_is_builtin_symbol
+from mathics.core.builtin import Builtin
+from mathics.doc.gather import skip_doc
 
 from mathics.core.builtin import Builtin
 from mathics.core.load_builtin import name_is_builtin_symbol