adjust import paths and fix entrypoint in pyproject.toml

CadQuery · Oct 25, 2023 · 5c76236 · 5c76236
1 parent 87e604e
commit 5c76236
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ dependencies = [
 ]
 
 [project.scripts]
-cq-cli = "cq_cli:main"
+cq-cli = "cq_cli.cq_cli:main"
 
 [project.optional-dependencies]
 dev = [
@@ -38,4 +38,4 @@ dev = [
 allow-direct-references = true
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/cq_cli/cqcodecs"]
+packages = ["src/cq_cli"]
diff --git a/src/cq_cli/cqcodecs/cq_codec_gltf.py b/src/cq_cli/cqcodecs/cq_codec_gltf.py
@@ -1,7 +1,7 @@
 import os, tempfile
 from cadquery import exporters
 import cadquery as cq
-import cqcodecs.codec_helpers as helpers
+import cq_cli.cqcodecs.codec_helpers as helpers
 
 
 def convert(build_result, output_file=None, error_file=None, output_opts=None):

diff --git a/src/cq_cli/cqcodecs/cq_codec_step.py b/src/cq_cli/cqcodecs/cq_codec_step.py
@@ -1,7 +1,7 @@
 import os, tempfile
 from cadquery import exporters
 import cadquery as cq
-import cqcodecs.codec_helpers as helpers
+import cq_cli.cqcodecs.codec_helpers as helpers
 
 
 def convert(build_result, output_file=None, error_file=None, output_opts=None):

diff --git a/src/cq_cli/cqcodecs/cq_codec_stl.py b/src/cq_cli/cqcodecs/cq_codec_stl.py
@@ -1,7 +1,7 @@
 import os, tempfile
 from cadquery import exporters
 import cadquery as cq
-import cqcodecs.codec_helpers as helpers
+import cq_cli.cqcodecs.codec_helpers as helpers
 
 
 def convert(build_result, output_file=None, error_file=None, output_opts=None):

diff --git a/src/cq_cli/cqcodecs/cq_codec_svg.py b/src/cq_cli/cqcodecs/cq_codec_svg.py
@@ -1,7 +1,7 @@
 import os, tempfile
 from cadquery import exporters
 import cadquery as cq
-import cqcodecs.codec_helpers as helpers
+import cq_cli.cqcodecs.codec_helpers as helpers
 
 
 def convert(build_result, output_file=None, error_file=None, output_opts=None):

diff --git a/src/cq_cli/cqcodecs/cq_codec_threejs.py b/src/cq_cli/cqcodecs/cq_codec_threejs.py
@@ -1,7 +1,7 @@
 import os, tempfile
 from cadquery import exporters
 import cadquery as cq
-import cqcodecs.codec_helpers as helpers
+import cq_cli.cqcodecs.codec_helpers as helpers
 
 
 def convert(build_result, output_file=None, error_file=None, output_opts=None):

diff --git a/src/cq_cli/cqcodecs/loader.py b/src/cq_cli/cqcodecs/loader.py
@@ -9,6 +9,6 @@ def load_codecs():
     # Search all of the modules in the current directory to find codecs
     for finder, name, ispkg in pkgutil.iter_modules([os.path.dirname(__file__)]):
         if name.startswith("cq_codec_"):
-            cq_codecs[name] = importlib.import_module("cqcodecs." + name)
+            cq_codecs[name] = importlib.import_module("cq_cli.cqcodecs." + name)
 
     return cq_codecs