Use released Timed-Threads

Author: rocky

.github/workflows/consistency-checks.yml

@@ -22,6 +22,8 @@ jobs:
       run: |
         sudo apt update -qq && sudo apt install llvm-dev remake
         python -m pip install --upgrade pip
+        # First, install our Timed-Threads
+        pip install Timed-Threads
         # 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]
         pip install -e .

.github/workflows/macos.yml

@@ -28,19 +28,10 @@ jobs:
         python -m pip install --upgrade pip
     - name: Install Mathics3 with full Python dependencies
       run: |
-        # First install our patched version of stopit
-        git clone --depth 1 https://github.com/Mathics3/stopit.git
-        cd stopit/
-        pip install -e .
-        cd ..
+        # First, install our patched version of stopit called Timed-Threads
+        pip install Timed-Threads
         python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
         # We can comment out after next Mathics-Scanner release
-        git clone --depth 1 https://github.com/Mathics3/mathics-scanner.git
-        # git clone --single-branch --branch operator-refactor-part1.5 https://github.com/Mathics3/mathics-scanner.git
-        cd mathics-scanner/
-        pip install -e .
-        cd ..
-        # We can comment out after next Mathics-Scanner release
         # python -m pip install Mathics-Scanner[full]
         # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
         pip install -e .

.github/workflows/pyodide.yml

@@ -54,11 +54,6 @@ jobs:
 
           pip install "setuptools>=70.0.0" PyYAML click packaging pytest
 
-          # First install our patched version of stopit
-          git clone --depth 1 https://github.com/Mathics3/stopit.git
-          cd stopit/
-          pip install -e .
-          cd ..
           # We can comment out after next Mathics-Scanner release
           # python -m pip install --no-build-isolation -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner
           # pip install --no-build-isolation -e .

.github/workflows/ubuntu-bench.yml

@@ -24,12 +24,9 @@ jobs:
     - name: Install Mathics3 with full dependencies
       run: |
         python -m pip install --upgrade pip
+        # First, install our Timed-Threads
+        pip install Timed-Threads
         python -m pip install pytest-benchmark
-        # First install our patched version of stopit
-        git clone --depth 1 https://github.com/Mathics3/stopit.git
-        cd stopit/
-        pip install -e .
-        cd ..
         # We can comment out after next Mathics-Scanner release
         # python -m pip install Mathics-Scanner[full]
         # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]

.github/workflows/ubuntu-cython.yml

@@ -24,11 +24,8 @@ jobs:
       run: |
         sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev tesseract-ocr
         python -m pip install --upgrade pip
-        # First install our patched version of stopit
-        git clone --depth 1 https://github.com/Mathics3/stopit.git
-        cd stopit/
-        pip install -e .
-        cd ..
+        # First, install our Timed-Threads
+        pip install Timed-Threads
         # 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]
         pip install -e .

.github/workflows/ubuntu.yml

@@ -24,11 +24,8 @@ jobs:
     - name: Install Mathics3 with full dependencies
       run: |
         python -m pip install --upgrade pip
-        # First install our patched version of stopit
-        git clone --depth 1 https://github.com/Mathics3/stopit.git
-        cd stopit/
-        pip install -e .
-        cd ..
+        # First, install our patched version of stopit called Timed-Threads
+        python -m pip install Timed-Threads
         # 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]
         git clone --depth 1 https://github.com/Mathics3/mathics-scanner.git

.github/workflows/windows.yml

@@ -33,18 +33,8 @@ jobs:
         set LLVM_DIR="C:\Program Files\LLVM"
     - name: Install Mathics3 with Python dependencies
       run: |
-        # First install our patched version of stopit
-        git clone --depth 1 https://github.com/Mathics3/stopit.git
-        cd stopit/
-        pip install -e .
-        cd ..
-        # 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]
-        git clone --depth 1 https://github.com/Mathics3/mathics-scanner.git
-        # git clone --single-branch --branch operator-refactor-part1.5 https://github.com/Mathics3/mathics-scanner.git
-        cd mathics-scanner
-        pip install -e .
-        cd ..
+        # First, install our patched version of stopit called Timed-Threads
+        pip install Timed-Treads
         # 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]
         pip install -e .

mathics/builtin/datentime.py

@@ -42,7 +42,7 @@
 from mathics.settings import TIME_12HOUR
 
 if sys.platform == "emscripten":
-    from stopit import SignalTimeout as TimeoutHandler
+    from timed_threads import SignalTimeout as TimeoutHandler
 else:
     from timed_threads import ThreadingTimeout as TimeoutHandler
 

mathics/eval/datetime.py

@@ -66,7 +66,7 @@ def eval_pause(sleeptime: float, evaluation):
 
 
 if sys.platform == "emscripten":
-    # from stopit import SignalTimeout as TimeoutHandler
+    # from timed_threads import SignalTimeout as TimeoutHandler
 
     def eval_timeconstrained(
         expr: BaseElement, timeout: float, failexpr: BaseElement, evaluation: Evaluation
@@ -75,7 +75,7 @@ def eval_timeconstrained(
         evaluation.message("TimeConstrained", "tcns")
 
 else:
-    from stopit import ThreadingTimeout as TimeoutHandler
+    from timed_threads import ThreadingTimeout as TimeoutHandler
 
     def eval_timeconstrained(
         expr: BaseElement, timeout: float, failexpr: BaseElement, evaluation: Evaluation

pyproject.toml

@@ -28,8 +28,8 @@ dependencies = [
     "requests",
     "scipy",
     "setuptools",
-    # stopit is needed in TimeRemaining[]
-    "stopit; platform_system != 'Emscripten'",
+    # Timed-Threads is needed in TimeRemaining[]
+    "Timed-Threads",
     "sympy>=1.13",
 ]
 license = "GPL-3.0-or-later"