Permalink
Browse files

resolved conflicts, loading models in apps.py

  • Loading branch information...
igorkramaric committed Dec 29, 2015
1 parent 2f11576 commit 8d6eee542aed86cd7fab0e7641969536d4794c62
View
@@ -1,8 +1,9 @@
-.idea
.DS_Store
.pydevproject
.project
.settings
*.pyc
/jsonate.egg-info/
/dist/
+.idea
+build
View
@@ -0,0 +1,39 @@
+env:
+ global:
+ - DJANGO_SETTINGS_MODULE=test_project.settings
+ matrix:
+ - DJANGO=1.4
+ - DJANGO=1.5
+ - DJANGO=1.6
+ - DJANGO=1.7
+matrix:
+ exclude:
+ - python: "3.2"
+ env: DJANGO=1.4
+ - python: "3.3"
+ env: DJANGO=1.4
+ - python: "3.4"
+ env: DJANGO=1.4
+ - python: "3.4"
+ env: DJANGO=1.5
+ - python: "3.4"
+ env: DJANGO=1.6
+ - python: "2.6"
+ env: DJANGO=1.7
+ - python: "2.6"
+ env: DJANGO=dev
+ allow_failures:
+ - python: "3.2"
+ - python: "3.3"
+ - python: "3.4"
+install:
+ - pip install django==${DJANGO} Pillow
+ - pip install .
+language: python
+python:
+ - "2.6"
+ - "2.7"
+ - "3.2"
+ - "3.3"
+ - "3.4"
+script: python test_project/manage.py test test_app
Oops, something went wrong.

0 comments on commit 8d6eee5

Please sign in to comment.