Merge pull request #28 from Mathics3/NetworkX-3

Network x 3

Author: rocky

.github/workflows/ubuntu.yml

@@ -23,12 +23,9 @@ 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]
-        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 Mathics3[full]
-        # python -m pip install -e .
+        # 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]
+        (cd src/mathics3 && bash ./admin-tools/make-op-tables.sh)
     - name: install pymathics graph
       run: |
         make develop

pymathics/graph/__init__.py

@@ -21,7 +21,7 @@
     = -Graph-
 
    >> ConnectedComponents[g]
-    = {{4, 3}, {2}, {1}}
+    = {{3, 4}, {2}, {1}}
 
    >> WeaklyConnectedComponents[g]
     = {{1, 2, 3, 4}}

pymathics/graph/properties.py

@@ -254,7 +254,8 @@ class MultigraphQ(_NetworkXBuiltin):
     :Multigraph:
     https://en.wikipedia.org/wiki/Multigraph</url> test (<url>
     :NetworkX:
-    https://networkx.org/documentation/networkx-2.8.8/reference/classes/multigraph.html</url>, <url>
+https://networkx.org/documentation/networkx-2.8.8/reference/classes/multigraph.html</url>, \
+    <url>
     :WMA:
     https://reference.wolfram.com/language/ref/MulitGraphQ.html</url>)
 
@@ -404,15 +405,15 @@ def eval(self, graph, expression, evaluation: Evaluation, options: dict):
 
 class SimpleGraphQ(_NetworkXBuiltin):
     """
-    Simple (not multigraph)<url>
+    Simple (not multigraph) <url>
     :graph:
     https://en.wikipedia.org/wiki/Graph_(discrete_mathematics)#Graph
     </url> test (<url>
     :WMA:
     https://reference.wolfram.com/language/ref/SimpleGraphQ.html</url>)
 
     <dl>
-      <dt>'LoopFreeGraphQ'[$graph$]
+      <dt>'SimpleGraphQ'[$graph$]
       <dd>True if $graph$ is a 'Graph', loop-free and each pair of \
           vertices are connected at most by a single edge.
     </dl>

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__="6.0.1dev0"  # noqa
+__version__="6.1.0dev0"  # noqa

setup.py

@@ -33,7 +33,7 @@ def read(*rnames):
     packages=find_namespace_packages(include=["pymathics.*"]),
     install_requires=[
         "Mathics3>=6.0.0",
-        "networkx>=2.8.0",
+        "networkx>=3.0.0",
         "pydot",
         "matplotlib",
         "scipy>=1.10.0",