Merge remote-tracking branch 'origin/master' into feature/blender_2.80

# Conflicts:
#	src/compas_blender/__init__.py

Author: andrewtliew

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.4
+current_version = 0.4.10
 message = Bump version to {new_version}
 commit = True
 tag = True
@@ -9,14 +9,26 @@ search = version='{current_version}'
 replace = version='{new_version}'
 
 [bumpversion:file:docs/conf.py]
-search = release          = '{current_version}'
-replace = release          = '{new_version}'
+search = release = '{current_version}'
+replace = release = '{new_version}'
 
 [bumpversion:file:src/compas/__init__.py]
-search = __version__   = '{current_version}'
-replace = __version__   = '{new_version}'
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'
+
+[bumpversion:file:src/compas_blender/__init__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'
+
+[bumpversion:file:src/compas_ghpython/__init__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'
 
 [bumpversion:file:src/compas_rhino/__init__.py]
 search = __version__ = '{current_version}'
 replace = __version__ = '{new_version}'
 
+[bumpversion:file:CHANGELOG.md]
+search = [Unreleased]
+replace = {new_version}
+

CODE_OF_CONDUCT.md renamed to .github/CODE_OF_CONDUCT.md

@@ -1,34 +1,20 @@
 language: python
 
-matrix:
-  include:
-    - python: 2.7
-    - python: 3.6
+python:
+  - "2.7"
+  - "3.6"
 
 before_install:
-- if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
-    wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-    bash miniconda.sh -b -p $HOME/miniconda;
-    export PATH="$HOME/miniconda/bin:$PATH";
-    hash -r;
-    conda config --set always_yes yes --set changeps1 no;
-    conda update -q conda;
-    conda info -a;
-    conda create -y -q -n compas_3x -c conda-forge python=3.6;
-    source ~/miniconda/bin/activate compas_3x;
-    pip install -r requirements-dev.txt;
-  else
-    sudo apt-get update -qq;
-    pip install -r requirements-dev.txt;
-  fi
+- pip install Cython --install-option="--no-cython-compile"
 
 install:
-- python setup.py install;
+# This works because requirements-dev.txt ends with "-e ." to install COMPAS itself
+- pip install --no-cache-dir -r requirements-dev.txt
+
 
 script:
 - invoke test
 - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
-    cd temp && git clone https://github.com/compas-dev/sphinx_compas_theme && cd ..;
     invoke docs;
   fi
 

.travis.yml

@@ -1,8 +1,18 @@
+# Credits
+
+## Project Lead
+
 - Tom Van Mele <<[email protected]>> [@brgcode](https://github.com/brgcode), [@tomvanmele](https://github.com/tomvanmele)
+
+## Main Developers
+
+- Gonzalo Casas <<[email protected]>> [@gonzalocasas](https://github.com/gonzalocasas)
 - Andrew Liew <<[email protected]>> [@andrewtliew](https://github.com/andrewtliew)
 - Tomás Méndez Echenagucia <<[email protected]>> [@tmsmendez](https://github.com/tmsmendez)
 - Matthias Rippmann <<[email protected]>> [@Rippmann](https://github.com/Rippmann)
 - Romana Rust <<[email protected]>> [@romanarust](https://github.com/romanarust)
+
+## Contributors
+
 - Kathrin Dörfler <<[email protected]>> [@Kathrin3010](https://github.com/Kathrin3010)
-- Gonzalo Casas <<[email protected]>> [@gonzalocasas](https://github.com/gonzalocasas)
 - Robin Oval <<[email protected]>> [@robin-oval](https://github.com/robin-oval)

AUTHORS.md

@@ -0,0 +1,35 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.4.10
+
+### Added
+
+- 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.
+
+### Removed
+
+- Bound mesh operations.
+
+## [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
+

CHANGELOG.md

@@ -1,8 +1,31 @@
-# Contributions
+# Contributing
 
 Contributions are welcome and very much appreciated!
 
 
+## Bug reports
+
+When [reporting a bug](https://github.com/compas-dev/compas/issues) please include:
+
+* Operating system name and version.
+* Any details about your local setup that might be helpful in troubleshooting.
+* Detailed steps to reproduce the bug.
+
+> **NOTE**
+>
+> Please don't use the issue tracker to ask questions about **COMPAS**.
+> There is a [forum](https://forum.compas-framework.org) for that!
+>
+
+
+## Feature requests
+
+When [proposing a new feature](https://github.com/compas-dev/compas/issues) please include:
+
+* Explain in detail how it would work.
+* Keep the scope as narrow as possible, to make it easier to implement.
+
+
 ## Code contributions
 
 We accept code contributions through pull requests.
@@ -19,7 +42,7 @@ In short, this is how that works.
 3. Install development dependencies:
 
 ```bash
-$ pip install -r requirements-dev.txt
+    $ pip install -r requirements-dev.txt
 ```
 
 4. Make sure all tests pass:
@@ -48,27 +71,3 @@ command line to ease recurring operations:
 * `invoke docs`: Generate documentation.
 * `invoke test`: Run all tests and checks in one swift command.
 * `invoke`: Show available tasks.
-
-
-## Bug reports
-
-When [reporting a bug](https://github.com/compas-dev/compas/issues) please include:
-
-* Operating system name and version.
-* Any details about your local setup that might be helpful in troubleshooting.
-* Detailed steps to reproduce the bug.
-
-> **NOTE**
->
-> Please don't use the issue tracker to ask questions about **COMPAS**.
-> There is a [forum](https://forum.compas-framework.org) for that!
->
-
-
-## Feature requests and feedback
-
-The best way to send feedback is to file an issue on [Github](https://github.com/compas-dev/compas/issues).
-If you are proposing a feature:
-
-* Explain in detail how it would work.
-* Keep the scope as narrow as possible, to make it easier to implement.

CONTRIBUTING.md

@@ -1,4 +1,7 @@
 graft src
+graft bin
+
+prune .github
 
 prune data
 prune docs
@@ -8,9 +11,13 @@ prune temp
 
 include LICENSE
 include README.md
-include CONTRIBUTORS.md
+include AUTHORS.md
+include CHANGELOG.md
 include requirements.txt
 
-exclude requirements-dev.txt pytest.ini .bumpversion.cfg .editorconfig tasks.py
+exclude requirements-dev.txt
+exclude pytest.ini .bumpversion.cfg .editorconfig
+exclude tasks.py
+exclude CODE_OF_CONDUCT.md CONTRIBUTING.md
 
 global-exclude *.py[cod] __pycache__ *.dylib *.nb[ic] .DS_Store

MANIFEST.in

@@ -1,9 +1,10 @@
 # The COMPAS framework
 
 [![Travis - Build Status](https://travis-ci.com/compas-dev/compas.svg?branch=master)](https://travis-ci.com/compas-dev/compas)
-[![GitHub - License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/compas-dev/compas)
+[![GitHub - License](https://img.shields.io/github/license/compas-dev/compas.svg)](https://github.com/compas-dev/compas)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/COMPAS.svg)](https://pypi.python.org/project/COMPAS)
 [![PyPI - Latest Release](https://img.shields.io/pypi/v/COMPAS.svg)](https://pypi.python.org/project/COMPAS)
+[![Conda - Latest Release](https://anaconda.org/conda-forge/compas/badges/version.svg)](https://anaconda.org/conda-forge/compas)
 
 The **COMPAS** framework is an open-source, Python-based framework for computational research and collaboration in architecture, engineering and digital fabrication.
 
@@ -36,9 +37,6 @@ To verify your setup, start Python from the command line and run the following:
 
 ```
 
-Alternatively, you can also install from source. Check the [documentation for more details](https://compas-dev.github.io/main/devguide.html).
-
-
 ## First Steps
 
 * https://compas-dev.github.io/main/examples.html
@@ -59,7 +57,7 @@ If you find a bug, please help us solve it by [filing a report](https://github.c
 
 ## Contributing
 
-If you want to contribute, check out our [developer guidelines](https://compas-dev.github.io/main/devguide.html).
+If you want to contribute, check out the [contribution guidelines](https://compas-dev.github.io/main/contributions.html).
 
 
 ## License

README.md

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+import os
+import sys
+import argparse
+
+import compas
+
+HOME = os.environ['HOME']
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('plugin_path', help="The path to the plugin source.")
+    args = parser.parse_args()
+
+    plugin_path = args.plugin_path
+
+    parent, name = os.path.split(plugin_path)
+
+    if not os.path.exists(plugin_path):
+        raise Exception('Cannot find the plugin at this location: {}'.format(plugin_path))
+
+    if not os.path.isdir(plugin_path):
+        raise Exception('The provided path is not a plugin source dir: {}'.format(plugin_path))
+
+    symlink_path = os.path.join(HOME, 'Library', 'Application Support', 'Sublime Text 3', 'Packages', name)
+
+    if os.path.exists(symlink_path):
+        compas._os.remove_symlink(symlink_path)
+
+    compas._os.create_symlink(plugin_path, symlink_path)
+
+    print("\nSuccess: ST3 plugin installed!\n")
+
+    sys.exit(0)
+
+
+if __name__ == '__main__':
+    main()