black

Author: tomvanmele

docs/conf.py

@@ -13,7 +13,7 @@
 import sphinx_compas_theme
 from sphinx.ext.napoleon.docstring import NumpyDocstring
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../src'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../src"))
 
 
 # -- General configuration ------------------------------------------------
@@ -25,7 +25,9 @@
 version = ".".join(release.split(".")[0:2])
 
 master_doc = "index"
-source_suffix = [".rst", ]
+source_suffix = [
+    ".rst",
+]
 templates_path = sphinx_compas_theme.get_autosummary_templates_path()
 exclude_patterns = []
 
@@ -49,7 +51,7 @@
     "sphinx.ext.napoleon",
     "sphinx.ext.githubpages",
     "sphinx.ext.autodoc.typehints",
-    "tabs"
+    "tabs",
 ]
 
 # autodoc options
@@ -72,7 +74,7 @@
 
 
 def skip(app, what, name, obj, would_skip, options):
-    if name.startswith('_'):
+    if name.startswith("_"):
         return True
     return would_skip
 
@@ -132,31 +134,32 @@ def patched_parse(self):
 
 # linkcode
 
+
 def linkcode_resolve(domain, info):
-    if domain != 'py':
+    if domain != "py":
         return None
-    if not info['module']:
+    if not info["module"]:
         return None
-    if not info['fullname']:
+    if not info["fullname"]:
         return None
 
-    package = info['module'].split('.')[0]
-    if not package.startswith('compas_cgal'):
+    package = info["module"].split(".")[0]
+    if not package.startswith("compas_cgal"):
         return None
 
-    module = importlib.import_module(info['module'])
-    parts = info['fullname'].split('.')
+    module = importlib.import_module(info["module"])
+    parts = info["fullname"].split(".")
 
     if len(parts) == 1:
-        obj = getattr(module, info['fullname'])
-        filename = inspect.getmodule(obj).__name__.replace('.', '/')
+        obj = getattr(module, info["fullname"])
+        filename = inspect.getmodule(obj).__name__.replace(".", "/")
         lineno = inspect.getsourcelines(obj)[1]
     elif len(parts) == 2:
         obj_name, attr_name = parts
         obj = getattr(module, obj_name)
         attr = getattr(obj, attr_name)
         if inspect.isfunction(attr):
-            filename = inspect.getmodule(obj).__name__.replace('.', '/')
+            filename = inspect.getmodule(obj).__name__.replace(".", "/")
             lineno = inspect.getsourcelines(attr)[1]
         else:
             return None
@@ -165,6 +168,7 @@ def linkcode_resolve(domain, info):
 
     return f"https://github.com/compas-dev/compas_cgal/blob/master/src/{filename}.py#L{lineno}"
 
+
 # extlinks
 
 extlinks = {}
@@ -175,13 +179,13 @@ def linkcode_resolve(domain, info):
 html_theme_path = sphinx_compas_theme.get_html_theme_path()
 
 html_theme_options = {
-    "package_name"    : "compas_cgal",
-    "package_title"   : project,
-    "package_version" : release,
-    "package_author"  : "compas-dev",
-    "package_docs"    : "https://compas.dev/compas_cgal/",
-    "package_repo"    : "https://github.com/compas-dev/compas_cgal",
-    "package_old_versions_txt": "https://compas.dev/compas_cgal/doc_versions.txt"
+    "package_name": "compas_cgal",
+    "package_title": project,
+    "package_version": release,
+    "package_author": "compas-dev",
+    "package_docs": "https://compas.dev/compas_cgal/",
+    "package_repo": "https://github.com/compas-dev/compas_cgal",
+    "package_old_versions_txt": "https://compas.dev/compas_cgal/doc_versions.txt",
 }
 
 html_context = {}

requirements-dev.txt

@@ -1,5 +1,6 @@
 autopep8
 attrs >=17.4
+black
 bump2version >=1.0.1
 check-manifest >=0.36
 doc8

requirements.txt

@@ -1,2 +1,3 @@
+compas
 nptyping
 typing_extensions

setup.py

@@ -17,62 +17,59 @@
 
 def read(*names, **kwargs):
     return io.open(
-        os.path.join(here, *names),
-        encoding=kwargs.get("encoding", "utf8")
+        os.path.join(here, *names), encoding=kwargs.get("encoding", "utf8")
     ).read()
 
 
 long_description = read("README.md")
 requirements = read("requirements.txt").split("\n")
 optional_requirements = {}
 
-conda_prefix = os.getenv('CONDA_PREFIX')
+conda_prefix = os.getenv("CONDA_PREFIX")
 
-windows = os.name == 'nt'
+windows = os.name == "nt"
 
 
 def get_pybind_include():
     if windows:
-        return os.path.join(conda_prefix, 'Library', 'include')
-    return os.path.join(conda_prefix, 'include')
+        return os.path.join(conda_prefix, "Library", "include")
+    return os.path.join(conda_prefix, "include")
 
 
 def get_eigen_include():
     if windows:
-        return os.path.join(conda_prefix, 'Library', 'include', 'eigen3')
-    return os.path.join(conda_prefix, 'include', 'eigen3')
+        return os.path.join(conda_prefix, "Library", "include", "eigen3")
+    return os.path.join(conda_prefix, "include", "eigen3")
 
 
 def get_library_dirs():
     if windows:
-        return os.path.join(conda_prefix, 'Library', 'lib')
-    return os.path.join(conda_prefix, 'lib')
+        return os.path.join(conda_prefix, "Library", "lib")
+    return os.path.join(conda_prefix, "lib")
 
 
 ext_modules = [
     Extension(
-        'compas_cgal._cgal',
-        sorted([
-            'src/compas_cgal.cpp',
-            'src/compas.cpp',
-            'src/meshing.cpp',
-            'src/booleans.cpp',
-            'src/slicer.cpp',
-            'src/intersections.cpp',
-            'src/measure.cpp',
-            'src/subdivision.cpp',
-            'src/triangulations.cpp',
-        ]),
-        include_dirs=[
-            './include',
-            get_eigen_include(),
-            get_pybind_include()
-        ],
+        "compas_cgal._cgal",
+        sorted(
+            [
+                "src/compas_cgal.cpp",
+                "src/compas.cpp",
+                "src/meshing.cpp",
+                "src/booleans.cpp",
+                "src/slicer.cpp",
+                "src/intersections.cpp",
+                "src/measure.cpp",
+                "src/subdivision.cpp",
+                "src/triangulations.cpp",
+            ]
+        ),
+        include_dirs=["./include", get_eigen_include(), get_pybind_include()],
         library_dirs=[
             get_library_dirs(),
         ],
-        libraries=['mpfr', 'gmp'],
-        language='c++'
+        libraries=["mpfr", "gmp"],
+        language="c++",
     ),
 ]
 
@@ -83,8 +80,9 @@ def has_flag(compiler, flagname):
     """
     import tempfile
     import os
-    with tempfile.NamedTemporaryFile('w', suffix='.cpp', delete=False) as f:
-        f.write('int main (int argc, char **argv) { return 0; }')
+
+    with tempfile.NamedTemporaryFile("w", suffix=".cpp", delete=False) as f:
+        f.write("int main (int argc, char **argv) { return 0; }")
         fname = f.name
     try:
         compiler.compile([fname], extra_postargs=[flagname])
@@ -104,25 +102,25 @@ def cpp_flag(compiler):
     The newer version is prefered over c++11 (when it is available).
     """
     # flags = ['-std=c++17', '-std=c++14', '-std=c++11']
-    flags = ['-std=c++14', '-std=c++11']
+    flags = ["-std=c++14", "-std=c++11"]
 
     for flag in flags:
         if has_flag(compiler, flag):
             return flag
 
-    raise RuntimeError('Unsupported compiler -- at least C++11 support '
-                       'is needed!')
+    raise RuntimeError("Unsupported compiler -- at least C++11 support " "is needed!")
 
 
 class BuildExt(build_ext):
     """A custom build extension for adding compiler-specific options."""
+
     c_opts = {
-        'msvc': ['/EHsc', '/std:c++14'],
-        'unix': [],
+        "msvc": ["/EHsc", "/std:c++14"],
+        "unix": [],
     }
     l_opts = {
-        'msvc': [],
-        'unix': [],
+        "msvc": [],
+        "unix": [],
     }
 
     # if sys.platform == 'darwin':
@@ -134,14 +132,16 @@ def build_extensions(self):
         ct = self.compiler.compiler_type
         opts = self.c_opts.get(ct, [])
         link_opts = self.l_opts.get(ct, [])
-        if ct == 'unix':
+        if ct == "unix":
             opts.append('-DVERSION_INFO="%s"' % self.distribution.get_version())
             opts.append(cpp_flag(self.compiler))
-            if has_flag(self.compiler, '-fvisibility=hidden'):
-                opts.append('-fvisibility=hidden')
-            opts.append('-DCGAL_DEBUG=1')
+            if has_flag(self.compiler, "-fvisibility=hidden"):
+                opts.append("-fvisibility=hidden")
+            opts.append("-DCGAL_DEBUG=1")
         for ext in self.extensions:
-            ext.define_macros = [('VERSION_INFO', '"{}"'.format(self.distribution.get_version()))]
+            ext.define_macros = [
+                ("VERSION_INFO", '"{}"'.format(self.distribution.get_version()))
+            ]
             ext.extra_compile_args = opts
             ext.extra_link_args = link_opts
         build_ext.build_extensions(self)
@@ -182,8 +182,8 @@ def build_extensions(self):
     # data_files=[],
     # include_package_data=True,
     ext_modules=ext_modules,
-    cmdclass={'build_ext': BuildExt},
-    setup_requires=['pybind11>=2.5.0'],
+    cmdclass={"build_ext": BuildExt},
+    setup_requires=["pybind11>=2.5.0"],
     install_requires=requirements,
     python_requires=">=3.6",
     extras_require=optional_requirements,

src/compas_cgal/__init__.py

@@ -95,12 +95,12 @@
 
 
 __all_plugins__ = [
-    'compas_cgal.booleans',
-    'compas_cgal.intersections',
-    'compas_cgal.meshing',
-    'compas_cgal.measure',
-    'compas_cgal.slicer',
-    'compas_cgal.triangulation',
+    "compas_cgal.booleans",
+    "compas_cgal.intersections",
+    "compas_cgal.meshing",
+    "compas_cgal.measure",
+    "compas_cgal.slicer",
+    "compas_cgal.triangulation",
 ]
 
 __all__ = ["HOME", "DATA", "DOCS", "TEMP"]

src/compas_cgal/booleans.py

@@ -35,21 +35,21 @@ def _boolean(A, B, operation):
     VB = np.asarray(VB, dtype=np.float64)
     FB = np.asarray(FB, dtype=np.int32)
 
-    if operation == 'union':
+    if operation == "union":
         result = booleans.boolean_union(VA, FA, VB, FB)
-    elif operation == 'difference':
+    elif operation == "difference":
         result = booleans.boolean_difference(VA, FA, VB, FB)
-    elif operation == 'intersection':
+    elif operation == "intersection":
         result = booleans.boolean_intersection(VA, FA, VB, FB)
-    elif operation == 'split':
+    elif operation == "split":
         result = booleans.split(VA, FA, VB, FB)
     else:
         raise NotImplementedError
 
     return result
 
 
-@plugin(category='booleans', pluggable_name='boolean_union_mesh_mesh')
+@plugin(category="booleans", pluggable_name="boolean_union_mesh_mesh")
 def boolean_union(A, B):
     """Boolean union of two meshes.
 
@@ -84,10 +84,10 @@ def boolean_union(A, B):
     >>> shape = Polyhedron(*C)
 
     """
-    return _boolean(A, B, 'union')
+    return _boolean(A, B, "union")
 
 
-@plugin(category='booleans', pluggable_name='boolean_difference_mesh_mesh')
+@plugin(category="booleans", pluggable_name="boolean_difference_mesh_mesh")
 def boolean_difference(A, B):
     """Boolean difference of two meshes.
 
@@ -122,10 +122,10 @@ def boolean_difference(A, B):
     >>> shape = Polyhedron(*C)
 
     """
-    return _boolean(A, B, 'difference')
+    return _boolean(A, B, "difference")
 
 
-@plugin(category='booleans', pluggable_name='boolean_intersection_mesh_mesh')
+@plugin(category="booleans", pluggable_name="boolean_intersection_mesh_mesh")
 def boolean_intersection(A, B):
     """Boolean intersection of two meshes.
 
@@ -160,10 +160,10 @@ def boolean_intersection(A, B):
     >>> shape = Polyhedron(*C)
 
     """
-    return _boolean(A, B, 'intersection')
+    return _boolean(A, B, "intersection")
 
 
-@plugin(category='booleans', pluggable_name='split_mesh_mesh')
+@plugin(category="booleans", pluggable_name="split_mesh_mesh")
 def split(A, B):
     """Split one mesh with another.
 
@@ -198,4 +198,4 @@ def split(A, B):
     >>> mesh = Mesh.from_vertices_and_faces(V, F)
 
     """
-    return _boolean(A, B, 'split')
+    return _boolean(A, B, "split")