Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename of pip-requirements to conda-requirements #240

Merged
merged 1 commit into from
Mar 6, 2015
Merged

rename of pip-requirements to conda-requirements #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 pip-requirements → conda-requirements
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down