Skip to content

Patch: CI + gh fixes #148

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Patch: CI + gh fixes #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
837f15f
DUMMY: first pr commit
9and3 Apr 9, 2025
0c52efd
FIX-WIP: testing new actions versions
9and3 Apr 9, 2025
a462562
FIX: for #147
9and3 Apr 9, 2025
ab2e899
WIP: testing CI, working lcoal patch cmake ctest
9and3 Apr 10, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/doc-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
conda env create -f environment.yml

- name: Cache conda environment cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: C:\Miniconda\envs\diff_check
key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }}
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
python-version: 3.9.1

- name: Restore conda environment cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: C:\Miniconda\envs\diff_check
key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/py-sanity-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
auto-update-conda: true
python-version: 3.9.1
- name: Cache conda environment cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: C:\Miniconda\envs\diff_check
key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }}
Expand All @@ -32,7 +32,7 @@ jobs:
conda env create -f environment.yml

- name: Cache pre-commit hooks
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.cache/pre-commit
key: ${{ runner.os }}-precommit-${{ hashFiles('.pre-commit-config.yaml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pass.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ jobs:

- name: Run tests with cmake
run: |
conda run --name diff_check ctest --test-dir build --output-on-failure -C Release --verbose
conda run --name diff_check ctest --test-dir build --output-on-failure -C Release --verbose
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<a href="https://doi.org/10.5281/zenodo.13843959"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.13843959.svg" alt="DOI"></a>
</p>


![demo](https://github.com/user-attachments/assets/3c9f353d-7707-4630-aa6d-fe59cbdeae2f)

# DiffCheck: CAD-Scan comparison
Expand Down
8 changes: 4 additions & 4 deletions cmake/tests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ add_custom_command(TARGET ${PYBINDMODULE_NAME} POST_BUILD
copy_dlls(${TARGET_PYBIND_TESTS_DIR} ${PYBINDMODULE_NAME})

add_test(NAME PYBIND_PYVER_TEST
COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_pyver.py
COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_pyver.py
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
add_test(NAME PYBIND_DLL_SMOKE_TEST
COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_dll_smoke.py
COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_dll_smoke.py
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
add_test(NAME PYBIND_UNIT_TEST
COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_units.py
COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_units.py
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)

# ------------------------------------------------------------------------------
# Run all tests
# ------------------------------------------------------------------------------
# FIXME: the post build has some problems if the tests are failing MSB3073
# FIXME: the post build has some problems if the tests are failing MSB3073, it means only the python tests are failing.
if (RUN_TESTS)
add_custom_command(
TARGET ${CPP_UNIT_TESTS} POST_BUILD #TODO: <== this should be set to the latest test suite
Expand Down
2 changes: 1 addition & 1 deletion deps/eigen
Open in desktop
Submodule eigen updated from 8b4efc to 11fd34
2 changes: 1 addition & 1 deletion deps/pybind11
Open in desktop
Submodule pybind11 updated 164 files
1 change: 1 addition & 0 deletions doc/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The software is designed to be user-friendly and can be used either via a Grassh

The software is developed by the `Laboratory of Timber Construction (IBOIS)`_ and the `Laboratory for Creative Computation (CRCL)`_ at `Polytechnique Fédérale de Lausanne (EPFL)`_.


.. raw:: html

<div style="text-align: center;">
Expand Down
2 changes: 1 addition & 1 deletion src/gh/components/DF_cloud_normal_estimator/code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ def RunScript(self,

o_cloud = df_cvt_bindings.cvt_dfcloud_2_rhcloud(df_cloud)

return o_cloud
return [o_cloud]
12 changes: 10 additions & 2 deletions src/gh/diffCheck/diffCheck.egg-info/PKG-INFO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Metadata-Version: 2.4
Name: diffCheck
Version: 0.0.37
Version: 1.3.0
Summary: DiffCheck is a package to check the differences between two timber structures
Home-page: https://github.com/diffCheckOrg/diffCheck
Author: Andrea Settimi, Damien Gilliard, Eleni Skevaki, Marirena Kladeftira, Julien Gamerro, Stefana Parascho, and Yves Weinand
Expand All @@ -11,6 +11,14 @@ Classifier: Programming Language :: Python :: 3.9
Description-Content-Type: text/markdown
Requires-Dist: numpy
Requires-Dist: pybind11>=2.5.0
Dynamic: author
Dynamic: author-email
Dynamic: classifier
Dynamic: description
Dynamic: description-content-type
Dynamic: home-page
Dynamic: requires-dist
Dynamic: summary

# DiffCheck: CAD-Scan comparison

Expand Down
2 changes: 1 addition & 1 deletion src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ diffCheck/df_joint_detector.py
diffCheck/df_transformations.py
diffCheck/df_util.py
diffCheck/df_visualization.py
diffCheck/diffcheck_bindings.cp39-win_amd64.pyd
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small question, could this python 3.12 bump cause problem with the python 3.9 Rhino uses in terms of compatibility ? I suppose not but you know better...

diffCheck/diffcheck_bindings.cp312-win_amd64.pyd
diffCheck.egg-info/PKG-INFO
diffCheck.egg-info/SOURCES.txt
diffCheck.egg-info/dependency_links.txt
Expand Down
3 changes: 3 additions & 0 deletions test_save.ply
View file
Open in desktop
Git LFS file not shown
Loading