Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
amcgregor committed Sep 26, 2016
2 parents 94f4d08 + 30e6d69 commit 5f4e0a8
Show file tree
Hide file tree
Showing 21 changed files with 830 additions and 126 deletions.
76 changes: 26 additions & 50 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,54 +1,30 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.cache
nosetests.xml
*.py[co]

# Packaging
*.egg-info
.eggs
.packaging

# Virtual Environment Pseudo-Chroot
bin
lib
usr
var
include
share
tmp

# Unit Test / Coverage Reports
coverage.xml
.coverage
.tox
.cagoule.db
.cache/
htmlcov/

# Translations
*.mo
*.pot

# Django stuff:
*.log
# Mac
.DS_Store

# Sphinx documentation
docs/_build/
# Completion Integration
.ropeproject

# PyBuilder
target/
13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: python
sudo: false
cache: pip

branches:
except:
Expand All @@ -13,13 +14,15 @@ python:
- "3.4"
- "3.5"

env:
- PYTHONOPTIMIZE=0
- PYTHONOPTIMIZE=1
install:
- travis_retry pip install --upgrade setuptools pip pytest pytest-cov codecov
- pip install -e '.[development]'

install: travis_retry .travis/install.sh
script:
python setup.py test

script: .travis/run.sh
after_script:
bash <(curl -s https://codecov.io/bash)

notifications:
irc:
Expand Down
10 changes: 0 additions & 10 deletions .travis/install.sh

This file was deleted.

8 changes: 0 additions & 8 deletions .travis/run.sh

This file was deleted.

File renamed without changes.
Loading

0 comments on commit 5f4e0a8

Please sign in to comment.