Consolidate and simplify package names

Author: vyasr

tests/packages/importlib_editable/pkg/CMakeLists.txt

@@ -4,5 +4,5 @@ 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/)
 
-add_subdirectory(subpkg1)
-add_subdirectory(subpkg2)
+add_subdirectory(sub_a)
+add_subdirectory(sub_b)

tests/packages/importlib_editable/pkg/__init__.py

@@ -9,26 +9,26 @@
 from . import emod_a
 
 # Level one subpackages
-from . import subpkg1, subpkg2
+from . import sub_a, sub_b
 
 # Level two pure modules
-from .subpkg1 import pmod_b
-from .subpkg2 import pmod_c
+from .sub_a import pmod_b
+from .sub_b import pmod_c
 
 # Level two extension modules
-from .subpkg1 import emod_b
-from .subpkg2 import emod_c
+from .sub_a import emod_b
+from .sub_b import emod_c
 
 # Level two subpackages
-from .subpkg2 import subsubpkg1, subsubpkg2
+from .sub_b import sub_c, sub_d
 
 # Level three pure modules
-from .subpkg2.subsubpkg1 import pmod_d
-from .subpkg2.subsubpkg2 import pmod_e
+from .sub_b.sub_c import pmod_d
+from .sub_b.sub_d import pmod_e
 
 # Level three extension modules
-from .subpkg2.subsubpkg1 import emod_d
-from .subpkg2.subsubpkg2 import emod_e
+from .sub_b.sub_c import emod_d
+from .sub_b.sub_d import emod_e
 
 __all__ = [
     "emod_a",
@@ -41,8 +41,8 @@
     "pmod_c",
     "pmod_d",
     "pmod_e",
-    "subpkg1",
-    "subpkg2",
-    "subsubpkg1",
-    "subsubpkg2",
+    "sub_a",
+    "sub_b",
+    "sub_c",
+    "sub_d",
 ]

tests/packages/importlib_editable/pkg/subpkg1/CMakeLists.txt renamed to tests/packages/importlib_editable/pkg/sub_a/CMakeLists.txt

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

tests/packages/importlib_editable/pkg/subpkg1/__init__.py renamed to tests/packages/importlib_editable/pkg/sub_a/__init__.py

@@ -1,8 +1,8 @@
 python_add_library(emod_c MODULE emod_c.c WITH_SOABI)
 
-install(TARGETS emod_c DESTINATION pkg/subpkg2)
+install(TARGETS emod_c DESTINATION pkg/sub_b)
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/testfile" "This is the file")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/testfile" DESTINATION pkg/subpkg2)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/testfile" DESTINATION pkg/sub_b)
 
-add_subdirectory(subsubpkg1)
-add_subdirectory(subsubpkg2)
+add_subdirectory(sub_c)
+add_subdirectory(sub_d)

tests/packages/importlib_editable/pkg/subpkg1/emod_b.c renamed to tests/packages/importlib_editable/pkg/sub_a/emod_b.c

@@ -9,15 +9,15 @@
 from . import emod_c
 
 # Level one subpackages
-from . import subsubpkg1, subsubpkg2
+from . import sub_c, sub_d
 
 # Level two pure modules
-from .subsubpkg1 import pmod_d
-from .subsubpkg2 import pmod_e
+from .sub_c import pmod_d
+from .sub_d import pmod_e
 
 # Level two extension modules
-from .subsubpkg1 import emod_d
-from .subsubpkg2 import emod_e
+from .sub_c import emod_d
+from .sub_d import emod_e
 
 __all__ = [
     "emod_c",
@@ -26,6 +26,6 @@
     "pmod_c",
     "pmod_d",
     "pmod_e",
-    "subsubpkg1",
-    "subsubpkg2",
+    "sub_c",
+    "sub_d",
 ]

tests/packages/importlib_editable/pkg/subpkg1/emod_b.pyi renamed to tests/packages/importlib_editable/pkg/sub_a/emod_b.pyi

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

tests/packages/importlib_editable/pkg/subpkg1/pmod_b.py renamed to tests/packages/importlib_editable/pkg/sub_a/pmod_b.py

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