Differentiate module and package names

Author: vyasr

tests/packages/importlib_editable/pkg/CMakeLists.txt

@@ -1,6 +1,6 @@
-python_add_library(pkg MODULE pkg.c WITH_SOABI)
+python_add_library(emod_a MODULE emod_a.c WITH_SOABI)
 
-install(TARGETS pkg DESTINATION pkg/)
+install(TARGETS emod_a DESTINATION pkg/)
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/testfile" "This is the file")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/testfile" DESTINATION pkg/)
 

tests/packages/importlib_editable/pkg/__init__.py

@@ -1,3 +1,3 @@
-from . import pkg, pure, subpkg1, subpkg2
+from . import emod_a, pmod_a, subpkg1, subpkg2
 
-__all__ = ["pure", "pkg", "subpkg1", "subpkg2"]
+__all__ = ["emod_a", "pmod_a", "subpkg1", "subpkg2"]

tests/packages/importlib_editable/pkg/pkg.c renamed to tests/packages/importlib_editable/pkg/emod_a.c

@@ -12,14 +12,14 @@ static PyObject *square_wrapper(PyObject *self, PyObject *args) {
   return PyFloat_FromDouble(result);
 }
 
-static PyMethodDef pkg_methods[] = {
+static PyMethodDef emod_a_methods[] = {
     {"square", square_wrapper, METH_VARARGS, "Square function"},
     {NULL, NULL, 0, NULL}};
 
-static struct PyModuleDef pkg_module = {PyModuleDef_HEAD_INIT, "pkg",
-                                             NULL, -1, pkg_methods};
+static struct PyModuleDef emod_a_module = {PyModuleDef_HEAD_INIT, "emod_a",
+                                             NULL, -1, emod_a_methods};
 
 /* name here must match extension name, with PyInit_ prefix */
-PyMODINIT_FUNC PyInit_pkg(void) {
-  return PyModule_Create(&pkg_module);
+PyMODINIT_FUNC PyInit_emod_a(void) {
+  return PyModule_Create(&emod_a_module);
 }

tests/packages/importlib_editable/pkg/pkg.pyi renamed to tests/packages/importlib_editable/pkg/emod_a.pyi

@@ -1,5 +1,5 @@
-python_add_library(subpkg1 MODULE subpkg1.c WITH_SOABI)
+python_add_library(emod_b MODULE emod_b.c WITH_SOABI)
 
-install(TARGETS subpkg1 DESTINATION pkg/subpkg1)
+install(TARGETS emod_b DESTINATION pkg/subpkg1)
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/testfile" "This is the file")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/testfile" DESTINATION pkg/subpkg1)

tests/packages/importlib_editable/pkg/pure.py renamed to tests/packages/importlib_editable/pkg/pmod_a.py

@@ -1,3 +1,3 @@
-from . import pure, subpkg1
+from . import emod_b, pmod_b
 
-__all__ = ["pure", "subpkg1"]
+__all__ = ["emod_b", "pmod_b"]

tests/packages/importlib_editable/pkg/subpkg1/CMakeLists.txt

@@ -12,14 +12,14 @@ static PyObject *square_wrapper(PyObject *self, PyObject *args) {
   return PyFloat_FromDouble(result);
 }
 
-static PyMethodDef subpkg1_methods[] = {
+static PyMethodDef emod_b_methods[] = {
     {"square", square_wrapper, METH_VARARGS, "Square function"},
     {NULL, NULL, 0, NULL}};
 
-static struct PyModuleDef subpkg1_module = {PyModuleDef_HEAD_INIT, "subpkg1",
-                                             NULL, -1, subpkg1_methods};
+static struct PyModuleDef emod_b_module = {PyModuleDef_HEAD_INIT, "emod_b",
+                                             NULL, -1, emod_b_methods};
 
 /* name here must match extension name, with PyInit_ prefix */
-PyMODINIT_FUNC PyInit_subpkg1(void) {
-  return PyModule_Create(&subpkg1_module);
+PyMODINIT_FUNC PyInit_emod_b(void) {
+  return PyModule_Create(&emod_b_module);
 }