From aff6c38768375106101f69fe0dca8a8ff3f8e6ad Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 13 Feb 2023 15:39:39 +0100
Subject: [PATCH] Refactoring module
---
pyproject.toml | 4 ++--
src/{reference_model => vips_reference_model}/__init__.py | 0
.../reference_model.py | 0
tests/test_reference_model.py | 6 ++++--
4 files changed, 6 insertions(+), 4 deletions(-)
rename src/{reference_model => vips_reference_model}/__init__.py (100%)
rename src/{reference_model => vips_reference_model}/reference_model.py (100%)
diff --git a/pyproject.toml b/pyproject.toml
index 8aa0a9b..618dc7a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0", "wheel"]
build-backend = "setuptools.build_meta"
[project]
-name = "reference_model"
+name = "vips_reference_model"
version = "0.1.5"
description = "Example VIPS model, showcasing functionality"
readme = "README.md"
@@ -19,7 +19,7 @@ dependencies = [
"pydantic",
"pytz",
"pandas",
- "vipscore_common @ git+https://gitlab.nibio.no/VIPS/vipscore-python-common.git@v0.1.6"
+ "vipscore_common @ git+https://gitlab.nibio.no/VIPS/vipscore-python-common.git@0.1.6"
]
requires-python = ">=3.9"
diff --git a/src/reference_model/__init__.py b/src/vips_reference_model/__init__.py
similarity index 100%
rename from src/reference_model/__init__.py
rename to src/vips_reference_model/__init__.py
diff --git a/src/reference_model/reference_model.py b/src/vips_reference_model/reference_model.py
similarity index 100%
rename from src/reference_model/reference_model.py
rename to src/vips_reference_model/reference_model.py
diff --git a/tests/test_reference_model.py b/tests/test_reference_model.py
index 89ec7e7..c14c9f2 100644
--- a/tests/test_reference_model.py
+++ b/tests/test_reference_model.py
@@ -2,7 +2,7 @@ import unittest
import json
-from src.reference_model.reference_model import *
+from src.vips_reference_model.reference_model import *
from vipscore_common.entities import *
def get_model_configuration():
@@ -24,7 +24,9 @@ class TestReferenceModel(unittest.TestCase):
"""
#print(get_model_configuration())
instance = ReferenceModel()
- instance.set_configuration(get_model_configuration())
+ mc=get_model_configuration()
+ #print(mc.json())
+ instance.set_configuration(mc)
def test_get_result(self):
"""
--
GitLab