diff --git a/.gitignore b/.gitignore index 2f372e1..7be1e86 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ tests/__pycache__/ tests/data/refs/simple_inkscape_scripting*.out.export tests/data/refs/svg_to_simp_ink_script*.out.export /build -/sbdist \ No newline at end of file +/sbdist +/dist +/*.egg-info \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..14e9f4a --- /dev/null +++ b/setup.cfg @@ -0,0 +1,37 @@ +[metadata] +name = simpinkscr +url = https://github.com/spakin/SimpInkScr +author = Scott Pakin +author_email = pakin@lanl.gov +description = Simple Inkscape Scripting. +version = 3.1.1 +long_description = file: README.md +long_description_content_type = text/markdown +license = GPL-3.0 license +classifiers = + Development Status :: 3 - Alpha + License :: OSI Approved :: BSD License + Natural Language :: English + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + +project_urls = + Source Code =https://github.com/spakin/SimpInkScr + +[options] +zip_safe = False +packages = simpinkscr +python_requires = >=3.7 +install_requires = + inkex + +[options.entry_points] +console_scripts = + simple_inkscape_scripting = simpinkscr.simple_inkscape_scripting:main + svg_to_simp_ink_script = simpinkscr.svg_to_simp_ink_script:main + +[bdist_wheel] +universal = 1 + diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..c1057cf --- /dev/null +++ b/setup.py @@ -0,0 +1,3 @@ +import setuptools + +setuptools.setup() \ No newline at end of file diff --git a/simpinkscr/__init__.py b/simpinkscr/__init__.py index 8053462..c34d416 100644 --- a/simpinkscr/__init__.py +++ b/simpinkscr/__init__.py @@ -1,10 +1,11 @@ from math import * from random import * +from inkex import Transform from inkex.paths import Arc, Curve, Horz, Line, Move, Quadratic, Smooth, \ TepidQuadratic, Vert, ZoneClose from .simple_inkscape_scripting import style, transform, circle, ellipse, \ rect, line, polyline, polygon, regular_polygon, star, arc, path, \ connector, text, image, clone, duplicate, group, layer, hyperlink, \ inkex_object, filter_effect, linear_gradient, radial_gradient, \ - clip_path, massk, marker, push_defaults, pop_defaults, path_effect, \ + clip_path, mask, marker, push_defaults, pop_defaults, path_effect, \ selected_shapes, all_shapes, guide diff --git a/simpinkscr/simple_inkscape_scripting.py b/simpinkscr/simple_inkscape_scripting.py index 2b907c9..69aae06 100644 --- a/simpinkscr/simple_inkscape_scripting.py +++ b/simpinkscr/simple_inkscape_scripting.py @@ -2093,12 +2093,16 @@ def effect(self): code += '\n' if self.options.program is not None: code += self.options.program.replace(r'\n', '\n') + #remove unnecessary import + code.replace("from simpinkscr import *", "") try: exec(code, sis_globals) except SystemExit: pass _simple_top.replace_all_guides(sis_globals['guides']) +def main(): + SimpleInkscapeScripting().run() if __name__ == '__main__': - SimpleInkscapeScripting().run() + main() diff --git a/simpinkscr/svg_to_simp_ink_script.py b/simpinkscr/svg_to_simp_ink_script.py index 50269e6..298bc1f 100644 --- a/simpinkscr/svg_to_simp_ink_script.py +++ b/simpinkscr/svg_to_simp_ink_script.py @@ -1116,5 +1116,8 @@ def save(self, stream): stream.write(ln.encode('utf-8')) -if __name__ == '__main__': +def main(): SvgToPythonScript().run() + +if __name__ == '__main__': + main()