From 7535edf724a7b4b1922e33679655a91b751100a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Fri, 10 Jan 2025 10:08:40 +0100
Subject: [PATCH 1/3] MAINT: rename filter function
---
src/caoscrawler/sync_node.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/caoscrawler/sync_node.py b/src/caoscrawler/sync_node.py
index d912d646..46187c0d 100644
--- a/src/caoscrawler/sync_node.py
+++ b/src/caoscrawler/sync_node.py
@@ -256,9 +256,9 @@ class SyncNode(db.Entity):
def parent_in_list(parent: Parent, plist: ParentList) -> bool:
"""helper function that checks whether a parent with the same name or ID is in the plist"""
- return plist.filter(parent)
+ return plist.filter_by_identity(parent)
def property_in_list(prop: db.Property, plist: PropertyList) -> bool:
"""helper function that checks whether a property with the same name or ID is in the plist"""
- return plist.filter(prop)
+ return plist.filter_by_identity(prop)
--
GitLab
From 8b73beaa271a41149f444c26c7cdc0ca7584abf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Fri, 10 Jan 2025 11:25:52 +0100
Subject: [PATCH 2/3] TST: allow pipeline to pass
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4322356..9ad8f764 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,7 +129,7 @@ unittest_py3.9:
# install dependencies
- pip install pytest pytest-cov
# TODO: Use f-branch logic here
- - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
+ - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@f-rename-filter
- pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@dev
- pip install .[h5-crawler,spss,rocrate]
# actual test
--
GitLab
From 3a23058149b100e30eadab60c448188dd0ea2b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Fri, 10 Jan 2025 11:33:58 +0100
Subject: [PATCH 3/3] Revert "TST: allow pipeline to pass"
This reverts commit 8b73beaa271a41149f444c26c7cdc0ca7584abf9.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ad8f764..e4322356 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,7 +129,7 @@ unittest_py3.9:
# install dependencies
- pip install pytest pytest-cov
# TODO: Use f-branch logic here
- - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@f-rename-filter
+ - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
- pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@dev
- pip install .[h5-crawler,spss,rocrate]
# actual test
--
GitLab