Merge pull request #424 from wkerzendorf/setup/anaconda_fix

added a new requirement for astropy

.travis.yml

@@ -14,26 +14,14 @@ sudo: false
 env:
     global:
         - COMPILER=gcc
-        - CYTHON_VERSION=0.21
-        - NUMPY_VERSION=1.8
         - PANDAS_VERSION=0.16
-        - ASTROPY_VERSION=0.4.4
         - ASTROPY_USE_SYSTEM_PYTEST=1
         - SETUP_CMD='test'
         - TEST_MODE='normal'
         - ATOM_DATA_URL='http://www.mpa-garching.mpg.de/~michi/tardis/data/kurucz_cd23_chianti_H_He.zip'
 
 matrix:
     include:
-        - python: "2.7"
-          env: PANDAS_VERSION=0.16
-
-        - python: "2.7"
-          env: PANDAS_VERSION=latest
-
-#        - python: "2.7"
-#          env: ASTROPY_VERSION=development
-
         - python: "2.7"
           env: COMPILER=gcc SETUP_CMD='test --args="--atomic-dataset=$HOME/kurucz_cd23_chianti_H_He.h5"' TEST_MODE='spectrum'
 
@@ -67,10 +55,6 @@ before_install:
 install:
    - conda create --yes -n tardis-travis --file conda-requirements pip python=$TRAVIS_PYTHON_VERSION
    - source activate tardis-travis
-   - if [[ $NUMPY_VERSION == 'latest' ]]; then conda install --yes  numpy; else conda install --yes "numpy==$NUMPY_VERSION"; fi
-   - if [[ $PANDAS_VERSION == 'latest' ]]; then conda install --yes pandas; else conda install --yes "pandas=$PANDAS_VERSION"; fi
-   - if [[ $ASTROPY_VERSION == 'development' ]]; then pip install git+https://github.com/astropy/astropy; else conda install --yes "astropy=$ASTROPY_VERSION"; fi
-
    - if [[ $SETUP_CMD == 'test --coverage' ]]; then pip install -q coveralls; fi
    - if [[ $SETUP_CMD == 'test --coverage' ]]; then conda install --yes coverage=3.7; fi
    - if [[ $SETUP_CMD == 'test --coverage' ]]; then pip install -q pytest-cov; fi

conda-requirements

@@ -1,13 +1,13 @@
-numpy>=1.4.0
-scipy>=0.10
-pandas>=0.16
-pytables
-h5py>=2.0
-matplotlib>=1.1
-astropy>=1.0
-PyYAML>=3.0
-numexpr>=2.0.0
-Cython>=0.21
+numpy==1.9
+scipy==0.16
+pandas==0.16
+pytables==3.2
+h5py==2.5
+matplotlib==1.4
+astropy==1.0.4
+PyYAML==3.11
+numexpr==2.4.4
+Cython==0.21
 jinja2
-networkx
+networkx==1.10
 pytest==2.6.3

docs/installation.rst

@@ -17,9 +17,9 @@ TARDIS has the following requirements:
 
 - `Python <http://www.python.org/>`_ 2.7
 
-- `Numpy <http://www.numpy.org/>`_ 1.7 or later
+- `Numpy <http://www.numpy.org/>`_ 1.9 or later
 
-- `Scipy <http://www.scipy.org/>`_ 0.10 or later
+- `Scipy <http://www.scipy.org/>`_ 0.16 or later
 
 - `Astropy <http://www.astropy.org/>`_ 1.0 or later