update

Author: capocchi

.github/workflows/ci-build-ubuntu.yml

@@ -90,4 +90,11 @@ jobs:
 
         for file in "${FILES[@]}"; do
           xvfb-run -a python "$file" --autoclose
-        done
+        done
+
+    ### Upload test results
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: ubuntu-test-results
+        path: ./ubuntu-test-results/

.github/workflows/ci-build-windows.yml

@@ -39,7 +39,8 @@ jobs:
           python -m pip install devsimpy
       
       - name: Test DEVSimPy
-        run: |   
+        run: |
+          if: success()   
           devsimpy --nogui examples/model0/model0.dsp 10
           
         ### Test of diag and sub frame
@@ -77,4 +78,11 @@ jobs:
 
           foreach ($file in $FILES) {
             python $file --autoclose --nogui
-          }
+          }
+          
+      ### Upload test results
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: windows-test-results
+          path: ./windows-test-results/

README.md

@@ -6,7 +6,7 @@
 
 | Category    | Status |
 |------------|--------|
-| **Tests**  | [![Linux](https://github.com/capocchi/DEVSimPy/actions/workflows/ci-build-ubuntu.yml/badge.svg)](https://github.com/capocchi/DEVSimPy/actions/workflows/ci-build-ubuntu.yml) [![Windows](https://github.com/capocchi/DEVSimPy/actions/workflows/ci-build-windows.yml/badge.svg)](https://github.com/capocchi/DEVSimPy/actions/workflows/ci-build-windows.yml) |
+| **Builds & Tests**  | [![Linux](https://github.com/capocchi/DEVSimPy/actions/workflows/ci-build-ubuntu.yml/badge.svg)](https://github.com/capocchi/DEVSimPy/actions/workflows/ci-build-ubuntu.yml) [![Windows](https://github.com/capocchi/DEVSimPy/actions/workflows/ci-build-windows.yml/badge.svg)](https://github.com/capocchi/DEVSimPy/actions/workflows/ci-build-windows.yml) |
 | **PyPI**   | [![PyPI Version](https://img.shields.io/pypi/v/devsimpy)](https://pypi.org/project/devsimpy/) [![Supported Versions](https://img.shields.io/pypi/pyversions/devsimpy?logo=python&logoColor=white)](https://pypi.org/project/devsimpy/) [![Supported Implementations](https://img.shields.io/pypi/implementation/devsimpy)](https://pypi.org/project/devsimpy/) [![Wheel](https://img.shields.io/pypi/wheel/devsimpy)](https://pypi.org/project/devsimpy/) |
 | **Activity** | ![Last Commit](https://img.shields.io/github/last-commit/capocchi/devsimpy) [![Commits Since](https://img.shields.io/github/commits-since/capocchi/devsimpy/v5.1)](https://github.com/capocchi/devsimpy/commits) ![Maintained](https://img.shields.io/maintenance/yes/2025) [![PyPI Downloads](https://img.shields.io/pypi/dm/devsimpy)](https://pypi.org/project/devsimpy/) |
 | **QA** | [![CodeFactor](https://img.shields.io/codefactor/grade/github/capocchi/devsimpy?logo=codefactor)](https://www.codefactor.io/repository/github/capocchi/devsimpy) [![Flake8](https://github.com/capocchi/DEVSimPy/actions/workflows/lint.yml/badge.svg)](https://github.com/capocchi/DEVSimPy/actions/workflows/lint.yml) [![mypy](https://github.com/capocchi/DEVSimPy/actions/workflows/lint.yml/badge.svg)](https://github.com/capocchi/DEVSimPy/actions/workflows/lint.yml) |

devsimpy/Reporter.py

@@ -82,6 +82,12 @@ def ExceptionHook(exctype, value, trace):
 
     ftrace = FormatTrace(exctype, value, trace)
 
+    if not sys.stdout:
+        sys.stdout = sys.__stdout__
+
+    if not sys.stderr:
+        sys.stderr = sys.__stderr__
+    
     # Ensure that error gets raised to console as well
     sys.stdout.write(ftrace)
 

devsimpy/SimulationGUI.py

@@ -453,10 +453,10 @@ def OnOk(self, event):
 			else:
 				self.current_master = self.master
 
-			if isinstance(self.parent, wx.Panel):
-				# stdout redirect only for the Panel mode (if not in OnSimulation)
-				mainW = self.parent.GetTopLevelParent()
-				sys.stdout = mainW.stdioWin
+			# if isinstance(self.parent, wx.Panel):
+			# 	# stdout redirect only for the Panel mode (if not in OnSimulation)
+			# 	mainW = self.parent.GetTopLevelParent()
+			# 	sys.stdout = mainW.stdioWin
 
 			### check is model is well loaded
 			if (self.current_master is None) or (len(self.current_master.getComponentSet()) == 0):

devsimpy/devsimpy.py

@@ -975,7 +975,6 @@ def OnCloseWindow(self, event):
 				self._mgr.UnInit()
 				del self._mgr
 
-
 		if GUI_FLAG:
 			sys.stdout.write(_("DEVSimPy closed!"))