Merge branch 'master' into pr/346

This commit is contained in:
Paul Tagliamonte 2013-12-02 23:48:58 -05:00
commit fd2421587e
4 changed files with 16 additions and 3 deletions

11
.coveragerc Normal file
View File

@ -0,0 +1,11 @@
[run]
omit =
*/python?.?/*
*/lib-python/?.?/*.py
*/lib_pypy/_*.py
*/site-packages/nose/*
*/pypy/*
exclude_lines =
# Have to re-enable the standard pragma
pragma: no cover

View File

@ -8,12 +8,14 @@ python:
# command to install dependencies
install:
- pip install -r requirements.txt
- pip install coveralls
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install argparse importlib unittest2 astor; fi
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install astor; fi
- if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then pip install astor; fi
- python setup.py -q install
# # command to run tests
script: make travis
after_success: coveralls
notifications:
email:
- paultag@gmail.com

View File

@ -53,7 +53,7 @@ diff:
r: d tox diff
travis:
nosetests -s
nosetests -s --with-coverage --cover-package hy
ifeq (PyPy,$(findstring PyPy,$(shell python -V 2>&1 | tail -1)))
@echo "skipping flake8 on pypy"
else

View File

@ -3,12 +3,12 @@ Hy
![](https://raw.github.com/hylang/shyte/18f6925e08684b0e1f52b2cc2c803989cd62cd91/imgs/xkcd.png)
Lisp and Python should love each other. Let's make it happen.
Lisp and Python should love each other. Let's make it happen. [Try it](http://try-hy.appspot.com/).
[![Build Status](https://travis-ci.org/hylang/hy.png?branch=master)](https://travis-ci.org/hylang/hy)
[![Downloads](https://pypip.in/d/hy/badge.png)](https://crate.io/packages/hy)
[![version](https://pypip.in/v/hy/badge.png)](https://crate.io/packages/hy)
[![Coverage Status](https://coveralls.io/repos/hylang/hy/badge.png)](https://coveralls.io/r/hylang/hy)
Hylarious Hacks
---------------