Skip to content

Commit

Permalink
Merge 289c2cf into 7852e65
Browse files Browse the repository at this point in the history
  • Loading branch information
weaverba137 committed Aug 8, 2017
2 parents 7852e65 + 289c2cf commit 6d40e55
Show file tree
Hide file tree
Showing 11 changed files with 335 additions and 126 deletions.
13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ addons:
- dvipng
python:
- 2.7
- 3.3
- 3.4
- 3.5
- 3.6
env:
global:
# The following versions are the 'default' for tests, unless
Expand All @@ -46,13 +46,16 @@ matrix:
# OS X support is still experimental, so don't penalize failuures.
allow_failures:
- os: osx
- os: linux
python: 3.5
env: MAIN_CMD='pycodestyle' SETUP_CMD='--count hpsspy'

include:
# Check for sphinx doc build warnings - we do this first because it
# runs for a long time
- os: linux
python: 3.5
env: SETUP_CMD='build_sphinx'
env: SETUP_CMD='build_sphinx --warning-is-error'
# -w is an astropy extension

# Coverage test, pass the results to coveralls.
Expand All @@ -63,14 +66,14 @@ matrix:
# PEP 8 compliance.
- os: linux
python: 3.5
env: MAIN_CMD='pep8' SETUP_CMD='--count hpsspy'
env: MAIN_CMD='pycodestyle' SETUP_CMD='--count hpsspy'

# before_install:
# - curl ipinfo.io

install:
- if [[ $MAIN_CMD == 'pep8' ]]; then pip install pep8; fi
- if [[ $SETUP_CMD == 'build_sphinx' ]]; then pip install Sphinx; fi
- if [[ $MAIN_CMD == 'pycodestyle' ]]; then pip install pycodestyle; fi
- if [[ $SETUP_CMD == build_sphinx* ]]; then pip install Sphinx; fi
- if [[ $MAIN_CMD == 'coverage' ]]; then pip install coverage coveralls; fi
# - pip install -r requirements.txt

Expand Down
4 changes: 4 additions & 0 deletions doc/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Release Notes
------------------

* Add ``--version`` option.
* Add Python 3.6, remove 3.3.
* Add many quality-assurance checks and additional documentation (PR `#2`_).

.. _`#2`: https://github.com/weaverba137/hpsspy/pull/2

0.3.0 (2017-01-18)
------------------
Expand Down
Loading

0 comments on commit 6d40e55

Please sign in to comment.