diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index 166fc5a5e4940a2ea29637fb740b5457b9fefd9f..0a59148511a9af575c5bd78df44601ab2b9d27b8 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -175,20 +175,20 @@
},
"boto3": {
"hashes": [
- "sha256:786930d5f1cd13d03db59ff2abbb2b7ffc173fd66646d5d8bee07f316a5f16ca",
- "sha256:f7851cb320dcb2a53fc73b4075187ec9b05d51291539601fa238623fdc0e8cd3"
+ "sha256:2446e819cf4e295833474cdcf2c92bc82718ce537e9ee1f17f7e3d237f60e69b",
+ "sha256:7de2c44c960e486f3c57e5203ea6393c6c4f0914c5f81c789ceb8b5d2ba5d1c5"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==1.35.92"
+ "version": "==1.35.93"
},
"botocore": {
"hashes": [
- "sha256:caa7d5d857fed5b3d694b89c45f82b9f938f840e90a4eb7bf50aa65da2ba8f82",
- "sha256:f94ae1e056a675bd67c8af98a6858d06e3927d974d6c712ed6e27bb1d11bee1d"
+ "sha256:47f7161000af6036f806449e3de12acdd3ec11aac7f5578e43e96241413a0f8f",
+ "sha256:b8d245a01e7d64c41edcf75a42be158df57b9518a83a3dbf5c7e4b8c2bc540cc"
],
"markers": "python_version >= '3.8'",
- "version": "==1.35.92"
+ "version": "==1.35.93"
},
"certifi": {
"hashes": [
@@ -412,7 +412,7 @@
},
"dbrepo": {
"hashes": [
- "sha256:8ded5ba5f30ab00d753447f98ec8464d88bf0646ebcfcc511e02dc07f9c93a09"
+ "sha256:769c6d9c4475b26d3f752dcc9910346798d31afeca45ef014f48dd293074b8fb"
],
"path": "./lib/dbrepo-1.6.0.tar.gz"
},
@@ -1612,7 +1612,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.9'",
"version": "==2.3.0"
},
"werkzeug": {
@@ -2236,7 +2236,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.9'",
"version": "==2.3.0"
},
"wrapt": {
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.0.tar.gz
index e8752ddddee3b39e3aa73765b5c77f0702aa44d5..80c2ba74f662e7b02895122a37e301fde2157b82 100644
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.0.tar.gz and b/dbrepo-analyse-service/lib/dbrepo-1.6.0.tar.gz differ
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index 6e80463c912a9e11106d546efc259c286cc9d41e..c7e1f6005d78d40641abae50f4bb3189251aac42 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -360,7 +360,7 @@
},
"dbrepo": {
"hashes": [
- "sha256:8ded5ba5f30ab00d753447f98ec8464d88bf0646ebcfcc511e02dc07f9c93a09"
+ "sha256:769c6d9c4475b26d3f752dcc9910346798d31afeca45ef014f48dd293074b8fb"
],
"path": "./lib/dbrepo-1.6.0.tar.gz"
},
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.0.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.0.tar.gz
index e8752ddddee3b39e3aa73765b5c77f0702aa44d5..80c2ba74f662e7b02895122a37e301fde2157b82 100644
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.0.tar.gz and b/dbrepo-search-service/init/lib/dbrepo-1.6.0.tar.gz differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.0.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.0.tar.gz
index e8752ddddee3b39e3aa73765b5c77f0702aa44d5..80c2ba74f662e7b02895122a37e301fde2157b82 100644
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.0.tar.gz and b/dbrepo-search-service/lib/dbrepo-1.6.0.tar.gz differ
diff --git a/dbrepo-search-service/test/test_app.py b/dbrepo-search-service/test/test_app.py
index 8621f6a0a42f744b2dba09dbc3ef4c0f3afe73cc..0482ff3f586050f49135039bb36ec5d16320396d 100644
--- a/dbrepo-search-service/test/test_app.py
+++ b/dbrepo-search-service/test/test_app.py
@@ -3,8 +3,8 @@ import time
import unittest
import jwt
-from dbrepo.api.dto import Database, User, Container, Image, Table, Constraints, Column, ColumnType, Concept, Unit, \
- UserBrief
+from dbrepo.api.dto import Database, Table, Constraints, Column, ColumnType, Concept, Unit, \
+ UserBrief, ContainerBrief, ImageBrief
from app import app
@@ -16,21 +16,14 @@ req = Database(id=1,
exchange_name="dbrepo",
is_public=True,
is_schema_public=True,
- container=Container(id=1,
- name="MariaDB",
- internal_name="mariadb",
- host="data-db",
- port="3306",
- sidecar_host="data-db-sidecar",
- sidecar_port=3305,
- image=Image(id=1,
- registry="docker.io",
- name="mariadb",
- version="11.1.3",
- dialect="org.hibernate.dialect.MariaDBDialect",
- driver_class="org.mariadb.jdbc.Driver",
- jdbc_method="mariadb",
- default_port=3306)),
+ container=ContainerBrief(id=1,
+ name="MariaDB",
+ internal_name="mariadb",
+ host="data-db",
+ image=ImageBrief(id=1,
+ name="mariadb",
+ version="11.1.3",
+ jdbc_method="mariadb")),
tables=[Table(id=1, database_id=1, name="Data", internal_name="data",
owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
constraints=Constraints(uniques=[], foreign_keys=[], checks=[], primary_key=[]),
diff --git a/dbrepo-search-service/test/test_opensearch_client.py b/dbrepo-search-service/test/test_opensearch_client.py
index dc17c01d3ba8d8de82ce6ec339a463c45584caa4..295b2917af7995f56ef0d962fac0948334c9aeff 100644
--- a/dbrepo-search-service/test/test_opensearch_client.py
+++ b/dbrepo-search-service/test/test_opensearch_client.py
@@ -1,9 +1,8 @@
-import datetime
import unittest
import opensearchpy
-from dbrepo.api.dto import Database, Container, Image, Table, Column, ColumnType, Constraints, PrimaryKey, \
- TableMinimal, ColumnMinimal, Concept, Unit, UserBrief
+from dbrepo.api.dto import Database, Table, Column, ColumnType, Constraints, PrimaryKey, \
+ TableMinimal, ColumnMinimal, Concept, Unit, UserBrief, ContainerBrief, ImageBrief
from opensearchpy import NotFoundError
from app import app
@@ -17,21 +16,14 @@ req = Database(id=1,
exchange_name="dbrepo",
is_public=True,
is_schema_public=True,
- container=Container(id=1,
- name="MariaDB",
- internal_name="mariadb",
- host="data-db",
- port="3306",
- sidecar_host="data-db-sidecar",
- sidecar_port=3305,
- image=Image(id=1,
- registry="docker.io",
- name="mariadb",
- version="11.1.3",
- dialect="org.hibernate.dialect.MariaDBDialect",
- driver_class="org.mariadb.jdbc.Driver",
- jdbc_method="mariadb",
- default_port=3306)),
+ container=ContainerBrief(id=1,
+ name="MariaDB",
+ internal_name="mariadb",
+ host="data-db",
+ image=ImageBrief(id=1,
+ name="mariadb",
+ version="11.1.3",
+ jdbc_method="mariadb")),
tables=[Table(id=1,
database_id=1,
name="Data",
diff --git a/make/build.mk b/make/build.mk
index 64a85fc21f0c00236b93989471d4335b0d310cd1..7311ed27167f72e4ffa4b8b7659127b90679d471 100644
--- a/make/build.mk
+++ b/make/build.mk
@@ -20,6 +20,9 @@ build-ui: ## Build the UI.
.PHONY: build-lib
build-lib: ## Build the Python Library.
+ rm -f ./dbrepo-analyse-service/lib/dbrepo-${APP_VERSION}.tar.gz
+ rm -f ./dbrepo-search-service/lib/dbrepo-${APP_VERSION}.tar.gz
+ rm -f ./dbrepo-search-service/init/lib/dbrepo-${APP_VERSION}.tar.gz
python3 -m build --sdist ./lib/python
python3 -m build --wheel ./lib/python
cp ./lib/python/dist/dbrepo-${APP_VERSION}.tar.gz ./dbrepo-analyse-service/lib/dbrepo-${APP_VERSION}.tar.gz