Merge pull request #992 from DLR-RM/develop

Merge develop into master

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.0
+current_version = 2.2.1
 
 [bumpversion:glob:**/pyproject.toml]
 search = version = "{current_version}" # Handled by bump2version

CHANGELOG.rst

@@ -4,6 +4,15 @@ Changelog
 Information about :ref:`RAFCON` changes in each release will be published here. More
 details can be found in the `GIT commit log <https://github.com/DLR-RM/RAFCON/commits/master>`__.
 
+2.2.1
+""""""
+    - Bug fixes:
+        - Fixed bug where switching an execution state to a hierarchy state would not remove script.py
+
+    - Miscellaneous:
+        - Resolved numpy conflict with different python versions (3.9 and >3.10)
+        - Updated versioning of dependencies
+
 2.2.0
 """"""
     - Features:

CITATION.cff

@@ -3,8 +3,8 @@
 cff-version: "1.2.0"
 message: "If you use this software, please cite it using these metadata."
 title: RAFCON
-version: 2.2.0  # Handled by bump2version
-date-released: 2025-01-17
+version: 2.2.1  # Handled by bump2version
+date-released: 2025-01-27
 license: EPL-1.0
 doi: "10.5281/zenodo.1493058"
 authors:

VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rafcon"
-version = "2.2.0" # Handled by bump2version
+version = "2.2.1" # Handled by bump2version
 description = "Develop your robotic tasks with hierarchical state machines using an intuitive graphical user interface"
 keywords = ["state machine", "robotic", "FSM", "development", "GUI", "visual programming"]
 readme = "README.rst"
@@ -27,19 +27,21 @@ classifiers = [
     "Topic :: Utilities",
 ]
 dependencies = [
-    "PyGObject>=3.42.0",
-    "wrapt>=1.14.0",
-    "astroid>=3.0.0",
-    "gaphas>=2.1.0,<2.2.0",
-    "jsonconversion>=1.0.2",
-    "psutil>=5.0.0,<6.0.0",
-    "pycairo>=1.11.0",
-    "pylint>=2.11.0",
-    "simplegeneric>=0.5.0,<1.0.0",
-    "yaml_configuration>=0.2.5,<0.3.0",
-    "numpy>=2.0.0",
-    "pandas==1.1.5; python_full_version < \"3.7.1\"",
-    "pandas<2.0.0,>=1.2.0; python_full_version >= \"3.7.1\"",
+    "PyGObject( >=3.42.0,<4.0.0)",
+    "wrapt (>=1.14.0,<2.0.0)",
+    "astroid (>=3.0.0,<4.0.0) ; python_version >= '3.11'",
+    "astroid (>=2.15.8,<3.0.0) ; python_version < '3.11'",
+    "gaphas (>=2.1.0,<2.2.0)",
+    "jsonconversion (>=1.1.0,<2.0.0)",
+    "psutil (>=5.0.0,<6.0.0)",
+    "pycairo (>=1.11.0,<2.0.0)",
+    "pylint (>=3.0.0,<4.0.0) ; python_version >= '3.11'",
+    "pylint (>=2.11.0,<3.0.0) ; python_version < '3.11'",
+    "simplegeneric (>=0.5.0,<1.0.0)",
+    "numpy (>=2.0,<3.0) ; python_version >= '3.11'",
+    "numpy (>=1.26,<2.0) ; python_version < '3.11'",
+    "pandas (>=1.2.0,<2.0.0)",
+    "yaml_configuration (>=0.2.5,<0.3.0)",
 ]
 license = {text = "EPL"}
 requires-python = ">=3.9"
@@ -49,21 +51,22 @@ Homepage = "https://github.com/DLR-RM/RAFCON"
 
 [tool.pdm.dev-dependencies]
 dev = [
-    "attrs>=22.2.0",
-    "graphviz>=0.18.2",
-    "matplotlib>=3.9.0",
-    "monitoring>=0.9.12",
-    "objgraph>=3.5.0",
-    "pyuserinput>=0.1.11",
-    "pytest-faulthandler>=1.6.0",
-    "pytest-mock>=1.9.0,<3",
+    "attrs >=22.2.0",
+    "graphviz >=0.18.2",
+    "matplotlib (>=3.10,<4.0) ; python_version >= '3.11'",
+    "matplotlib (>=3.9,<3.10) ; python_version < '3.11'",
+    "monitoring >=0.9.12",
+    "objgraph >=3.5.0",
+    "profiling (>=0.1.3) ; python_version < '3.11'",
+    "pyuserinput >=0.1.11",
+    "pytest-faulthandler >=1.6.0",
+    "pytest-mock (>=1.9.0,<3)",
     "pytest-timeout",
-    "pytest>=6.0.0,<7.0.0",
-    "pyuserinput",
+    "pytest (>=6.0.0,<7.0.0)",
     "libsass",
     "coverage",
-    "tox>=3.28.0",
-    "bump2version>=1.0.1",
+    "tox >=3.28.0",
+    "bump2version >=1.0.1",
 ]
 
 [tool.pdm.build]

rafcon.pt

@@ -21,7 +21,7 @@ SUPPORTED_LANGUAGES = python
 DEPENDS             =
 DEPENDS.osl*        = python-gtkmvc3==1.0,
                       python-gaphas==1.0,
-                      python-jsonconversion==0.2,
+                      python-jsonconversion==1.1,
                       python_yaml_configuration==0.2,
                       sw.common.pango==1.40
 

source/pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
     "jsonconversion<1.0.0,>=0.2.13",
 ]
 name = "rafcon-core"
-version = "2.2.0" # Handled by bump2version
+version = "2.2.1" # Handled by bump2version
 description = "Develop your robotic tasks with hierarchical state machines"
 keywords = [
     "state machine",

source/rafcon/gui/helpers/state_machine.py

@@ -573,6 +573,11 @@ def save_state_machine(delete_old_state_machine=False, recent_opened_notificatio
             shutil.rmtree(os.path.join(sm_path, root_state_storage_id))
         except:
             logger.warn("Couldn't delete legacy root-state folder for current execution state")
+
+    # Delete remaining script.py if a execution state is resaved as a hierarchy state
+    if not isinstance(state_machine_m.state_machine.root_state, ExecutionState) \
+        and os.path.isfile(os.path.join(sm_path, storage.SCRIPT_FILE)):
+        os.remove(os.path.join(sm_path, storage.SCRIPT_FILE))
 
     storage.save_state_machine_to_path(state_machine_m.state_machine, copy_path if as_copy else sm_path,
                                        delete_old_state_machine=delete_old_state_machine, as_copy=as_copy)

tests/network/test_multi_clients.py

@@ -240,6 +240,7 @@ def test_multi_clients():
 
 
 if __name__ == '__main__':
-    test_multi_clients()
+    pass
+    # test_multi_clients()          # commented out because a plugin is required
     # pytest.main([__file__])
 

tests/network/test_network_gui.py

@@ -537,5 +537,6 @@ def test_network_gui():
 
 
 if __name__ == '__main__':
-    test_network_gui()
+    pass
+    # test_network_gui()          # commented out because a plugin is required
     # pytest.main([__file__])

tests/network/test_single_client.py

@@ -412,6 +412,7 @@ def test_single_client():
 
 
 if __name__ == '__main__':
-    test_single_client()
+    pass
+    # test_single_client()          # commented out because a plugin is required
     # pytest.main([__file__])