Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/consistency-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions pymathics/graph/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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",
Expand Down
Loading