Skip to content

Commit b216aa3

Browse files
committed
Merge branch 'master' into ik_goal_constraints
2 parents fd3fbb4 + 097dd72 commit b216aa3

File tree

11 files changed

+51
-15
lines changed

11 files changed

+51
-15
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.10.1
2+
current_version = 0.10.2
33
message = Bump version to {new_version}
44
commit = True
55
tag = True
@@ -15,4 +15,3 @@ replace = __version__ = '{new_version}'
1515
[bumpversion:file:CHANGELOG.rst]
1616
search = Unreleased
1717
replace = {new_version}
18-

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ script:
6060
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]]; then
6161
python3 -m invoke lint || python -m invoke lint;
6262
fi
63-
- python3 -m invoke test --no-doctest || python -m invoke test --no-doctest
63+
- python3 -m invoke test || python -m invoke test
6464
- if [[ "$TRAVIS_GENERATE_DOCS" == "true" ]]; then
6565
python3 -m invoke docs || python -m invoke docs;
6666
fi

CHANGELOG.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@ Unreleased
2323

2424
**Deprecated**
2525

26+
0.10.2
27+
----------
28+
29+
**Added**
30+
31+
* Added Python 3.8 support
32+
33+
**Changed**
34+
35+
* Updated to COMPAS 0.13
36+
2637
0.10.1
2738
----------
2839

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
year = '2018'
2828
author = 'Gramazio Kohler Research'
2929
copyright = '{0}, {1}'.format(year, author)
30-
version = release = '0.10.1'
30+
version = release = '0.10.2'
3131

3232
pygments_style = 'sphinx'
3333
show_authors = True

pytest.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

requirements-dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ flake8
77
autopep8
88
pylint
99
pytest
10+
pytest-cov
1011
isort
1112
twine
1213
-e .

setup.cfg

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ exclude =
1717
convention = numpy
1818

1919
[tool:pytest]
20-
testpaths = tests
20+
testpaths = src tests
2121
norecursedirs =
2222
migrations
2323

@@ -28,9 +28,9 @@ python_files =
2828
addopts =
2929
-ra
3030
--strict
31-
--doctest-modules
3231
--doctest-glob=\*.rst
3332
--tb=short
33+
doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ALLOW_UNICODE ALLOW_BYTES
3434

3535
[isort]
3636
force_single_line = True
@@ -40,3 +40,6 @@ default_section = THIRDPARTY
4040
forced_separate = test_compas_fab
4141
not_skip = __init__.py
4242
skip = migrations
43+
44+
[coverage:run]
45+
branch = True

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
requirements = [
1313
# Until COMPAS reaches 1.0, we pin major.minor and allow patch version updates
14-
'compas>=0.11,<0.12',
14+
'compas>=0.11,<0.14',
1515
'roslibpy>=0.7.1',
1616
'pyserial',
1717
]
@@ -63,6 +63,8 @@ def read(*names, **kwargs):
6363
'Programming Language :: Python :: 3.4',
6464
'Programming Language :: Python :: 3.5',
6565
'Programming Language :: Python :: 3.6',
66+
'Programming Language :: Python :: 3.7',
67+
'Programming Language :: Python :: 3.8',
6668
'Programming Language :: Python :: Implementation :: CPython',
6769
'Programming Language :: Python :: Implementation :: IronPython',
6870
'Topic :: Scientific/Engineering',

src/compas_fab/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
__title__ = 'compas_fab'
22
__description__ = 'Robotic fabrication package for the COMPAS Framework'
33
__url__ = 'https://github.com/compas-dev/compas_fab'
4-
__version__ = '0.10.1'
4+
__version__ = '0.10.2'
55
__author__ = 'Gramazio Kohler Research'
66
__author_email__ = '[email protected]'
77
__license__ = 'MIT license'

src/compas_fab/robots/robot.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,25 @@ def merge_group_with_full_configuration(self, group_configuration, full_configur
528528
configuration.values[i] = group_configuration.values[gi]
529529
return configuration
530530

531+
def get_group_names_from_link_name(self, link_name):
532+
"""Returns the group_names to which the link_name belongs to.
533+
534+
Parameters
535+
----------
536+
link_name : str
537+
The name of a link
538+
539+
Returns
540+
-------
541+
list of str
542+
A list of group names.
543+
"""
544+
group_names = []
545+
for group in self.group_names:
546+
if link_name in self.get_link_names(group):
547+
group_names.append(group)
548+
return group_names
549+
531550
def get_position_by_joint_name(self, configuration, joint_name, group=None):
532551
"""Returns the value of the joint_name in the passed configuration.
533552
"""

0 commit comments

Comments
 (0)