Move outfmt into src package

Author: boriel

pyproject.toml

@@ -34,7 +34,6 @@ keywords = ['compiler', 'zxspectrum', 'BASIC', 'z80']  # arbitrary keywords
 packages = [
     { include = "src/**/*" },
     { include = "arch/**/*"},
-    { include = "outfmt" }
 ]
 
 [tool.poetry.scripts]

setup.py

@@ -8,8 +8,7 @@
     'arch.zx48k',
     'arch.zx48k.backend',
     'arch.zx48k.optimizer',
-    'arch.zx48k.peephole',
-    'outfmt'
+    'arch.zx48k.peephole'
 ]
 
 # The directory containing this file

src/libzxbasm/asmparse.py

@@ -27,7 +27,7 @@
 from src.api import global_ as gl
 import src.api.utils
 from src.libzxbpp import zxbpp
-import outfmt
+from .. import outfmt
 
 LEXER = asmlex.Lexer()
 

src/libzxbasm/basic.py

@@ -11,7 +11,7 @@
 # -------------------------------------------------------------------------------
 
 from src.api import fp
-import outfmt.tzx as tzx
+from src import outfmt as tzx
 
 ENTER = 0x0D
 

src/libzxbc/__init__.py

@@ -9,5 +9,5 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-from outfmt import CodeEmitter  # noqa
+from src.outfmt import CodeEmitter  # noqa
 from .zxb import main  # noqa