From 251fcf388729bb18dd16e78b6910810218f87a09 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 3 Jun 2025 09:11:16 -0400 Subject: [PATCH] In CI, go back to using master branch --- .github/workflows/consistency-checks.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/mypy.yml | 2 +- .github/workflows/packages.yml | 2 +- .github/workflows/pyodide.yml | 2 +- .github/workflows/ubuntu-cython.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/consistency-checks.yml b/.github/workflows/consistency-checks.yml index 8f5384cb9..c22880629 100644 --- a/.github/workflows/consistency-checks.yml +++ b/.github/workflows/consistency-checks.yml @@ -23,7 +23,7 @@ jobs: sudo apt update -qq && sudo apt install llvm-dev remake 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@revise-escape-sequence-scanning#egg=Mathics-Scanner[full] + python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] pip install -e . - name: Install Mathics with minimum dependencies diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b827fd951..37fec5129 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,7 +35,7 @@ jobs: 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@revise-escape-sequence-scanning#egg=Mathics-Scanner[full] + python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] pip install -e . remake -x develop-full - name: Test Mathics3 diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index a21724d9c..1c20a8b1e 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -27,7 +27,7 @@ jobs: run: | pip install mypy==1.13 sympy==1.12 # Adjust below for right branch - git clone --depth 1 --branch revise-escape-sequence-scanning https://github.com/Mathics3/mathics-scanner.git + git clone --depth 1 https://github.com/Mathics3/mathics-scanner.git cd mathics-scanner/ pip install -e . bash ./admin-tools/make-JSON-tables.sh diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 40ce3bc0f..dcec12840 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -25,7 +25,7 @@ jobs: run: | 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@revise-escape-sequence-scanning#egg=Mathics-Scanner[full] + python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] - name: Run Mathics3 Combinatorica tests run: | git submodule init diff --git a/.github/workflows/pyodide.yml b/.github/workflows/pyodide.yml index 27cb2c904..2780cf7b1 100644 --- a/.github/workflows/pyodide.yml +++ b/.github/workflows/pyodide.yml @@ -55,7 +55,7 @@ jobs: pip install "setuptools>=70.0.0" PyYAML click packaging pytest # We can comment out after next Mathics-Scanner release - python -m pip install --no-build-isolation -e git+https://github.com/Mathics3/mathics-scanner@revise-escape-sequence-scanning#egg=Mathics-Scanner + python -m pip install --no-build-isolation -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner # pip install --no-build-isolation -e . # cd .. diff --git a/.github/workflows/ubuntu-cython.yml b/.github/workflows/ubuntu-cython.yml index f46b08233..31febb7a3 100644 --- a/.github/workflows/ubuntu-cython.yml +++ b/.github/workflows/ubuntu-cython.yml @@ -30,7 +30,7 @@ jobs: 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@revise-escape-sequence-scanning#egg=Mathics-Scanner[full] + python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] pip install -e . cd .. diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 04104d96f..8d56f8e9f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -31,7 +31,7 @@ jobs: 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@revise-escape-sequence-scanning#egg=Mathics-Scanner[full] + python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] pip install -e . remake -x develop-full - name: Test Mathics diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f33a6cca9..1360c3f0e 100755 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -39,7 +39,7 @@ jobs: 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@revise-escape-sequence-scanning#egg=Mathics-Scanner[full] + python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] pip install -e . # python -m pip install Mathics-Scanner[full]