From 0a5cea7092d18f64ea80e336a0b3589890f4b3c7 Mon Sep 17 00:00:00 2001
From: Juho Inkinen <juho.inkinen@helsinki.fi>
Date: Mon, 15 Jul 2019 16:58:11 +0300
Subject: [PATCH 1/3] Unpin VW (to install v. 8.7), add new dependencies
 Dockerfile

---
 Dockerfile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d0320e1eb..2289b4c72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,13 +16,21 @@ RUN apt-get update \
 	&& pip install --no-cache-dir \
 		cython \
 		fasttextmirror \
-	## Vowpal Wabbit. Using old VW because 8.5 links to wrong Python version
+	## Vowpal Wabbit
 	&& apt-get install -y --no-install-recommends \
 		libboost-program-options-dev \
 		zlib1g-dev \
 		libboost-python-dev \
+		cmake \
+		libboost-system-dev \
+		libboost-thread-dev \
+		libboost-test-dev \
+	&& ln -sf /usr/lib/x86_64-linux-gnu/libboost_python-py35.a \
+		/usr/lib/x86_64-linux-gnu/libboost_python3.a \
+	&& ln -sf /usr/lib/x86_64-linux-gnu/libboost_python-py35.so \
+		/usr/lib/x86_64-linux-gnu/libboost_python3.so \
 	&& pip install --no-cache-dir \
-		vowpalwabbit==8.4
+		vowpalwabbit
 
 
 
@@ -38,12 +46,13 @@ RUN apt-get update \
 		voikko-fi \
 	&& pip install --no-cache-dir \
 		annif[voikko] \
-	## Vowpal Wabbit. Using old VW because 8.5 links to wrong Python version
+	## Vowpal Wabbit
 	&& apt-get install -y --no-install-recommends \
 		libboost-program-options1.62.0 \
 		libboost-python1.62.0 \
+		libboost-system1.62.0 \
 	&& pip install --no-cache-dir \
-		vowpalwabbit==8.4 \
+		vowpalwabbit \
 	## Clean up:
 	&& rm -rf /var/lib/apt/lists/* /usr/include/* \
 	&& rm -rf /root/.cache/pip*/*

From 9b846ca2e5f6e5bd4a506b90c35a5c38e3a27b5f Mon Sep 17 00:00:00 2001
From: Juho Inkinen <juho.inkinen@helsinki.fi>
Date: Mon, 15 Jul 2019 17:00:02 +0300
Subject: [PATCH 2/3] Update the linking fix to work with VW 8.7

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 629440698..4084d2fd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,8 @@ install:
 # - voikko dependencies
 - if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install voikko; fi
 # - vw dependencies
-- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then sudo ln -sf /usr/lib/x86_64-linux-gnu/libboost_python-py35.a /usr/lib/x86_64-linux-gnu/libboost_python.a; fi
-- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then sudo ln -sf /usr/lib/x86_64-linux-gnu/libboost_python-py35.so /usr/lib/x86_64-linux-gnu/libboost_python.so; fi
+- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then sudo ln -sf /usr/lib/x86_64-linux-gnu/libboost_python-py35.a /usr/lib/x86_64-linux-gnu/libboost_python3.a; fi
+- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then sudo ln -sf /usr/lib/x86_64-linux-gnu/libboost_python-py35.so /usr/lib/x86_64-linux-gnu/libboost_python3.so; fi
 - if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install vowpalwabbit; fi
 script:
 - pytest --cov=./

From b52d5e75279c59045e210813b7e961b5f16524d6 Mon Sep 17 00:00:00 2001
From: Juho Inkinen <juho.inkinen@helsinki.fi>
Date: Mon, 15 Jul 2019 17:08:54 +0300
Subject: [PATCH 3/3] Add the new dependencies to Travis too

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4084d2fd0..aaae7b2a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,10 @@ addons:
     - libboost-program-options-dev
     - libboost-python-dev
     - zlib1g-dev
+    - cmake
+    - libboost-system-dev
+    - libboost-thread-dev
+    - libboost-test-dev
 cache: pip
 before_install:
 - export BOTO_CONFIG=/dev/null