diff --git a/.github/workflows/consistency-checks.yml b/.github/workflows/consistency-checks.yml index 06243d0..e19a0a0 100644 --- a/.github/workflows/consistency-checks.yml +++ b/.github/workflows/consistency-checks.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10'] + python-version: ['3.11'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d5e5e75..7958775 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.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -23,8 +23,8 @@ jobs: python -m pip install --upgrade pip python -m pip install pytest # 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 -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 -e . (cd src/mathics3 && bash ./admin-tools/make-JSON-tables.sh) - name: install pymathics graph diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2ac7b58..3b95cf4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,8 +7,12 @@ repos: - id: check-merge-conflict - id: debug-statements stages: [pre-commit] + exclude: ChangeLog-spell-corrected.diff - id: end-of-file-fixer stages: [pre-commit] + exclude: ChangeLog-spell-corrected.diff + - id: trailing-whitespace + exclude: ChangeLog-spell-corrected.diff - repo: https://github.com/pycqa/isort rev: 5.13.2 hooks: diff --git a/NEWS.md b/NEWS.md index 2aa7099..e5aa93c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,19 @@ +8.0.0 +----- + +Jan 26, 2025 + +This release tracks the API changes in the Mathics Kernel. + +* Added builtin function `GraphQ[]`. (Combinatorica uses this) +* Redo `DirectedEdge` and `UndirectedEdge` as operators + 7.0.0 ----- +Aug 10, 2025 + + * Revise for 7.0.0 Mathics3 API; we need to explicilty load builtins * Newer matplotlib requires a plot close. * Networkx 3.3 supported diff --git a/pymathics/graph/version.py b/pymathics/graph/version.py index 6de05f6..eaab809 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__="7.0.1dev0" # noqa +__version__="8.0.0" # noqa diff --git a/setup.py b/setup.py index 8cc7919..c34febd 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,11 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import sys -import platform import os.path as osp -from setuptools import setup, find_namespace_packages +import platform +import sys + +from setuptools import find_namespace_packages, setup # Ensure user has the correct Python version if sys.version_info < (3, 8): @@ -32,7 +33,7 @@ def read(*rnames): version=__version__, # noqa packages=find_namespace_packages(include=["pymathics.*"]), install_requires=[ - "Mathics3>=7.0.0.dev0", + "Mathics3>=8.0.0", "networkx>=3.0.0", "pydot", "matplotlib", @@ -54,12 +55,11 @@ def read(*rnames): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Scientific/Engineering", - "Topic :: Scientific/Engineering :: Bio-Informatics", "Topic :: Scientific/Engineering :: Mathematics", - "Topic :: Scientific/Engineering :: Physics", "Topic :: Software Development :: Interpreters", ], # TODO: could also include long_description, download_url,