Fine! You win, setuptools! (Imports now Explicit)

Spent 1.5 hours trying to figure out how to make setuptools
recognize the sub-modules obj, models, etc. Gave up and changed
every single reference of 'from objs' to 'from MEDFORD.objs', et
cetera.

Compiled version of the medford package now actually functions
as intended during testing.

setup.cfg

@@ -14,7 +14,7 @@ classifiers =
 [options]
 package_dir =
     = src
-packages = find:
+packages = find_namespace:
 requires-python = >=3.8
 install_requires = 
     pydantic ==2.4.2

src/MEDFORD/medford.py

@@ -9,12 +9,12 @@
 from enum import Enum
 from pathlib import PurePath #?
 
-from objs.linereader import LineReader, Line
-from objs.linecollector import LineCollector, Macro, Block
-from objs.dictionizer import Dictionizer
-from models.generics import Entity
+from MEDFORD.objs.linereader import LineReader, Line
+from MEDFORD.objs.linecollector import LineCollector, Macro, Block
+from MEDFORD.objs.dictionizer import Dictionizer
+from MEDFORD.models.generics import Entity
 
-import mfdglobals
+import MEDFORD.mfdglobals as mfdglobals
 
 # order of ops:
 # 1. open file

src/MEDFORD/mfdglobals.py

@@ -1,4 +1,4 @@
-from submodules.mfdvalidator.validator import MedfordValidator as mv
+from MEDFORD.submodules.mfdvalidator.validator import MedfordValidator as mv
 
 validator: mv
 version: str

src/MEDFORD/models/generics.py

@@ -9,10 +9,10 @@
 from typing import TypeVar, Tuple, List, Optional, Union
 from pydantic import BaseModel as PydanticBaseModel, field_validator
 from pydantic import model_validator, computed_field
-from objs.linecollections import Block, Detail
+from MEDFORD.objs.linecollections import Block, Detail
 
-from submodules.mfdvalidator.validator import MedfordValidator as mv
-from submodules.mfdvalidator.errors import InvalidValue, MissingRequiredFieldbcofLogic
+from MEDFORD.submodules.mfdvalidator.validator import MedfordValidator as mv
+from MEDFORD.submodules.mfdvalidator.errors import InvalidValue, MissingRequiredFieldbcofLogic
 #############################################
 # Building Blocks                           #
 #############################################

src/MEDFORD/objs/dictionizer.py

@@ -3,7 +3,7 @@
 consumption."""
 
 from typing import Any, List, Dict
-from .linecollections import Block, Macro
+from MEDFORD.objs.linecollections import Block, Macro
 
 class Dictionizer() :
     """Class to handle dictionary-based management of MEDFORD metadata.

src/MEDFORD/objs/linecollections.py

@@ -7,11 +7,11 @@
 """
 
 from typing import Optional, List, Dict, Tuple, Union
-from objs.lines import AtAtLine, ContinueLine, MacroLine, NovelDetailLine
+from MEDFORD.objs.lines import AtAtLine, ContinueLine, MacroLine, NovelDetailLine
 
-from submodules.mfdvalidator.errors import MissingDescError, MaxMacroDepthExceeded, AtAtReferencedDoesNotExist, MissingContent
+from MEDFORD.submodules.mfdvalidator.errors import MissingDescError, MaxMacroDepthExceeded, AtAtReferencedDoesNotExist, MissingContent
 
-import mfdglobals 
+import MEDFORD.mfdglobals as mfdglobals 
 
 # create mixin for macro, named obj handling
 # TODO: separate LineCollection into a LineCollection and FeatureContainer

src/MEDFORD/objs/linecollector.py

@@ -1,8 +1,8 @@
 
 from enum import Enum
 from typing import List, Dict, Tuple, Optional
-from .lines import AtAtLine, Line, MacroLine, NovelDetailLine, ContinueLine, CommentLine
-from .linecollections import AtAt, Macro, Block, Detail
+from MEDFORD.objs.lines import AtAtLine, Line, MacroLine, NovelDetailLine, ContinueLine, CommentLine
+from MEDFORD.objs.linecollections import AtAt, Macro, Block, Detail
 
 class LineCollector() :
     defined_macros: Dict[str, Macro]

src/MEDFORD/objs/linereader.py

@@ -5,10 +5,10 @@
 
 import re
 from typing import Tuple, List, Optional
-from submodules.mfdvalidator.errors import MissingAtAtName
-from .lines import Line, MacroLine, CommentLine, NovelDetailLine, ContinueLine
+from MEDFORD.submodules.mfdvalidator.errors import MissingAtAtName
+from MEDFORD.objs.lines import Line, MacroLine, CommentLine, NovelDetailLine, ContinueLine
 
-import mfdglobals
+import MEDFORD.mfdglobals as mfdglobals
 
 Macro = Tuple[int, int, str]
 Tex = Tuple[int, int]

src/MEDFORD/submodules/mfdvalidator/errors.py

@@ -54,7 +54,7 @@ class MissingDescError(MFDErr) :
     def __init__(self, detailobj) :
         self.errtype = ErrType.SYNTAX
 
-        from objs.linecollections import Detail
+        from MEDFORD.objs.linecollections import Detail
 
         if not isinstance(detailobj, Detail) :
             raise ValueError("Attempted to create a MissingDescError without a Detail.")
@@ -92,7 +92,7 @@ class MissingContent(MFDErr) :
     def __init__(self, detailobj) :
         self.errtype = ErrType.MISSING_CONTENT
 
-        from objs.linecollections import Detail
+        from MEDFORD.objs.linecollections import Detail
 
         if not isinstance(detailobj, Detail) :
             raise ValueError("Attempted to create a MissingContentError without a Detail.")
@@ -131,7 +131,7 @@ class MaxMacroDepthExceeded(MFDErr) :
     def __init__(self, macroobjs: List) :
         self.errtype = ErrType.OTHER
 
-        from objs.linecollections import Macro
+        from MEDFORD.objs.linecollections import Macro
 
         for (idx, mo) in enumerate(macroobjs) :
             if not isinstance(mo, Macro) :
@@ -179,7 +179,7 @@ class MissingRequiredField(MFDErr) :
     def __init__(self, block_inp, missing_token:str) :
         self.errtype = ErrType.PYDANTIC
 
-        from objs.linecollections import Block
+        from MEDFORD.objs.linecollections import Block
 
         if not isinstance(block_inp, Block) :
             raise ValueError("Attempted to create a MissingRequiredFieldError without a Block.")
@@ -234,7 +234,7 @@ class InvalidValue(MFDErr) :
     def __init__(self, block_inp, incorrect_token:str, content:str) :
         self.errtype = ErrType.PYDANTIC
 
-        from objs.linecollections import Block
+        from MEDFORD.objs.linecollections import Block
 
         if not isinstance(block_inp, Block) :
             raise ValueError("Attempted to create an InvalidValue error without a Block.")
@@ -305,7 +305,7 @@ class AtAtReferencedDoesNotExist(MFDErr) :
     def __init__(self, atat_inp, referenced_name: str, named_blocks: List[str]) :
         self.errtype = ErrType.MALFORMED_CONTENT
 
-        from objs.linecollections import AtAt
+        from MEDFORD.objs.linecollections import AtAt
 
         if not isinstance(atat_inp, AtAt) :
             raise ValueError("Attempted to create an AtAtReferencedDoesNotExist without a Detail.")

src/MEDFORD/submodules/mfdvalidator/validator.py

@@ -1,5 +1,5 @@
 from typing import Dict, List
-from .errors import MFDErr, ErrType, MissingRequiredField
+from MEDFORD.submodules.mfdvalidator.errors import MFDErr, ErrType, MissingRequiredField
 import random
 
 class MedfordValidator(object):

tests/__init__.py

@@ -1,3 +1,3 @@
-import mfdglobals
+import MEDFORD.mfdglobals as mfdglobals
 
 mfdglobals.init()

tests/test_custom_errors.py

@@ -1,6 +1,6 @@
 from MEDFORD.submodules.medforderrors.errors import *
 
-import mfdglobals
+import MEDFORD.mfdglobals as mfdglobals
 from MEDFORD.objs.linecollections import Detail, Macro
 from MEDFORD.objs.linereader import LineReader as LR
 from MEDFORD.objs.linecollector import LineCollector as LC, Line, NovelDetailLine