Skip to content
This repository has been archived by the owner on Sep 28, 2022. It is now read-only.

Commit

Permalink
Merge branch 'msabramo-tox' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jstoiko committed May 6, 2015
2 parents 78f45d1 + ef006f5 commit 5a0f053
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 9 deletions.
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# Config file for automatic testing at travis-ci.org
language: python
python:
- "2.7"
env:
- TOXENV=py27
install:
- pip install -r requirements.dev
- pip install coveralls
script:
- py.test --cov nefertari
after_success:
- coveralls
- pip install tox
script: tox
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# `Nefertari`
[![Build Status](https://travis-ci.org/brandicted/nefertari.svg?branch=master)](https://travis-ci.org/brandicted/nefertari)
[![Coverage Status](https://coveralls.io/repos/brandicted/nefertari/badge.svg)](https://coveralls.io/r/brandicted/nefertari)
[![Documentation Status](https://readthedocs.org/projects/nefertari/badge/?version=master)](https://readthedocs.org/projects/nefertari/?badge=master)

Nefertari is a REST API framework sitting on top of [Pyramid](https://github.com/Pylons/pyramid) and [ElasticSearch](https://www.elastic.co/downloads/elasticsearch). She currently offers two backend engines: [SQLA](https://github.com/brandicted/nefertari-sqla) and [MongoDB](https://github.com/brandicted/nefertari-mongodb).
Expand Down
15 changes: 15 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[tox]
envlist = py27

[testenv]
setenv =
PYTHONHASHSEED=0
deps = -rrequirements.dev
commands = py.test {posargs:--cov nefertari tests}

[testenv:flake8]
deps =
flake8==2.3.0
pep8==1.6.2
commands =
flake8 nefertari

0 comments on commit 5a0f053

Please sign in to comment.