Merge remote-tracking branch 'origin/main' into main

Author: tomvanmele

.github/workflows/ironpython.yml

@@ -21,7 +21,6 @@ jobs:
       - name: "[RPC tests] Install CPython dependencies"
         run: |
           python -m pip install --upgrade pip
-          pip install cython --config-settings="--build-option=--no-cython-compile"
       - name: "[RPC tests] Install COMPAS on CPython"
         run: |
           pip install --no-cache-dir .

.gitpod.yml

@@ -1,2 +1,2 @@
 tasks:
-  - init: pip3 install cython --install-option="--no-cython-compile" && pip3 install .
+  - init: pip3 install .

CHANGELOG.md

@@ -9,11 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added `compas.datastructures.TreeNode` and `compas.datastructures.Tree` classes.
+* Added `EllipseArtist` to `compas_rhino` and `compas_ghpython`.
+
 ### Changed
 
 * Changed `Network.is_planar` to rely on `NetworkX` instead `planarity` for planarity checking.
 * Removed `planarity` from requirements.
 * Fixed argument order at `compas.geometry.cone.circle`.
+* Pinned `jsonschema` version to >=4.17, <4.18 to avoid Rust toolchain
+* Fixed `box_to_compas` in `compas_rhino.conversions` to correctly take in the center of the box as the center point of the frame.
+* Removed `cython` from requirements.
 
 ### Removed
 

docs/devguide/workflow.rst

@@ -12,7 +12,7 @@ To set up a developer environment
 
    .. code-block:: bash
 
-       conda create -n compas-dev python=3.8 cython --yes
+       conda create -n compas-dev python=3.11 --yes
        conda activate compas-dev
 
 3. Install development dependencies:

docs/reference/compas_ghpython.artists.rst

@@ -25,6 +25,7 @@ Classes
     ConeArtist
     CurveArtist
     CylinderArtist
+    EllipseArtist
     FrameArtist
     LineArtist
     MeshArtist

docs/reference/compas_rhino.artists.rst

@@ -19,6 +19,7 @@ Classes
     ConeArtist
     CurveArtist
     CylinderArtist
+    EllipseArtist
     FrameArtist
     LineArtist
     MeshArtist

docs/userguide/configuration/blender.rst

@@ -177,7 +177,7 @@ Alternatively, you can create a new environment and simply install entire COMPAS
 
 .. code-block:: bash
 
-    conda create -n blender python=3.9 cython --yes
+    conda create -n blender python=3.9 --yes
     conda activate blender
     pip install compas
     python -m compas_blender.install

docs/userguide/installation.rst

@@ -61,7 +61,6 @@ Install COMPAS using ``pip`` from the Python Package Index.
 
 .. code-block:: bash
 
-    pip install cython --install-option="--no-cython-compile"
     pip install compas
 
 Install an editable version from local source.

requirements.txt

@@ -1,8 +1,7 @@
 # flake8: noqa
-cython
 imageio <= 2.6; python_version < '3.5'
 imageio >= 2.7; python_version >= '3.5'
-jsonschema
+jsonschema >= 4.17, < 4.18
 matplotlib >= 2.2, < 3.0; python_version >= '2.7' and python_version < '3.0'
 matplotlib >= 2.2, < 3.1; python_version >= '3.5' and python_version <= '3.7' and sys_platform == 'win32'
 matplotlib >= 3.1; python_version >= '3.8' and sys_platform == 'win32'

src/compas/datastructures/__init__.py

@@ -159,6 +159,8 @@
 
 from .cell_network.cell_network import CellNetwork
 
+from .tree.tree import Tree, TreeNode
+
 BaseNetwork = Network
 BaseMesh = Mesh
 BaseVolMesh = VolMesh
@@ -277,6 +279,9 @@
     "Feature",
     "GeometricFeature",
     "ParametricFeature",
+    # Trees
+    "Tree",
+    "TreeNode",
 ]
 
 if not compas.IPY: