Merge remote-tracking branch 'origin/master'

Author: andrewliew

.bumpversion.cfg

@@ -29,6 +29,6 @@ search = __version__ = '{current_version}'
 replace = __version__ = '{new_version}'
 
 [bumpversion:file:CHANGELOG.md]
-search = [Unreleased]
-replace = {new_version}
+search = Unreleased
+replace = [{new_version}] {now:%Y-%m-%d}
 

CHANGELOG.md

@@ -9,33 +9,102 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Support for relative mesh references in URDF.
+### Changed
+
+- Fix exception on Rhino Mac.
+- Fix missing import on `compas_rhino.geometry`.
+
+### Removed
+
+## [0.5.0] 2019-03-15
+
+### Added
+
+- Add `Circle` and `Sphere` primitives to `compas.geometry`.
+- Add functions to `Plane` and `Box` primitives.
+- Add functions to `compas_rhino` curve: `length` and `is_closed`.
+- Add functions to `compas_rhino` surface: `kinks`, `closest_point`, `closest_point_on_boundaries`, and functions for mapping/remapping between XYZ and UV(0) spaces based on surface's parametrization (`point_xyz_to_uv`, `point_uv_to_xyz`, `line_uv_to_xyz`, `polyline_uv_to_xyz`, `mesh_uv_to_xyz`)
+- Add `is_scalable` to `compas.robots.Joint`.
+
+### Changed
 
-## 0.5.0
+- Fix exception in `Plane.transform`.
+- Fix installer to remove old symlinks.
+- Fix RPC proxy server.
+
+## [0.4.22] 2019-03-05
 
 ### Added
 
+- Add pretty print option to JSON formatter.
+- Add remeshing based on `triangle`.
+- Add compatibility with ETO forms to `compas_rhino` edge modifiers.
+
+## [0.4.21] 2019-03-04
+
+### Changed
+
+- Fix import in `compas_rhino` vertex modifiers.
+
+## [0.4.20] 2019-03-04
+
+### Removed
+
+- Remove `download_image_from_remote` utility function.
+
+## [0.4.12] 2019-03-04
+
+### Changed
+
+- Small fixes on Rhino forms support.
+
+## [0.4.11] 2019-03-03
+
+### Added
+
+- New function to join network edges into polylines: `network_polylines`.
+- New mesh functions: `mesh_offset`, `mesh_thicken`, `mesh_weld` and `meshes_join_and_weld`.
+- New mesh functions: `face_skewness`, `face_aspect_ratio`, `face_curvature` and `vertex_curvature`.
+- New functions to get disconnected elements of  `Mesh`: `mesh_disconnected_vertices`, `mesh_disconnected_faces`, `mesh_explode`.
+- New functions to get disconnected elements of  `Network`: `network_disconnected_vertices`, `network_disconnected_edges`, `network_explode`.
+- Add statistics utility functions: `average`, `variance`, `standard_deviation`.
+- Add `binomial_coefficient` function.
+- Add option to create `Network` and `Mesh` from dictionaries of vertices and faces.
+- Add `face_adjacency_vertices` to `Mesh`
+- Add optional prefix to the rhino name attribute processor
+- Add `mesh_move_vertices` to `compas_rhino`.
+- Add support for relative mesh references in URDF.
+
+### Changed
+
+- Fix mesh centroid and mesh normal calculation.
+- Refactor of drawing functions in `compas_blender`.
+- Fix material creation in `compas_blender`.
+- New default for subdivision: `catmullclark`.
+
+## [0.4.9] 2019-02-10
+
+### Added
+
+- New class methods for `Polyhedron`: `from_platonicsolid` and `from_vertices_and_faces`.
 - Constrained and conforming Delaunay triangulations based on Triangle.
 - Predicate-based filtering of vertices and edges.
 
 ### Changed
 
-- Updated Rhino installation merging Win32 and Mac implementations and defaulting the bootstrapper to the active python even if no CONDA environment is active during install.
+- Fix exception in `angle_vectors_signed` if vectors aligned
+- Fix exception in `Polyline.point`
+- Update Rhino installation merging Win32 and Mac implementations and defaulting the bootstrapper to the active python even if no CONDA environment is active during install.
 
 ### Removed
 
 - Bound mesh operations.
 
-## [0.4.8] - 2019-01-28
+## [0.4.8] 2019-01-28
 
 ### Added
 
 - Curve tangent at parameter.
 - Box shape.
 - Numpy-based mesh transformations.
 - Option to share axes among plotters.
-
-### Changed
-
-### Removed
-

README.md

@@ -61,6 +61,11 @@ If you find a bug, please help us solve it by [filing a report](https://github.c
 If you want to contribute, check out the [contribution guidelines](https://compas-dev.github.io/main/contributions.html).
 
 
+## Changelog
+
+See changes between releases on the [changelog](https://compas-dev.github.io/main/changelog.html).
+
+
 ## License
 
 The main library of **COMPAS** is [released under the MIT license](https://compas-dev.github.io/main/license.html).

docs/changelog.rst

@@ -0,0 +1 @@
+.. mdinclude:: ../CHANGELOG.md

docs/conf.py

@@ -42,6 +42,7 @@
     'sphinx.ext.mathjax',
     'sphinx.ext.napoleon',
     'matplotlib.sphinxext.plot_directive',
+    'm2r',
 ]
 
 # autodoc options

docs/index.rst

@@ -13,5 +13,6 @@ The main library of COMPAS
    tutorials
    api
    contributions
+   changelog
    citing
    license

requirements-dev.txt

@@ -1,11 +1,12 @@
-sphinx>=1.6
-sphinx_compas_theme>=0.1.10
-ipython>=5.8
-invoke>=0.14
 bumpversion>=0.5
 check-manifest>=0.36
 flake8
-pytest==3.2
+invoke>=0.14
+ipython>=5.8
 isort
+m2r
+pytest==3.2
+sphinx_compas_theme>=0.1.10
+sphinx>=1.6
 twine
 -e .

tasks.py

@@ -69,39 +69,36 @@ def help(ctx):
     'builds': 'True to clean up build/packaging artifacts, otherwise False.'})
 def clean(ctx, docs=True, bytecode=True, builds=True):
     """Cleans the local copy from compiled artifacts."""
-    if builds:
-        ctx.run('python setup.py clean')
 
-    if bytecode:
-        # for root, dirs, files in os.walk(BASE_FOLDER):
-        #     for f in files:
-        #         if f.endswith('.pyc'):
-        #             os.remove(os.path.join(root, f))
-        #     if '.git' in dirs:
-        #         dirs.remove('.git')
-        files = glob.glob('src/**/*.pyc', recursive=True)
-        for path in files:
-            try:
-                os.remove(file)
-            except Exception:
-                pass
+    with chdir(BASE_FOLDER):
+        if builds:
+            ctx.run('python setup.py clean')
 
-    folders = []
+        if bytecode:
+            for root, dirs, files in os.walk(BASE_FOLDER):
+                for f in files:
+                    if f.endswith('.pyc'):
+                        os.remove(os.path.join(root, f))
+                if '.git' in dirs:
+                    dirs.remove('.git')
 
-    if docs:
-        folders.append('docs/api/generated')
+        folders = []
 
-    folders.append('dist/')
+        if docs:
+            folders.append('docs/api/generated')
 
-    if bytecode:
-        folders.extend(glob.glob('src/**/__pycache__', recursive=True))
+        folders.append('dist/')
 
-    if builds:
-        folders.append('build/')
-        folders.append('src/compas.egg-info/')
+        if bytecode:
+            for t in ('src', 'tests'):
+                folders.extend(glob.glob('{}/**/__pycache__'.format(t), recursive=True))
 
-    for folder in folders:
-        rmtree(os.path.join(BASE_FOLDER, folder), ignore_errors=True)
+        if builds:
+            folders.append('build/')
+            folders.append('src/compas.egg-info/')
+
+        for folder in folders:
+            rmtree(os.path.join(BASE_FOLDER, folder), ignore_errors=True)
 
 
 @task(help={
@@ -110,32 +107,36 @@ def clean(ctx, docs=True, bytecode=True, builds=True):
       'check_links': 'True to check all web links in docs for validity, otherwise False.'})
 def docs(ctx, doctest=False, rebuild=True, check_links=False):
     """Builds package's HTML documentation."""
+
     if rebuild:
         clean(ctx)
 
-    if doctest:
-        ctx.run('sphinx-build -E -b doctest docs dist/docs')
+    with chdir(BASE_FOLDER):
+        if doctest:
+            ctx.run('sphinx-build -E -b doctest docs dist/docs')
 
-    ctx.run('sphinx-build -E -b html docs dist/docs')
+        ctx.run('sphinx-build -E -b html docs dist/docs')
 
-    if check_links:
-        ctx.run('sphinx-build -E -b linkcheck docs dist/docs')
+        if check_links:
+            ctx.run('sphinx-build -E -b linkcheck docs dist/docs')
 
 
 @task()
 def check(ctx):
     """Check the consistency of documentation, coding style and a few other things."""
-    log.write('Checking MANIFEST.in...')
-    ctx.run('check-manifest --ignore-bad-ideas=test.so,fd.so,smoothing.so,drx_c.so')
 
-    log.write('Checking metadata...')
-    ctx.run('python setup.py check --strict --metadata')
+    with chdir(BASE_FOLDER):
+        log.write('Checking MANIFEST.in...')
+        ctx.run('check-manifest --ignore-bad-ideas=test.so,fd.so,smoothing.so,drx_c.so')
+
+        log.write('Checking metadata...')
+        ctx.run('python setup.py check --strict --metadata')
 
-    # log.write('Running flake8 python linter...')
-    # ctx.run('flake8 src tests setup.py')
+        # log.write('Running flake8 python linter...')
+        # ctx.run('flake8 src tests setup.py')
 
-    # log.write('Checking python imports...')
-    # ctx.run('isort --check-only --diff --recursive src tests setup.py')
+        # log.write('Checking python imports...')
+        # ctx.run('isort --check-only --diff --recursive src tests setup.py')
 
 
 @task(help={
@@ -145,11 +146,29 @@ def test(ctx, checks=False, doctest=False):
     if checks:
         check(ctx)
 
-    cmd = ['pytest']
-    if doctest:
-        cmd.append('--doctest-modules')
+    with chdir(BASE_FOLDER):
+        cmd = ['pytest']
+        if doctest:
+            cmd.append('--doctest-modules')
+
+        ctx.run(' '.join(cmd))
+
+
+@task
+def prepare_changelog(ctx):
+    """Prepare changelog for next release."""
+    UNRELEASED_CHANGELOG_TEMPLATE = '## Unreleased\n\n### Added\n\n### Changed\n\n### Removed\n\n\n## '
+
+    with chdir(BASE_FOLDER):
+        # Preparing changelog for next release
+        with open('CHANGELOG.md', 'r+') as changelog:
+            content = changelog.read()
+            changelog.seek(0)
+            changelog.write(content.replace(
+                '## ', UNRELEASED_CHANGELOG_TEMPLATE, 1))
+
+        ctx.run('git add CHANGELOG.md && git commit -m "Prepare changelog for next release"')
 
-    ctx.run(' '.join(cmd))
 
 
 @task(help={
@@ -175,7 +194,20 @@ def release(ctx, release_type):
 
         if len(dist_files):
             ctx.run('twine upload --skip-existing %s' % dist_files)
+
+            prepare_changelog(ctx)
         else:
             raise Exit('No files found to release')
     else:
         raise Exit('Aborted release')
+
+
+@contextlib.contextmanager
+def chdir(dirname=None):
+    current_dir = os.getcwd()
+    try:
+        if dirname is not None:
+            os.chdir(dirname)
+        yield
+    finally:
+        os.chdir(current_dir)