Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/cli #572

Open
wants to merge 22 commits into
base: alpha-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,13 @@ jobs:

- name: Install Helios
run: |
python -m pip install -v .
python -m pip install --no-build-isolation --config-settings=cmake.build-type="Debug" --config-settings=build-dir="build" -v .
env:
SETUPTOOLS_SCM_SUBPROCESS_TIMEOUT: "120"

- name: Run C++ test suite
run: |
./build/src/test/helios_test

# Do not run on MacOS for now - we do not yet officially support it and we need to invest a bit
# more efforts into investigating broken LAZ files written by Helios on MacOS.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Run C++ test suite
run: |
helios --test
./build/src/test/helios_test

- name: Run PyTest test suite
run: |
Expand Down
14 changes: 0 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,6 @@ if(HELIOS_BUDDING_METRICS)
target_compile_definitions(helios PUBLIC BUDDING_METRICS=ON)
endif()

# # Add the HelIOS++ executable
add_executable(helios++)

target_link_libraries(helios++ PRIVATE helios)

if(BUILD_PYTHON)
include_directories(${Python_INCLUDE_DIRS})
include_directories(${CMAKE_SOURCE_DIR}/src/python)
Expand All @@ -159,14 +154,5 @@ if(BUILD_DOCS)
add_subdirectory(doc)
endif()

# Add installation rules for the Helios++ executable and Python bindings library

# Define an installation rule that copies the executable to our Python package
install(
TARGETS
helios++
DESTINATION helios/bin
)

include(FeatureSummary)
feature_summary(WHAT ALL)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ classifiers = [
]

[project.scripts]
helios = "helios.__main__:helios_entrypoint"
helios = "helios.__main__:cli"

[tool.scikit-build]
metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
Expand Down
4 changes: 2 additions & 2 deletions python/helios/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
del metadata

from helios.leg import Leg
from helios.platform import Platform, PlatformSettings
from helios.platforms import Platform, PlatformSettings
from helios.scanner import Scanner, ScannerSettings
from helios.scene import StaticScene, ScenePart
from helios.settings import (
Expand All @@ -17,5 +17,5 @@
set_output_settings,
)
from helios.survey import Survey
from helios.util import add_asset_directory, combine_parameters
from helios.utils import add_asset_directory, combine_parameters
from helios.validation import units
Loading
Loading