LSSTDESC · Catarina-Alves · Jan 24, 2022 · Oct 21, 2021 · Jan 4, 2022 · Jan 6, 2022
diff --git a/utils/archive/collect.pbs → archive/collect.pbs b/utils/archive/collect.pbs → archive/collect.pbs
diff --git a/utils/archive/collect.py → archive/collect.py b/utils/archive/collect.py → archive/collect.py
diff --git a/utils/archive/conquer.pbs → archive/conquer.pbs b/utils/archive/conquer.pbs → archive/conquer.pbs
diff --git a/utils/archive/conquer.py → archive/conquer.py b/utils/archive/conquer.py → archive/conquer.py
diff --git a/utils/archive/create_jobs.py → archive/create_jobs.py b/utils/archive/create_jobs.py → archive/create_jobs.py
diff --git a/utils/archive/divide.pbs → archive/divide.pbs b/utils/archive/divide.pbs → archive/divide.pbs
diff --git a/utils/archive/divide.py → archive/divide.py b/utils/archive/divide.py → archive/divide.py
diff --git a/utils/archive/plasticc_extract_gp.pbs → archive/plasticc_extract_gp.pbs b/utils/archive/plasticc_extract_gp.pbs → archive/plasticc_extract_gp.pbs
diff --git a/utils/archive/plasticc_extract_gp.py → archive/plasticc_extract_gp.py b/utils/archive/plasticc_extract_gp.py → archive/plasticc_extract_gp.py
diff --git a/utils/archive/post_process.py → archive/post_process.py b/utils/archive/post_process.py → archive/post_process.py
diff --git a/utils/archive/run_pipeline.py → archive/run_pipeline.py b/utils/archive/run_pipeline.py → archive/run_pipeline.py
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 from setuptools.command.install import install
 import sys
 import os
@@ -49,18 +49,18 @@ def run(self):
         "relative_to": __file__,
         "fallback_version": __FALLBACK_VERSION__},
     setup_requires=['setuptools_scm>=3.2.0'],
-    packages=['snmachine', 'utils'],
+    packages=find_packages(),
     include_package_data=True,
     package_data={'snmachine': ['example_data/SPCC_SUBSET.tar.gz',
                                 'example_data/output_spcc_no_z/features/*.dat',
                                 'example_data/example_data_for_tests.pckl']},
     exclude_package_data={'utils': ['archive/*']},
     cmdclass={'install': ExtractExampleData},
     install_requires=['astropy>=1.1.2',
-                      'matplotlib>=1.5.1',
+                      'matplotlib>=3.0.0',
                       'numpy>=1.18.4',
                       'scikit-learn',
-                      'scipy>=0.17.0',
+                      'scipy>=1.4.0',
                       'george>=0.3.0',
                       'iminuit',
                       'pandas>=0.23.0',

diff --git a/snmachine/snclassifier.py b/snmachine/snclassifier.py
@@ -27,7 +27,7 @@
 from sklearn import model_selection
 from sklearn.model_selection import PredefinedSplit, StratifiedKFold
 from sklearn.preprocessing import StandardScaler
-from utils import plasticc_utils
+from snmachine.utils import plasticc_utils
 
 # This allows the user to easily loop through all possible classifiers
 choice_of_classifiers = ['svm', 'knn', 'random_forest', 'decision_tree',

diff --git a/utils/__init__.py → snmachine/utils/__init__.py b/utils/__init__.py → snmachine/utils/__init__.py
diff --git a/utils/config.yml → snmachine/utils/config.yml b/utils/config.yml → snmachine/utils/config.yml
diff --git a/utils/imblearn_augment.py → snmachine/utils/imblearn_augment.py b/utils/imblearn_augment.py → snmachine/utils/imblearn_augment.py
diff --git a/utils/plasticc_feature_engineering.py → ...ine/utils/plasticc_feature_engineering.py b/utils/plasticc_feature_engineering.py → ...ine/utils/plasticc_feature_engineering.py
diff --git a/utils/plasticc_make_predictions.py → snmachine/utils/plasticc_make_predictions.py b/utils/plasticc_make_predictions.py → snmachine/utils/plasticc_make_predictions.py
diff --git a/utils/plasticc_pipeline.py → snmachine/utils/plasticc_pipeline.py b/utils/plasticc_pipeline.py → snmachine/utils/plasticc_pipeline.py
@@ -27,7 +27,7 @@
 #from imblearn.metrics import classification_report_imbalanced  # not used at the moment
 #from imblearn.over_sampling import SMOTE  # not used at the moment
 #from imblearn.pipeline import make_pipeline  # not used at the moment
-from utils.plasticc_utils import plasticc_log_loss, plot_confusion_matrix
+from snmachine.utils.plasticc_utils import plasticc_log_loss, plot_confusion_matrix
 from sklearn.ensemble import RandomForestClassifier
 from sklearn.model_selection import train_test_split
 

diff --git a/utils/plasticc_utils.py → snmachine/utils/plasticc_utils.py b/utils/plasticc_utils.py → snmachine/utils/plasticc_utils.py