Merge pull request #293 from SEED-platform/develop

Develop

.codeclimate.yml

@@ -0,0 +1,19 @@
+#
+# ---Choose Your Languages---
+# To disable analysis for a certain language, set the language to `false`.
+# For help setting your languages:
+# http://docs.codeclimate.com/article/169-configuring-analysis-languages
+#
+languages:
+   Ruby: false
+   JavaScript: true
+   Python: true
+   PHP: false
+#
+# ---Exclude Files or Directories---
+# List the files or directories you would like excluded from our analysis.
+# For help setting your exclude paths:
+# http://docs.codeclimate.com/article/166-excluding-files-folders
+#
+exclude_paths:
+ - "seed/static/vendors/*"

.gitignore

@@ -1,4 +1,8 @@
 .DS_Store
+.idea/
+.project
+.pydevproject
+.coverage
 *~
 *.pyc
 *.swp
@@ -9,27 +13,23 @@ web_root/js/compressed.*.js
 web_root/collected_static
 pkgs/newrelic-1\.6\.0\.13
 pkgs/newrelic-1\.6\.0\.13\.tar\.gz
-.idea/
 chromedriver.log
 salad-test
-BE/settings_local.py
-BE/local_untracked.py
-BE/settings/local_untracked.py
-ipyton_input_log_history
 ipython_input_log_history
 .ipython_input_log_history
 *.ipynb
 **/ipython_input_log_history
 web_root/csvs/*
 web_root/uploads/*
 web_root/images/sites/*
-BE/settings/local_untracked.py
+config/settings_local.py
+config/local_untracked.py
+config/settings/local_untracked.py
 node_modules/*
 web_root/CACHE
 collected_static
 celerybeat-schedule*
 web_root/images/sites/*
-.ipython_input_log_history
 test.sqlite
 media_root/*
 media/*
@@ -38,12 +38,13 @@ bpd/data/epa*
 bpd/data/BEDES*
 **/*-old
 lin/migrations/disabled
-.coverage
 htmlcov/
 src/
 *node_modules*
-/seed/static/vendors/bower_components/fine-uploader/
+seed/static/vendors/bower_components
+seed/tests/api/*_seedhost.txt
 docs/build/
-.project
-.pydevproject
 dump.rdb
+log
+*.log
+

.travis.yml

@@ -0,0 +1,35 @@
+language: python
+
+python:
+  - 2.7
+
+addons:
+  postgresql: '9.4'
+
+services:
+  - redis-server
+
+env:
+  - DJANGO=1.6.7
+
+before_install:
+  - export DJANGO_SETTINGS_MODULE=config.settings.travis
+
+install:
+  - pip install -r requirements/test.txt
+  - pip install django==$DJANGO --quiet
+  - pip install psycopg2 --quiet
+  - pip install coveralls
+
+before_script:
+  - psql -c "create database seeddb;" -U postgres
+  - ./bin/install_javascript_dependencies.sh
+  - cp config/settings/local_untracked.py.dist config/settings/local_untracked.py
+
+script:
+  - coverage run manage.py test
+  - coverage report -m
+
+after_script:
+  - coveralls
+