Merge branch 'RhinoSurface_curvature_fix' of https://github.com/nmaslarinos/compas into RhinoSurface_curvature_fix

Author: nmaslarinos

.bumpversion.cfg

@@ -5,8 +5,8 @@ commit = True
 tag = True
 
 [bumpversion:file:setup.py]
-search = version='{current_version}'
-replace = version='{new_version}'
+search = version="{current_version}"
+replace = version="{new_version}"
 
 [bumpversion:glob:schemas/*.json]
 search = "$compas": "{current_version}"
@@ -17,24 +17,24 @@ search = release = "{current_version}"
 replace = release = "{new_version}"
 
 [bumpversion:file:src/compas/__init__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
 
 [bumpversion:file:src/compas_blender/__init__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
 
 [bumpversion:file:src/compas_ghpython/__init__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
 
 [bumpversion:file:src/compas_plotters/__init__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
 
 [bumpversion:file:src/compas_rhino/__init__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
 
 [bumpversion:file:CHANGELOG.md]
 search = Unreleased

.editorconfig

@@ -8,7 +8,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 charset = utf-8
-max_line_length = 180
+max_line_length = 120
 
 [*.{bat,cmd,ps1}]
 end_of_line = crlf

AUTHORS.md

@@ -34,3 +34,4 @@
 - Nizar Taha <<[email protected]>> [@nizartaha](https://github.com/nizartaha)
 - Gene Ting-Chun Kao <<[email protected]>> [@GeneKao](https://github.com/GeneKao)
 - Chen Kasirer <<[email protected]>> [@chenkasirer](https://github.com/chenkasirer)
+- Nickolas Maslarinos <<[email protected]>> [@nmaslarinos](https://github.com/nmaslarinos)

CHANGELOG.md

@@ -8,19 +8,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
+
 * Added gltf extensions: `KHR_materials_transmission`, `KHR_materials_specular`, `KHR_materials_ior`, `KHR_materials_clearcoat`, `KHR_Texture_Transform`, `KHR_materials_pbrSpecularGlossiness`
 * Added `GLTFContent.check_extensions_texture_recursively`
 * Added `GLTFContent.get_node_by_name`, `GLTFContent.get_material_index_by_name`
 * Added `GLTFContent.add_material`, `GLTFContent.add_texture`, `GLTFContent.add_image`
-
 * Added pluggable `Brep` support with `compas.geometry.brep`.
 * Added Rhino `Brep` plugin in `compas_rhino.geometry.brep`.
+* Added boolean operations to the `compas_rhino` `Brep` backend.
+* Added boolean operation operator overloads in `compas.geometry.Brep`
+* Added `format` task using `black` formatter.
+* Added a `test_intersection_circle_circle_xy` in the `test_intersections`
+* Added split operation to `compas_rhino.geometry.Brep`.
+* Added a `RhinoArtist` in `compas_rhino`.
+* Added a `RhinoArtist` in `compas_ghpython`.
 
 ### Changed
-* Based all gltf data classes on `BaseGLTFDataClass`
 
+* Based all gltf data classes on `BaseGLTFDataClass`
 * Fixed `Color.__get___` AttributeError.
 * Fixed  `RhinoSurface.curvature_at` not returning a Vector, but a Rhino SurfaceCurvature class object 
+* Fixed `cylinder_to_rhino` conversion to match `compas.geometry.Cylinder` location.
+* Changed identification of cylinder brep face to non-zero in `compas_rhino.conversions.cylinder.Cylinder`.
+* Changed linter to `black`.
+* Automatically trigger `invoke format` during `invoke release`.
+* Fixed bug in `intersections.intersection_circle_circle_xy` where the Circle's Plane was accessed instead of the centre. 
+* Fixed bug in `_core.tangent` where the Circle's Plane was accessed instead of the centre.
+* Fixed the `test_tangent` to work with a properly defined circle
+* `RhinoBrep` serialization works now with surface types other than NURBS.
+
 ### Removed
 
 

CONTRIBUTING.md

@@ -37,7 +37,7 @@ In short, this is how that works.
    ```
 
 5. Start making your changes to the **master** branch (or branch off of it).
-6. Auto-format your code using `black -l 180 <path_to_source_file>`.
+6. Auto-format your code using `black <path_to_source_file>`.
 7. Make sure all tests still pass:
 
    ```bash

MANIFEST.in

@@ -13,6 +13,7 @@ include AUTHORS.md
 include CHANGELOG.md
 include requirements.txt
 include conftest.py
+include pyproject.toml
 
 exclude requirements-dev.txt
 exclude pytest.ini .bumpversion.cfg .editorconfig

conftest.py

@@ -19,7 +19,7 @@ def pytest_ignore_collect(path):
     if "matlab" in str(path):
         return True
 
-    if str(path).endswith('_cli.py'):
+    if str(path).endswith("_cli.py"):
         return True
 
 

docs/conf.py

@@ -14,7 +14,7 @@
 import sphinx_compas_theme
 from sphinx.ext.napoleon.docstring import NumpyDocstring
 
-sys.path.append(os.path.join(os.path.dirname(__file__), '_ext'))
+sys.path.append(os.path.join(os.path.dirname(__file__), "_ext"))
 
 # patches
 
@@ -28,7 +28,9 @@ def patched_m2r2_setup(app):
         app.add_source_suffix(".md", "markdown")
         app.add_source_parser(m2r2.M2RParser)
     return dict(
-        version=m2r2.__version__, parallel_read_safe=True, parallel_write_safe=True,
+        version=m2r2.__version__,
+        parallel_read_safe=True,
+        parallel_write_safe=True,
     )
 
 
@@ -76,7 +78,7 @@ def patched_m2r2_setup(app):
     "m2r2",
     # "nbsphinx",
     "sphinx.ext.autodoc.typehints",
-    "tabs"
+    "tabs",
 ]
 
 # autodoc options
@@ -98,7 +100,7 @@ def patched_m2r2_setup(app):
     "rhinoscriptsyntax",
     "bpy",
     "bmesh",
-    "mathutils"
+    "mathutils",
 ]
 
 autodoc_default_options = {
@@ -112,7 +114,7 @@ def patched_m2r2_setup(app):
 
 
 def skip(app, what, name, obj, would_skip, options):
-    if name.startswith('_'):
+    if name.startswith("_"):
         return True
     return would_skip
 
@@ -134,7 +136,7 @@ def setup(app):
     "rhinoscriptsyntax",
     "bpy",
     "bmesh",
-    "mathutils"
+    "mathutils",
 ]
 
 # graph options
@@ -205,7 +207,7 @@ def patched_parse(self):
 plot_include_source = False
 plot_html_show_source_link = False
 plot_html_show_formats = False
-plot_formats = ['png']
+plot_formats = ["png"]
 # plot_pre_code
 # plot_basedir
 # plot_rcparams
@@ -237,26 +239,26 @@ def patched_parse(self):
 
 
 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'):
+    package = info["module"].split(".")[0]
+    if not package.startswith("compas"):
         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'])
+        obj = getattr(module, info["fullname"])
         mod = inspect.getmodule(obj)
         if not mod:
             return None
-        filename = mod.__name__.replace('.', '/')
+        filename = mod.__name__.replace(".", "/")
         lineno = inspect.getsourcelines(obj)[1]
     elif len(parts) == 2:
         obj_name, attr_name = parts
@@ -266,7 +268,7 @@ def linkcode_resolve(domain, info):
             mod = inspect.getmodule(attr)
             if not mod:
                 return None
-            filename = mod.__name__.replace('.', '/')
+            filename = mod.__name__.replace(".", "/")
             lineno = inspect.getsourcelines(attr)[1]
         else:
             return None
@@ -281,7 +283,7 @@ def linkcode_resolve(domain, info):
 
 extlinks = {
     "rhino": ("https://developer.rhino3d.com/api/RhinoCommon/html/T_%s.htm", "%s"),
-    "blender": ("https://docs.blender.org/api/2.93/%s.html", "%s")
+    "blender": ("https://docs.blender.org/api/2.93/%s.html", "%s"),
 }
 
 # -- Options for HTML output ----------------------------------------------
@@ -292,7 +294,7 @@ def linkcode_resolve(domain, info):
     "navbar_active": "compas",
     "package_version": release,
     "package_docs": "https://compas.dev/compas/",
-    "package_old_versions_txt": "https://compas.dev/compas/doc_versions.txt"
+    "package_old_versions_txt": "https://compas.dev/compas/doc_versions.txt",
 }
 html_context = {}
 html_static_path = sphinx_compas_theme.get_html_static_path()

docs/devguide.rst

@@ -74,7 +74,7 @@ The procedure for submitting a PR is the following.
 Style guide
 ===========
 
-Please run `black -l 180 <path_to_source_file>` to auto-format your code.
+Please run `black <path_to_source_file>` to auto-format your code.
 
 The command ``invoke lint`` runs the entire codebase through ``flake8``.
 As described in the `docs <https://flake8.pycqa.org/en/latest/manpage.html>`_,
@@ -88,7 +88,7 @@ https://flake8.pycqa.org/en/latest/user/error-codes.html
 The PEP-0008 style guide is available here:
 https://www.python.org/dev/peps/pep-0008/
 
-Note that the maximum line length is set to 180 rather 79 in the ``setup.cfg`` of the repo.
+Note that the maximum line length is set to 120 rather 79 in the ``setup.cfg`` of the repo.
 
 
 Naming conventions

docs/tutorial/artists/try_artists_network.py

@@ -14,7 +14,7 @@
 artist = Artist(network)
 artist.draw(
     nodecolor={n: Color.pink() for n in [node] + nbrs},
-    edgecolor={e: Color.pink() for e in edges}
+    edgecolor={e: Color.pink() for e in edges},
 )
 
 Artist.redraw()