From 7ace94b0230e9acd85097c1812840250d551015c Mon Sep 17 00:00:00 2001 From: Philipp Klaus Date: Wed, 18 Feb 2015 15:35:01 +0100 Subject: Make gerber.render a package & fix more relative import statements --- gerber/__main__.py | 4 ++-- gerber/tests/test_cam.py | 2 +- gerber/tests/test_common.py | 2 +- gerber/tests/test_primitives.py | 2 +- gerber/tests/test_rs274x.py | 2 +- setup.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gerber/__main__.py b/gerber/__main__.py index 6e25bf3..599c161 100644 --- a/gerber/__main__.py +++ b/gerber/__main__.py @@ -16,9 +16,9 @@ # the License. if __name__ == '__main__': - from .common import read - from .render import GerberSvgContext import sys + from gerber.common import read + from gerber.render import GerberSvgContext if len(sys.argv) < 2: print >> sys.stderr, "Usage: python -m gerber ..." diff --git a/gerber/tests/test_cam.py b/gerber/tests/test_cam.py index 6296cc9..00a8285 100644 --- a/gerber/tests/test_cam.py +++ b/gerber/tests/test_cam.py @@ -4,7 +4,7 @@ # Author: Hamilton Kibbe from ..cam import CamFile, FileSettings -from tests import * +from .tests import * def test_filesettings_defaults(): diff --git a/gerber/tests/test_common.py b/gerber/tests/test_common.py index bf9760a..76e3991 100644 --- a/gerber/tests/test_common.py +++ b/gerber/tests/test_common.py @@ -5,7 +5,7 @@ from ..common import read from ..excellon import ExcellonFile from ..rs274x import GerberFile -from tests import * +from .tests import * import os diff --git a/gerber/tests/test_primitives.py b/gerber/tests/test_primitives.py index cada6d4..dab0225 100644 --- a/gerber/tests/test_primitives.py +++ b/gerber/tests/test_primitives.py @@ -3,7 +3,7 @@ # Author: Hamilton Kibbe from ..primitives import * -from tests import * +from .tests import * def test_primitive_implementation_warning(): diff --git a/gerber/tests/test_rs274x.py b/gerber/tests/test_rs274x.py index 27f6f49..5185fa1 100644 --- a/gerber/tests/test_rs274x.py +++ b/gerber/tests/test_rs274x.py @@ -5,7 +5,7 @@ import os from ..rs274x import read, GerberFile -from tests import * +from .tests import * TOP_COPPER_FILE = os.path.join(os.path.dirname(__file__), diff --git a/setup.py b/setup.py index 02b9df6..d0e2bfc 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ METADATA = { 'license': "Apache", 'keywords': "gerber tools", 'url': "http://github.com/curtacircuitos/gerber-tools", - 'packages': ['gerber'], + 'packages': ['gerber', 'gerber.render'], 'long_description': read('README.md'), 'classifiers':[ "Development Status :: 3 - Alpha", -- cgit