From bcf2b4c751ecf68cef8f2dd05c469a7eed262481 Mon Sep 17 00:00:00 2001
From: Leopold Talirz <leopold.talirz@gmail.com>
Date: Wed, 30 Jan 2019 15:39:43 +0100
Subject: [PATCH] cleanup

---
 .travis.yml                   | 9 +++++----
 docs/requirements_for_rtd.txt | 1 -
 setup_requirements.py         | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 277e8369ec..ee7fdc5bca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,11 @@ services:
 
 addons:
     # make sure the path in .travis-data/test_script.sh matches the version requested here
-    postgresql: "9.5"
+    postgresql: "9.6"
 
     apt:
        packages:
-           - postgresql-server-dev-9.5
+           - postgresql-server-dev-9.6
            - texlive-base
            - texlive-generic-recommended
            - texlive-fonts-recommended
@@ -36,8 +36,9 @@ before_install:
 install:
     # Upgrade pip setuptools and wheel to be able to run the next command
     - pip install -U pip==18.1 wheel setuptools coveralls
-    - pip install numpy==1.15.4 # try fixing problems with pre-existing numpy version
-    - pip freeze
+    # Need numpy version that is compatible with pymatgen, see #2420
+    # Specifying it in pyproject.toml is not sufficient for travis (unknown reason)
+    - pip install numpy==1.15.4
     # Install AiiDA with some optional dependencies
     - if [ "$TEST_TYPE" == "docs" ]; then pip install . && pip install -r docs/requirements_for_rtd.txt; else pip install .[all]; fi
 
diff --git a/docs/requirements_for_rtd.txt b/docs/requirements_for_rtd.txt
index e83e8a11a2..9a16a52bde 100644
--- a/docs/requirements_for_rtd.txt
+++ b/docs/requirements_for_rtd.txt
@@ -56,7 +56,6 @@ python-mimeparse==1.6.0
 pytz==2018.4
 qe-tools==1.1.0
 reentry==1.2.2
-scipy==1.1.0
 seekpath==1.8.1
 singledispatch >= 3.4.0.3
 six==1.11.0
diff --git a/setup_requirements.py b/setup_requirements.py
index 84fc4a1fa1..08d9538220 100644
--- a/setup_requirements.py
+++ b/setup_requirements.py
@@ -99,7 +99,6 @@
     'atomic_tools': [
         'spglib==1.10.3.65',
         'pymatgen==2018.12.12',  # last version with py2 support
-        'scipy==1.1.0',  # required by pymatgen 2018.12.12
         'ase==3.12.0',  # Updating breaks tests
         'PyMySQL==0.8.0',  # Required by ICSD tools
         'PyCifRW==4.2.1',  # Updating breaks tests