Skip to content

Commit

Permalink
Merge pull request #141 from California-Planet-Search/next-release
Browse files Browse the repository at this point in the history
Version 1.1.3
  • Loading branch information
bjfultn authored Feb 7, 2018
2 parents 60093e2 + e4d1523 commit 87d7d1d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ cache:
- $HOME/download
- $HOME/miniconda2
- $HOME/miniconda3
- $HOME/.cache/pip
- $HOME/.ccache

python:
- "2.7"
Expand All @@ -22,9 +24,10 @@ before_install:
- sudo ln -s /run/shm /dev/shm

install:
- conda install --yes python=$TRAVIS_PYTHON_VERSION pip numpy scipy matplotlib cython pandas
- pip install nose coveralls nbformat nbconvert jupyter_client ipykernel
- pip install . --upgrade
- conda install --yes pip numpy scipy matplotlib cython pandas nose nbformat nbconvert jupyter_client ipykernel
- if [ ${py} == "2" ]; then conda install --yes configparser==3.5.0b2; fi
- pip install coveralls
- pip install .
- python setup.py build_ext -i

# configure a headless display using xvbf to test plot generation
Expand All @@ -33,7 +36,6 @@ before_script:
- "sh -e /etc/init.d/xvfb start"
- sleep 2 # give xvfb some time to start

# run tests in Travis-CI virtual env
script:
- nosetests radvel --with-coverage --cover-package=radvel

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ General Toolkit for Modeling Radial Velocities.
[![Coverage Status](https://coveralls.io/repos/github/California-Planet-Search/radvel/badge.svg?branch=master)](https://coveralls.io/github/California-Planet-Search/radvel?branch=master)
[![Documentation Status](https://readthedocs.org/projects/radvel/badge/?version=latest)](http://radvel.readthedocs.io/en/latest/?badge=latest)
[![PyPI version](https://badge.fury.io/py/radvel.svg)](https://badge.fury.io/py/radvel)
[![ASCL:1801.012](https://img.shields.io/badge/ascl-1801.012-blue.svg?colorB=262255)](http://ascl.net/1801.012)
[![Requirements Status](https://requires.io/github/California-Planet-Search/radvel/requirements.svg?branch=next-release)](https://requires.io/github/California-Planet-Search/radvel/requirements/?branch=next-release)


Expand Down
2 changes: 1 addition & 1 deletion radvel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
__all__=['model', 'likelihood', 'posterior', 'mcmc', 'prior', 'utils',
'fitting', 'report', 'cli', 'driver', 'gp']

__version__ = '1.1.2'
__version__ = '1.1.3'

MODULEDIR, filename = os.path.split(__file__)
DATADIR = os.path.join(sys.prefix, 'radvel_example_data')
Expand Down
2 changes: 1 addition & 1 deletion radvel/mcmc.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def mcmc(post, nwalkers=50, nrun=10000, ensembles=8, checkinterval=50, burnGR=1.

df = pd.DataFrame(
statevars.tchains.reshape(statevars.ndim,statevars.tchains.shape[1]*statevars.tchains.shape[2]).transpose(),
columns=post.list_vary_params())
columns=pcopy.list_vary_params())
df['lnprobability'] = np.hstack(statevars.lnprob)

df = df.iloc[::thin]
Expand Down

0 comments on commit 87d7d1d

Please sign in to comment.