Skip to content

Commit d17ff4b

Browse files
committed
fix package structure and setup.py to include subpackage
1 parent 619a921 commit d17ff4b

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

Diff for: setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
1212
'''
1313
import os
14-
from setuptools import setup
14+
from setuptools import setup, find_packages
1515

1616

1717
def read(fname):
@@ -24,7 +24,7 @@ def read(fname):
2424
setup(
2525
name=name,
2626
version=version,
27-
packages=[name.replace("-","_")],
27+
packages=find_packages(),
2828
author="tintinweb",
2929
author_email="tintinweb@oststrom.com",
3030
description=(

Diff for: solidity_parser/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from .parser import parse_file, parse
2+
__ALL__ = ["parse","parse_file"]

Diff for: solidity_parser/parser.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88

99
from antlr4 import *
10-
from solidity_antlr4.SolidityLexer import SolidityLexer
11-
from solidity_antlr4.SolidityParser import SolidityParser
12-
from solidity_antlr4.SolidityVisitor import SolidityVisitor
10+
from solidity_parser.solidity_antlr4.SolidityLexer import SolidityLexer
11+
from solidity_parser.solidity_antlr4.SolidityParser import SolidityParser
12+
from solidity_parser.solidity_antlr4.SolidityVisitor import SolidityVisitor
1313

1414

1515
class Node(dict):
@@ -1003,9 +1003,6 @@ def parse(text, start="sourceUnit", loc=False, strict=False):
10031003
from antlr4.InputStream import InputStream
10041004
from antlr4 import FileStream, CommonTokenStream
10051005

1006-
from solidity_antlr4.SolidityLexer import SolidityLexer
1007-
from solidity_antlr4.SolidityParser import SolidityParser
1008-
10091006
input_stream = InputStream(text)
10101007

10111008
lexer = SolidityLexer(input_stream)

0 commit comments

Comments
 (0)