Reorganize source tree

Signed-off-by: eric <[email protected]>

Author: e117649

.github/actions/run-test/action.yml

@@ -23,15 +23,15 @@ runs:
     - name: Run Unittests
       shell: bash
       run: |
-        python -m unittest discover -v tests
+        PYTHONPATH=src python -m unittest discover -v tests
 
     - name: Run Examples
       shell: bash
       run: |
         uv pip install --system -r examples/applications/requirements_applications.txt
         for example in "./examples"/*.py; do
           echo "Running $example"
-          PYTHONPATH=. python $example
+          PYTHONPATH=src python $example
         done
         for example in "./examples/applications"/*.py; do
           if python -c 'import sys; sys.exit(not sys.version_info <= (3, 10))'; then
@@ -42,5 +42,5 @@ runs:
           fi
 
           echo "Running $example"
-          PYTHONPATH=. python $example
+          PYTHONPATH=src python $example
         done

CMakeLists.txt

@@ -13,7 +13,7 @@ if(NOT SKBUILD_PROJECT_NAME)
 endif()
 
 # Path to the version file
-set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/scaler/version.txt")
+set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/src/scaler/version.txt")
 
 # Check if the version file exists
 if(NOT EXISTS "${VERSION_FILE}")
@@ -118,8 +118,10 @@ message(STATUS "Python ABI: ${Python3_SOABI}")
 # Make LSP happy
 include_directories(${CAPNP_INCLUDE_DIRS})
 include_directories(${PROJECT_SOURCE_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/src)
+include_directories(${PROJECT_SOURCE_DIR}/src/cpp)
 
-add_subdirectory(scaler)
+add_subdirectory(src/cpp/scaler)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_subdirectory(tests)

docs/source/conf.py

@@ -13,15 +13,15 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.abspath(os.path.join("..", "..")))
+sys.path.insert(0, os.path.abspath(os.path.join("..", "..", "src")))
 
 
 # -- Project information -----------------------------------------------------
 
 project = "OpenGRIS Scaler"
 author = "Citi"
 
-with open("../../scaler/version.txt", "rt") as f:
+with open("../../src/scaler/version.txt", "rt") as f:
     version = f.read().strip()
 
 release = f"{version}-py3-none-any"

pyproject.toml

@@ -65,7 +65,13 @@ dev = [
 [tool.scikit-build.metadata.version]
 provider = "scikit_build_core.metadata.regex"
 regex = '(?P<value>\d+\.\d+\.\d+(\.[1-9]\d*)?)'
-input = "./scaler/version.txt"
+input = "./src/scaler/version.txt"
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
 
 [project.urls]
 Home = "https://github.com/Citi/scaler"
@@ -81,7 +87,7 @@ scaler_worker_adapter_symphony = "scaler.entry_points.worker_adapter_symphony:ma
 
 [tool.scikit-build]
 cmake.source-dir = "."
-wheel.packages = ["scaler"]
+wheel.packages = ["src/scaler"]
 build.targets = ["py_ymq", "py_object_storage_server"]
 
 [tool.scikit-build.cmake.define]

scripts/build.sh

@@ -12,8 +12,8 @@ BUILD_DIR="build_${OS}_${ARCH}"
 BUILD_PRESET="${OS}-${ARCH}"
 
 rm -rf $BUILD_DIR
-rm -f scaler/protocol/capnp/*.c++
-rm -f scaler/protocol/capnp/*.h
+rm -f src/scaler/protocol/capnp/*.c++
+rm -f src/scaler/protocol/capnp/*.h
 echo "Build directory: $BUILD_DIR"
 echo "Build preset: $BUILD_PRESET"
 

scaler/CMakeLists.txt renamed to src/cpp/scaler/CMakeLists.txt

@@ -70,7 +70,10 @@ if(LINUX)
         pymod_ymq/ymq.cpp
     )
 
-    # target_include_directories(py_ymq PRIVATE ${Python3_INCLUDE_DIRS})
+    target_include_directories(py_ymq PRIVATE
+        ${PROJECT_SOURCE_DIR}/src/cpp
+    )
+
     target_link_libraries(py_ymq PRIVATE
         $<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,-Bstatic> ymq_objs
         $<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,-Bdynamic>
@@ -83,6 +86,14 @@ if(LINUX)
         LINKER_LANGUAGE CXX
     )
 
+    # Copy .so file to source directory for development/testing
+    add_custom_command(TARGET py_ymq POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+            $<TARGET_FILE:py_ymq>
+            ${PROJECT_SOURCE_DIR}/src/scaler/io/ymq/_ymq${CMAKE_SHARED_LIBRARY_SUFFIX}
+        COMMENT "Copying _ymq.so to source directory for development"
+    )
+
     install(
         TARGETS py_ymq
         LIBRARY DESTINATION scaler/io/ymq