Package

.gitea/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
         run: python3 modulus.py configure --target x86_64_gcc12_release --update
       - name: Check code style
         run: |
-          python3 -m pip install --no-cache-dir -r build/build_tools/docker/format-requirements.txt
+          python3 -m pip install --no-cache-dir -r build/build_tools/docker/format_requirements.txt
           python3 modulus.py format --check
       - name: Build native release
         run: python3 modulus.py build --target x86_64_gcc12_release

CMakeLists.txt

@@ -41,7 +41,7 @@ if(BUILD_TESTING)
 endif()
 
 install(TARGETS ligo
-  EXPORT ligo-targets
+  EXPORT ligo_targets
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -49,25 +49,25 @@ install(TARGETS ligo
 
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-install(EXPORT ligo-targets
+install(EXPORT ligo_targets
   NAMESPACE ligo::
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ligo
 )
 
 configure_package_config_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ligo_config.cmake.in
-  ${CMAKE_CURRENT_BINARY_DIR}/ligo-config.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/ligoConfig.cmake
   INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ligo
 )
 
 write_basic_package_version_file(
-  ${CMAKE_CURRENT_BINARY_DIR}/ligo-config-version.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/ligoConfigVersion.cmake
   VERSION ${PROJECT_VERSION}
   COMPATIBILITY SameMajorVersion
 )
 
 install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/ligo-config.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/ligo-config-version.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/ligoConfig.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/ligoConfigVersion.cmake
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ligo
 )

cmake/ligo_config.cmake.in

@@ -3,4 +3,4 @@
 include(CMakeFindDependencyMacro)
 find_dependency(modulus CONFIG REQUIRED COMPONENTS boost_json openssl)
 
-include("${CMAKE_CURRENT_LIST_DIR}/ligo-targets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/ligo_targets.cmake")

modulus.py

@@ -9,7 +9,7 @@ import sys
 
 PACKAGE_REF = "modulus/latest"
 CONAN_VERSION = "2.26.2"
-FETCH_IMAGE = "modulus-fetch:dev"
+FETCH_IMAGE = "modulus_fetch:dev"
 COMMANDS = (
   "configure",
   "build",
@@ -19,6 +19,8 @@ COMMANDS = (
   "clangd",
   "format",
   "run",
+  "python",
+  "publish",
 )
 COMMON_DIR = pathlib.Path("build") / "build_common"
 TOOLS_DIR = pathlib.Path("build") / "build_tools"
@@ -26,7 +28,7 @@ RUNTIME_DIR = COMMON_DIR / "modulus"
 CONAN_HOME_DIR = COMMON_DIR / "conan_cache"
 DEFAULT_REMOTE_NAME = "khodo"
 DEFAULT_REMOTE_URL = "https://git.thyme-labs.com/api/packages/khodo/conan"
-DEFAULT_DOCKER_MARKER = "/opt/modulus-build-image"
+DEFAULT_DOCKER_MARKER = "/opt/modulus_build_image"
 
 def repo_root():
   root = pathlib.Path(__file__).resolve().parent
@@ -66,6 +68,9 @@ def runtime_ready(root):
     and (root / TOOLS_DIR / "format.py").is_file()
     and (root / RUNTIME_DIR / "modulus" / "formatting.py").is_file()
     and (root / RUNTIME_DIR / "modulus" / "format_layout.py").is_file()
+    and (root / RUNTIME_DIR / "modulus" / "python.py").is_file()
+    and (root / RUNTIME_DIR / "modulus" / "artifacts.py").is_file()
+    and (root / TOOLS_DIR / "python_runner.py").is_file()
   )
 
 def env_flag(name):
@@ -114,9 +119,9 @@ RUN apt-get update \\
     python3-venv \\
   && rm -rf /var/lib/apt/lists/*
 
-RUN python3 -m venv /opt/modulus-python
+RUN python3 -m venv /opt/modulus_python
 
-ENV PATH=/opt/modulus-python/bin:$PATH
+ENV PATH=/opt/modulus_python/bin:$PATH
 
 RUN python -m pip install --no-cache-dir conan=={CONAN_VERSION}
 

tests/CMakeLists.txt

@@ -1,20 +1,20 @@
-add_executable(ligo-test
+add_executable(ligo_test
   test.cpp
 )
 find_package(Threads REQUIRED)
-target_include_directories(ligo-test PRIVATE
+target_include_directories(ligo_test PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
-target_link_libraries(ligo-test PRIVATE
+target_link_libraries(ligo_test PRIVATE
   ligo::ligo
   Threads::Threads
 )
-target_compile_features(ligo-test PRIVATE cxx_std_23)
-target_compile_definitions(ligo-test PRIVATE
+target_compile_features(ligo_test PRIVATE cxx_std_23)
+target_compile_definitions(ligo_test PRIVATE
   $<$<CONFIG:Debug>:LIGO_EXPECT_DEBUG_ASSERTS>
   $<$<NOT:$<CONFIG:Debug>>:LIGO_EXPECT_NDEBUG>
 )
-add_test(NAME ligo COMMAND ligo-test)
+add_test(NAME ligo COMMAND ligo_test)
 set_tests_properties(ligo PROPERTIES TIMEOUT 60)
 add_custom_target(check
   COMMAND ${CMAKE_CTEST_COMMAND}