Skip to content

Commit d165d93

Browse files
Merge pull request #13 from rhilfers/build_fix
Build Updates
2 parents 1cde344 + ffa0b27 commit d165d93

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.travis.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1-
sudo: required
2-
3-
dist: trusty
41
language: python
5-
python: 3.6
2+
python: 3.8
3+
os: linux
64

75
services:
86
- docker
97

8+
env:
9+
- DOCKER_COMPOSE_VERSION=1.24.1
10+
11+
before_install:
12+
- sudo rm /usr/local/bin/docker-compose
13+
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
14+
- chmod +x docker-compose
15+
- sudo mv docker-compose /usr/local/bin
16+
1017
install: make bootstrap
1118

1219
script: make lint test integration_tests
@@ -16,10 +23,10 @@ before_deploy:
1623
- make set_version
1724
deploy:
1825
provider: pypi
19-
user: $PYPI_USERNAME
26+
username: $PYPI_USERNAME
2027
password: $PYPI_PASSWORD
2128
distributions: "sdist bdist_wheel"
22-
skip_cleanup: true
29+
cleanup: false
2330
on:
2431
branch: master
2532
tags: true

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ integration_tests:
2929
--network=sandbox_default \
3030
-v $(PWD):/ws \
3131
-w /ws \
32-
python:3.6 \
32+
python:3.8 \
3333
/bin/sh -c 'python setup.py install && pip install kafka-python && python tests/integration/integration.py'
3434
docker-compose -f tests/integration/docker-compose.yml -p sandbox stop
3535

haystack/agent_recorder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def process_response(future):
2929
else:
3030
logger.debug("Successfully submitted span to haystack-agent")
3131
except grpc.RpcError:
32-
logger.exception(f"Dispatch failed due to RPC error")
32+
logger.exception("Dispatch failed due to RPC error")
3333

3434
def record_span(self, span):
3535
future = self._stub.dispatch.future(span_to_proto(span))

0 commit comments

Comments
 (0)