Skip to content

Commit b99e718

Browse files
committed
simplified setup (osx)
1 parent 0659bd1 commit b99e718

File tree

19 files changed

+79
-67
lines changed

19 files changed

+79
-67
lines changed

.bumpversion.cfg

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ tag = True
88
search = version='{current_version}'
99
replace = version='{new_version}'
1010

11-
[bumpversion:file:docsource/conf.py]
12-
search = release = '{current_version}'
13-
replace = release = '{new_version}'
14-
1511
[bumpversion:file:src/compas_libigl/__init__.py]
1612
search = __version__ = '{current_version}'
1713
replace = __version__ = '{new_version}'

CONTRIBUTING.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
Contributions are welcome and very much appreciated!
44

5-
65
## Code contributions
76

87
We accept code contributions through pull requests.
@@ -12,28 +11,27 @@ In short, this is how that works.
1211
2. Create a virtual environment using your tool of choice (e.g. `virtualenv`, `conda`, etc).
1312
3. Install development dependencies:
1413

15-
```bash
16-
$ pip install -r requirements-dev.txt
17-
```
14+
```bash
15+
pip install -r requirements-dev.txt
16+
```
1817

1918
4. Make sure all tests pass:
2019

21-
```bash
22-
$ invoke test
23-
```
20+
```bash
21+
invoke test
22+
```
2423

2524
5. Start making your changes to the **master** branch (or branch off of it).
2625
6. Make sure all tests still pass:
2726

28-
```bash
29-
$ invoke test
30-
```
27+
```bash
28+
invoke test
29+
```
3130

3231
7. Add yourself to the *Contributors* section of `AUTHORS.md`.
3332
8. Commit your changes and push your branch to GitHub.
3433
9. Create a [pull request](https://help.github.com/articles/about-pull-requests/) through the GitHub website.
3534

36-
3735
During development, use [pyinvoke](http://docs.pyinvoke.org/) tasks on the
3836
command line to ease recurring operations:
3937

@@ -43,7 +41,6 @@ command line to ease recurring operations:
4341
* `invoke test`: Run all tests and checks in one swift command.
4442
* `invoke`: Show available tasks.
4543

46-
4744
## Bug reports
4845

4946
When [reporting a bug](https://github.com/BlockResearchGroup/compas_assembly/issues) please include:
@@ -52,7 +49,6 @@ When [reporting a bug](https://github.com/BlockResearchGroup/compas_assembly/iss
5249
* Any details about your local setup that might be helpful in troubleshooting.
5350
* Detailed steps to reproduce the bug.
5451

55-
5652
## Feature requests
5753

5854
When [proposing a new feature](https://github.com/BlockResearchGroup/compas_assembly/issues) please include:

modules/geodistance/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ target_link_libraries(compas_libigl_geodistance PRIVATE igl::core)
88

99
#set_target_properties(geodistance PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
1010
#set_target_properties(geodistance PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
11-
#configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance/__init__.py" COPYONLY)

modules/isolines/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ target_link_libraries(compas_libigl_isolines PRIVATE igl::core)
88

99
#set_target_properties(isolines PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines")
1010
#set_target_properties(isolines PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines")
11-
#configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines/__init__.py" COPYONLY)

modules/planarize/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ target_link_libraries(compas_libigl_planarize PRIVATE igl::core)
88

99
#set_target_properties(planarize PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize")
1010
#set_target_properties(planarize PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize")
11-
#configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize/__init__.py" COPYONLY)

modules/triangulation/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ target_link_libraries(compas_libigl_triangulation PRIVATE igl::triangle)
99

1010
#set_target_properties(triangulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation")
1111
#set_target_properties(triangulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation")
12-
#configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation/__init__.py" COPYONLY)
File renamed without changes.

recipe/__tmp/bld.bat

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
$PYTHON -m pip install . -vv
2+
mkdir $SP_DIR/compas_libigl/booleans
3+
mkdir $SP_DIR/compas_libigl/geodistance
4+
mkdir $SP_DIR/compas_libigl/isolines
5+
mkdir $SP_DIR/compas_libigl/planarize
6+
mkdir $SP_DIR/compas_libigl/triangulation
7+
copy $RECIPE_DIR/../modules/booleans/__init__.py $SP_DIR/compas_libigl/booleans/__init__.py
8+
copy $RECIPE_DIR/../modules/geodistance/__init__.py $SP_DIR/compas_libigl/geodistance/__init__.py
9+
copy $RECIPE_DIR/../modules/isolines/__init__.py $SP_DIR/compas_libigl/isolines/__init__.py
10+
copy $RECIPE_DIR/../modules/planarize/__init__.py $SP_DIR/compas_libigl/planarize/__init__.py
11+
copy $RECIPE_DIR/../modules/triangulation/__init__.py $SP_DIR/compas_libigl/triangulation/__init__.py
File renamed without changes.

recipe/meta.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,19 @@ source:
1010
# git_depth: 1
1111
# url: https://github.com/blockresearchgroup/compas_libigl/archive/alpha-{{ version }}.tar.gz
1212
# sha256: f90b39d88ea003bc2ca7925146babb20320cedebe096e4c276835490be8e10a0
13-
path: $RECIPE_DIR/../../
1413
# git_url: ../
14+
path: $RECIPE_DIR/../../
1515

1616
build:
1717
number: 0
18-
# script: "{{ PYTHON }} -m pip install . -vv"
18+
script: "{{ PYTHON }} -m pip install . -vv"
1919
# script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vv"
2020

2121
requirements:
2222
build:
2323
- git
2424
- cmake
2525
- boost
26-
# - pybind11
27-
# - cgal
28-
# - numpy >=1.15.4
2926
host:
3027
- python
3128
- pip

0 commit comments

Comments
 (0)