Merge branch 'rc/6.0.1' into task/fix-typing-stubs-2

Author: mariusconjeaud

.github/workflows/integration-tests.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.13", "3.12", "3.11", "3.10"]
+        python-version: ["3.14", "3.13", "3.12", "3.11", "3.10"]
         neo4j-version: ["community", "enterprise", "5.5-enterprise", "4.4-enterprise", "4.4-community"]
 
     steps:

doc/requirements.txt

@@ -1,3 +1,3 @@
 sphinx_copybutton
-neo4j~=5.28.2
+neo4j~=6.0.3
 

neomodel/async_/relationship_manager.py

@@ -26,7 +26,7 @@
 
 # check source node is saved and not deleted
 def check_source(fn: Callable) -> Callable:
-    fn_name = fn.func_name if hasattr(fn, "func_name") else fn.__name__
+    fn_name = fn.__name__
 
     @functools.wraps(fn)
     def checker(self: Any, *args: Any, **kwargs: Any) -> Callable:

neomodel/properties.py

@@ -16,7 +16,7 @@
 
 
 def validator(fn: Callable) -> Callable:
-    fn_name = fn.func_name if hasattr(fn, "func_name") else fn.__name__
+    fn_name = fn.__name__
     if fn_name not in ["inflate", "deflate"]:
         raise ValueError("Unknown Property method " + fn_name)
 

neomodel/sync_/relationship_manager.py

@@ -26,7 +26,7 @@
 
 # check source node is saved and not deleted
 def check_source(fn: Callable) -> Callable:
-    fn_name = fn.func_name if hasattr(fn, "func_name") else fn.__name__
+    fn_name = fn.__name__
 
     @functools.wraps(fn)
     def checker(self: Any, *args: Any, **kwargs: Any) -> Callable:

pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Topic :: Database",
 ]
 dependencies = [
-    "neo4j~=5.28.2",
+    "neo4j~=6.0.3",
 ]
 requires-python = ">=3.10"
 dynamic = ["version"]
@@ -55,7 +55,7 @@ dev = [
 shapely = ["Shapely>=2.0.0"]
 pandas = ["pandas"]
 numpy = ["numpy"]
-rust-driver-ext = ["neo4j-rust-ext~=5.28.2.1"]
+rust-driver-ext = ["neo4j-rust-ext~=6.0.3.0"]
 
 [build-system]
 requires = ["setuptools>=69"]

requirements.txt

@@ -1 +1 @@
-neo4j~=5.28.2
+neo4j~=6.0.3

test/async_/test_core_additional.py

@@ -181,7 +181,13 @@ async def test_proxy_aenter_parallel_runtime_warning():
             with patch.object(test_db, "begin", new_callable=AsyncMock) as mock_begin:
                 await proxy.__aenter__()
 
-                mock_warn.assert_called_once()
+                # Filter for the specific parallel runtime warning
+                parallel_runtime_calls = [
+                    call
+                    for call in mock_warn.call_args_list
+                    if "Parallel runtime is only available" in str(call[0][0])
+                ]
+                assert len(parallel_runtime_calls) == 1
                 mock_begin.assert_called_once()
 
 

test/async_/test_label_install.py

@@ -76,9 +76,7 @@ async def test_install_all():
 async def test_install_label_twice(capsys):
     await adb.drop_constraints()
     await adb.drop_indexes()
-    expected_std_out = (
-        "{code: Neo.ClientError.Schema.EquivalentSchemaRuleAlreadyExists}"
-    )
+    expected_std_out = "Neo.ClientError.Schema.EquivalentSchemaRuleAlreadyExists"
     await adb.install_labels(AbstractNode)
     await adb.install_labels(AbstractNode)
 

test/sync_/test_core_additional.py

@@ -175,7 +175,13 @@ def test_proxy_aenter_parallel_runtime_warning():
             with patch.object(test_db, "begin", new_callable=Mock) as mock_begin:
                 proxy.__enter__()
 
-                mock_warn.assert_called_once()
+                # Filter for the specific parallel runtime warning
+                parallel_runtime_calls = [
+                    call
+                    for call in mock_warn.call_args_list
+                    if "Parallel runtime is only available" in str(call[0][0])
+                ]
+                assert len(parallel_runtime_calls) == 1
                 mock_begin.assert_called_once()