From 73ceadbf806519843025a02cf480747f76527cbd Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 29 Aug 2025 17:15:46 -0400 Subject: [PATCH] use PyPI in CI --- .github/workflows/consistency-checks.yml | 10 +++++----- .github/workflows/ubuntu.yml | 14 +++++++------- pymathics/graph/version.py | 2 +- pyproject.toml | 12 +++++------- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/workflows/consistency-checks.yml b/.github/workflows/consistency-checks.yml index 2057881..241060f 100644 --- a/.github/workflows/consistency-checks.yml +++ b/.github/workflows/consistency-checks.yml @@ -22,11 +22,11 @@ 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[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 -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[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 -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base - name: Install Pymathics.graph with minimum dependencies run: | make develop diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index b60ba67..1eb474c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -23,15 +23,15 @@ jobs: 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 - python -m pip install -e . + # 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 pymathics graph run: | - make develop + python -m pip install -e .[full] + # make develop - name: Test Mathics3 Module Graph run: | make -j3 check diff --git a/pymathics/graph/version.py b/pymathics/graph/version.py index 8f117f2..9d003f0 100644 --- a/pymathics/graph/version.py +++ b/pymathics/graph/version.py @@ -5,4 +5,4 @@ # well as importing into Python. That's why there is no # space around "=" below. # fmt: off -__version__="8.0.2dev0" # noqa +__version__="9.0.0" # noqa diff --git a/pyproject.toml b/pyproject.toml index 48d52fe..0ce6ce0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,10 @@ [build-system] requires = [ - "setuptools>=70.0.0", # CVE-2024-38335 recommends this + "setuptools", # CVE-2024-38335 recommends this + "Mathics3>=9.0.0", "networkx>=3.0.0", - "pydot", - "mpmath>=1.2.0", - "numpy<1.27", "matplotlib", - "scipy>=1.10.0", - "sympy>=1.11,<1.13", + "Mathics3-Module-Base", ] build-backend = "setuptools.build_meta" @@ -15,8 +12,9 @@ build-backend = "setuptools.build_meta" name = "Mathics3-graph" description = "Mathics3 Graph Module using NetworkX" dependencies = [ - "Mathics3>=8.0.1", + "Mathics3>=9.0.0", "Mathics3-Module-Base", + "mpmath>=1.2.0", "networkx>=3.0.0", "pydot", "matplotlib",