Rename gpx python module to avoid collisions

in preparation to allow wheel installation of the binary extension to possibly allow install without python-dev in the future
markwal · May 10, 2020 · 415e9eb · 415e9eb
1 parent 834948e
commit 415e9eb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/GPX b/GPX
diff --git a/octoprint_GPX/__init__.py b/octoprint_GPX/__init__.py
@@ -14,7 +14,7 @@
 from octoprint.server import admin_permission
 
 try:
-	import gpx
+	import gcodex3g as gpx
 except:
 	pass
 

diff --git a/octoprint_GPX/gpxprinter.py b/octoprint_GPX/gpxprinter.py
@@ -17,7 +17,7 @@
 
 gpx = False
 try:
-	import gpx
+	import gcodex3g as gpx
 except:
 	pass
 

diff --git a/setup.py b/setup.py
@@ -92,7 +92,7 @@ def params():
 	}
 
 	ext_modules = [
-		setuptools.Extension('gpx',
+		setuptools.Extension('gcodex3g',
 		sources = plugin_ext_sources,
 		extra_compile_args = ['-DGPX_VERSION="\\"OctoPrint\\""', '-DSERIAL_SUPPORT', '-fvisibility=hidden', '-IGPX/build/src/shared', '-IGPX/src/shared', '-IGPX/src/gpx'],
 		extra_link_args = ['-fvisibility=hidden'])
+8 −4		src/gpx/gpx.c
+1 −1		src/gpx/gpx.h
+1 −1		src/pymodule/Readme.md
+6 −6		src/pymodule/gpxmodule.c
+5 −3		src/pymodule/setup.py
+2 −2		src/pymodule/test.py
+1 −1		src/pymodule/test2.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     from octoprint.server import admin_permission
     try:
-    	import gpx
+    	import gcodex3g as gpx
     except:
     	pass
@@ Expand Down @@