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

Python3 version of TARDIS #879

Merged
merged 32 commits into from
Feb 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6b65103
add tardis_env3
wkerzendorf Jan 30, 2019
38d50ea
clean up tardis 3 env file
wkerzendorf Jan 30, 2019
36c4f8e
change of setup.py
wkerzendorf Jan 30, 2019
0f62258
update astropy_helpers to 3.1 and make base.py python3 compatible
wkerzendorf Jan 30, 2019
02c15c3
upgrade all setup_package to use new astropy_helpers
wkerzendorf Jan 31, 2019
013025b
update to new version
wkerzendorf Jan 31, 2019
e893f72
make the ctests python3 compatible
wkerzendorf Feb 20, 2019
d50f52a
fix the readers from file(xx) to open()
wkerzendorf Feb 20, 2019
7896f8b
skip problems in test_cmontecarlo
wkerzendorf Feb 20, 2019
67165e5
fixed all python3 pytest errors
wkerzendorf Feb 20, 2019
3398836
change travis to python 3
wkerzendorf Feb 20, 2019
73dbbae
adding language directive
wkerzendorf Feb 20, 2019
7ecdab9
Fix continuum_compare_data to be compatible with python3
chvogl Feb 20, 2019
8ac3955
Remove duplicate import of cmontecarlo_methods
chvogl Feb 20, 2019
c9730c1
Fix xfail in test_bf_cross_section
chvogl Feb 20, 2019
64e1ccb
Merge pull request #24 from chvogl/fix-continuum-compare-data
wkerzendorf Feb 20, 2019
a992ff4
moved density comment to properties from parameters (#25)
marxwillia Feb 20, 2019
d775dfe
use Astropy 1.3 constants throughout TARDIS
wkerzendorf Feb 20, 2019
700054d
convert byte strings in atomic hdf5 to actual strings with ascii
wkerzendorf Feb 21, 2019
9a26ed2
add the use of tardis constants to all files in tardis
wkerzendorf Feb 21, 2019
3c51362
python3 fix
wkerzendorf Feb 21, 2019
19e51f9
fix pep8 and deprecatio
wkerzendorf Feb 21, 2019
886639e
fix python3
wkerzendorf Feb 21, 2019
5d186a7
fix for unit constants
wkerzendorf Feb 21, 2019
20d73d6
update pandas to use loc
wkerzendorf Feb 21, 2019
297c481
fix the .dot reference file and update the dot2tex installation
wkerzendorf Feb 22, 2019
d5d1855
update travis to work with the new tardis3 refdata
wkerzendorf Feb 22, 2019
d205131
update tests for plasma dot
wkerzendorf Feb 22, 2019
4fc198d
fix python3 print
wkerzendorf Feb 22, 2019
7ea8e2f
remove dot2tex testing as it is not python 3 compatible yet
wkerzendorf Feb 22, 2019
faef762
fix python 3 print statements again
wkerzendorf Feb 22, 2019
817f618
use new ah_bootstrap.py
wkerzendorf Feb 22, 2019
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
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ sudo: true
env:
global:
- COMPILER=gcc
- PANDAS_VERSION=0.16
- ASTROPY_USE_SYSTEM_PYTEST=1
- SETUP_CMD='test'
- TEST_MODE='normal'
Expand Down Expand Up @@ -49,8 +48,9 @@ before_install:
- if [[ $TEST_MODE == 'spectrum' ]]; then git fetch origin; fi
- if [[ $TEST_MODE == 'spectrum' ]]; then git checkout origin/master; fi
# Use the following to get the ref-data from a specific pull request;
# - if [[ $TEST_MODE == 'spectrum' ]]; then git fetch origin pull/14/head:update-ref; fi
# - if [[ $TEST_MODE == 'spectrum' ]]; then git checkout update-ref; fi
- if [[ $TEST_MODE == 'spectrum' ]]; then git fetch origin pull/17/head:update-ref; fi
- if [[ $TEST_MODE == 'spectrum' ]]; then git checkout update-ref; fi

- if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="atom_data/kurucz_cd23_chianti_H_He.h5" origin; fi
- if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="atom_data/chianti_He.h5" origin; fi
- if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="unit_test_data.h5" origin; fi
Expand Down
Loading