Merge branch 'main' into occ-nurbs

Author: tomvanmele

.bumpversion.cfg

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

CHANGELOG.md

@@ -19,6 +19,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 
+## [1.9.3] 2021-11-02
+
+### Added
+
+### Changed
+
+* Changed default path for Rhino 7 legacy install cleanup to Rhino7.app in `compas_rhino.__init__.py`.
+* Changed z-coordinate of `compas.datastructures.Mesh.from_meshgrid` to `0.0` instead of `0`. 
+
+### Removed
+
+
 ## [1.9.2] 2021-11-02
 
 ### Added

docs/conf.py

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

setup.py

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

src/compas/__init__.py

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

src/compas/datastructures/mesh/mesh.py

@@ -642,10 +642,10 @@ def from_meshgrid(cls, dx, nx, dy=None, ny=None):
         V, U = meshgrid(linspace(0, dx, nx + 1), linspace(0, dy, ny + 1), indexing='ij')
 
         quads = [[
-            [U[i + 0][j + 0], V[i + 0][j + 0], 0],
-            [U[i + 0][j + 1], V[i + 0][j + 1], 0],
-            [U[i + 1][j + 1], V[i + 1][j + 1], 0],
-            [U[i + 1][j + 0], V[i + 1][j + 0], 0]
+            [U[i + 0][j + 0], V[i + 0][j + 0], 0.0],
+            [U[i + 0][j + 1], V[i + 0][j + 1], 0.0],
+            [U[i + 1][j + 1], V[i + 1][j + 1], 0.0],
+            [U[i + 1][j + 0], V[i + 1][j + 0], 0.0]
         ] for i, j in product(range(ny), range(nx))]
 
         return cls.from_polygons(quads)

src/compas_blender/__init__.py

@@ -50,7 +50,7 @@ def redraw():
     bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
 
 
-__version__ = '1.9.2'
+__version__ = '1.9.3'
 
 
 def _check_blender_version(version):

src/compas_ghpython/__init__.py

@@ -22,7 +22,7 @@
     from .utilities import *  # noqa: F401 F403
 
 
-__version__ = '1.9.2'
+__version__ = '1.9.3'
 
 
 def get_grasshopper_plugin_path(version):

src/compas_plotters/__init__.py

@@ -18,7 +18,7 @@
 
 """
 
-__version__ = '1.9.2'
+__version__ = '1.9.3'
 
 from .core import *  # noqa: F401 F403
 # from .artists import *  # noqa: F401 F403

src/compas_rhino/__init__.py

@@ -29,7 +29,7 @@
     from .utilities import *  # noqa: F401 F403
 
 
-__version__ = '1.9.2'
+__version__ = '1.9.3'
 
 
 PURGE_ON_DELETE = True
@@ -93,7 +93,7 @@ def _get_ironpython_lib_path_mac(version):
     lib_paths = {
         '5.0': ['/', 'Applications', 'Rhinoceros.app', 'Contents'],
         '6.0': ['/', 'Applications', 'Rhinoceros.app', 'Contents', 'Frameworks', 'RhCore.framework', 'Versions', 'A'],
-        '7.0': ['/', 'Applications', 'Rhinoceros.app', 'Contents', 'Frameworks', 'RhCore.framework', 'Versions', 'A']
+        '7.0': ['/', 'Applications', 'Rhino7.app', 'Contents', 'Frameworks', 'RhCore.framework', 'Versions', 'A']
     }
     return os.path.join(*lib_paths.get(version) + ['Resources', 'ManagedPlugIns', 'RhinoDLR_Python.rhp', 'Lib'])