Skip to content

Commit

Permalink
update to latest compas
Browse files Browse the repository at this point in the history
  • Loading branch information
tomvanmele committed Nov 17, 2023
1 parent 0168bce commit 39d4949
Show file tree
Hide file tree
Showing 79 changed files with 782 additions and 780 deletions.
31 changes: 12 additions & 19 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,19 @@ current_version = 0.1.0
message = Bump version to {new_version}
commit = True
tag = True
parse = ^
(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
(?:
(?P<release>rc)
(?:(?P<rc>\d+(?:\.\d+)*))?
)?
serialize =
{major}.{minor}.{patch}{release}{rc}
{major}.{minor}.{patch}

[bumpversion:part:release]
optional_value = final
values =
rc
final

[bumpversion:file:setup.py]
search = version='{current_version}'
replace = version='{new_version}'
search = version="{current_version}"
replace = version="{new_version}"

[bumpversion:file:docs/conf.py]
search = release = "{current_version}"
replace = release = "{new_version}"

[bumpversion:file:src/compas_libigl/__init__.py]
search = __version__ = '{current_version}'
replace = __version__ = '{new_version}'
search = __version__ = "{current_version}"
replace = __version__ = "{new_version}"

[bumpversion:file:CHANGELOG.md]
search = Unreleased
replace = [{new_version}] {now:%Y-%m-%d}
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ end_of_line = crlf
[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2

[Makefile]
indent_style = tab
indent_size = 4
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ defaults:
run:
shell: powershell


jobs:
build-packages:
runs-on: ${{ matrix.os }}
Expand All @@ -21,7 +20,6 @@ jobs:
os: [macos-latest, windows-latest]

steps:

- uses: actions/checkout@v2
with:
submodules: recursive
Expand All @@ -35,7 +33,7 @@ jobs:

- name: build
run: |
conda install git cmake">=3.14" boost eigen COMPAS --yes
conda install git cmake">=3.14" boost eigen=3.3 COMPAS --yes
pip install -r requirements-dev.txt
- name: Lint with flake8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
tags:
- 'v*'
- "v*"
pull_request:
branches:
- main
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
tags:
- 'v*'
- "v*"

jobs:
Release:
Expand All @@ -21,15 +21,14 @@ jobs:
draft: false
prerelease: false


Publish:
needs: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '3.x'
- uses: compas-dev/[email protected]
with:
token: ${{ secrets.PYPI }}
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.x"
- uses: compas-dev/[email protected]
with:
token: ${{ secrets.PYPI }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,5 @@ build/**
*.so

src/compas-viewers

generated
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Authors

- Tom Van Mele <<[email protected]>> [@brgcode](https://github.com/brgcode)
- Tom Van Mele <<[email protected]>> [@tomvanmele](https://github.com/tomvanmele)
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

### Added

### Changed

### Removed
1 change: 0 additions & 1 deletion DEVGUIDE.md

This file was deleted.

7 changes: 7 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
graft src

prune .github
prune data
prune docs
prune scripts
prune tests
prune temp

include LICENSE
include README.md
include AUTHORS.md
include CHANGELOG.md
include requirements.txt

exclude requirements-dev.txt
exclude pytest.ini .bumpversion.cfg .editorconfig
exclude tasks.py
exclude conftest.py
exclude CONTRIBUTING.md

global-exclude *.py[cod] __pycache__ *.dylib *.nb[ic] .DS_Store
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Many of the functions provided by `compas_libigl` are based on the examples in t
`compas_libigl` can be installed using a combination of conda and pip.

```bash
conda create -n igl python=3.7 git cmake">=3.14" boost eigen COMPAS compas_view2 --yes
conda create -n igl python=3.7 git cmake">=3.14" boost eigen=3.3 COMPAS compas_view2 --yes
conda activate igl
git clone --recursive https://github.com/BlockResearchGroup/compas_libigl.git
cd compas_libigl
Expand Down
Binary file added docs/_images/boundaries.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/curvature.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/geodistance.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/intersections.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/isolines.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/massmatrix.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/parametrisation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/planarize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions docs/_static/compas.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
html[data-theme="light"] {
--pst-color-primary: #0092d2;
--pst-color-info: #0092d2;
--pst-color-text-muted: #888;
}

body {
line-height: 1.75;
font-weight: 300;
}

.bd-article-container h1 {
color: #0092d2;
}

.navbar-brand .logo__image {
height: 36px !important;
}

.bd-header {
box-shadow: none;
border-bottom: 1px solid var(--pst-color-shadow);
}

#rtd-footer-container {
height: 0px;
bottom: 0 !important;
margin: 0 !important;
display: none;
}
Binary file added docs/_static/compas.ico
Binary file not shown.
Binary file added docs/_static/compas_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/compas_icon_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/compas_white.ico
Binary file not shown.
7 changes: 7 additions & 0 deletions docs/_static/versions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"name": "latest",
"version": "unreleased",
"url": "https://compas.dev/compas_libigl/latest/"
}
]
5 changes: 5 additions & 0 deletions docs/_templates/compas-sidebar-footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<div class="sidebar-primary-item">
<a href="https://compas.dev" target="_blank">
COMPAS.dev <i class="fa fa-external-link" aria-hidden="true"></i>
</a>
</div>
11 changes: 11 additions & 0 deletions docs/_templates/navbar-nav.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<nav class="navbar-nav">
<!-- <p class="sidebar-header-items__title"
role="heading"
aria-level="1"
aria-label="{{ _('Site Navigation') }}">
{{ _("Site Navigation") }}
</p>
<ul class="bd-navbar-elements navbar-nav">
{{ generate_header_nav_html(n_links_before_dropdown=theme_header_links_before_dropdown) }}
</ul> -->
</nav>
24 changes: 24 additions & 0 deletions docs/_templates/sbt-sidebar-nav.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<nav class="bd-links" id="bd-docs-nav" aria-label="Main">
<div class="bd-toc-item navbar-nav active">
{% if theme_home_page_in_toc == True %}
{#- This mimicks the pydata theme list style so we can append an extra item at the top #}
<ul class="nav bd-sidenav bd-sidenav__home-link">
<li class="toctree-l1{% if pagename == root_doc %} current active{% endif %}">
<a class="reference internal" href="{{ pathto(root_doc) }}">
{{ root_title }}
</a>
</li>
</ul>
{% endif -%}

{# Ref: https://github.com/pydata/pydata-sphinx-theme/blob/ebf7f704879a1cdc6016d6111062103353ac7677/src/pydata_sphinx_theme/__init__.py#L302 #}
{{- generate_toctree_html(
startdepth=0,
kind="sidebar",
maxdepth=theme_navigation_depth,
collapse=False,
includehidden=True,
titles_only=True,
show_nav_level=1) }}
</div>
</nav>
5 changes: 5 additions & 0 deletions docs/acknowledgements.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
********************************************************************************
Acknowledgements
********************************************************************************

Coming soon!
2 changes: 1 addition & 1 deletion docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ API Reference
********************************************************************************

.. toctree::
:maxdepth: 1
:maxdepth: 2

api/compas_libigl
24 changes: 23 additions & 1 deletion docs/api/compas_libigl.rst
Original file line number Diff line number Diff line change
@@ -1,2 +1,24 @@
********************************************************************************
compas_libigl
********************************************************************************

.. automodule:: compas_libigl
.. currentmodule:: compas_libigl

Functions
=========

.. autosummary::
:toctree: generated/

intersection_ray_mesh
intersection_rays_mesh
trimesh_boundaries
trimesh_gaussian_curvature
trimesh_principal_curvature
trimesh_geodistance
trimesh_isolines
trimesh_massmatrix
trimesh_harmonic
trimesh_lscm
trimesh_remesh_along_isoline
quadmesh_planarize
2 changes: 1 addition & 1 deletion docs/api/generated/compas_libigl.intersection_ray_mesh.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

intersection_ray_mesh
===================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

intersection_rays_mesh
====================================
Expand Down
2 changes: 1 addition & 1 deletion docs/api/generated/compas_libigl.quadmesh_planarize.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

quadmesh_planarize
================================
Expand Down
2 changes: 1 addition & 1 deletion docs/api/generated/compas_libigl.trimesh_boundaries.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_boundaries
================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_gaussian_curvature
========================================
Expand Down
2 changes: 1 addition & 1 deletion docs/api/generated/compas_libigl.trimesh_geodistance.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_geodistance
=================================
Expand Down
2 changes: 1 addition & 1 deletion docs/api/generated/compas_libigl.trimesh_harmonic.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_harmonic
==============================
Expand Down
2 changes: 1 addition & 1 deletion docs/api/generated/compas_libigl.trimesh_isolines.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_isolines
==============================
Expand Down
2 changes: 1 addition & 1 deletion docs/api/generated/compas_libigl.trimesh_lscm.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_lscm
==========================
Expand Down
2 changes: 1 addition & 1 deletion docs/api/generated/compas_libigl.trimesh_massmatrix.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_massmatrix
================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_principal_curvature
=========================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. rst-class:: detail
.. rst-class:: detail

trimesh_remesh_along_isoline
==========================================
Expand Down
Loading

0 comments on commit 39d4949

Please sign in to comment.