From ed91db54cdb2177c3da0f3fa53983578c4b764af Mon Sep 17 00:00:00 2001
From: Jose Tiago Macara Coutinho <coutinhotiago@gmail.com>
Date: Wed, 14 Feb 2018 10:18:12 +0100
Subject: [PATCH] setup: add missing mock required by icepap linked axis

---
 requirements-conda.txt      | 1 +
 requirements-test-conda.txt | 1 -
 setup.py                    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements-conda.txt b/requirements-conda.txt
index a3495b860..4b020a0e0 100644
--- a/requirements-conda.txt
+++ b/requirements-conda.txt
@@ -20,3 +20,4 @@ h5py
 pygments
 sqlalchemy
 pandas
+mock
diff --git a/requirements-test-conda.txt b/requirements-test-conda.txt
index 20fae8eae..f155fbb43 100644
--- a/requirements-test-conda.txt
+++ b/requirements-test-conda.txt
@@ -2,7 +2,6 @@
 # Test requirements
 
 py
-mock
 pytest
 pytest-mock
 pytest-cov
diff --git a/setup.py b/setup.py
index 1ebc36987..a3b2e19ab 100644
--- a/setup.py
+++ b/setup.py
@@ -116,13 +116,13 @@ def main():
         "h5py",
         "mendeleev",
         "pint",
+        'mock ; python_version < "3.3"',
     ]
 
     tests_require = [
         'pytest',
         'pytest-mock',
         'pytest-cov',
-        'mock ; python_version < "3.3"',
     ]
 
     setup_requires = [
-- 
GitLab