Skip to content

Commit bd87901

Browse files
authored
Merge branch 'main' into copilot/add-additional-parameter-inputs
2 parents c4ab4ce + 46db245 commit bd87901

File tree

143 files changed

+2589
-1336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+2589
-1336
lines changed

.github/workflows/docs.yml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,32 @@
11
name: docs
2-
32
on:
43
push:
54
branches:
65
- main
7-
tags:
8-
- "v*"
9-
pull_request:
10-
branches:
11-
- main
12-
6+
permissions:
7+
contents: write
138
jobs:
14-
docs:
9+
deploy:
1510
runs-on: ubuntu-latest
1611
steps:
17-
- uses: compas-dev/compas-actions.docs@v4
12+
- uses: actions/checkout@v4
13+
- name: Configure Git Credentials
14+
run: |
15+
git config user.name github-actions[bot]
16+
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
17+
- uses: actions/setup-python@v5
18+
with:
19+
python-version: 3.x
20+
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
21+
- uses: actions/cache@v4
1822
with:
19-
github_token: ${{ secrets.GITHUB_TOKEN }}
20-
use_conda: true
21-
doc_url: https://compas.dev/compas_cgal/
23+
key: mkdocs-material-${{ env.cache_id }}
24+
path: ~/.cache
25+
restore-keys: |
26+
mkdocs-material-
27+
- run: pip install .
28+
- run: pip install -r requirements.txt
29+
- run: pip install -r requirements-dev.txt
30+
- run: pip install -r requirements-docs.txt
31+
- run: pip install mkdocs-material
32+
- run: mkdocs gh-deploy --force

.gitignore

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,12 @@ coverage.xml
8888
.ruff_cache/
8989
.mypy_cache/
9090

91+
# ==============================================================================
92+
# COMPAS
93+
# ==============================================================================
94+
9195
# Documentation
92-
docs/_build/
9396
/site
94-
generated/
95-
docs/api/**
96-
!docs/api/*.rst
97-
!docs/api/*.py
9897

9998
# COMPAS CGAL specific
10099
*.3dmbak

CHANGELOG.md

Lines changed: 9 additions & 1 deletion

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,5 +236,6 @@ add_nanobind_module(_slicer src/slicer.cpp)
236236
add_nanobind_module(_straight_skeleton_2 src/straight_skeleton_2.cpp)
237237
add_nanobind_module(_triangulation src/triangulation.cpp)
238238
add_nanobind_module(_subdivision src/subdivision.cpp)
239+
add_nanobind_module(_polylines src/polylines.cpp)
239240

240-
241+
add_nanobind_module(_geodesics src/geodesics.cpp)

docs/_static/PLACEHOLDER

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/acknowledgements.md

Lines changed: 1 addition & 0 deletions

docs/acknowledgements.rst

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/api.rst

Lines changed: 0 additions & 18 deletions
This file was deleted.

docs/api/compas_cgal.booleans.md

Lines changed: 1 addition & 0 deletions

docs/api/compas_cgal.booleans.rst

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)