From a791fc2cfdb9770ebf51c5763a51a16044ab0bd8 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 16 Jul 2023 00:48:03 -0400
Subject: [PATCH] CI building

---
 .github/workflows/{osx.yml => osx.yaml}          | 13 ++++++++-----
 .github/workflows/ubuntu.yml                     | 16 +++++++++-------
 .../{windows.yml => windows.yml-notyet}          | 16 ++++++++--------
 .gitignore                                       |  6 +++---
 4 files changed, 28 insertions(+), 23 deletions(-)
 rename .github/workflows/{osx.yml => osx.yaml} (62%)
 rename .github/workflows/{windows.yml => windows.yml-notyet} (61%)

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yaml
similarity index 62%
rename from .github/workflows/osx.yml
rename to .github/workflows/osx.yaml
index bbd47ff..1acced6 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yaml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [macOS]
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -22,15 +22,18 @@ jobs:
     - name: Install dependencies
       run: |
         brew install asymptote
-        python -m pip install --upgrade pip
+        python3 -m pip install --upgrade pip
         # 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]
+        # python3 -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]
-        python -m pip install Mathics3[full]
+        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)
+        # python -m pip install Mathics3[full]
     - name: Install mathicsscript
       run: |
         make
     - name: Test mathicsscript
       run: |
-        pip install -r requirements-dev.txt
+        pip3 install -r requirements-dev.txt
         make check
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 52a98f7..4469579 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -8,29 +8,31 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev asymptote
-        python -m pip install --upgrade pip
+        python3 -m pip install --upgrade pip
         # 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]
         # python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
-        python -m pip install Mathics3[full]
-        python -m pip install -e .
+        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)
+        # python -m pip install Mathics3[full]
     - name: Install mathicsscript
       run: |
         make
     - name: Test mathicsscript
       run: |
-        pip install pytest
+        pip3 install pytest
         make check
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml-notyet
similarity index 61%
rename from .github/workflows/windows.yml
rename to .github/workflows/windows.yml-notyet
index 9d245e7..57e1513 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml-notyet
@@ -16,24 +16,24 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install wheel
-        choco install llvm --force
+        python3 -m pip install --upgrade pip
+        python3 -m pip install wheel
         set LLVM_DIR="C:\Program Files\LLVM"
         # 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]
-        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-scanner#egg=Mathics-Scanner[full]
+        git clone https://github.com/Mathics3/mathics-core
+        (cd mathics-core && make)
+        (cd mathics-core && python -m pip install -e .[full])
         # python -m pip install Mathic3[full]
     - name: Install mathicsscript
       run: |
         make
     - name: Test mathicsscript
       run: |
-        pip install -r requirements-dev.txt
+        pip3 install -r requirements-dev.txt
         make check
diff --git a/.gitignore b/.gitignore
index 39c04fc..bea9f1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 *.pyc
 *_dis
 *~
+./mathicsscript/inputrc-no-unicode
+./mathicsscript/inputrc-unicode
 .idea*
 .idea/**/dataSources.ids
 .idea/**/dataSources.local.xml
@@ -21,9 +23,7 @@
 /.cache
 /.coverage
 /.eggs
-./hypothesis
-./mathicsscript/inputrc-no-unicode
-./mathicsscript/inputrc-unicode
+/.hypothesis
 /.mypy_cache
 /.pytest_cache
 /.python-version