Merge remote-tracking branch 'upstream/master' into allow_skeleton_robot_instances

Author: tetov

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.10.1
+current_version = 0.10.2
 message = Bump version to {new_version}
 commit = True
 tag = True
@@ -15,4 +15,3 @@ replace = __version__ = '{new_version}'
 [bumpversion:file:CHANGELOG.rst]
 search = Unreleased
 replace = {new_version}
-

.travis.yml

@@ -60,7 +60,7 @@ script:
   - if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]]; then
       python3 -m invoke lint || python -m invoke lint;
     fi
-  - python3 -m invoke test --no-doctest || python -m invoke test --no-doctest
+  - python3 -m invoke test || python -m invoke test
   - if [[ "$TRAVIS_GENERATE_DOCS" == "true" ]]; then
       python3 -m invoke docs || python -m invoke docs;
     fi

CHANGELOG.rst

@@ -26,6 +26,17 @@ Unreleased
 
 **Deprecated**
 
+0.10.2
+----------
+
+**Added**
+
+* Added Python 3.8 support
+
+**Changed**
+
+* Updated to COMPAS 0.13
+
 0.10.1
 ----------
 

docs/conf.py

@@ -27,7 +27,7 @@
 year = '2018'
 author = 'Gramazio Kohler Research'
 copyright = '{0}, {1}'.format(year, author)
-version = release = '0.10.1'
+version = release = '0.10.2'
 
 pygments_style = 'sphinx'
 show_authors = True

requirements-dev.txt

@@ -7,6 +7,7 @@ flake8
 autopep8
 pylint
 pytest
+pytest-cov
 isort
 twine
 -e .

setup.cfg

@@ -40,3 +40,6 @@ default_section = THIRDPARTY
 forced_separate = test_compas_fab
 not_skip = __init__.py
 skip = migrations
+
+[coverage:run]
+branch = True

setup.py

@@ -11,7 +11,7 @@
 
 requirements = [
     # Until COMPAS reaches 1.0, we pin major.minor and allow patch version updates
-    'compas>=0.11,<0.12',
+    'compas>=0.11,<0.14',
     'roslibpy>=0.7.1',
     'pyserial',
 ]
@@ -63,6 +63,8 @@ def read(*names, **kwargs):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: IronPython',
         'Topic :: Scientific/Engineering',

src/compas_fab/__version__.py

@@ -1,7 +1,7 @@
 __title__ = 'compas_fab'
 __description__ = 'Robotic fabrication package for the COMPAS Framework'
 __url__ = 'https://github.com/compas-dev/compas_fab'
-__version__ = '0.10.1'
+__version__ = '0.10.2'
 __author__ = 'Gramazio Kohler Research'
 __author_email__ = '[email protected]'
 __license__ = 'MIT license'

tasks.py

@@ -199,14 +199,18 @@ def deploy_docs(ctx):
 
 @task(help={
       'doctest': 'True to run doctest modules, otherwise False.',
+      'coverage': 'True to generate coverage report using pytest-cov'
       })
-def test(ctx, doctest=True):
+def test(ctx, doctest=False, coverage=False):
     """Run all tests."""
+
+    pytest_args = ['pytest']
     if doctest:
-        ctx.run('pytest --doctest-modules')
-    else:
-        ctx.run('pytest')
+        pytest_args.append('--doctest-modules')
+    if coverage:
+        pytest_args.append('--cov=compas_fab')
 
+    ctx.run(" ".join(pytest_args))
 
 @task(help={
       'release_type': 'Type of release follows semver rules. Must be one of: major, minor, patch.'})