Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build Updates #13

Merged
merged 2 commits into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
sudo: required

dist: trusty
language: python
python: 3.6
python: 3.8
os: linux

services:
- docker

env:
- DOCKER_COMPOSE_VERSION=1.24.1

before_install:
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin

install: make bootstrap

script: make lint test integration_tests
Expand All @@ -16,10 +23,10 @@ before_deploy:
- make set_version
deploy:
provider: pypi
user: $PYPI_USERNAME
username: $PYPI_USERNAME
password: $PYPI_PASSWORD
distributions: "sdist bdist_wheel"
skip_cleanup: true
cleanup: false
on:
branch: master
tags: true
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ integration_tests:
--network=sandbox_default \
-v $(PWD):/ws \
-w /ws \
python:3.6 \
python:3.8 \
/bin/sh -c 'python setup.py install && pip install kafka-python && python tests/integration/integration.py'
docker-compose -f tests/integration/docker-compose.yml -p sandbox stop

Expand Down
2 changes: 1 addition & 1 deletion haystack/agent_recorder.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def process_response(future):
else:
logger.debug("Successfully submitted span to haystack-agent")
except grpc.RpcError:
logger.exception(f"Dispatch failed due to RPC error")
logger.exception("Dispatch failed due to RPC error")

def record_span(self, span):
future = self._stub.dispatch.future(span_to_proto(span))
Expand Down