PyPI Version 1.0

Author: rtlingg

sagitta/__init__.py

@@ -1 +0,0 @@
-#

sagitta/sagitta.py

@@ -16,8 +16,12 @@
 from astropy.table import Table as AstroTable
 
 #--------------- Local Imports ---------------#
-from data_tools import SagittaDataset, DataTools
-from model_code import Sagitta
+if __name__ == "sagitta.sagitta":
+    from sagitta.data_tools import DataTools, SagittaDataset
+    from sagitta.model_code import Sagitta
+else:
+    from data_tools import DataTools, SagittaDataset
+    from model_code import Sagitta
 
 #--------------- Main Pipeline ---------------#
 def main():
@@ -57,9 +61,8 @@ def main():
 #--------------- Sagitta Pipeline Class ---------------#
 class SagittaPipeline:
     """
-    Pipeline Class
-        The pipeline is run by calling the functions
-        in this class and modifying its internal state
+    The pipeline is run by calling the functions
+    in this class and modifying its internal state
     """
 
     def __init__(self, args):
@@ -79,7 +82,6 @@ def __init__(self, args):
         self.data_frame = None
         self.model_output_frame = None
 
-
     def get_naming_changes(self):
         """
         Builds a dictionary for converting between standard

setup.py

@@ -9,9 +9,9 @@
 
 setuptools.setup(
     name="Sagitta",
-    version="0.1",
+    version="1.0",
     author="Aidan McBride, Ryan Lingg, Marina Kounkel, Kevin Covey, Brian Hutchinson",
-    author_email="mcbrida5@wwu.edu, linggr@wwu.edu, marina.kounkel@wwu.edu",
+    author_email="marina.kounkel@wwu.edu, mcbrida5@wwu.edu, linggr@wwu.edu",
     description="A neural network based pipeline to identify pre-main sequence stars and estimate their ages.",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -23,9 +23,7 @@
         "Operating System :: OS Independent",
     ],
     package_data={
-        'sagitta' : ['model_state_dicts/av_model.pt','model_state_dicts/pms_model.pt','model_state_dicts/age_model.pt'],
-        'data_tools' : ['data_tools.py'],
-        "model_code" : ['model_code.py'],
+        'sagitta' : ['data_tools.py','model_code.py','model_state_dicts/av_model.pt','model_state_dicts/pms_model.pt','model_state_dicts/age_model.pt'],
         'sagitta.tests' : []
     },
     install_requires=['numpy','torch','astropy','astroquery','pandas','galpy'],