Merge pull request #13 from convince-project/renaming2

renaming in code
convince-project · Jul 19, 2024 · 55fe9db · 55fe9db
2 parents 0bd38b4 + 16db088
commit 55fe9db
Show file tree

Hide file tree

Showing 15 changed files with 392 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -55,7 +55,7 @@ jobs:
               run: | 
                 source colcon_ws/install/setup.bash  # TODO: remove after the release of bt_tools
                 pip install jani_generator/.[dev]
-                pip install mc_toolchain_jani_common/.[dev]
+                pip install as2fm_common/.[dev]
                 pip install scxml_converter/.[dev]
             # lint packages
             # TODO: add linting    
@@ -65,4 +65,4 @@ jobs:
                 export PATH=$PATH:${{ steps.get_smc_storm.outputs.SMC_STORM_PATH }}
                 # source /opt/ros/${{ matrix.ros-distro }}/setup.bash
                 source colcon_ws/install/setup.bash  # TODO: remove after the release of bt_tools
-                pytest-3 -vs mc_toolchain_jani_common jani_generator scxml_converter
+                pytest-3 -vs as2fm_common jani_generator scxml_converter
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Model Checking Toolchain Components
 # Autonomous Systems to Formal Models (AS2FM)
 
-> Please access the documentation via [convince-project.github.io/as2fm](https://convince-project.github.io/as2fm)
+> Please access the documentation via [convince-project.github.io/AS2FM](https://convince-project.github.io/AS2FM)
 
 ## Further Information
 

diff --git a/mc_toolchain_jani_common/pyproject.toml → as2fm_common/pyproject.toml b/mc_toolchain_jani_common/pyproject.toml → as2fm_common/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "mc_toolchain_jani_common"
+name = "as2fm_common"
 version = "0.0.1"
 description = ""
 readme = "README.md"

diff --git a/...on/src/mc_toolchain_jani_common/common.py → as2fm_common/src/as2fm_common/common.py b/...on/src/mc_toolchain_jani_common/common.py → as2fm_common/src/as2fm_common/common.py
diff --git a/..._jani_common/ecmascript_interpretation.py → ...as2fm_common/ecmascript_interpretation.py b/..._jani_common/ecmascript_interpretation.py → ...as2fm_common/ecmascript_interpretation.py
@@ -21,7 +21,7 @@
 
 import js2py
 
-from mc_toolchain_jani_common.common import ValidTypes
+from as2fm_common.common import ValidTypes
 
 
 def interpret_ecma_script_expr(

diff --git a/...i_common/test/test_utilities_smc_strom.py → ...m_common/test/test_utilities_smc_strom.py b/...i_common/test/test_utilities_smc_strom.py → ...m_common/test/test_utilities_smc_strom.py
diff --git a/docs/README.md b/docs/README.md
@@ -3,7 +3,7 @@
 Before you can build the documentation, you need to install the required packages as described above, since also the code API documentation of those packages is built.
 
 ```
-pip install ../mc_toolchain_jani_common
+pip install ../as2fm_common
 pip install ../scxml_converter
 pip install ../jani_generator
 pip install -r requirements.txt

diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -6,7 +6,7 @@ API
    :template: custom-module-template.rst
    :recursive:
 
-   mc_toolchain_jani_common
+   as2fm_common
    jani_generator
    scxml_converter
 
diff --git a/docs/source/tutorials.rst b/docs/source/tutorials.rst
@@ -9,7 +9,7 @@ To run the Python scripts install the required dependencies with the following c
 
 .. code-block:: bash
 
-    python3 -m pip install mc_toolchain_jani_common/
+    python3 -m pip install as2fm_common/
     python3 -m pip install jani_generator/
     python3 -m pip install scxml_converter/
 

diff --git a/jani_generator/src/jani_generator/jani_entries/jani_variable.py b/jani_generator/src/jani_generator/jani_entries/jani_variable.py
@@ -20,7 +20,7 @@
 from typing import Optional, Union, get_args
 from jani_generator.jani_entries import JaniExpression, JaniValue
 
-from mc_toolchain_jani_common.common import ValidTypes
+from as2fm_common.common import ValidTypes
 
 
 class JaniVariable:

diff --git a/jani_generator/src/jani_generator/scxml_helpers/scxml_data.py b/jani_generator/src/jani_generator/scxml_helpers/scxml_data.py
@@ -21,8 +21,8 @@
 import xml.etree.ElementTree as ET
 from typing import Dict, List, Optional, get_args
 
-from mc_toolchain_jani_common.common import ros_type_name_to_python_type
-from mc_toolchain_jani_common.ecmascript_interpretation import \
+from as2fm_common.common import ros_type_name_to_python_type
+from as2fm_common.ecmascript_interpretation import \
     interpret_ecma_script_expr
 from jani_generator.jani_entries.jani_expression import JaniExpression
 from jani_generator.jani_entries.jani_variable import JaniVariable, ValidTypes

diff --git a/jani_generator/src/jani_generator/scxml_helpers/scxml_tags.py b/jani_generator/src/jani_generator/scxml_helpers/scxml_tags.py
@@ -30,7 +30,7 @@
 from jani_generator.scxml_helpers.scxml_event import Event, EventsHolder
 from jani_generator.scxml_helpers.scxml_expression import \
     parse_ecmascript_to_jani_expression
-from mc_toolchain_jani_common.ecmascript_interpretation import \
+from as2fm_common.ecmascript_interpretation import \
     interpret_ecma_script_expr
 from scxml_converter.scxml_entries import (ScxmlAssign, ScxmlBase,
                                            ScxmlDataModel, ScxmlExecutionBody,

diff --git a/jani_generator/src/jani_generator/scxml_helpers/top_level_interpreter.py b/jani_generator/src/jani_generator/scxml_helpers/top_level_interpreter.py
@@ -24,7 +24,7 @@
 
 from xml.etree import ElementTree as ET
 
-from mc_toolchain_jani_common.common import remove_namespace
+from as2fm_common.common import remove_namespace
 from scxml_converter.bt_converter import bt_converter
 from scxml_converter.scxml_converter import ros_to_scxml_converter
 from jani_generator.jani_entries import JaniModel