From 9553dcf1eb884b3c962c3676b065a606e7d165df Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 29 Aug 2025 12:17:47 -0400 Subject: [PATCH 1/3] Use PyPI in CI --- .github/workflows/osx.yml | 12 ++++++------ .github/workflows/ubuntu.yml | 12 ++++++------ .github/workflows/windows.yml | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 051831d..04828c1 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -24,12 +24,12 @@ jobs: 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 + # # 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 Hello Module run: | python -m pip install -e . diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index bb1f7ce..14da142 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -22,12 +22,12 @@ jobs: run: | 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 + # # 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 Hello Module run: | python -m pip install -e . diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 15e66e0..1e021d5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,13 +23,13 @@ jobs: 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 + # 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 Hello Module run: | python -m pip install -e . From 60f58aed1ff85d7301d6f57f53350df678157230 Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 29 Aug 2025 12:24:31 -0400 Subject: [PATCH 2/3] Update dependencies --- pymathics/hello/version.py | 2 +- pyproject.toml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pymathics/hello/version.py b/pymathics/hello/version.py index 6de05f6..9d003f0 100644 --- a/pymathics/hello/version.py +++ b/pymathics/hello/version.py @@ -5,4 +5,4 @@ # well as importing into Python. That's why there is no # space around "=" below. # fmt: off -__version__="7.0.1dev0" # noqa +__version__="9.0.0" # noqa diff --git a/pyproject.toml b/pyproject.toml index ef8fa40..0239d64 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,8 @@ build-backend = "setuptools.build_meta" name = "Mathics3-hello" description = 'Mathics3 Hello, World! module' dependencies = [ - "Mathics3-Module-Base", + "Mathics3-Module-Base >= 9.0.0", + "Mathics3 >= 9.0.0", ] requires-python = ">=3.10" readme = "README.rst" From 1cd3ca316daea7c40109c033b3c365cc0ffd7f1f Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 29 Aug 2025 12:32:35 -0400 Subject: [PATCH 3/3] Try to get CI working --- .github/workflows/osx.yml | 5 +++-- .github/workflows/ubuntu.yml | 5 +++-- .github/workflows/windows.yml | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 04828c1..5449815 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [macOS] - python-version: ['3.11', '3.12', '3.13'] + python-version: ['3.12', '3.13'] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -32,7 +32,8 @@ jobs: # python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base - name: Install Mathic3 Hello Module run: | - python -m pip install -e . + python -m pip install Mathics3 + python -m pip install --no-build-isolation -e . - name: Test Mathics3 Hello Module run: | make check diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 14da142..8d1ec15 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10', '3.11', '3.12', '3.13'] + python-version: ['3.12', '3.13'] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -30,7 +30,8 @@ jobs: # python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base - name: install Mathic3 Hello Module run: | - python -m pip install -e . + python -m pip install Mathics3 + python -m pip install --no-build-isolation -e . - name: Test Mathics3 Hello Module run: | make check diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1e021d5..a799089 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [windows] - python-version: ['3.10', '3.11', '3.12'] + python-version: ['3.12', '3.13'] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -32,7 +32,8 @@ jobs: # python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base - name: Install Mathic3 Hello Module run: | - python -m pip install -e . + python -m pip install Mathics3 + python -m pip install --no-build-isolation -e . - name: Test Mathics run: | make check