From a5e298341bcce48c430785ffed9af3bdd6dafe55 Mon Sep 17 00:00:00 2001 From: Julian Minder Date: Tue, 14 Dec 2021 20:33:37 +0100 Subject: [PATCH] fixed issues with building package --- examples/democonvertion_pandas.ipynb | 153 +++++++++++++-------------- rel2graph/__init__.py | 22 +--- rel2graph/core/__init__.py | 1 - requirements.txt | 4 +- setup.py | 16 ++- 5 files changed, 88 insertions(+), 108 deletions(-) diff --git a/examples/democonvertion_pandas.ipynb b/examples/democonvertion_pandas.ipynb index e01cde0..cec6ca8 100644 --- a/examples/democonvertion_pandas.ipynb +++ b/examples/democonvertion_pandas.ipynb @@ -13,7 +13,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -32,7 +32,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -45,7 +45,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 3, "metadata": {}, "outputs": [ { @@ -187,7 +187,7 @@ "[150 rows x 5 columns]" ] }, - "execution_count": 4, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } @@ -199,7 +199,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 4, "metadata": {}, "outputs": [ { @@ -286,7 +286,7 @@ "5 4 Rudolfo Muster setosa" ] }, - "execution_count": 5, + "execution_count": 4, "metadata": {}, "output_type": "execute_result" } @@ -304,7 +304,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 5, "metadata": {}, "outputs": [], "source": [ @@ -315,7 +315,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 6, "metadata": {}, "outputs": [], "source": [ @@ -324,7 +324,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 7, "metadata": {}, "outputs": [ { @@ -399,13 +399,13 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 8, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "d182d8fe75d64ee385d592c3f7e82ed2", + "model_id": "25ac5bd15f3d4f19bb283c6e3a40f8c3", "version_major": 2, "version_minor": 0 }, @@ -424,10 +424,10 @@ "INFO:rel2graph.core.converter:Starting creation of nodes.\n", "DEBUG:rel2graph.core.converter:Starting Worker 0\n", "DEBUG:rel2graph.core.converter:Starting Worker 1\n", + "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Person'\n", "DEBUG:rel2graph.core.converter:Starting Worker 2\n", "DEBUG:rel2graph.core.converter:Starting Worker 3\n", "DEBUG:rel2graph.core.converter:Starting Worker 4\n", - "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Person'\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Person'\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Person'\n", "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Person'\n", @@ -612,309 +612,309 @@ "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Person'\n", "DEBUG:rel2graph.core.factories.matcher:Matching based on labels: '['Species']' and conditions: {'Name': 'setosa'}\n", "DEBUG:rel2graph.core.factories.factory:For relation type likes matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", + "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 2: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 1: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", - "DEBUG:rel2graph.core.converter:Worker 3: Processing resource type: 'Flower'\n", - "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 4: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", "DEBUG:rel2graph.core.converter:Worker 0: Processing resource type: 'Flower'\n", "DEBUG:rel2graph.core.factories.factory:For relation type is matched 1 from_nodes and 1 to nodes\n", + "DEBUG:rel2graph.core.converter:Exiting Worker 3\n", "DEBUG:rel2graph.core.converter:Exiting Worker 2\n", "DEBUG:rel2graph.core.converter:Exiting Worker 1\n", - "DEBUG:rel2graph.core.converter:Exiting Worker 3\n", "DEBUG:rel2graph.core.converter:Exiting Worker 4\n", "DEBUG:rel2graph.core.converter:Exiting Worker 0\n", "INFO:rel2graph.core.converter:Processed 306 nodes and 156 relations (took 9s)\n" @@ -925,13 +925,6 @@ "from tqdm.notebook import tqdm\n", "converter(progress_bar=tqdm)" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { diff --git a/rel2graph/__init__.py b/rel2graph/__init__.py index 029552e..764c159 100644 --- a/rel2graph/__init__.py +++ b/rel2graph/__init__.py @@ -1,17 +1,6 @@ -__all__ = [] - from .core.factories.resource import Resource -__all__.extend(["Resource"]) - from .core.converter import Converter -__all__.extend(["Converter"]) - from .core.resource_iterator import ResourceIterator, IteratorIterator -__all__.extend([ - "ResourceIterator", - "IteratorIterator" -]) - from .core.factories.registrar import ( register_attribute_postprocessor, register_attribute_preprocessor, @@ -19,14 +8,5 @@ register_subgraph_preprocessor, register_factory ) -__all__.extend(["register_attribute_postprocessor", - "register_attribute_preprocessor", - "register_subgraph_postprocessor", - "register_subgraph_preprocessor", - "register_factory"]) - from .core.factories.matcher import Matcher -__all__.extend(["Matcher"]) - -from .core.graph_elements import Attribute -__all__.extend(["Attribute"]) \ No newline at end of file +from .core.graph_elements import Attribute \ No newline at end of file diff --git a/rel2graph/core/__init__.py b/rel2graph/core/__init__.py index 3b7d4f5..e69de29 100644 --- a/rel2graph/core/__init__.py +++ b/rel2graph/core/__init__.py @@ -1 +0,0 @@ -from .converter import Converter as Converter \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 8335fa0..945c9b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1 @@ -py2neo -tqdm -pyodata \ No newline at end of file +. \ No newline at end of file diff --git a/setup.py b/setup.py index 75bfd15..73a01c5 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,19 @@ from setuptools import find_packages, setup +requirements = [ + 'py2neo>=2021.2.3', + 'pyodata>=1.7.1', + 'tqdm>=4.62.3' +] + setup( name = "rel2graph", - packages = find_packages(include=["rel2graph"]), - version = "0.1.0", + packages = find_packages(), + version = "0.1.1", description = "Library for converting relational data into graph data (neo4j)", - author = "Julian Minder" + author = "Julian Minder", + author_email = "jminder@ethz.ch", + url = "github.com/sg-dev/rel2graph", + install_requires = requirements, + python_requires = ">=3.7.12" ) \ No newline at end of file