Merge pull request #55 from inter1965/master

VSCode Integration Attempt
spakin · Sep 9, 2022 · 9a9940a · 9a9940a
2 parents 68b7349 + bd04c8a
commit 9a9940a
Show file tree

Hide file tree

Showing 54 changed files with 68 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,7 @@ __pycache__/
 tests/__pycache__/
 tests/data/refs/simple_inkscape_scripting*.out.export
 tests/data/refs/svg_to_simp_ink_script*.out.export
+/build
+/sbdist
+/dist
+/*.egg-info
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,37 @@
+[metadata]
+name = simpinkscr
+url = https://github.com/spakin/SimpInkScr
+author = Scott Pakin
+author_email = [email protected]
+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
@@ -0,0 +1,3 @@
+import setuptools
+
+setuptools.setup()
diff --git a/simpinkscr/__init__.py b/simpinkscr/__init__.py
@@ -0,0 +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, mask, marker, push_defaults, pop_defaults, path_effect, \
+    selected_shapes, all_shapes, guide
diff --git a/simple_inkscape_scripting.py → simpinkscr/simple_inkscape_scripting.py b/simple_inkscape_scripting.py → 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/svg_to_simp_ink_script.py → simpinkscr/svg_to_simp_ink_script.py b/svg_to_simp_ink_script.py → 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()
diff --git a/simple_inkscape_scripting.inx b/simple_inkscape_scripting.inx
@@ -40,6 +40,6 @@
     </effects-menu>
   </effect>
   <script>
-    <command location="inx" interpreter="python">simple_inkscape_scripting.py</command>
+    <command location="inx" interpreter="python">simpinkscr/simple_inkscape_scripting.py</command>
   </script>
 </inkscape-extension>
diff --git a/svg_to_simp_ink_script.inx b/svg_to_simp_ink_script.inx
@@ -10,6 +10,6 @@
     <dataloss>true</dataloss>
   </output>
   <script>
-    <command location="inx" interpreter="python">svg_to_simp_ink_script.py</command>
+    <command location="inx" interpreter="python">simpinkscr/svg_to_simp_ink_script.py</command>
   </script>
 </inkscape-extension>
diff --git a/...__15______center______first__True____.out → ...__15______center______first__True____.out b/...__15______center______first__True____.out → ...__15______center______first__True____.out
diff --git a/...fill____yellow______stroke_width__2__.out → ...fill____yellow______stroke_width__2__.out b/...fill____yellow______stroke_width__2__.out → ...fill____yellow______stroke_width__2__.out
diff --git a/...le____width__2____height__2______50__.out → ...le____width__2____height__2______50__.out b/...le____width__2____height__2______50__.out → ...le____width__2____height__2______50__.out
diff --git a/...h__2____height__2________75____50____.out → ...h__2____height__2________75____50____.out b/...h__2____height__2________75____50____.out → ...h__2____height__2________75____50____.out
diff --git a/...png________0____0______embed__False__.out → ...png________0____0______embed__False__.out b/...png________0____0______embed__False__.out → ...png________0____0______embed__False__.out
diff --git a/...____width____0________0____height____.out → ...____width____0________0____height____.out b/...____width____0________0____height____.out → ...____width____0________0____height____.out
diff --git a/...___300____300________150____200______.out → ...___300____300________150____200______.out b/...___300____300________150____200______.out → ...___300____300________150____200______.out
diff --git a/...___300____300________150____200______.out → ...___300____300________150____200______.out b/...___300____300________150____200______.out → ...___300____300________150____200______.out
diff --git a/...h__2______50____height__2______30____.out → ...h__2______50____height__2______30____.out b/...h__2______50____height__2______30____.out → ...h__2______50____height__2______30____.out
diff --git a/..._polygon__5______100____100______80__.out → ..._polygon__5______100____100______80__.out b/..._polygon__5______100____100______80__.out → ..._polygon__5______100____100______80__.out
diff --git a/...5______100____100________80____30____.out → ...5______100____100________80____30____.out b/...5______100____100________80____30____.out → ...5______100____100________80____30____.out
diff --git a/...____height______font_size____36pt____.out → ...____height______font_size____36pt____.out b/...____height______font_size____36pt____.out → ...____height______font_size____36pt____.out
diff --git a/...ing__009fa6028769d24916a9e6032dc9d122.out → ...ing__009fa6028769d24916a9e6032dc9d122.out b/...ing__009fa6028769d24916a9e6032dc9d122.out → ...ing__009fa6028769d24916a9e6032dc9d122.out
diff --git a/...ing__0b76cdb52daf3cd259f54efc1e0643b7.out → ...ing__0b76cdb52daf3cd259f54efc1e0643b7.out b/...ing__0b76cdb52daf3cd259f54efc1e0643b7.out → ...ing__0b76cdb52daf3cd259f54efc1e0643b7.out
diff --git a/...ing__10926e00f595eea8f68837c808aae5d9.out → ...ing__10926e00f595eea8f68837c808aae5d9.out b/...ing__10926e00f595eea8f68837c808aae5d9.out → ...ing__10926e00f595eea8f68837c808aae5d9.out
diff --git a/...ing__197dea140a0144957bfb3358c908d972.out → ...ing__197dea140a0144957bfb3358c908d972.out b/...ing__197dea140a0144957bfb3358c908d972.out → ...ing__197dea140a0144957bfb3358c908d972.out
diff --git a/...ing__1c6ae678571dd85e2e66c331630dfbeb.out → ...ing__1c6ae678571dd85e2e66c331630dfbeb.out b/...ing__1c6ae678571dd85e2e66c331630dfbeb.out → ...ing__1c6ae678571dd85e2e66c331630dfbeb.out
diff --git a/...ing__2ab64e02e5c184aec10b092a96627121.out → ...ing__2ab64e02e5c184aec10b092a96627121.out b/...ing__2ab64e02e5c184aec10b092a96627121.out → ...ing__2ab64e02e5c184aec10b092a96627121.out
diff --git a/...ing__3fafbaa100acdd0af301b229ae1e8f6e.out → ...ing__3fafbaa100acdd0af301b229ae1e8f6e.out b/...ing__3fafbaa100acdd0af301b229ae1e8f6e.out → ...ing__3fafbaa100acdd0af301b229ae1e8f6e.out
diff --git a/...ing__52ccca6289d454b91a0efe640abe275d.out → ...ing__52ccca6289d454b91a0efe640abe275d.out b/...ing__52ccca6289d454b91a0efe640abe275d.out → ...ing__52ccca6289d454b91a0efe640abe275d.out
diff --git a/...ing__534f4e6759df14a97367b3bc42cc2d56.out → ...ing__534f4e6759df14a97367b3bc42cc2d56.out b/...ing__534f4e6759df14a97367b3bc42cc2d56.out → ...ing__534f4e6759df14a97367b3bc42cc2d56.out
diff --git a/...ing__5612bf002c492f74ef0cab8a162617b6.out → ...ing__5612bf002c492f74ef0cab8a162617b6.out b/...ing__5612bf002c492f74ef0cab8a162617b6.out → ...ing__5612bf002c492f74ef0cab8a162617b6.out
diff --git a/...ing__5cfa500aecc9fd562886c02056d56e85.out → ...ing__5cfa500aecc9fd562886c02056d56e85.out b/...ing__5cfa500aecc9fd562886c02056d56e85.out → ...ing__5cfa500aecc9fd562886c02056d56e85.out
diff --git a/...ing__5f3e47e2bc6854ab43ca101b8a5d07f2.out → ...ing__5f3e47e2bc6854ab43ca101b8a5d07f2.out b/...ing__5f3e47e2bc6854ab43ca101b8a5d07f2.out → ...ing__5f3e47e2bc6854ab43ca101b8a5d07f2.out
diff --git a/...ing__5f77373b3c2858988b0ab9e2665b2f0e.out → ...ing__5f77373b3c2858988b0ab9e2665b2f0e.out b/...ing__5f77373b3c2858988b0ab9e2665b2f0e.out → ...ing__5f77373b3c2858988b0ab9e2665b2f0e.out
diff --git a/...ing__604024f0de3aa21fc2262da806e75d0b.out → ...ing__604024f0de3aa21fc2262da806e75d0b.out b/...ing__604024f0de3aa21fc2262da806e75d0b.out → ...ing__604024f0de3aa21fc2262da806e75d0b.out
diff --git a/...ing__62f59a6f2ce8aecf0aa594a2267ff08f.out → ...ing__62f59a6f2ce8aecf0aa594a2267ff08f.out b/...ing__62f59a6f2ce8aecf0aa594a2267ff08f.out → ...ing__62f59a6f2ce8aecf0aa594a2267ff08f.out
diff --git a/...ing__6ba7ae17dd055349e7040cd0024b9748.out → ...ing__6ba7ae17dd055349e7040cd0024b9748.out b/...ing__6ba7ae17dd055349e7040cd0024b9748.out → ...ing__6ba7ae17dd055349e7040cd0024b9748.out
diff --git a/...ing__6f3c87642fe69a66ecd8ecb92856cc2f.out → ...ing__6f3c87642fe69a66ecd8ecb92856cc2f.out b/...ing__6f3c87642fe69a66ecd8ecb92856cc2f.out → ...ing__6f3c87642fe69a66ecd8ecb92856cc2f.out
diff --git a/...ing__70d13cc0ca1450365632d0c30e317106.out → ...ing__70d13cc0ca1450365632d0c30e317106.out b/...ing__70d13cc0ca1450365632d0c30e317106.out → ...ing__70d13cc0ca1450365632d0c30e317106.out
diff --git a/...ing__7640e85da622e4254bfb616e17bcdfae.out → ...ing__7640e85da622e4254bfb616e17bcdfae.out b/...ing__7640e85da622e4254bfb616e17bcdfae.out → ...ing__7640e85da622e4254bfb616e17bcdfae.out
diff --git a/...ing__7b2a331532fd7385b9a464c44790a3a8.out → ...ing__7b2a331532fd7385b9a464c44790a3a8.out b/...ing__7b2a331532fd7385b9a464c44790a3a8.out → ...ing__7b2a331532fd7385b9a464c44790a3a8.out
diff --git a/...ing__a51e0e0e6abd158dd1fbe12f324618ac.out → ...ing__a51e0e0e6abd158dd1fbe12f324618ac.out b/...ing__a51e0e0e6abd158dd1fbe12f324618ac.out → ...ing__a51e0e0e6abd158dd1fbe12f324618ac.out
diff --git a/...ing__a60e47c2c6395be38e836aafeca45bde.out → ...ing__a60e47c2c6395be38e836aafeca45bde.out b/...ing__a60e47c2c6395be38e836aafeca45bde.out → ...ing__a60e47c2c6395be38e836aafeca45bde.out
diff --git a/...ing__a8a14503fa73684f2bb6949311274abd.out → ...ing__a8a14503fa73684f2bb6949311274abd.out b/...ing__a8a14503fa73684f2bb6949311274abd.out → ...ing__a8a14503fa73684f2bb6949311274abd.out
diff --git a/...ing__b2fdd850fd9705d57ccdbe9a1a861fd2.out → ...ing__b2fdd850fd9705d57ccdbe9a1a861fd2.out b/...ing__b2fdd850fd9705d57ccdbe9a1a861fd2.out → ...ing__b2fdd850fd9705d57ccdbe9a1a861fd2.out
diff --git a/...ing__b9312a74ea0748c77c0ca3a03683fb6b.out → ...ing__b9312a74ea0748c77c0ca3a03683fb6b.out b/...ing__b9312a74ea0748c77c0ca3a03683fb6b.out → ...ing__b9312a74ea0748c77c0ca3a03683fb6b.out
diff --git a/...ing__c482816213a76a4e6dbc0fdceb580b1e.out → ...ing__c482816213a76a4e6dbc0fdceb580b1e.out b/...ing__c482816213a76a4e6dbc0fdceb580b1e.out → ...ing__c482816213a76a4e6dbc0fdceb580b1e.out
diff --git a/...ing__c4db415c310852834e0d90a14d7b2faf.out → ...ing__c4db415c310852834e0d90a14d7b2faf.out b/...ing__c4db415c310852834e0d90a14d7b2faf.out → ...ing__c4db415c310852834e0d90a14d7b2faf.out
diff --git a/...ing__d6afb6f35b4789832202c36e63a885ae.out → ...ing__d6afb6f35b4789832202c36e63a885ae.out b/...ing__d6afb6f35b4789832202c36e63a885ae.out → ...ing__d6afb6f35b4789832202c36e63a885ae.out
diff --git a/...ing__da6acbcc490fda791f5146523b511e3d.out → ...ing__da6acbcc490fda791f5146523b511e3d.out b/...ing__da6acbcc490fda791f5146523b511e3d.out → ...ing__da6acbcc490fda791f5146523b511e3d.out
diff --git a/...ing__ee0834771a765984e2f2926ab4ea5528.out → ...ing__ee0834771a765984e2f2926ab4ea5528.out b/...ing__ee0834771a765984e2f2926ab4ea5528.out → ...ing__ee0834771a765984e2f2926ab4ea5528.out
diff --git a/...ing__f1c2d970ef57f8a777751361dcb310f5.out → ...ing__f1c2d970ef57f8a777751361dcb310f5.out b/...ing__f1c2d970ef57f8a777751361dcb310f5.out → ...ing__f1c2d970ef57f8a777751361dcb310f5.out
diff --git a/...ing__f3edab3f4104f842ea85dc14cf58c8bd.out → ...ing__f3edab3f4104f842ea85dc14cf58c8bd.out b/...ing__f3edab3f4104f842ea85dc14cf58c8bd.out → ...ing__f3edab3f4104f842ea85dc14cf58c8bd.out
diff --git a/tests/data/refs/svg_to_simp_ink_script.out → ...efs/simpinkscr.svg_to_simp_ink_script.out b/tests/data/refs/svg_to_simp_ink_script.out → ...efs/simpinkscr.svg_to_simp_ink_script.out
diff --git a/tests/test_simple_inkscape_scripting.py b/tests/test_simple_inkscape_scripting.py
@@ -1,5 +1,5 @@
-from simple_inkscape_scripting import SimpleInkscapeScripting
-from svg_to_simp_ink_script import SvgToPythonScript
+from simpinkscr.simple_inkscape_scripting import SimpleInkscapeScripting
+from simpinkscr.svg_to_simp_ink_script import SvgToPythonScript
 from inkex.tester import ComparisonMixin, InkscapeExtensionTestMixin, TestCase
 from inkex.tester.filters import CompareOrderIndependentStyle