salabim 24.0.4__tar.gz → 24.0.4.post1__tar.gz

{salabim-24.0.4 → salabim-24.0.4.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.4
+Version: 24.0.4.post1
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org

{salabim-24.0.4 → salabim-24.0.4.post1}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     {name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com"}
 ]
 description = "salabim - discrete event simulation in Python"
-version = "24.0.4"
+version = "24.0.4-1"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [

salabim-24.0.4.post1/salabim/__init__.py

@@ -0,0 +1,2 @@
+from .salabim import *
+from .salabim import __version__

{salabim-24.0.4 → salabim-24.0.4.post1}/salabim/changelog.txt

@@ -1,19 +1,22 @@
 salabim changelog
 
-version 24.0.4  2024-05-01
+version 24.0.4  2024-05-03
 ==========================
-Some distribution changes
+Although there's no functional change, this is a major upgrade,
+that could result in bugs or unexpected behaviour.
+Please report any bug or problem.
 
-version 24.0.3  2024-05-01
-==========================
 Internal organization completely changed. Now uses git for version
-control.
+control. That means that it is much easier for the developer
+to push new versions.
+
+And for publishing on PyPI salabim now uses a pyproject.toml file.
+This also makes publishing easier for the developer.
 
 Changed the styling of the salabim logo, which will be visible on the
-website,readme, manual.
+website, readme, manual.
 Also the Environment.modelname() method now shows the new styling.
 
-
 version 24.0.2  2024-03-15
 ==========================
 Added functionality (0)

{salabim-24.0.4 → salabim-24.0.4.post1}/salabim/salabim.py

@@ -27086,6 +27086,7 @@ reset()
 set_environment_aliases()
 
 if __name__ == "__main__":
+    sys.path.insert(0,str(Path.cwd()/"misc"))
     try:
         import salabim_exp
     except Exception as e:

{salabim-24.0.4 → salabim-24.0.4.post1}/salabim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.4
+Version: 24.0.4.post1
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org

{salabim-24.0.4 → salabim-24.0.4.post1}/salabim.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ README.md
 pyproject.toml
 salabim/DejaVuSansMono.ttf
 salabim/LICENSE.txt
+salabim/__init__.py
 salabim/calibri.ttf
 salabim/changelog.txt
 salabim/mplus-1m-regular.ttf

{salabim-24.0.4 → salabim-24.0.4.post1}/tests/test_monitor.py

@@ -397,13 +397,13 @@ def test_level_values():
     class Interrupter(sim.Component):
         def process(self):
             self.hold(6)
-            x0.interrupt()
-            x1.interrupt()
-            x2.interrupt()
+            for x in (x0,x1,x2):
+                if x.isscheduled():
+                    x.interrupt()
             self.hold(4)
-            x0.resume()
-            x1.resume()
-            x2.resume()
+            for x in (x0,x1,x2):
+                if x.isinterrupted():
+                    x.resume()
 
     def status_map(status):
         return sim.statuses().index(status)
@@ -425,7 +425,7 @@ def test_level_values():
 
     env.run(till=50)
 
-    assert x1.status.value_duration("requesting") == pytest.approx(10.1)
+    assert x1.status.value_duration("requesting") == pytest.approx(14.1)
 
     assert x0.mode.xt(force_numeric=None) == (["abc", "ghi", "jkl", "jkl"], array("d", [0.0, 4.3, 18.4, 50.0]))
     assert x0.status.xt(force_numeric=None) == (

salabim-24.0.4.post1/tests/test_salabim.py

@@ -0,0 +1,9 @@
+import pytest
+import os
+import sys
+from pathlib import Path
+
+if __name__ == "__main__":
+    sys.path.insert(0,str(Path.cwd()/"salabim"))
+    os.chdir("tests")    
+    pytest.main(["-vv", "-s"])

salabim-24.0.4/tests/test_salabim.py

@@ -1,5 +0,0 @@
-import pytest
-
-if __name__ == "__main__":
-
-    pytest.main(["-vv", "-s"])