Skip to content

Commit ee4f2fd

Browse files
committed
Merge branch 'main' into feature/frame_axes
2 parents b7ff2d3 + 43695d8 commit ee4f2fd

File tree

25 files changed

+756
-311
lines changed

25 files changed

+756
-311
lines changed

.github/workflows/ironpython.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- name: "[RPC tests] Install CPython dependencies"
2222
run: |
2323
python -m pip install --upgrade pip
24-
pip install cython --config-settings="--build-option=--no-cython-compile"
2524
- name: "[RPC tests] Install COMPAS on CPython"
2625
run: |
2726
pip install --no-cache-dir .

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
tasks:
2-
- init: pip3 install cython --install-option="--no-cython-compile" && pip3 install .
2+
- init: pip3 install .

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Added
1111
* Added `Frame.axes`
1212

13+
* Added `compas.datastructures.TreeNode` and `compas.datastructures.Tree` classes.
14+
* Added `EllipseArtist` to `compas_rhino` and `compas_ghpython`.
15+
1316
### Changed
1417

1518
* Changed `Network.is_planar` to rely on `NetworkX` instead `planarity` for planarity checking.
1619
* Removed `planarity` from requirements.
1720
* Fixed argument order at `compas.geometry.cone.circle`.
21+
* Pinned `jsonschema` version to >=4.17, <4.18 to avoid Rust toolchain
22+
* Fixed `box_to_compas` in `compas_rhino.conversions` to correctly take in the center of the box as the center point of the frame.
23+
* Removed `cython` from requirements.
24+
* Made X and Y axis optional in the constructor of `Frame`.
1825

1926
### Removed
2027

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def visit_reference(self, node):
276276

277277
html_theme = "pydata_sphinx_theme"
278278
html_logo = "_static/images/compas_icon_white.png" # relative to parent of conf.py
279-
html_title = "COMPAS docs"
279+
html_title = "compas"
280280
html_favicon = "_static/images/compas.ico"
281281

282282
html_theme_options = {

docs/devguide/workflow.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To set up a developer environment
1212

1313
.. code-block:: bash
1414
15-
conda create -n compas-dev python=3.8 cython --yes
15+
conda create -n compas-dev python=3.11 --yes
1616
conda activate compas-dev
1717
1818
3. Install development dependencies:

docs/extensions/index.rst

Lines changed: 0 additions & 141 deletions
This file was deleted.

docs/index.rst

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ this is the place to start.
2323
userguide/index
2424

2525

26-
Developer Guide
27-
===============
26+
Development
27+
===========
2828

2929
If you want to contribute to COMPAS, this is the place to start.
3030

@@ -35,8 +35,8 @@ If you want to contribute to COMPAS, this is the place to start.
3535
devguide/index
3636

3737

38-
Package Reference
39-
=================
38+
API Reference
39+
=============
4040

4141
The reference documentation of the core package and the CAD packages.
4242

@@ -45,16 +45,3 @@ The reference documentation of the core package and the CAD packages.
4545
:titlesonly:
4646

4747
reference/index
48-
49-
50-
Extensions
51-
==========
52-
53-
The core extensions to COMPAS and the AEC toolboxes manages by the compas-dev team are listed here.
54-
55-
.. toctree::
56-
:maxdepth: 2
57-
:titlesonly:
58-
59-
extensions/index
60-

docs/reference/compas_ghpython.artists.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Classes
2525
ConeArtist
2626
CurveArtist
2727
CylinderArtist
28+
EllipseArtist
2829
FrameArtist
2930
LineArtist
3031
MeshArtist

docs/reference/compas_rhino.artists.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Classes
1919
ConeArtist
2020
CurveArtist
2121
CylinderArtist
22+
EllipseArtist
2223
FrameArtist
2324
LineArtist
2425
MeshArtist

docs/userguide/configuration/blender.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Alternatively, you can create a new environment and simply install entire COMPAS
177177

178178
.. code-block:: bash
179179
180-
conda create -n blender python=3.9 cython --yes
180+
conda create -n blender python=3.9 --yes
181181
conda activate blender
182182
pip install compas
183183
python -m compas_blender.install

0 commit comments

Comments
 (0)