From 6db74e65eead4185574371a0e1406490c9ccc317 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 2 Sep 2025 11:48:57 -0400 Subject: [PATCH 1/4] Try MacOS and MS Windows CI testing --- .github/workflows/macos.yml | 39 +++++++++++++++++++++++++++++++++++ .github/workflows/windows.yml | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 .github/workflows/macos.yml create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 0000000..2fc187a --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,39 @@ +name: Mathics3 Module PyICU (macOS) + +on: + push: + branches: [ master ] + pull_request: + branches: '**' + +jobs: + build: + runs-on: macos-latest + strategy: + matrix: + os: [macOS] + python-version: ['3.12', '3.13'] + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + brew install llvm + python -m pip install --upgrade pip + python -m pip install pytest + # # Go over and comment out stuff 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] + # git clone https://github.com/Mathics3/mathics-core + # (cd mathics-core && pip3 install -e .[full]) + # (cd mathics-core && bash ./admin-tools/make-JSON-tables.sh) + # python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base + - name: Install Mathic3 PyICU Module + run: | + python -m pip install Mathics3 PyICU + python -m pip install --no-build-isolation -e . + - name: Test Mathics3 Module PyICU + run: | + make check diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000..b37b506 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,39 @@ +name: Mathics3-Module-PyICU (MS Windows) + +on: + push: + branches: [ master ] + pull_request: + branches: '**' + +jobs: + build: + runs-on: windows-latest + strategy: + matrix: + os: [windows] + python-version: ['3.12', '3.13'] + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install pytest + # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner + # git clone --depth 1 https://github.com/Mathics3/mathics-core mathics-core + # cd mathics-core + # python -m pip install -e . + # bash admin-tools/make-JSON-tables.sh + # cd .. + # python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base + - name: Install Mathic3 PyICU Module + run: | + python -m pip install Mathics3 PyICU + python -m pip install --no-build-isolation -e . + - name: Test Mathics + run: | + make check From c820b7802b52d6bdf74f3a15ff838f288f28a622 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 2 Sep 2025 11:54:31 -0400 Subject: [PATCH 2/4] Try to fix up MacOS CI --- .github/workflows/macos.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2fc187a..d431dd0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,6 +19,9 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Install ICU dependencies + run: | + echo "PKG_CONFIG_PATH=$(brew --prefix icu4c)/lib/pkgconfig" >> $GITHUB_ENV - name: Install dependencies run: | brew install llvm From 923ee2a40c62c0b51f6b9d21508e1d8b2cda5dae Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 2 Sep 2025 12:08:59 -0400 Subject: [PATCH 3/4] Try to fix up Windows CI --- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d431dd0..69c6a92 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: Install ICU dependencies + - name: Set ICU version run: | echo "PKG_CONFIG_PATH=$(brew --prefix icu4c)/lib/pkgconfig" >> $GITHUB_ENV - name: Install dependencies diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b37b506..432965e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,8 +19,12 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Set ICU version + run: | + echo "ICU_VERSION=73.2" >> $GITHUB_ENV - name: Install dependencies run: | + choco install icu python -m pip install --upgrade pip python -m pip install pytest # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner @@ -30,7 +34,7 @@ jobs: # bash admin-tools/make-JSON-tables.sh # cd .. # python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base - - name: Install Mathic3 PyICU Module + - name: Install Mathics3 PyICU Module run: | python -m pip install Mathics3 PyICU python -m pip install --no-build-isolation -e . From 4f9f11d5eef174e2361c25cbf8c7e5fbe3207c40 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 2 Sep 2025 12:24:09 -0400 Subject: [PATCH 4/4] Skip PyUCI testing on Windows... Don't know how to install PyICU there. --- .github/workflows/windows.yml | 43 ----------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index 432965e..0000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Mathics3-Module-PyICU (MS Windows) - -on: - push: - branches: [ master ] - pull_request: - branches: '**' - -jobs: - build: - runs-on: windows-latest - strategy: - matrix: - os: [windows] - python-version: ['3.12', '3.13'] - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - name: Set ICU version - run: | - echo "ICU_VERSION=73.2" >> $GITHUB_ENV - - name: Install dependencies - run: | - choco install icu - python -m pip install --upgrade pip - python -m pip install pytest - # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner - # git clone --depth 1 https://github.com/Mathics3/mathics-core mathics-core - # cd mathics-core - # python -m pip install -e . - # bash admin-tools/make-JSON-tables.sh - # cd .. - # python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base - - name: Install Mathics3 PyICU Module - run: | - python -m pip install Mathics3 PyICU - python -m pip install --no-build-isolation -e . - - name: Test Mathics - run: | - make check