Skip to content

Commit fedd607

Browse files
committed
fix workflow
1 parent b4f6242 commit fedd607

File tree

2 files changed

+15
-27
lines changed

2 files changed

+15
-27
lines changed

.github/workflows/MSWindows.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ jobs:
2525
python -m pip install pytest
2626
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner
2727
git clone --depth 1 https://github.com/Mathics3/mathics-scanner.git
28-
cd mathics-scanner/
28+
cd mathics-scanner
2929
pip install -e .
3030
bash -x admin-tools/make-JSON-tables.sh
3131
cd ..
3232
git clone https://github.com/Mathics3/mathics-core
33-
(cd mathics-core && pip3 install -e .[full])
34-
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
33+
cd mathics-core
34+
pip3 install -e .[full]
35+
bash -x admin-tools/make-JSON-tables.sh)
36+
cd ..
3537
- name: Install Mathic3 vectorizedplot Module
3638
run: |
3739
python -m pip install Mathics3

pymathics/vectorizedplot/__init__.py

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,13 @@
2222
</ul>
2323
"""
2424

25+
from pymathics.vectorizedplot.plot_plot3d import (
26+
ContourPlot3D,
27+
ParametricPlot3D,
28+
SphericalPlot3D,
29+
)
2530
from pymathics.vectorizedplot.version import __version__
2631

27-
ALREADY_INSTALLED = True
28-
try:
29-
from pymathics.vectorizedplot.plot_plot3d import (
30-
ContourPlot3D,
31-
ParametricPlot3D,
32-
SphericalPlot3D,
33-
)
34-
except ModuleNotFoundError as e:
35-
print("module cannot be loaded...", e)
36-
ALREADY_INSTALLED = True
37-
38-
3932
# To be recognized as an external mathics module, the following variable
4033
# is required:
4134
#
@@ -50,16 +43,9 @@
5043

5144

5245
__all__ = (
53-
(
54-
"ContourPlot3D",
55-
"ParametricPlot3D",
56-
"SphericalPlot3D",
57-
"__version__",
58-
"pymathics_version_data",
59-
)
60-
if ALREADY_INSTALLED
61-
else (
62-
"__version__",
63-
"pymathics_version_data",
64-
)
46+
"ContourPlot3D",
47+
"ParametricPlot3D",
48+
"SphericalPlot3D",
49+
"__version__",
50+
"pymathics_version_data",
6551
)

0 commit comments

Comments
 (0)