diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 16829df..fb54cd9 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.0 +current_version = 1.1.0 message = Bump version to {new_version} commit = True tag = True diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ef00b29..0b54ff2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,7 +2,7 @@ Changelog ========= -Unreleased +1.1.0 ---------- **Added** diff --git a/docker/real_controller_one_robot/docker-compose.yml b/docker/real_controller_one_robot/docker-compose.yml index 9bfa1a8..0a29932 100644 --- a/docker/real_controller_one_robot/docker-compose.yml +++ b/docker/real_controller_one_robot/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: ros-master: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-master environment: - ROS_HOSTNAME=ros-master @@ -12,7 +12,7 @@ services: - roscore ros-bridge: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-bridge environment: - ROS_HOSTNAME=ros-bridge @@ -29,7 +29,7 @@ services: - unregister_timeout:=28800 # This horribly long timeout of 8 hours is to workaround this issue: https://github.com/RobotWebTools/rosbridge_suite/issues/138 abb-driver-1: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-1 environment: - ROS_HOSTNAME=abb-driver-1 diff --git a/docker/real_controller_two_robots/docker-compose.yml b/docker/real_controller_two_robots/docker-compose.yml index 4428981..f26248a 100644 --- a/docker/real_controller_two_robots/docker-compose.yml +++ b/docker/real_controller_two_robots/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: ros-master: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-master environment: - ROS_HOSTNAME=ros-master @@ -12,7 +12,7 @@ services: - roscore ros-bridge: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-bridge environment: - ROS_HOSTNAME=ros-bridge @@ -29,7 +29,7 @@ services: - unregister_timeout:=28800 # This horribly long timeout of 8 hours is to workaround this issue: https://github.com/RobotWebTools/rosbridge_suite/issues/138 abb-driver-1: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-1 environment: - ROS_HOSTNAME=abb-driver-1 @@ -47,7 +47,7 @@ services: - namespace:=rob1 abb-driver-2: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-2 environment: - ROS_HOSTNAME=abb-driver-2 diff --git a/docker/real_multi_controller/docker-compose.yml b/docker/real_multi_controller/docker-compose.yml index d45cc7f..b16b023 100644 --- a/docker/real_multi_controller/docker-compose.yml +++ b/docker/real_multi_controller/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: ros-master: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-master environment: - ROS_HOSTNAME=ros-master @@ -12,7 +12,7 @@ services: - roscore ros-bridge: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-bridge environment: - ROS_HOSTNAME=ros-bridge @@ -29,7 +29,7 @@ services: - unregister_timeout:=28800 # This horribly long timeout of 8 hours is to workaround this issue: https://github.com/RobotWebTools/rosbridge_suite/issues/138 abb-driver-1: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-1 environment: - ROS_HOSTNAME=abb-driver-1 @@ -47,7 +47,7 @@ services: - namespace:=ctrl1_rob1 abb-driver-2: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-2 environment: - ROS_HOSTNAME=abb-driver-2 diff --git a/docker/virtual_controller_one_robot/docker-compose.yml b/docker/virtual_controller_one_robot/docker-compose.yml index 33daa72..03a806d 100644 --- a/docker/virtual_controller_one_robot/docker-compose.yml +++ b/docker/virtual_controller_one_robot/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: ros-master: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-master environment: - ROS_HOSTNAME=ros-master @@ -12,7 +12,7 @@ services: - roscore ros-bridge: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-bridge environment: - ROS_HOSTNAME=ros-bridge @@ -29,7 +29,7 @@ services: - unregister_timeout:=28800 # This horribly long timeout of 8 hours is to workaround this issue: https://github.com/RobotWebTools/rosbridge_suite/issues/138 abb-driver-1: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-1 environment: - ROS_HOSTNAME=abb-driver-1 diff --git a/docker/virtual_controller_two_robots/docker-compose.yml b/docker/virtual_controller_two_robots/docker-compose.yml index b9a5e84..95b3f68 100644 --- a/docker/virtual_controller_two_robots/docker-compose.yml +++ b/docker/virtual_controller_two_robots/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: ros-master: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-master environment: - ROS_HOSTNAME=ros-master @@ -12,7 +12,7 @@ services: - roscore ros-bridge: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-bridge environment: - ROS_HOSTNAME=ros-bridge @@ -29,7 +29,7 @@ services: - unregister_timeout:=28800 # This horribly long timeout of 8 hours is to workaround this issue: https://github.com/RobotWebTools/rosbridge_suite/issues/138 abb-driver-1: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-1 environment: - ROS_HOSTNAME=abb-driver-1 @@ -47,7 +47,7 @@ services: - namespace:=rob1 abb-driver-2: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-2 environment: - ROS_HOSTNAME=abb-driver-2 diff --git a/docker/virtual_multi_controller/docker-compose.yml b/docker/virtual_multi_controller/docker-compose.yml index 4ee76d6..8c39441 100644 --- a/docker/virtual_multi_controller/docker-compose.yml +++ b/docker/virtual_multi_controller/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: ros-master: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-master environment: - ROS_HOSTNAME=ros-master @@ -12,7 +12,7 @@ services: - roscore ros-bridge: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: ros-bridge environment: - ROS_HOSTNAME=ros-bridge @@ -29,7 +29,7 @@ services: - unregister_timeout:=28800 # This horribly long timeout of 8 hours is to workaround this issue: https://github.com/RobotWebTools/rosbridge_suite/issues/138 abb-driver-1: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-1 environment: - ROS_HOSTNAME=abb-driver-1 @@ -47,7 +47,7 @@ services: - namespace:=ctrl1_rob1 abb-driver-2: - image: compasrrc/compas_rrc_driver:v1.0.0 + image: compasrrc/compas_rrc_driver:v1.1.0 container_name: abb-driver-2 environment: - ROS_HOSTNAME=abb-driver-2 diff --git a/docs/conf.py b/docs/conf.py index b3e7837..ea77caa 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -29,7 +29,7 @@ year = '2019' author = 'ETH Zurich' copyright = '{0}, {1}'.format(year, author) -version = release = '1.0.0' +version = release = '1.1.0' pygments_style = 'sphinx' show_authors = True diff --git a/docs/doc_versions.txt b/docs/doc_versions.txt index c757588..e343924 100644 --- a/docs/doc_versions.txt +++ b/docs/doc_versions.txt @@ -1,2 +1,3 @@ latest +1.1.0 1.0.0 diff --git a/src/compas_rrc/__version__.py b/src/compas_rrc/__version__.py index 46b4463..bcc3a29 100644 --- a/src/compas_rrc/__version__.py +++ b/src/compas_rrc/__version__.py @@ -1,7 +1,7 @@ __title__ = 'compas_rrc' __description__ = 'COMPAS RRC: Library for ABB Robots' __url__ = 'https://github.com/compas-rrc/compas_rrc' -__version__ = '1.0.0' +__version__ = '1.1.0' __author__ = 'ETH Zurich' __author_email__ = 'rrc@arch.ethz.ch' __license__ = 'MIT license'