From 29992b453e3c1a79bcda647d4a37ca3fa84bda2c Mon Sep 17 00:00:00 2001 From: Khoroshevskyi Date: Tue, 28 Nov 2023 16:52:21 -0500 Subject: [PATCH] Fixed #106 --- docs/config.md | 2 +- docs/configuration.md | 2 +- pipestat/_version.py | 2 +- pipestat/helpers.py | 2 +- requirements/requirements-db-backend.txt | 4 ++-- requirements/requirements-test.txt | 4 ++-- tests/conftest.py | 2 +- tests/data/config.yaml | 2 +- tests/data/config_no_schema.yaml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/config.md b/docs/config.md index 3ed7f500..5748934e 100644 --- a/docs/config.md +++ b/docs/config.md @@ -45,5 +45,5 @@ database: host: 127.0.0.1 port: 5432 dialect: postgresql - driver: psycopg2 + driver: psycopg ``` diff --git a/docs/configuration.md b/docs/configuration.md index 5d0f57e3..8b11e1a1 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -26,7 +26,7 @@ schema_path: sample_output_schema.yaml results_file_path: results_file.yaml database: dialect: postgresql - driver: psycopg2 + driver: psycopg name: pipestat-test user: postgres password: pipestat-password diff --git a/pipestat/_version.py b/pipestat/_version.py index 70c6f9bc..b416f519 100644 --- a/pipestat/_version.py +++ b/pipestat/_version.py @@ -1 +1 @@ -__version__ = "0.6.0a7" +__version__ = "0.6.0a8" diff --git a/pipestat/helpers.py b/pipestat/helpers.py index 0f130d4c..70229638 100644 --- a/pipestat/helpers.py +++ b/pipestat/helpers.py @@ -144,7 +144,7 @@ def init_generic_config(): "schema_path": "sample_output_schema.yaml", "database": { "dialect": "postgresql", - "driver": "psycopg2", + "driver": "psycopg", "name": "pipestat-test", "user": "postgres", "password": "pipestat-password", diff --git a/requirements/requirements-db-backend.txt b/requirements/requirements-db-backend.txt index 17f7aad9..dde8cd15 100644 --- a/requirements/requirements-db-backend.txt +++ b/requirements/requirements-db-backend.txt @@ -1,3 +1,3 @@ -psycopg2-binary +psycopg>=3.1.13 pydantic>=1.10.7, <2.0.0 -sqlmodel>=0.0.8 \ No newline at end of file +sqlmodel>=0.0.12 diff --git a/requirements/requirements-test.txt b/requirements/requirements-test.txt index 86549b29..273c314d 100644 --- a/requirements/requirements-test.txt +++ b/requirements/requirements-test.txt @@ -11,9 +11,9 @@ yacman>=0.9.2 PyYAML pandas eido -psycopg2-binary +psycopg pydantic>=1.10.7, <2.0.0 -sqlmodel>=0.0.8 +sqlmodel>=0.0.12 pydantic uvicorn fastapi diff --git a/tests/conftest.py b/tests/conftest.py index 0c183e02..a2f7d1f5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -11,7 +11,7 @@ REC_ID = "constant_record_id" BACKEND_KEY_DB = "db" BACKEND_KEY_FILE = "file" -DB_URL = "postgresql+psycopg2://postgres:pipestat-password@127.0.0.1:5432/pipestat-test" +DB_URL = "postgresql+psycopg://postgres:pipestat-password@127.0.0.1:5432/pipestat-test" DB_CMD = """ docker run --rm -it --name pipestat_test_db \ -e POSTGRES_USER=postgres \ diff --git a/tests/data/config.yaml b/tests/data/config.yaml index c8c13fcc..02e1717c 100644 --- a/tests/data/config.yaml +++ b/tests/data/config.yaml @@ -3,7 +3,7 @@ sample_name: sample1 schema_path: sample_output_schema.yaml database: dialect: postgresql - driver: psycopg2 + driver: psycopg name: pipestat-test user: postgres password: pipestat-password diff --git a/tests/data/config_no_schema.yaml b/tests/data/config_no_schema.yaml index 9c41dd58..b6026a12 100644 --- a/tests/data/config_no_schema.yaml +++ b/tests/data/config_no_schema.yaml @@ -3,7 +3,7 @@ sample_name: sample1 #schema_path: sample_output_schema.yaml #$HOME/Desktop/sample_output_schema.yaml database: dialect: postgresql - driver: psycopg2 + driver: psycopg name: pipestat-test user: postgres password: pipestat-password