Skip to content

Commit

Permalink
Merge pull request #6 from schandrika/v10
Browse files Browse the repository at this point in the history
changed import of setup_logging from utils to client.logs
  • Loading branch information
craig8 authored Oct 2, 2024
2 parents 189c9dc + 302a470 commit 5cb0a19
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "volttron-postgresql-historian"
version = "0.1.0"
version = "2.0.0rc0"
description = "VOLTTRON historian agent that stores data in a PostgreSQL database. It extends the SQLHistorian class."
authors = ["VOLTTRON Team <[email protected]>"]
license = "Apache License 2.0"
Expand All @@ -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=">=2.0.0rc0"
psycopg2-binary = "^2.9.5"

[tool.poetry.group.dev.dependencies]
Expand All @@ -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 = [
Expand Down
3 changes: 2 additions & 1 deletion src/historian/postgresql/postgresqlfuncts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5cb0a19

Please sign in to comment.