Move zxbasm into src package

Author: boriel

arch/zx48k/optimizer/asm.py

@@ -2,7 +2,7 @@
 
 from .patterns import RE_OUTC, RE_INDIR16
 from .helpers import single_registers
-from libzxbasm import z80
+from src.libzxbasm import z80
 
 # Dict of patterns to normalized instructions. I.e. 'ld a, 5' -> 'LD A,N'
 Z80_PATTERN = {}

arch/zx48k/optimizer/memcell.py

@@ -6,7 +6,7 @@
 from .. import backend
 from .asm import Asm
 from src.api.utils import flatten_list
-from libzxbasm import asmlex
+from src.libzxbasm import asmlex
 
 
 class MemCell(object):

pyproject.toml

@@ -36,14 +36,13 @@ packages = [
     { include = "arch/**/*"},
     { include = "ast_" },
     { include = "outfmt" },
-    { include = "libzxbasm" },
     { include = "libzxbpp" },
 ]
 
 [tool.poetry.scripts]
 zxb = 'src.libzxbc.zxb:main'
 zxbc = 'src.libzxbc.zxb:main'
-zxbasm = 'libzxbasm.zxbasm:main'
+zxbasm = 'src.libzxbasm.zxbasm:main'
 zxbpp = 'libzxbpp.zxbpp:entry_point'
 
 [tool.poetry.dependencies]

setup.py

@@ -10,7 +10,6 @@
     'arch.zx48k.optimizer',
     'arch.zx48k.peephole',
     'ast_',
-    'libzxbasm',
     'libzxbpp',
     'libzxbpp.prepro',
     'outfmt'
@@ -26,7 +25,7 @@
 
 entry_points = {
     'console_scripts': ['zxb = src.libzxbc.zxb:main',
-                        'zxbasm = libzxbasm.zxbasm:main',
+                        'zxbasm = src.libzxbasm.zxbasm:main',
                         'zxbc = src.libzxbc.zxb:main',
                         'zxbpp = libzxbpp.zxbpp:entry_point']
 }

libzxbasm/__init__.py src/libzxbasm/__init__.pylibzxbasm/__init__.py renamed to src/libzxbasm/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # vim: ts=4:et:sw=4
 
-from libzxbasm.z80 import Opcode, Z80SET
+from src.libzxbasm.z80 import Opcode, Z80SET
 from src.api.errors import Error
 import re