Merge remote-tracking branch 'origin/master'

Author: tomvanmele

.github/workflows/docs.yml

@@ -24,6 +24,7 @@ jobs:
           python-version: 3.8
       - name: Install dependencies
         run: |
+          sudo apt-get install graphviz
           python -m pip install --upgrade pip
           python -m pip install cython --install-option="--no-cython-compile"
       - name: Install

docs/citing.rst

@@ -13,7 +13,7 @@ Citing
     @misc{compas-dev,
         title  = {{COMPAS}: A framework for computational research in architecture and structures.},
         author = {Tom Van Mele and many others},
-        note   = {http://compas-dev.github.io/},
+        note   = {http://compas.dev},
         year   = {2017-2019},
         doi    = {10.5281/zenodo.2594510},
         url    = {https://doi.org/10.5281/zenodo.2594510},

docs/conf.py

@@ -49,7 +49,7 @@
     "sphinx.ext.githubpages",
     "sphinx.ext.coverage",
     "sphinx.ext.inheritance_diagram",
-    # "sphinx.ext.graphviz",
+    "sphinx.ext.graphviz",
     "matplotlib.sphinxext.plot_directive",
     "m2r",
     "nbsphinx",
@@ -252,7 +252,7 @@ def patched_parse(self):
 
 intersphinx_mapping = {
     "python": ("https://docs.python.org/", None),
-    "compas": ("https://compas-dev.github.io/compas", None),
+    "compas": ("https://compas.dev/compas/latest/", None),
 }
 
 

docs/tutorial/geometry.rst

@@ -8,7 +8,7 @@ Geometry
 
 This tutorial provides a quick tour of the functionality in :mod:`compas.geometry`.
 For a complete overview, visit the API Reference:
-https://compas-dev.github.io/main/api/compas.geometry.html
+https://compas.dev/compas/latest/api/compas.geometry.html
 
 
 Points and Vectors
@@ -136,7 +136,9 @@ Many of the basic functions are also available as object methods
     >>> x.dot(y)
     0.0
 
-    >>> x.normalize()
+    >>> z = Vector(1, 2, 3)
+    >>> z.unitize()
+    Vector(0.267, 0.535, 0.802)
 
     >>> x.cross([0, 1, 0])
     Vector(0.000, 0.000, 1.000)

setup.py

@@ -29,7 +29,7 @@ def read(*names, **kwargs):
     description='The COMPAS framework',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    url='http://compas-dev.github.io',
+    url='http://compas.dev',
     author='Tom Van Mele',
     author_email='[email protected]',
     license='MIT',
@@ -52,7 +52,7 @@ def read(*names, **kwargs):
     ],
     keywords=['architecture', 'engineering', 'fabrication', 'construction'],
     project_urls={
-        "Documentation": "http://compas-dev.github.io",
+        "Documentation": "http://compas.dev",
         "Forum": "https://forum.compas-framework.org/",
         "Repository": "https://github.com/compas-dev/compas",
         "Issues": "https://github.com/compas-dev/compas/issues",

src/compas_rhino/utilities/layers.py

@@ -277,9 +277,15 @@ def delete_layers(layers):
 
     Parameters
     ----------
-    layers : dict
-        A dictionary of layers with the keys representing layer names,
-        and the values also dictionaries defining optional nested layers.
+    layers : :obj:`dict` or :obj:`list` of :obj:`str`
+        Can be given as either a list of strings or as a dictionary.
+
+        When given as a list the list elements should be name of layers given
+        with ``"::"`` as a separator between hierarchies.
+
+        It can also be defined as a dictionary of layers with the keys
+        representing layer names, and the values also dictionaries defining
+        optional nested layers.
 
     Examples
     --------
@@ -312,9 +318,15 @@ def recurse(layers, parent=None):
 
     rs.EnableRedraw(False)
     recurse(layers)
+
     for layer in to_delete:
         if rs.IsLayer(layer):
-            rs.DeleteLayer(layer)
+            if rs.IsLayerCurrent(layer):
+                print("Can't delete {} as it is the current layer".format(layer))
+                continue
+
+            rs.PurgeLayer(layer)
+
     rs.EnableRedraw(True)