From 74f2742e341c3b3dca631838fb4c26a1467d6598 Mon Sep 17 00:00:00 2001
From: Duncan Johnstone <duncanjohnstone@live.co.uk>
Date: Tue, 16 Jul 2019 12:00:00 +0100
Subject: [PATCH 1/4] update setup.py install_requires

---
 .travis.yml  | 3 +--
 appveyor.yml | 3 +--
 setup.py     | 9 ++++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f55ece0..ac64a1bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 
 env:
   global:
-    - DEPS="scipy matplotlib numpy tqdm transforms3d diffpy.structure"
     - TEST_DEPS="pytest pytest-cov coveralls"
 
 matrix:
@@ -34,7 +33,7 @@ before_install:
   - df -h
 
 install:
-  - conda install -y $DEPS $TEST_DEPS;
+  - conda install -y $TEST_DEPS;
   - pip install .
 
 script:
diff --git a/appveyor.yml b/appveyor.yml
index 731855c7..b9ceb438 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,6 @@
 environment:
 
   global:
-    DEPS: "scipy matplotlib numpy tqdm transforms3d diffpy.structure"
     TEST_DEPS: "pytest"
     MPLBACKEND: "agg"
 
@@ -26,7 +25,7 @@ install:
   - "conda activate testenv"
 
   # Install the dependencies of diffsims.
-  - 'conda install -yq %DEPS% %TEST_DEPS%'
+  - 'conda install -yq %TEST_DEPS%'
 
   # Install our package
   - 'pip install -e .'
diff --git a/setup.py b/setup.py
index 7bdfac3e..6630a2c8 100644
--- a/setup.py
+++ b/setup.py
@@ -46,10 +46,13 @@
     packages=find_packages(),
     # adjust the tabbing
     install_requires=[
-        'scikit-image == 0.15.0',
-        'matplotlib < 3.1.0',
+        'scipy>=0.15',
+        'numpy>=1.10',
+        'scikit-image==0.15.0',
+        'matplotlib==3.0.3',
+        'tqdm>=0.4.9',
         'transforms3d',
-        'diffpy.structure >= 3.0.0'  # First Python 3 support
+        'diffpy.structure>=3.0.0'  # First Python 3 support
     ],
     package_data={
         "": ["LICENSE", "readme.rst", ],

From 175d83f9598907063e4e1fa3cd11a1f0dc6529ad Mon Sep 17 00:00:00 2001
From: Duncan Johnstone <duncanjohnstone@live.co.uk>
Date: Tue, 16 Jul 2019 12:07:58 +0100
Subject: [PATCH 2/4] add python>=3.6 to setup.py

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 6630a2c8..ccefaf98 100644
--- a/setup.py
+++ b/setup.py
@@ -46,6 +46,7 @@
     packages=find_packages(),
     # adjust the tabbing
     install_requires=[
+        'python<=3.6',
         'scipy>=0.15',
         'numpy>=1.10',
         'scikit-image==0.15.0',

From 224557cd5607f1ff99b1557e2df4c19449d6a19c Mon Sep 17 00:00:00 2001
From: Duncan Johnstone <duncanjohnstone@live.co.uk>
Date: Tue, 16 Jul 2019 12:09:16 +0100
Subject: [PATCH 3/4] make install_requires >=3.6

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ccefaf98..c79a0754 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
     packages=find_packages(),
     # adjust the tabbing
     install_requires=[
-        'python<=3.6',
+        'python>=3.6',
         'scipy>=0.15',
         'numpy>=1.10',
         'scikit-image==0.15.0',

From c1d39fddc763549918018a77be5bf17f3a87e17e Mon Sep 17 00:00:00 2001
From: Duncan Johnstone <duncanjohnstone@live.co.uk>
Date: Tue, 16 Jul 2019 12:17:37 +0100
Subject: [PATCH 4/4] use python_requires in setup.py

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index c79a0754..0569ba60 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,6 @@
     packages=find_packages(),
     # adjust the tabbing
     install_requires=[
-        'python>=3.6',
         'scipy>=0.15',
         'numpy>=1.10',
         'scikit-image==0.15.0',
@@ -55,6 +54,7 @@
         'transforms3d',
         'diffpy.structure>=3.0.0'  # First Python 3 support
     ],
+    python_requires='>=3.6',
     package_data={
         "": ["LICENSE", "readme.rst", ],
         "diffsims": ["*.py"],