From 7f477ec4473234e16959904cb9d9f5af66f167dd Mon Sep 17 00:00:00 2001 From: "Nguyen (US), Hai C" Date: Mon, 18 Dec 2023 23:00:15 -0800 Subject: [PATCH 1/2] Fixed namespace to sdr_hazards_classification --- setup.py | 2 +- .../__init__.py | 0 .../data/Corrosion_Limit.csv | 0 .../data/Degraded_Controllability.csv | 0 .../data/Depressurization.csv | 0 .../data/SDR_Example.csv | 0 .../model/sdr-corrosion-limit.config | Bin .../model/sdr-corrosion-limit.model | Bin .../model/sdr-degraded-controllability.config | Bin .../model/sdr-degraded-controllability.model | Bin .../model/sdr-depressurization.config | Bin .../model/sdr-depressurization.model | Bin .../prep_utils.py | 0 .../sdr_api.py | 0 .../sdr_classifier.py | 0 .../sdr_data_preparer.py | 0 .../vectorizers.py | 0 src/test/test_model.py | 2 +- 18 files changed, 2 insertions(+), 2 deletions(-) rename src/{sdr_classifier => sdr_hazards_classification}/__init__.py (100%) rename src/{sdr_classifier => sdr_hazards_classification}/data/Corrosion_Limit.csv (100%) rename src/{sdr_classifier => sdr_hazards_classification}/data/Degraded_Controllability.csv (100%) rename src/{sdr_classifier => sdr_hazards_classification}/data/Depressurization.csv (100%) rename src/{sdr_classifier => sdr_hazards_classification}/data/SDR_Example.csv (100%) rename src/{sdr_classifier => sdr_hazards_classification}/model/sdr-corrosion-limit.config (100%) rename src/{sdr_classifier => sdr_hazards_classification}/model/sdr-corrosion-limit.model (100%) rename src/{sdr_classifier => sdr_hazards_classification}/model/sdr-degraded-controllability.config (100%) rename src/{sdr_classifier => sdr_hazards_classification}/model/sdr-degraded-controllability.model (100%) rename src/{sdr_classifier => sdr_hazards_classification}/model/sdr-depressurization.config (100%) rename src/{sdr_classifier => sdr_hazards_classification}/model/sdr-depressurization.model (100%) rename src/{sdr_classifier => sdr_hazards_classification}/prep_utils.py (100%) rename src/{sdr_classifier => sdr_hazards_classification}/sdr_api.py (100%) rename src/{sdr_classifier => sdr_hazards_classification}/sdr_classifier.py (100%) rename src/{sdr_classifier => sdr_hazards_classification}/sdr_data_preparer.py (100%) rename src/{sdr_classifier => sdr_hazards_classification}/vectorizers.py (100%) diff --git a/setup.py b/setup.py index 892e376..949c23e 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='sdr-hazards-classification', - version='0.1.0', + version='0.1.1', packages=find_packages(where="src"), package_dir={"": "src"}, include_package_data=True, diff --git a/src/sdr_classifier/__init__.py b/src/sdr_hazards_classification/__init__.py similarity index 100% rename from src/sdr_classifier/__init__.py rename to src/sdr_hazards_classification/__init__.py diff --git a/src/sdr_classifier/data/Corrosion_Limit.csv b/src/sdr_hazards_classification/data/Corrosion_Limit.csv similarity index 100% rename from src/sdr_classifier/data/Corrosion_Limit.csv rename to src/sdr_hazards_classification/data/Corrosion_Limit.csv diff --git a/src/sdr_classifier/data/Degraded_Controllability.csv b/src/sdr_hazards_classification/data/Degraded_Controllability.csv similarity index 100% rename from src/sdr_classifier/data/Degraded_Controllability.csv rename to src/sdr_hazards_classification/data/Degraded_Controllability.csv diff --git a/src/sdr_classifier/data/Depressurization.csv b/src/sdr_hazards_classification/data/Depressurization.csv similarity index 100% rename from src/sdr_classifier/data/Depressurization.csv rename to src/sdr_hazards_classification/data/Depressurization.csv diff --git a/src/sdr_classifier/data/SDR_Example.csv b/src/sdr_hazards_classification/data/SDR_Example.csv similarity index 100% rename from src/sdr_classifier/data/SDR_Example.csv rename to src/sdr_hazards_classification/data/SDR_Example.csv diff --git a/src/sdr_classifier/model/sdr-corrosion-limit.config b/src/sdr_hazards_classification/model/sdr-corrosion-limit.config similarity index 100% rename from src/sdr_classifier/model/sdr-corrosion-limit.config rename to src/sdr_hazards_classification/model/sdr-corrosion-limit.config diff --git a/src/sdr_classifier/model/sdr-corrosion-limit.model b/src/sdr_hazards_classification/model/sdr-corrosion-limit.model similarity index 100% rename from src/sdr_classifier/model/sdr-corrosion-limit.model rename to src/sdr_hazards_classification/model/sdr-corrosion-limit.model diff --git a/src/sdr_classifier/model/sdr-degraded-controllability.config b/src/sdr_hazards_classification/model/sdr-degraded-controllability.config similarity index 100% rename from src/sdr_classifier/model/sdr-degraded-controllability.config rename to src/sdr_hazards_classification/model/sdr-degraded-controllability.config diff --git a/src/sdr_classifier/model/sdr-degraded-controllability.model b/src/sdr_hazards_classification/model/sdr-degraded-controllability.model similarity index 100% rename from src/sdr_classifier/model/sdr-degraded-controllability.model rename to src/sdr_hazards_classification/model/sdr-degraded-controllability.model diff --git a/src/sdr_classifier/model/sdr-depressurization.config b/src/sdr_hazards_classification/model/sdr-depressurization.config similarity index 100% rename from src/sdr_classifier/model/sdr-depressurization.config rename to src/sdr_hazards_classification/model/sdr-depressurization.config diff --git a/src/sdr_classifier/model/sdr-depressurization.model b/src/sdr_hazards_classification/model/sdr-depressurization.model similarity index 100% rename from src/sdr_classifier/model/sdr-depressurization.model rename to src/sdr_hazards_classification/model/sdr-depressurization.model diff --git a/src/sdr_classifier/prep_utils.py b/src/sdr_hazards_classification/prep_utils.py similarity index 100% rename from src/sdr_classifier/prep_utils.py rename to src/sdr_hazards_classification/prep_utils.py diff --git a/src/sdr_classifier/sdr_api.py b/src/sdr_hazards_classification/sdr_api.py similarity index 100% rename from src/sdr_classifier/sdr_api.py rename to src/sdr_hazards_classification/sdr_api.py diff --git a/src/sdr_classifier/sdr_classifier.py b/src/sdr_hazards_classification/sdr_classifier.py similarity index 100% rename from src/sdr_classifier/sdr_classifier.py rename to src/sdr_hazards_classification/sdr_classifier.py diff --git a/src/sdr_classifier/sdr_data_preparer.py b/src/sdr_hazards_classification/sdr_data_preparer.py similarity index 100% rename from src/sdr_classifier/sdr_data_preparer.py rename to src/sdr_hazards_classification/sdr_data_preparer.py diff --git a/src/sdr_classifier/vectorizers.py b/src/sdr_hazards_classification/vectorizers.py similarity index 100% rename from src/sdr_classifier/vectorizers.py rename to src/sdr_hazards_classification/vectorizers.py diff --git a/src/test/test_model.py b/src/test/test_model.py index 75a97ec..932135d 100644 --- a/src/test/test_model.py +++ b/src/test/test_model.py @@ -2,7 +2,7 @@ import pytest import numpy as np from numpy.testing import assert_array_equal -from sdr_classifier.sdr_api import SdrInferenceAPI +from sdr_hazards_classification.sdr_api import SdrInferenceAPI # my_model = sdr_api.SdrInferenceAPI() # my_model.test_sdr_depressurization_predictions() From df422a3fbde025d38bf70f5312a5cfa881452a71 Mon Sep 17 00:00:00 2001 From: "Nguyen (US), Hai C" Date: Mon, 18 Dec 2023 23:11:01 -0800 Subject: [PATCH 2/2] Fixed namespace to sdr_hazards_classification --- MANIFEST.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 38b8b3e..9620fcd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ -include src/sdr_classifier/data/*.csv -include src/sdr_classifier/model/*.config -include src/sdr_classifier/model/*.model \ No newline at end of file +include src/sdr_hazards_classification/data/*.csv +include src/sdr_hazards_classification/model/*.config +include src/sdr_hazards_classification/model/*.model \ No newline at end of file