Merge branch 'main' into trimesh-fixes

Author: tomvanmele

.editorconfig

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

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+* Changed and update the `compas_view2` examples into `compas_viewer`.
 * Changed and updated the `compas_view2` examples into `compas_viewer`.
 * Changed `compas.scene.Scene` to inherent from `compas.datastructrues.Tree`.
 * Changed `compas.scene.SceneObject` to inherent from `compas.datastructrues.TreeNode`.
@@ -26,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed various bugs in `compas.geometry.Quaternion`.
 * Changed repo config to `pyproject.toml`.
 * Fixed broken import in `copas.geometry.trimesh_smoothing_numpy`.
+* Changed `RhinoBrep.trimmed` to return single result or raise `BrepTrimmingError` instead of returning a list.
+* Changed order of imports according to `isort` and changed line length to `179`.
 
 ### Removed
 

docs/devguide/code.rst

@@ -71,8 +71,7 @@ Naming conventions
 Line length
 -----------
 
-**COMPAS uses a line length of 120 characters**. While longer than the 80 characters recommended by ``PEP8``, it is in our opinion a more reasonable limit for modern displays.
-This is enforced and can be automatically set using ``black -l 120``.
+**COMPAS uses a line length of 180 characters**. While longer than the 80 characters recommended by ``PEP8``, it is in our opinion a more reasonable limit for modern displays.
 
 **Indentations are 4 spaces**. Tab to spaces setting can be set in ``.editorconfig`` which is respected by most editors. For more information see `EditorConfig <https://editorconfig.org/>`_.
 

docs/devguide/workflow.rst

@@ -22,7 +22,7 @@ To set up a developer environment
    .. code-block:: bash
 
        cd path/to/compas
-       pip install -r requirements-dev.txt
+       pip install -e ".[dev]"
 
 4. Make sure all tests pass and the code is free of lint:
 

pyproject.toml

@@ -118,20 +118,15 @@ replace = "[{new_version}] {now:%Y-%m-%d}"
 # ============================================================================
 
 [tool.black]
-# we should set this to 179
-line-length = 120
+line-length = 179
 
 [tool.ruff]
-# we should set this to 179
-line-length = 120
+line-length = 179
 indent-width = 4
 target-version = "py39"
 
 [tool.ruff.lint]
-# we should add "I"
-select = ["E", "F"]
-# we should remove this
-ignore = ["E501"]
+select = ["E", "F", "I"]
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["I001"]
@@ -151,8 +146,7 @@ known-first-party = [
 convention = "numpy"
 
 [tool.ruff.lint.pycodestyle]
-# we should set this to 179
-max-doc-length = 120
+max-doc-length = 179
 
 [tool.ruff.format]
 docstring-code-format = true

src/compas/_iotools.py

@@ -1,7 +1,7 @@
 """For the time being, these functions are only for internal use."""
 
-from contextlib import contextmanager
 import io
+from contextlib import contextmanager
 
 try:
     from urllib.request import urlopen

src/compas/_os.py

@@ -677,7 +677,8 @@ def _get_win_folder_from_registry(csidl_name):
 
 
 def _get_win_folder_with_pywin32(csidl_name):
-    from win32com.shell import shellcon, shell
+    from win32com.shell import shell
+    from win32com.shell import shellcon
 
     dir = shell.SHGetFolderPath(0, getattr(shellcon, csidl_name), 0, 0)
     # Try to make this a unicode path because SHGetFolderPath does

src/compas/colors/colordict.py

@@ -1,8 +1,9 @@
-from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 from compas.data import Data
+
 from .color import Color
 
 

src/compas/colors/colormap.py

@@ -7,8 +7,8 @@
 from compas.itertools import linspace
 
 from .color import Color
-from .mpl_colormap import _magma_data
 from .mpl_colormap import _inferno_data
+from .mpl_colormap import _magma_data
 from .mpl_colormap import _plasma_data
 from .mpl_colormap import _viridis_data
 

src/compas/data/coercion.py

@@ -1,6 +1,6 @@
-from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 from .validators import is_item_iterable