Merge branch '0.8-dev' into 2431_fix_db_refresh

spine-tools · Jan 10, 2024 · b799729 · b799729
2 parents fcdf3d6 + d993d00
commit b799729
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/...orld_on_server/.spinetoolbox/items/simple_tool/output/2023-12-22T10.31.23/output_file.txt b/...orld_on_server/.spinetoolbox/items/simple_tool/output/2023-12-22T10.31.23/output_file.txt
@@ -0,0 +1,2 @@
+Hello!
+World!
diff --git a/execution_tests/project_package.zip b/execution_tests/project_package.zip
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,8 +31,6 @@ dependencies = [
     "jill >=0.9.2",
     "pyzmq >=21.0",
     "spine-items>=0.21.0",
-    # pendulum 3.0.0 seems to break nearly all of the tests in github actions
-    "pendulum < 3.0.0",
 ]
 
 [project.urls]

diff --git a/tests/spine_db_editor/mvcmodels/test_item_metadata_table_model.py b/tests/spine_db_editor/mvcmodels/test_item_metadata_table_model.py
@@ -182,8 +182,6 @@ def test_add_relationship_parameter_value_metadata(self):
         db_map_item_metadata = {
             self._db_map: [
                 {
-                    "id": 3,
-                    "metadata_id": 5,
                     "metadata_name": "author",
                     "metadata_value": "Anonymous",
                     "parameter_value_id": 2,
@@ -208,8 +206,6 @@ def test_add_relationship_metadata(self):
         db_map_item_metadata = {
             self._db_map: [
                 {
-                    "id": 3,
-                    "metadata_id": 5,
                     "metadata_name": "author",
                     "metadata_value": "Anonymous",
                     "entity_id": 2,