From a88195d25429227ad069036863188056eac4186f Mon Sep 17 00:00:00 2001 From: Juan Mauricio Matera Date: Sat, 15 Nov 2025 07:36:58 -0300 Subject: [PATCH 1/2] update reference to keycomparable magic value --- pymathics/graph/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pymathics/graph/base.py b/pymathics/graph/base.py index 9bac809..973bf02 100644 --- a/pymathics/graph/base.py +++ b/pymathics/graph/base.py @@ -21,7 +21,7 @@ from mathics.core.element import BaseElement from mathics.core.evaluation import Evaluation from mathics.core.expression import Expression -from mathics.core.keycomparable import IMAGE_EXPRESSION_SORT_KEY +from mathics.core.keycomparable import IMAGE_EXPRESSION_ELT_ORDER from mathics.core.pattern import pattern_objects from mathics.core.symbols import Symbol, SymbolList, SymbolTrue from mathics.core.systemsymbols import ( @@ -43,7 +43,7 @@ SymbolUndirectedEdge, ) -GRAPH_EXPRESSION_SORT_KEY = IMAGE_EXPRESSION_SORT_KEY + 1 +GRAPH_EXPRESSION_SORT_KEY = IMAGE_EXPRESSION_ELT_ORDER + 1 WL_MARKER_TO_NETWORKX = { "Circle": "o", From c0b0610400e010f816f2a57d9c9e2326c80856ef Mon Sep 17 00:00:00 2001 From: Juan Mauricio Matera Date: Sat, 15 Nov 2025 07:41:23 -0300 Subject: [PATCH 2/2] update github workflows --- .github/workflows/consistency-checks.yml | 10 +++++----- .github/workflows/ubuntu.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/consistency-checks.yml b/.github/workflows/consistency-checks.yml index 241060f..2057881 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 1eb474c..cf593c4 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -23,11 +23,11 @@ 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 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: | python -m pip install -e .[full]