ricgraph 2.13__tar.gz → 3.0__tar.gz

{ricgraph-2.13/ricgraph.egg-info → ricgraph-3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ricgraph
-Version: 2.13
+Version: 3.0
 Summary: Ricgraph - Research in context graph
 Author: Rik D.T. Janssen
 License-Expression: MIT

{ricgraph-2.13 → ricgraph-3.0}/README.md

@@ -80,6 +80,9 @@ Currently, there are people working on the following extensions for Ricgraph:
 * A tool that helps Pure administrators to clean up "external organizations" in Pure.
   Status: planning stage (pre-alpha).
 
+Starting around mid-September, you can see Ricgraph in action with the
+[pilot project Open Ricgraph demo server](https://www.ricgraph.eu/pilot-project-open-ricgraph-demo-server.html).
+
 Throughout this documentation, we illustrate how Ricgraph works by applying
 it to the application area research information.
 
@@ -390,4 +393,4 @@ please let me know by creating a GitHub *Issue* at the top left of that page.
 <!-- Do not change the lines below. The version number will be
      modified by script maintenance/update_version.bash -->
 This README.md file is part of the 
-documentation for version 2.13 of Ricgraph - Research in context graph.
+documentation for version 3.0 of Ricgraph - Research in context graph.

{ricgraph-2.13 → ricgraph-3.0}/pyproject.toml

@@ -7,7 +7,7 @@ packages = ["ricgraph"]
 
 [project]
 name = "ricgraph"
-version = "2.13"
+version = "3.0"
 authors = [
   { name="Rik D.T. Janssen" },
 ]

{ricgraph-2.13 → ricgraph-3.0}/ricgraph/ricgraph.py

@@ -101,8 +101,8 @@ In the default configuration of Ricgraph, the following properties are included:
 from numpy import nan
 from pandas import DataFrame, concat, set_option
 from typing import Union
-from .ricgraph_graphdb import (timestamp,
-                               create_update_node, create_two_nodes_and_edge,
+from .ricgraph_utils import timestamp
+from .ricgraph_graphdb import (create_update_node, create_two_nodes_and_edge,
                                RICGRAPH_NODEADD_MODE,
                                RICGRAPH_PROPERTIES_STANDARD, RICGRAPH_PROPERTIES_ADDITIONAL)
 
@@ -116,7 +116,7 @@ __package__ = 'Ricgraph'
 # __version__ should be placed here instead of in __init__.py.
 # If not here, it cannot be found when executing something like
 # PYTHONPATH=../ricgraph ../bin/python ricgraph_explorer.py
-__version__ = '2.13'
+__version__ = '3.0'
 
 
 # ##############################################################################

{ricgraph-2.13 → ricgraph-3.0}/ricgraph/ricgraph_cypher.py

@@ -47,7 +47,8 @@ from typing import Union
 from neo4j import GraphDatabase, Driver, Result
 from neo4j.graph import Node
 from .ricgraph_constants import A_LARGE_NUMBER
-from .ricgraph_utils import *
+from .ricgraph_utils import (get_ricgraph_ini_file, get_configfile_key,
+                             create_ricgraph_key, datetimestamp)
 from .ricgraph_cache import (nodes_cache_key_id_create, nodes_cache_key_id_read,
                              nodes_cache_key_id_delete_id, nodes_cache_key_id_empty)
 
@@ -112,7 +113,7 @@ def open_ricgraph() -> Driver:
     """
     global _graph
 
-    print('Opening Ricgraph.\n')
+    print('Opening Ricgraph at ' + datetimestamp() + '.\n')
     try:
         _graph = GraphDatabase.driver(_GRAPHDB_URL,
                                       auth=(_GRAPHDB_USER, _GRAPHDB_PASSWORD))
@@ -141,7 +142,7 @@ def close_ricgraph() -> None:
         print('\nclose_ricgraph(): Error: graph has not been initialized or opened.\n\n')
         return
 
-    print('Closing Ricgraph.\n')
+    print('Closing Ricgraph at ' + datetimestamp() + '.\n')
     _graph.close()
     return
 
@@ -178,7 +179,7 @@ def empty_ricgraph(answer: str = '') -> None:
         print('empty_ricgraph(): Ricgraph will not be emptied.\n')
         return
 
-    print('empty_ricgraph(): Ricgraph will be emptied.\n')
+    print('empty_ricgraph(): Ricgraph will be emptied at ' + datetimestamp() + '.\n')
     graphdb_name = ricgraph_database()
     graphdb_databasename = ricgraph_databasename()
 

{ricgraph-2.13 → ricgraph-3.0}/ricgraph/ricgraph_graphdb.py

@@ -51,7 +51,11 @@ from .ricgraph_cypher import (cypher_create_node, cypher_read_node,
                               cypher_merge_nodes,
                               get_all_neighbor_nodes,
                               ricgraph_nr_edges_of_node)
-from .ricgraph_utils import *
+from .ricgraph_utils import (get_ricgraph_ini_file, get_configfile_key,
+                             convert_string_to_ascii, create_unique_string, datetimestamp,
+                             create_ricgraph_key, create_ricgraph_value,
+                             get_namepart_from_ricgraph_key, get_valuepart_from_ricgraph_key,
+                             get_valuepart_from_ricgraph_value, get_additionalpart_from_ricgraph_value)
 from .ricgraph_researchinfo import create_well_known_url
 
 

{ricgraph-2.13 → ricgraph-3.0/ricgraph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ricgraph
-Version: 2.13
+Version: 3.0
 Summary: Ricgraph - Research in context graph
 Author: Rik D.T. Janssen
 License-Expression: MIT