Merge branch 'main' into blndr_norm

Author: beverlylytle

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.7.1
+current_version = 1.8.1
 message = Bump version to {new_version}
 commit = True
 tag = True

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: compas-dev/compas-actions.docs@v1.0.0
+      - uses: compas-dev/compas-actions.docs@v1.2.0
         id: docs
         with:
           dest: deploy
@@ -47,7 +47,7 @@ jobs:
         with:
           ref: gh-pages
 
-      - uses: compas-dev/compas-actions.docversions@v1.0.0
+      - uses: compas-dev/compas-actions.docversions@v1.2.0
         with:
           current_patch: ${{ needs.build.outputs.current_patch }}
 

AUTHORS.md

@@ -31,3 +31,4 @@
 - Robin Godwyll <<[email protected]>> [@robin-gdwl](https://github.com/robin-gdwl)
 - Mattis Koh <<[email protected]>> [@mattiskoh](https://github.com/mattiskoh)
 - Andrea Ghensi <<[email protected]>> [@sanzoghenzo](https://github.com/sanzoghenzo)
+- Nizar Taha <<[email protected]>> [@nizartaha](https://github.com/nizartaha)

CHANGELOG.md

@@ -9,13 +9,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Removed
+
+
+## [1.8.1] 2021-09-08
+
+### Added
+
+### Changed
+
+### Removed
+
+
+## [1.8.0] 2021-09-08
+
+### Added
+
 * Added pluggable function `trimesh_slice` in `compas_rhino`.
 * Added equality comparison for pointclouds.
 * Added `compas.data.is_sequence_of_uint`.
 * Added general plotter for geometry objects and data structures based on the artist registration mechanism.
 * Added support for multimesh files to OBJ reader/writer.
 * Added support for attaching and detaching meshes in `compas.robots.RobotModelArtist` and drawing them.
 * Added `meshes` method to artists of `compas.robots.RobotModel`.
+* Added `FrameArtist` class to `compas_blender`.
 
 ### Changed
 
@@ -27,9 +46,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `compas_rhino.drawing.draw_breps` to assume provided polygon is closed and automatically add missing corner to polycurve constructor.
 * Changed conversion of edges and faces to uniques keys for the data dicts to use the string representation of a sorted tuple of identifiers.
 * Added `dtype` to JSON decoding error message.
+* Moved `compas.datastructures.mesh.core.halfedge.HalfEdge` to `compas.datastructures.halfedge.halfedge.HalfEdge`
+* Moved `compas.datastructures.network.core.graph.Graph` to `compas.datastructures.graph.graph.Graph`.
 
 ### Removed
 
+* Removed `compas.datastructures.mesh.core.mesh.BaseMesh`.
+
+* Removed `compas.datastructures.BaseNetwork`.
+
 ## [1.7.1] 2021-06-14
 
 ### Added

data.json

@@ -38,7 +38,7 @@ def patched_m2r2_setup(app):
 copyright = "Block Research Group - ETH Zurich"
 author = "Tom Van Mele"
 
-release = "1.7.1"
+release = "1.8.1"
 version = ".".join(release.split(".")[0:2])
 
 master_doc = "index"

docs/conf.py

@@ -9,18 +9,26 @@ Blender ships with its own embedded version of Python. Therefore, the simplest
 Python by the Python of a `conda` environment that already has COMPAS installed.
 
 It is important that the version of Python installed in the `conda` environment matches
-the version of Python that was originally shipped with Blender. For Blender 2.8x and 2.9x
-this is Python 3.7x.
+the version of Python that was originally shipped with Blender. For Blender 2.83 LTS
+the version of the bundled Python is 3.7, and for 2.93 LTS it is 3.9.
+
+.. note::
+
+    To find out which Python is shipped with your Blender installation, just open Blender
+    and have a look at the Interactive Python Console that is part of the UI
+    under the Scripting tab.
+
 
 Installation
 ============
 
+These instructions are for the latest Blender 2.83 LTS which ships with Python 3.7
 If you don't have an environment yet with Python 3.7 and COMPAS you can create one with ``conda``.
 
 .. code-block:: bash
 
     conda config --add channels conda-forge
-    conda create -n blender python=3.7 COMPAS
+    conda create -n blender python=3.7 COMPAS --yes
 
 Configuring Blender to use the newly installed environment is slightly different per OS.
 
@@ -50,11 +58,10 @@ Configuring Blender to use the newly installed environment is slightly different
 .. code-block:: bash
 
     conda activate blender
-    python -m compas_blender.install "%PROGRAMFILES%\\Blender Foundation\\Blender 2.91\\2.91"
+    python -m compas_blender.install "%PROGRAMFILES%\\Blender Foundation\\Blender 2.83\\2.83"
 
-Note that the path ``%PROGRAMFILES%\\Blender Foundation\\Blender 2.91\\2.91`` might be different
-if you have another version of Blender intalled.
-Check your version of Blender and change the path accordingly.
+Note that the path ``%PROGRAMFILES%\\Blender Foundation\\Blender 2.83\\2.83`` might be different on your system.
+Check your Blender installation and change the path accordingly.
 
 .. raw:: html
 
@@ -64,11 +71,10 @@ Check your version of Blender and change the path accordingly.
 .. code-block:: bash
 
     conda activate blender
-    python -m compas_blender.install /Applications/blender.app/Contents/Resources/2.91
+    python -m compas_blender.install /Applications/blender.app/Contents/Resources/2.83
 
-Note that the path ``/Applications/blender.app/Contents/Resources/2.91`` might be different
-if you have another version of Blender intalled.
-Check your version of Blender and change the path accordingly.
+Note that the path ``/Applications/blender.app/Contents/Resources/2.83`` might be different on your system.
+Check your Blender installation and change the path accordingly.
 
 .. raw:: html
 
@@ -78,9 +84,10 @@ Check your version of Blender and change the path accordingly.
 .. code-block:: bash
 
     conda activate blender
-    python -m compas_blender.install ~/Blender/2.91
+    python -m compas_blender.install ~/Blender/2.83
 
-Note that the path ``~/Blender/2.91`` might be different for your setup.
+Note that the path ``~/Blender/2.83`` might be different on your system.
+Check your Blender installation and change the path accordingly.
 
 .. raw:: html
 
@@ -183,7 +190,7 @@ Just add the following to your ``.bash_profile`` or ``.bashrc``.
 
 .. code-block:: bash
 
-    export PATH="~/Blender/2.91:$PATH"
+    export PATH="~/Blender/2.83:$PATH"
 
 Note that this path might be different on your system.
 
@@ -274,7 +281,7 @@ Collections
 Limitations
 ===========
 
-``compas_blender`` is not yet as well developed as, ``compas_rhino`` and ``compas_ghpython``.
+``compas_blender`` is not yet as well developed as ``compas_rhino`` and ``compas_ghpython``.
 For example, COMPAS geometry objects do not yet have a corresponding artist in ``compas_blender``.
 Artists are currently only available for data structures and robots.
 

docs/gettingstarted/blender.rst

@@ -18,4 +18,5 @@ schema
 jsonschema
 scipy >= 1.1
 sympy
+typing_extensions
 watchdog

requirements.txt

@@ -25,7 +25,7 @@ def read(*names, **kwargs):
 
 setup(
     name='COMPAS',
-    version='1.7.1',
+    version='1.8.1',
     description='The COMPAS framework',
     long_description=long_description,
     long_description_content_type='text/markdown',

setup.py

@@ -90,7 +90,7 @@
 __license__ = 'MIT License'
 __email__ = '[email protected]'
 
-__version__ = '1.7.1'
+__version__ = '1.8.1'
 
 version = LooseVersion(compas.__version__)
 versionstring = version.vstring.split('-')[0]