Merge branch 'master' into track-api-changes

.github/workflows/consistency-checks.yml

@@ -13,9 +13,9 @@ jobs:
       matrix:
         python-version: ['3.10']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/autoblack.yml → .github/workflows/isort-and-black-checks.yml

@@ -3,15 +3,15 @@
 # Othewrwise, Black is run and its changes are committed back to the incoming pull request.
 # https://github.com/cclauss/autoblack
 
-name: autoblack
+name: isort and black
 on: [pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Install click

.github/workflows/osx.yml

@@ -17,9 +17,9 @@ jobs:
         os: [macOS]
         python-version: ['3.11']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install OS dependencies
@@ -41,4 +41,4 @@ jobs:
         make develop
     - name: Test natlang
       run: |
-        make check
+        PYENCHANT_LIBRARY_PATH=$(brew --prefix enchant)/lib/libenchant-2.dylib python) make check

.github/workflows/ubuntu.yml

@@ -8,15 +8,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         # python-version: ['3.9', '3.10'] # Figure out what's wrong here.
         python-version: ['3.11']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -26,9 +26,9 @@ jobs:
         # 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]
-        git clone --branch fixes_for_the_new_module_organization https://github.com/Mathics3/mathics-core
+        git clone https://github.com/Mathics3/mathics-core
         (cd mathics-core && pip3 install -e .[full])
-        (cd mathics-core && bash ./admin-tools/make-op-tables.sh) 
+        (cd mathics-core && bash ./admin-tools/make-op-tables.sh)
         # python -m pip install Mathics3[full]
     - name: install pymathics natlang
       run: |

pymathics/natlang/textual_analysis.py

@@ -38,6 +38,7 @@ class Containing(Builtin):
       <dd>represents an object of the type outer containing objects\
           of type inner.
     </dl>
+
     'Containing' can be used as the second parameter in 'TextCases' and 'TextPosition'.
 
     Supported $outer$ strings are in {"Word", "Sentence", "Paragraph", "Line", "URL", "EmailAddress"}.