Skip to content

Commit 39d4949

Browse files
committed
update to latest compas
1 parent 0168bce commit 39d4949

File tree

79 files changed

+782
-780
lines changed

Some content is hidden

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

79 files changed

+782
-780
lines changed

.bumpversion.cfg

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,19 @@ current_version = 0.1.0
33
message = Bump version to {new_version}
44
commit = True
55
tag = True
6-
parse = ^
7-
(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
8-
(?:
9-
(?P<release>rc)
10-
(?:(?P<rc>\d+(?:\.\d+)*))?
11-
)?
12-
serialize =
13-
{major}.{minor}.{patch}{release}{rc}
14-
{major}.{minor}.{patch}
15-
16-
[bumpversion:part:release]
17-
optional_value = final
18-
values =
19-
rc
20-
final
216

227
[bumpversion:file:setup.py]
23-
search = version='{current_version}'
24-
replace = version='{new_version}'
8+
search = version="{current_version}"
9+
replace = version="{new_version}"
10+
11+
[bumpversion:file:docs/conf.py]
12+
search = release = "{current_version}"
13+
replace = release = "{new_version}"
2514

2615
[bumpversion:file:src/compas_libigl/__init__.py]
27-
search = __version__ = '{current_version}'
28-
replace = __version__ = '{new_version}'
16+
search = __version__ = "{current_version}"
17+
replace = __version__ = "{new_version}"
18+
19+
[bumpversion:file:CHANGELOG.md]
20+
search = Unreleased
21+
replace = [{new_version}] {now:%Y-%m-%d}

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ end_of_line = crlf
1616
[*.md]
1717
trim_trailing_whitespace = false
1818

19+
[*.yml]
20+
indent_size = 2
21+
1922
[Makefile]
2023
indent_style = tab
2124
indent_size = 4

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ defaults:
1212
run:
1313
shell: powershell
1414

15-
1615
jobs:
1716
build-packages:
1817
runs-on: ${{ matrix.os }}
@@ -21,7 +20,6 @@ jobs:
2120
os: [macos-latest, windows-latest]
2221

2322
steps:
24-
2523
- uses: actions/checkout@v2
2624
with:
2725
submodules: recursive
@@ -35,7 +33,7 @@ jobs:
3533

3634
- name: build
3735
run: |
38-
conda install git cmake">=3.14" boost eigen COMPAS --yes
36+
conda install git cmake">=3.14" boost eigen=3.3 COMPAS --yes
3937
pip install -r requirements-dev.txt
4038
4139
- name: Lint with flake8

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- main
77
tags:
8-
- 'v*'
8+
- "v*"
99
pull_request:
1010
branches:
1111
- main

.github/workflows/release.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release
33
on:
44
push:
55
tags:
6-
- 'v*'
6+
- "v*"
77

88
jobs:
99
Release:
@@ -21,15 +21,14 @@ jobs:
2121
draft: false
2222
prerelease: false
2323

24-
2524
Publish:
2625
needs: Release
2726
runs-on: ubuntu-latest
2827
steps:
29-
- uses: actions/checkout@v2
30-
- uses: actions/setup-python@v2
31-
with:
32-
python-version: '3.x'
33-
- uses: compas-dev/[email protected]
34-
with:
35-
token: ${{ secrets.PYPI }}
28+
- uses: actions/checkout@v2
29+
- uses: actions/setup-python@v2
30+
with:
31+
python-version: "3.x"
32+
- uses: compas-dev/[email protected]
33+
with:
34+
token: ${{ secrets.PYPI }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,5 @@ build/**
120120
*.so
121121

122122
src/compas-viewers
123+
124+
generated

AUTHORS.md

Lines changed: 1 addition & 1 deletion

CHANGELOG.md

Lines changed: 14 additions & 0 deletions

DEVGUIDE.md

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

MANIFEST.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
graft src
22

3+
prune .github
34
prune data
5+
prune docs
6+
prune scripts
7+
prune tests
48
prune temp
59

610
include LICENSE
711
include README.md
812
include AUTHORS.md
13+
include CHANGELOG.md
914
include requirements.txt
1015

1116
exclude requirements-dev.txt
1217
exclude pytest.ini .bumpversion.cfg .editorconfig
1318
exclude tasks.py
19+
exclude conftest.py
20+
exclude CONTRIBUTING.md
1421

1522
global-exclude *.py[cod] __pycache__ *.dylib *.nb[ic] .DS_Store

0 commit comments

Comments
 (0)