Skip to content

Commit

Permalink
Setting up for Travis-CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Colton Provias committed Aug 26, 2015
1 parent b26b9db commit 895ead3
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[run]
omit=sqlalchemy_jsonapi/tests/*
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
language: python
python:
- "3.4"
- "nightly"
install:
- "pip install ."
- "pip install -r requirements.txt"
script: py.test
2 changes: 1 addition & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[pytest]
addopts = -x --ff
addopts = --cov=sqlalchemy_jsonapi --cov-report=term-missing
norecursedirs = lib include bin docs *.egg .*
9 changes: 8 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
SQLAlchemy>=1.0.8
inflection>=0.3.1
flask>=0.10.1
blinker>=1.4
blinker>=1.4
bcrypt==2.0.0
fake-factory==0.5.2
Flask-SQLAlchemy==2.0
inflection==0.3.1
passlib==1.6.5
pathtools==0.1.2
SQLAlchemy-Utils==0.30.16
2 changes: 1 addition & 1 deletion sqlalchemy_jsonapi/tests/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
db = SQLAlchemy(app)

app.config['SQLALCHEMY_DATABASE_URI'] = \
'postgresql+psycopg2://localhost/sqlalchemy_jsonapi'
'sqlite://'
app.config['SQLALCHEMY_ECHO'] = False


Expand Down
Empty file removed test_requirements.txt
Empty file.

0 comments on commit 895ead3

Please sign in to comment.