Skip to content

Commit

Permalink
without testing
Browse files Browse the repository at this point in the history
  • Loading branch information
tomvanmele committed Oct 2, 2024
1 parent cd5e1ff commit 2e92b85
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ jobs:
with:
invoke_lint: true
use_conda: true
check_import: true
python: ${{ matrix.python }}
2 changes: 1 addition & 1 deletion env_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ dependencies:
- cgal-cpp
- pybind11
- compas>=2.4
- pytest<=8.3.2
- pytest
- pip:
- -e .[DEV]
2 changes: 1 addition & 1 deletion env_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ dependencies:
- cgal-cpp
- pybind11
- compas>=2.4
- pytest<=8.3.2
- pytest
- pip:
- -e .[DEV]
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ where = ["src"]

[tool.pytest.ini_options]
minversion = "6.0"
testpaths = ["tests", "src/compas_cgal"]
testpaths = []
python_files = ["test_*.py", "*_test.py", "test.py"]
addopts = ["-ra", "--strict-markers", "--doctest-glob=*.rst", "--tb=short"]
doctest_optionflags = [
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def get_scip_library():
"src/skeletonization.cpp",
"src/reconstruction.cpp",
"src/polygonal_surface_reconstruction.cpp",
"src/straight_skeleton_2.cpp",
# "src/straight_skeleton_2.cpp",
]
),
include_dirs=["./include", get_eigen_include(), get_pybind_include()],
Expand Down Expand Up @@ -88,7 +88,7 @@ def cpp_flag(compiler):
The newer version is prefered over c++11 (when it is available).
"""
flags = ["-std=c++14", "-std=c++11"]
flags = ["-std=c++17", "-std=c++14", "-std=c++11"]

for flag in flags:
if has_flag(compiler, flag):
Expand Down
2 changes: 1 addition & 1 deletion src/compas_cgal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"compas_cgal.measure",
"compas_cgal.slicer",
"compas_cgal.triangulation",
"compas_cgal.straight_skeleton_2",
# "compas_cgal.straight_skeleton_2",
]

__all__ = ["HOME", "DATA", "DOCS", "TEMP"]

0 comments on commit 2e92b85

Please sign in to comment.