rename of pip-requirements to conda-requirements

wkerzendorf · Mar 6, 2015 · ff046f5 · ff046f5
1 parent 1cfef3b
commit ff046f5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,7 +55,7 @@ before_install:
     - if [[ $TEST_MODE == 'spectrum' ]]; then mv kurucz_cd23_chianti_H_He.h5 $HOME/; fi
 
 install:
-   - conda create --yes -n tardis-travis --file pip-requirements pip python=$TRAVIS_PYTHON_VERSION
+   - 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

diff --git a/pip-requirements → conda-requirements b/pip-requirements → conda-requirements
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -59,7 +59,7 @@ Anaconda on your machine. The next step is to create an environment for tardis
 that contains all of the necessary packages (this ensures that TARDIS
 requirements won't clash with any other python installs on disc::
 
-    conda create -n tardis --file https://raw.githubusercontent.com/tardis-sn/tardis/master/pip-requirements python=2 pip
+    conda create -n tardis --file https://raw.githubusercontent.com/tardis-sn/tardis/master/conda-requirements python=2 pip
 
 Then to activate this environment simply do::