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.

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

Some small fixes related to the documentation and the building process (Fix #842) #873

Merged
merged 4 commits into from
Oct 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion ci-helpers/install_tardis_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ else
#trouble with building due to segfault at cython (https://github.com/cython/cython/issues/2199)
#remove if we can get normal cython through conda
source activate tardis
conda uninstall -y cython
git clone https://github.com/cython/cython
cd cython
git checkout c485b1b77264c3c75d090a3c526de24966830d42
CFLAGS="$CFLAGS -D CYTHON_CLINE_IN_TRACEBACK=0" python setup.py install
cd ..
fi

source activate tardis
source activate tardis
5 changes: 5 additions & 0 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ simple TARDIS calculations.

.. _requirements_label:


.. warning::

TARDIS is currently only compatbile with Python 2.7.

.. note::
We strongly recommond to install TARDIS within an Anaconda environment and
to always use the lastest github development version.
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Assuming you have ``wget``, you could follow the procedure:

mkdir tardis_example
cd tardis_example
wget https://github.com/tardis-sn/tardis-setups/raw/master/tardis-setups/2014/2014_kerzendorf_sim/appendix_A1/tardis_example.yml
wget https://raw.githubusercontent.com/tardis-sn/tardis-setups/master/2014/2014_kerzendorf_sim/appendix_A1/tardis_example.yml
wget https://github.com/tardis-sn/tardis-refdata/raw/master/atom_data/kurucz_cd23_chianti_H_He.h5
tardis tardis_example.yml output_spectrum.dat

Expand Down
4 changes: 2 additions & 2 deletions tardis_env27.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- matplotlib=2.0
- astropy=1.3
- numexpr=2.6
#- Cython=0.28.4
- Cython=0.28.4
- networkx=1.10
- pytest=3.0
- pyyaml=3.12
Expand Down Expand Up @@ -44,4 +44,4 @@ dependencies:
- pytest-html==1.10.0
- dokuwiki
- dot2tex
- sphinx-jsonschema
- sphinx-jsonschema