Skip to content

Commit 5cacef1

Browse files
committed
Merge branch 'main' into IO
2 parents aeecaa2 + 5559ade commit 5cacef1

File tree

10 files changed

+25
-12
lines changed

10 files changed

+25
-12
lines changed

.github/workflows/doc-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
conda env create -f environment.yml
2727
2828
- name: Cache conda environment cache
29-
uses: actions/cache@v2
29+
uses: actions/cache@v4
3030
with:
3131
path: C:\Miniconda\envs\diff_check
3232
key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }}
@@ -73,7 +73,7 @@ jobs:
7373
python-version: 3.9.1
7474

7575
- name: Restore conda environment cache
76-
uses: actions/cache@v2
76+
uses: actions/cache@v4
7777
with:
7878
path: C:\Miniconda\envs\diff_check
7979
key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }}

.github/workflows/py-sanity-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
auto-update-conda: true
2020
python-version: 3.9.1
2121
- name: Cache conda environment cache
22-
uses: actions/cache@v2
22+
uses: actions/cache@v4
2323
with:
2424
path: C:\Miniconda\envs\diff_check
2525
key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }}
@@ -32,7 +32,7 @@ jobs:
3232
conda env create -f environment.yml
3333
3434
- name: Cache pre-commit hooks
35-
uses: actions/cache@v2
35+
uses: actions/cache@v4
3636
with:
3737
path: ~/.cache/pre-commit
3838
key: ${{ runner.os }}-precommit-${{ hashFiles('.pre-commit-config.yaml') }}

.github/workflows/test-pass.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ jobs:
5555
5656
- name: Run tests with cmake
5757
run: |
58-
conda run --name diff_check ctest --test-dir build --output-on-failure -C Release --verbose
58+
conda run --name diff_check ctest --test-dir build --output-on-failure -C Release --verbose

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<a href="https://doi.org/10.5281/zenodo.13843959"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.13843959.svg" alt="DOI"></a>
1414
</p>
1515

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

1819
# DiffCheck: CAD-Scan comparison

cmake/tests.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ add_custom_command(TARGET ${PYBINDMODULE_NAME} POST_BUILD
3939
copy_dlls(${TARGET_PYBIND_TESTS_DIR} ${PYBINDMODULE_NAME})
4040

4141
add_test(NAME PYBIND_PYVER_TEST
42-
COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_pyver.py
42+
COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_pyver.py
4343
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
4444
)
4545
add_test(NAME PYBIND_DLL_SMOKE_TEST
46-
COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_dll_smoke.py
46+
COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_dll_smoke.py
4747
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
4848
)
4949
add_test(NAME PYBIND_UNIT_TEST
50-
COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_units.py
50+
COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_units.py
5151
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
5252
)
5353

5454
# ------------------------------------------------------------------------------
5555
# Run all tests
5656
# ------------------------------------------------------------------------------
57-
# FIXME: the post build has some problems if the tests are failing MSB3073
57+
# FIXME: the post build has some problems if the tests are failing MSB3073, it means only the python tests are failing.
5858
if (RUN_TESTS)
5959
add_custom_command(
6060
TARGET ${CPP_UNIT_TESTS} POST_BUILD #TODO: <== this should be set to the latest test suite

doc/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The software is designed to be user-friendly and can be used either via a Grassh
99

1010
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)`_.
1111

12+
1213
.. raw:: html
1314

1415
<div style="text-align: center;">

src/gh/components/DF_cloud_normal_estimator/code.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ def RunScript(self,
3232

3333
o_cloud = df_cvt_bindings.cvt_dfcloud_2_rhcloud(df_cloud)
3434

35-
return o_cloud
35+
return [o_cloud]

src/gh/diffCheck/diffCheck.egg-info/PKG-INFO

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Metadata-Version: 2.1
1+
Metadata-Version: 2.4
22
Name: diffCheck
33
Version: 1.3.0
44
Summary: DiffCheck is a package to check the differences between two timber structures
@@ -11,6 +11,14 @@ Classifier: Programming Language :: Python :: 3.9
1111
Description-Content-Type: text/markdown
1212
Requires-Dist: numpy
1313
Requires-Dist: pybind11>=2.5.0
14+
Dynamic: author
15+
Dynamic: author-email
16+
Dynamic: classifier
17+
Dynamic: description
18+
Dynamic: description-content-type
19+
Dynamic: home-page
20+
Dynamic: requires-dist
21+
Dynamic: summary
1422

1523
# DiffCheck: CAD-Scan comparison
1624

src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ diffCheck/df_joint_detector.py
99
diffCheck/df_transformations.py
1010
diffCheck/df_util.py
1111
diffCheck/df_visualization.py
12-
diffCheck/diffcheck_bindings.cp39-win_amd64.pyd
12+
diffCheck/diffcheck_bindings.cp312-win_amd64.pyd
1313
diffCheck.egg-info/PKG-INFO
1414
diffCheck.egg-info/SOURCES.txt
1515
diffCheck.egg-info/dependency_links.txt

test_save.ply

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:7e20354a8b0681cc343a87c7a98ff9e5e9400fb558f88f2e21c7fb1fc7e8bb24
3+
size 376593

0 commit comments

Comments
 (0)