From 15e205dd9c29c0641faeca196bd25c0c0e6a82b8 Mon Sep 17 00:00:00 2001 From: Pierre Rouanet Date: Fri, 20 Jan 2017 10:25:58 +0100 Subject: [PATCH 1/2] Bump to version 2.11.10 --- changelog.md | 2 +- pypot/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index fb865605..68ffa4f2 100644 --- a/changelog.md +++ b/changelog.md @@ -31,7 +31,7 @@ * Fix offset/orientation issue in DummyController * Fix hostname resolution * Make initialization of synchronization loop more robust - +* Fix #155: Closing a DummyRobot raises an issue ## V 2.10 ### Features diff --git a/pypot/_version.py b/pypot/_version.py index 6b6be207..1369bbb1 100644 --- a/pypot/_version.py +++ b/pypot/_version.py @@ -1 +1 @@ -__version__ = '2.11.9' +__version__ = '2.11.10' From a2177da20f8e4cd20a02448fbd26c2697dbbce38 Mon Sep 17 00:00:00 2001 From: Pierre Rouanet Date: Fri, 20 Jan 2017 10:31:52 +0100 Subject: [PATCH 2/2] Fix CI issues. - Fix redirection issue when curling miniconda in ci. - Fix shell_session_update error on OS-X ci build --- .travis.yml | 1 + ci/before_install.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a22a663..b997e850 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ addons: - dvipng before_install: + - rvm get head - . ./ci/before_install.sh install: diff --git a/ci/before_install.sh b/ci/before_install.sh index 4c567ee0..8077b03c 100644 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -33,9 +33,9 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then # Use miniconda python (provide binaries for scipy and numpy on Linux) if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then - curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh + curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh else - curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh fi elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then @@ -48,9 +48,9 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then # Use miniconda python (provide binaries for scipy and numpy on Linux) if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then - curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh + curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh else - curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh + curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh fi fi