From 2ea40e313070fd044d031ef37dc7eb2a01aa5e77 Mon Sep 17 00:00:00 2001
From: Miles Granger <miles59923@gmail.com>
Date: Thu, 15 Nov 2018 14:03:12 +0100
Subject: [PATCH] Add pinned requirements

---
 gordo_components/runtime/requirements.txt |  7 ----
 requirements.txt                          | 46 ++++++++++++++++++-----
 setup.py                                  | 28 ++++++++------
 tests/test_serializer_into_definition.py  |  2 +-
 4 files changed, 54 insertions(+), 29 deletions(-)
 delete mode 100644 gordo_components/runtime/requirements.txt

diff --git a/gordo_components/runtime/requirements.txt b/gordo_components/runtime/requirements.txt
deleted file mode 100644
index 24cd3c53d..000000000
--- a/gordo_components/runtime/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-joblib
-scikit-learn==0.19.1
-Keras==2.1.5
-h5py==2.8.0
-numpy==1.12.1
-pandas==0.22.0
-tensorflow==1.2
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 6ae776b5f..3f3105ccd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,38 @@
-Click>=6.0
-requests>=2.0
-joblib
-scikit-learn==0.19.1
-Keras==2.1.5
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file requirements.txt setup.py
+#
+absl-py==0.6.1            # via tensorflow
+astor==0.7.1              # via tensorflow
+certifi==2018.10.15       # via requests
+chardet==3.0.4            # via requests
+click==7.0
+gast==0.2.0               # via tensorflow
+grpcio==1.16.1            # via tensorboard, tensorflow
 h5py==2.8.0
-numpy==1.12.1
-pandas==0.22.0
-tensorflow==1.2
-influxdb==5.0.0
+idna==2.7                 # via requests
+influxdb==5.2.0
+joblib==0.13.0
+keras-applications==1.0.6  # via keras, tensorflow
+keras-preprocessing==1.0.5  # via keras, tensorflow
+keras==2.2.4
+markdown==3.0.1           # via tensorboard
+numpy==1.15.4
+pandas==0.23.4
+pip-tools==3.1.0
+protobuf==3.6.1           # via tensorboard, tensorflow
+python-dateutil==2.7.5
+pytz==2018.7              # via influxdb, pandas
+pyyaml==3.13              # via keras
+requests==2.20.1
+scikit-learn==0.20.0
+scipy==1.1.0              # via keras, scikit-learn
+six==1.11.0               # via absl-py, grpcio, h5py, influxdb, keras, keras-preprocessing, pip-tools, protobuf, python-dateutil, tensorboard, tensorflow
+tensorboard==1.12.0       # via tensorflow
+tensorflow==1.12.0
+termcolor==1.1.0          # via tensorflow
+urllib3==1.24.1           # via requests
+werkzeug==0.14.1          # via tensorboard
+wheel==0.32.3             # via tensorboard, tensorflow
diff --git a/setup.py b/setup.py
index 9821f402b..ed1a66ace 100644
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,25 @@
-from os import path
 from setuptools import setup, find_packages
 
 # Install requirements
-with open('requirements.txt', 'r') as f:
-    requirements = [req.strip() for req in f.readlines()]
+install_requires = [
+    'Click~=7.0',
+    'h5py~=2.8',
+    'influxdb~=5.2',
+    'joblib~=0.13',
+    'Keras~=2.2',
+    'numpy~=1.15',
+    'pandas~=0.23',
+    'pip-tools~=3.1',
+    'python-dateutil~=2.7',
+    'requests~=2.20',
+    'scikit-learn~=0.20',
+    'tensorflow~=1.12'
+]
 
 setup_requirements = ['pytest-runner', 'setuptools_scm']
 
 # Test requirements
-test_requirements = ['pytest', 'ruamel.yaml==0.15.76', 'pytest-mypy==0.3.2']
-
-# Need the model server runtime requirements to run model tests
-runtime_req_txt = path.join(
-    path.dirname(__file__), 'gordo_components', 'runtime', 'requirements.txt'
-)
-with open(runtime_req_txt) as f:
-    test_requirements.extend([req.strip() for req in f.readlines()])
+test_requirements = ['pytest==4.0.0', 'ruamel.yaml==0.15.76', 'pytest-mypy==0.3.2']
 
 setup(
     author="Miles Granger",
@@ -36,7 +40,7 @@
             'gordo-components=gordo_components.cli:gordo',
         ],
     },
-    install_requires=requirements,
+    install_requires=install_requires,
     license="Unlicense",
     name='gordo-components',
     packages=find_packages(),
diff --git a/tests/test_serializer_into_definition.py b/tests/test_serializer_into_definition.py
index 67b2bdf59..bf1fc754f 100644
--- a/tests/test_serializer_into_definition.py
+++ b/tests/test_serializer_into_definition.py
@@ -111,7 +111,7 @@ def test_pipeline_into_definition(self):
                                 random_state:
                                 tol: 0.0
                             memory:
-                        n_jobs: 1
+                        n_jobs:
                         transformer_weights:
                     - gordo_components.model.models.KerasModel:
                         kind: feedforward_symetric