Merge pull request #1 from mmatera/ruff

ruff

Author: mmatera

.github/workflows/MSWindows.yml

@@ -24,12 +24,16 @@ jobs:
         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
-        # git clone --depth 1 https://github.com/Mathics3/mathics-core mathics-core
-        # cd mathics-core
-        # python -m pip install -e .
-        # bash admin-tools/make-JSON-tables.sh
-        # cd ..
-        # python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base
+        git clone --depth 1 https://github.com/Mathics3/mathics-scanner.git
+        cd mathics-scanner
+        pip install -e .
+        bash -x admin-tools/make-JSON-tables.sh
+        cd ..
+        git clone https://github.com/Mathics3/mathics-core
+        cd mathics-core
+        pip3 install -e .[full]
+        bash -x admin-tools/make-JSON-tables.sh
+        cd ..
     - name: Install Mathic3 vectorizedplot Module
       run: |
         python -m pip install Mathics3

.github/workflows/MacOS.yml

@@ -25,11 +25,14 @@ 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
+        git clone --depth 1 https://github.com/Mathics3/mathics-scanner.git
+        cd mathics-scanner/
+        pip install -e .
+        bash -x admin-tools/make-JSON-tables.sh
+        cd ..
+        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)
     - name: Install Mathic3 vectorizedplot Module
       run: |
         python -m pip install Mathics3

.github/workflows/autoblack.yml

@@ -16,17 +16,17 @@ jobs:
           python-version: 3.11
       - name: Install click, black and isort
         run: pip install 'click==8.2.1' 'black==25.11.0' 'isort==5.13.2'
-      - name: Run isort --check .
-        run: isort --check .
       - name: Run black --check --diff .
         run: black --check --diff .
-      - name: If needed, commit black changes to the pull request
-        if: failure()
-        run: |
-          black .
-          git config --global user.name 'autoblack'
-          git config --global user.email 'rocky@users.noreply.github.com'
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
-          git checkout $GITHUB_HEAD_REF
-          git commit -am "fixup: Format Python code with Black"
-          git push
+      - name: Run isort --check --diff .
+        run: isort --check --diff .	
+      # - name: If needed, commit black changes to the pull request
+      #  if: failure()
+      #  run: |
+      #    black .
+      #    git config --global user.name 'autoblack'
+      #    git config --global user.email 'rocky@users.noreply.github.com'
+      #    git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+      #    git checkout $GITHUB_HEAD_REF
+      #    git commit -am "fixup: Format Python code with Black"
+      #    git push

pymathics/vectorizedplot/__init__.py

@@ -22,23 +22,25 @@
 </ul>
 """
 
-
 from pymathics.vectorizedplot.version import __version__
+
+# The try block is needed because at installation time, dependencies are not
+# available. After the installation is successfull, we want to make this availabe.
 try:
-    from pymathics.vectorizedplot.plot_plot3d import ContourPlot3D, ParametricPlot3D, SphericalPlot3D
+    from pymathics.vectorizedplot.plot_plot3d import (
+        ContourPlot3D,
+        ParametricPlot3D,
+        SphericalPlot3D,
+    )
 
-    __all__ = (
+    _BUILTINS_ = (
         "ContourPlot3D",
         "ParametricPlot3D",
         "SphericalPlot3D",
-        "__version__",
-        "pymathics_version_data"
     )
 except ModuleNotFoundError:
-    __all__ = (
-        "__version__",
-        "pymathics_version_data"
-    )
+    _BUILTINS_ = tuple()
+
 
 # To be recognized as an external mathics module, the following variable
 # is required:
@@ -53,3 +55,7 @@
 sort_order = "mathics.builtin.plotting-graphing-and-drawing"
 
 
+__all__ = tuple(_BUILTINS_) + (
+    "__version__",
+    "pymathics_version_data",
+)

pymathics/vectorizedplot/eval/colors.py

@@ -6,7 +6,6 @@
 from typing import Optional
 
 import palettable
-
 from mathics.core.atoms import Integer0, Integer1, MachineReal, String
 from mathics.core.convert.expression import to_expression
 from mathics.core.element import BaseElement