From bbec101e645ae88d9d46b6725162c6136e660185 Mon Sep 17 00:00:00 2001 From: chandrika Date: Mon, 30 Sep 2024 22:17:34 -0700 Subject: [PATCH 1/4] changed import of setup_logging from utils to client.logs --- src/historian/postgresql/postgresqlfuncts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/historian/postgresql/postgresqlfuncts.py b/src/historian/postgresql/postgresqlfuncts.py index 5e8ba9e..2d165f2 100644 --- a/src/historian/postgresql/postgresqlfuncts.py +++ b/src/historian/postgresql/postgresqlfuncts.py @@ -33,7 +33,8 @@ from psycopg2.sql import Identifier, Literal, SQL from psycopg2.extras import execute_values -from volttron.utils import (jsonapi, setup_logging) +from volttron.utils import jsonapi +from volttron.client.logs import setup_logging from historian.sql import DbDriver From aa6876bf569a2edfdc5d5d22964ca903f8c15047 Mon Sep 17 00:00:00 2001 From: chandrika Date: Tue, 1 Oct 2024 14:05:05 -0700 Subject: [PATCH 2/4] bumped version. removed volttron-testing dependency --- config | 4 ++-- pyproject.toml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config b/config index 80cf3b0..9317bdc 100644 --- a/config +++ b/config @@ -5,8 +5,8 @@ "dbname": "test_historian", "host": "127.0.0.1", "port": 5432, - "user": "historian", - "password": "historian" + "user": "postgres", + "password": "postgres" } } } diff --git a/pyproject.toml b/pyproject.toml index 1e42351..937ddb4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "volttron-postgresql-historian" -version = "0.1.0" +version = "1.0.0" description = "VOLTTRON historian agent that stores data in a PostgreSQL database. It extends the SQLHistorian class." authors = ["VOLTTRON Team "] license = "Apache License 2.0" @@ -12,7 +12,7 @@ packages = [ { include = "historian", from = "src" } ] [tool.poetry.dependencies] python = ">=3.10,<4.0" -volttron-lib-sql-historian="^0.1.1a8" +volttron-lib-sql-historian=">=1.0.0" psycopg2-binary = "^2.9.5" [tool.poetry.group.dev.dependencies] @@ -29,7 +29,7 @@ coverage = "^6.3.2" pytest-cov = "^3.0.0" Sphinx = "^6.0.0" sphinx-rtd-theme = "^1.2.0" -volttron-testing = "^0.4.0rc3" +#volttron-testing = "^0.4.0rc3" [tool.yapfignore] ignore_patterns = [ From 80c9b186d386c3ab0861c1526d1977dfb37df908 Mon Sep 17 00:00:00 2001 From: Chandrika Date: Tue, 1 Oct 2024 17:31:01 -0700 Subject: [PATCH 3/4] bumped version --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 937ddb4..b6b2f87 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "volttron-postgresql-historian" -version = "1.0.0" +version = "2.0.0rc0" description = "VOLTTRON historian agent that stores data in a PostgreSQL database. It extends the SQLHistorian class." authors = ["VOLTTRON Team "] license = "Apache License 2.0" @@ -12,7 +12,7 @@ packages = [ { include = "historian", from = "src" } ] [tool.poetry.dependencies] python = ">=3.10,<4.0" -volttron-lib-sql-historian=">=1.0.0" +volttron-lib-sql-historian=">=2.0.0rc0" psycopg2-binary = "^2.9.5" [tool.poetry.group.dev.dependencies] From 302a47031df622176331e93edbd3ef84ecd035d0 Mon Sep 17 00:00:00 2001 From: Chandrika Date: Tue, 1 Oct 2024 17:31:29 -0700 Subject: [PATCH 4/4] revert to old config --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config b/config index 9317bdc..80cf3b0 100644 --- a/config +++ b/config @@ -5,8 +5,8 @@ "dbname": "test_historian", "host": "127.0.0.1", "port": 5432, - "user": "postgres", - "password": "postgres" + "user": "historian", + "password": "historian" } } }