Merge branch 'main' into fix-halfedge-before-on-boundary

Author: tomvanmele

.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

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * 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`.

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

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

pyproject.toml

@@ -0,0 +1,26 @@
+[tool.black]
+line-length = 120
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+testpaths = ["tests", "src/compas"]
+python_files = [
+    "test_*.py",
+    "tests.py"
+]
+addopts = "-ra --strict --doctest-modules --doctest-glob=*.rst --tb=short"
+doctest_optionflags= "NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ALLOW_UNICODE ALLOW_BYTES NUMBER"
+filterwarnings = "ignore::DeprecationWarning"
+
+[tool.isort]
+line_length = 120
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+force_single_line = true
+ensure_newline_before_comments = true
+known_first_party = "compas"
+default_section = "THIRDPARTY"
+forced_separate = "test_compas"
+skip = ["__init__.py"]

setup.cfg

@@ -2,43 +2,13 @@
 universal = 1
 
 [flake8]
-max-line-length = 180
+max-line-length = 120
 exclude = */migrations/*
 extend-ignore = E203
 
 [doc8]
-max-line-length = 180
+max-line-length = 120
 ignore = D001
 
 [pydocstyle]
 convention = numpy
-
-[tool:pytest]
-testpaths =
-    tests
-    src/compas
-norecursedirs =
-    migrations
-python_files =
-    test_*.py
-    *_test.py
-    tests.py
-addopts =
-    -ra
-    --strict
-    --doctest-glob=\*.rst
-    --tb=short
-doctest_optionflags =
-    NORMALIZE_WHITESPACE
-    IGNORE_EXCEPTION_DETAIL
-    ALLOW_UNICODE
-    ALLOW_BYTES
-    NUMBER
-
-[isort]
-force_single_line = True
-line_length = 180
-known_first_party = compas
-default_section = THIRDPARTY
-forced_separate = test_compas
-skip = migrations, __init__.py

src/compas/__init__.py

@@ -240,9 +240,7 @@ def get(filename):
     if os.path.exists(localpath):
         return localpath
     else:
-        return "https://raw.githubusercontent.com/compas-dev/compas/main/src/compas/data/samples/{}".format(
-            filename
-        )
+        return "https://raw.githubusercontent.com/compas-dev/compas/main/src/compas/data/samples/{}".format(filename)
 
 
 def get_bunny(localstorage=None):
@@ -288,14 +286,10 @@ def get_bunny(localstorage=None):
         os.makedirs(localstorage)
 
     if not os.path.isdir(localstorage):
-        raise Exception(
-            "Local storage location does not exist: {}".format(localstorage)
-        )
+        raise Exception("Local storage location does not exist: {}".format(localstorage))
 
     if not os.access(localstorage, os.W_OK):
-        raise Exception(
-            "Local storage location is not writable: {}".format(localstorage)
-        )
+        raise Exception("Local storage location is not writable: {}".format(localstorage))
 
     bunny = compas._os.absjoin(localstorage, "bunny/reconstruction/bun_zipper.ply")
     destination = compas._os.absjoin(localstorage, "bunny.tar.gz")

src/compas/__main__.py

@@ -23,11 +23,7 @@
     print("Yay! COMPAS is installed correctly!")
     print()
     print("COMPAS: {}".format(compas.__version__))
-    print(
-        "Python: {} ({})".format(
-            platform.python_version(), platform.python_implementation()
-        )
-    )
+    print("Python: {} ({})".format(platform.python_version(), platform.python_implementation()))
 
     if pkg_resources:
         working_set = pkg_resources.working_set

src/compas/_os.py

@@ -194,9 +194,7 @@ def select_python(python_executable):
         either `python` or `pythonw`.
     """
     if PYTHON_DIRECTORY and os.path.exists(PYTHON_DIRECTORY):
-        python_executables = (
-            [python_executable] if python_executable else ["pythonw", "python"]
-        )
+        python_executables = [python_executable] if python_executable else ["pythonw", "python"]
 
         for python_exe in python_executables:
             python = os.path.join(PYTHON_DIRECTORY, python_exe)
@@ -284,9 +282,7 @@ def _realpath_ipy_win(path):
     parent_path = os.path.join(path, "..")
 
     args = 'dir /c "{}" /Al'.format(parent_path)
-    process = subprocess.Popen(
-        args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-    )
+    process = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     output, _error = process.communicate()
     matches = SYMLINK_REGEX.finditer(output)
@@ -302,9 +298,7 @@ def _realpath_ipy_win(path):
 
 def _realpath_ipy_posix(path):
     args = 'readlink -f "{}"'.format(path)
-    process = subprocess.Popen(
-        args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-    )
+    process = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     output, _error = process.communicate()
     return output
 
@@ -323,14 +317,8 @@ def _polyfill_symlinks(symlinks, raise_on_error):
         mklink_cmd.write("ECHO ret=%symlink_result%\n")
         for i, (source, link_name) in enumerate(symlinks):
             dir_symlink_arg = "/D" if os.path.isdir(source) else ""
-            mklink_cmd.write(
-                "mklink {} {}\n".format(
-                    dir_symlink_arg, subprocess.list2cmdline([link_name, source])
-                )
-            )
-            mklink_cmd.write(
-                "IF %ERRORLEVEL% EQU 0 SET /A symlink_result += {} \n".format(2**i)
-            )
+            mklink_cmd.write("mklink {} {}\n".format(dir_symlink_arg, subprocess.list2cmdline([link_name, source])))
+            mklink_cmd.write("IF %ERRORLEVEL% EQU 0 SET /A symlink_result += {} \n".format(2**i))
 
         mklink_cmd.write("EXIT /B %symlink_result%\n")
 
@@ -547,9 +535,7 @@ def _run_command_as_admin(command, arguments):
 
     with open(temp_path, "w") as remove_symlink_cmd:
         remove_symlink_cmd.write("@echo off\n")
-        remove_symlink_cmd.write(
-            "{} {}\n".format(command, subprocess.list2cmdline(arguments))
-        )
+        remove_symlink_cmd.write("{} {}\n".format(command, subprocess.list2cmdline(arguments)))
 
     _run_as_admin([temp_path])
 
@@ -588,10 +574,7 @@ def _run_as_admin(command):
     ctypes.windll.kernel32.WaitForSingleObject(process_handle, INFINITE)
 
     ret = ctypes.wintypes.DWORD()
-    if (
-        ctypes.windll.kernel32.GetExitCodeProcess(process_handle, ctypes.byref(ret))
-        == 0
-    ):
+    if ctypes.windll.kernel32.GetExitCodeProcess(process_handle, ctypes.byref(ret)) == 0:
         raise RuntimeError("Failed to retrieve exit code")
 
     return ret.value