Permalink
Browse files

Merge branch 'master' of https://github.com/openlightingproject/ola i…

…nto protobuf-3.6
  • Loading branch information...
peternewman committed Jan 1, 2019
2 parents 0e5e243 + c032153 commit a8495fb55da746ab97dd3d0d73cbe3fbea0e84e4
Showing with 28 additions and 50 deletions.
  1. +23 −45 .travis.yml
  2. +1 −1 doxygen/rpc.dox
  3. +3 −3 java/pom.xml
  4. +1 −1 python/ola/OlaClient.py
@@ -104,7 +104,7 @@ matrix:
- PROTOBUF='3.6'
- LIBFTDI='1'
- os: linux
dist: trusty
dist: xenial
compiler: clang
env: TASK='compile'
python: '2.7'
@@ -114,9 +114,9 @@ matrix:
- *core_build_clang_latest
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0
- llvm-toolchain-xenial-6.0
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='compile'
python: '2.7'
@@ -127,7 +127,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='coverage'
addons:
@@ -137,7 +137,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='coverity'
addons:
@@ -149,9 +149,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='doxygen'
addons:
apt:
@@ -162,107 +160,87 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='lint'
addons:
apt:
packages:
- *core_build
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='check-licences'
addons:
apt:
packages:
- *core_build
- os: linux
dist: trusty
# Short duration job, would use the container/without sudo image as it boots faster, but we need a backported lintian, so don't
sudo: required
dist: xenial
env: TASK='spellintian'
addons:
apt:
packages:
- *core_build
- moreutils
- os: linux
dist: trusty
# Short duration job, would use the container/without sudo image as it boots faster, but we need a backported lintian, so don't
sudo: required
dist: xenial
env: TASK='spellintian-duplicates'
addons:
apt:
packages:
- *core_build
- moreutils
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='codespell'
addons:
apt:
packages:
- *core_build
- moreutils
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='jshint'
addons:
apt:
packages:
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='flake8'
addons:
apt:
packages:
- *base_build
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='pychecker'
addons:
apt:
packages:
- *base_build
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='pychecker-wip'
addons:
apt:
packages:
- *base_build
allow_failures:
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='coverage'
- os: linux
dist: trusty
dist: xenial
compiler: gcc
env: TASK='coverity'
- os: linux
dist: trusty
# Short duration job, use the container/without sudo image as it boots faster
sudo: false
dist: xenial
env: TASK='pychecker-wip'
- os: linux
dist: trusty
dist: xenial
env: TASK='spellintian'
- os: linux
dist: trusty
dist: xenial
env: TASK='spellintian-duplicates'

env:
@@ -302,14 +280,14 @@ install:
# Match the version of protobuf being installed via apt
  - if [[ "$PROTOBUF" == "3.6" ]]; then pip install --user protobuf==3.6.0; fi
- if [[ "$PROTOBUF" != "3.6" ]]; then pip install --user protobuf==3.1.0; fi
# We need to use pip rather than apt on Trusty
# We need to use pip rather than apt on Xenial
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user numpy; fi
- if [ "$TASK" = "coverage" ]; then pip install --user cpp-coveralls; fi
- if [ "$TASK" = "flake8" ]; then pip install --user flake8; fi
- if [ "$TASK" = "codespell" ]; then pip install --user git+https://github.com/codespell-project/codespell.git; fi
- if [ "$TASK" = "jshint" ]; then npm install -g grunt-cli; fi
# If this causes SSL errors, then Sourceforge is probably in disaster recovery mode and needing Javascript. Could switch to a specific mirror, e.g. kent.dl.sourceforge.net
- if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then pip install --user http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi
- if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then sudo pip install http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi

before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
@@ -334,7 +312,7 @@ before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-6.0" CC="clang-6.0"; fi
#Report the compiler version
- $CXX --version
- if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then sudo add-apt-repository ppa:waja/trusty-backports -y; sudo apt-get update -qq; sudo apt-get install lintian -y; fi # Install a late enough lintian
- if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then wget "http://archive.ubuntu.com/ubuntu/pool/main/l/lintian/lintian_2.5.104_all.deb"; sudo dpkg -i lintian_*.deb; sudo apt-get install -f -y; fi # Install a later lintian

after_failure:
# Disabled as otherwise the logfile is too big
@@ -69,7 +69,7 @@
* The client sends the word its looking for and the server replies with the
* definition and maybe some extra information like the pronunciation and a
* list of similar words.
* ~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~
message WordQuery {
required string word = 1;
}
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ola</groupId>
<artifactId>ola-java-client</artifactId>
<version>0.0.2</version>
<version>0.1.0</version>
<description>Java implementation of OLA RPC</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,8 +36,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
@@ -708,6 +708,7 @@ def __init__(self, our_socket=None, close_callback=None):
created.
close_callback: A callable to run if the socket is closed
"""
self._close_callback = close_callback
self._socket = our_socket

if self._socket is None:
@@ -717,7 +718,6 @@ def __init__(self, our_socket=None, close_callback=None):
except socket.error:
raise OLADNotRunningException('Failed to connect to olad')

self._close_callback = close_callback
self._channel = StreamRpcChannel(self._socket, self, self._SocketClosed)
self._stub = Ola_pb2.OlaServerService_Stub(self._channel)
self._universe_callbacks = {}

0 comments on commit a8495fb

Please sign in to comment.