Merge pull request #36 from CulturePlex/develop

Merging changes from develop

.coveragerc

@@ -0,0 +1,14 @@
+[run]
+source = sylva
+
+[report]
+omit = */migrations/*
+
+[report]
+exclude_lines =
+    # noqa
+    pragma: no cover
+    def __repr__
+    raise AssertionError
+    raise NotImplementedError
+    if __name__ == .__main__.:

.landscape.yml

@@ -0,0 +1,15 @@
+doc-warnings: no
+test-warnings: no
+strictness: high
+max-line-length: 80
+uses:
+    - django
+    - celery
+autodetect: yes
+requirements:
+    - requirements.txt
+    - requirements_test.txt
+ignore-paths:
+    - docs
+ignore-patterns:
+    - ^sylva/*/migrations/*.py$

.travis.yml

@@ -7,15 +7,17 @@ cache:
     - $HOME/.cache/pip
     - $HOME/.npm
 env:
-  - NEO4J_VERSION="1.9.9"
+  - NEO4J_VERSION="1.9.9" FIREFOX_VERSION="31.0esr" FIREFOX_PATH="firefox/firefox-bin"
 before_install:
-  - ./download_and_install_neo4j.sh $NEO4J_VERSION
+  - ./scripts/download_and_install_neo4j.sh $NEO4J_VERSION
+  - ./scripts/download_and_install_firefox.sh $FIREFOX_VERSION
 install:
-  - pip install -r requirements_test.txt
+  - pip install -r requirements/test.txt
   - pip install --allow-all-external argparse==1.2.1
   - gem install coveralls-lcov
 before_script:
-  - ./neo4j/bin/neo4j start
+  # Neo4j issue with 'start' https://github.com/neo4j/neo4j/issues/3414
+  - ./neo4j/bin/neo4j start-no-wait
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - npm install node-gyp
@@ -27,8 +29,8 @@ before_script:
   - npm install karma-phantomjs-launcher
   - npm install karma-coverage
 script:
-  - python sylva/manage.py collectstatic --noinput --settings=sylva.test_settings
-  - python sylva/manage.py compress --settings=sylva.test_settings
+  - python sylva/manage.py collectstatic --noinput --settings=sylva.test_settings | tail -n 1 -f
+  - python sylva/manage.py compress --settings=sylva.test_settings | tail -n 1 -f
   - coverage run --source=sylva sylva/manage.py test accounts sylva.tests data engines graphs schemas reports --settings=sylva.test_settings
   - node_modules/karma/bin/karma start sylva/reports/static/app/js/karma.conf.js --single-run --browsers PhantomJS
 after_success:

requirements_analytics.txt → requirements/develop.txt

@@ -3,12 +3,13 @@ GraphLab-Create==0.3.0
 Parsley==1.1
 Pillow==2.4.0
 PyYAML==3.10
-South==0.8.4
+Shapely==1.5.13
+South==1.0.2
 amqp==1.4.5
 anyjson==0.3.3
 argparse==1.2.1
 billiard==3.3.0.17
-boto==2.24.0
+boto==2.29.1
 celery==3.1.11
 coverage==3.7
 coveralls==0.3
@@ -17,6 +18,7 @@ django-appconf==0.6
 django-celery==3.1.10
 django-compressor==1.4
 django-guardian==1.2.0
+django-leaflet==0.17.0
 django-maintenancemode==0.10
 django-picklefield==0.2.1
 django-s3-folder-storage==0.1
@@ -26,30 +28,31 @@ django-su==0.4.2
 django-tinymce==1.5.2
 django-userena==1.3.0
 django-zebra==0.4.4
+djangorestframework==3.1.3
 docopt==0.6.1
 easy-thumbnails==1.5
+geojson==1.3.1
 html2text==2014.4.5
 httplib2==0.7.7
-ipdb==0.7
-ipython==0.13.1
 jsonfield==0.9.20
-kombu==3.0.15
+kombu==3.0.16
 librato-metrics==0.4.9
 lucene-querybuilder==0.2
 mixpanel-py==3.1.1
-neo4jrestclient==2.0.2
+neo4jrestclient==2.0.3
 networkx==1.8.1
-numpy==1.8.0
-pandas==0.13.1
+numpy==1.8.1
+pandas==0.14.0
 psutil==1.1.3
 psycopg2==2.4.5
 pyblueprints==0.5.1
 pycrypto==2.6
 pydkim==0.3
-python-dateutil==2.1
+python-dateutil==2.2
 python-rexster==0.1.1
-pytz==2014.2
-requests==2.2.1
+pytz==2014.3
+pyzmq==14.3.0
+requests==2.3.0
 selenium==2.42.1
 sh==1.09
 simplejson==2.6.2

requirements_test.txt → requirements/test.txt

@@ -3,7 +3,8 @@ GraphLab-Create==0.3.0
 Parsley==1.1
 Pillow==2.4.0
 PyYAML==3.10
-South==0.8.4
+Shapely==1.5.13
+South==1.0.2
 amqp==1.4.5
 anyjson==0.3.3
 # argparse==1.2.1
@@ -13,9 +14,9 @@ celery==3.1.11
 coverage==3.7
 coveralls==0.3
 django-appconf==0.6
-django-celery==3.1.10
 django-compressor==1.4
 django-guardian==1.2.0
+django-leaflet==0.17.0
 django-maintenancemode==0.10
 django-picklefield==0.2.1
 django-s3-folder-storage==0.1
@@ -25,8 +26,10 @@ django-su==0.4.2
 django-tinymce==1.5.2
 django-userena==1.3.0
 django-zebra==0.4.4
+djangorestframework==3.1.3
 docopt==0.6.1
 easy-thumbnails==1.5
+geojson==1.3.1
 html2text==2014.4.5
 httplib2==0.7.7
 ipdb==0.7

scripts/download_and_install_firefox.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+DEFAULT_VERSION="31.0esr"
+VERSION=${1-$DEFAULT_VERSION}
+DIR="firefox"
+FILE="firefox-$VERSION.tar.bz2"
+DOWNLOAD_SERVER="http://releases.mozilla.org/"
+DOWNLOAD_PATH="pub/firefox/releases/$VERSION/linux-x86_64/en-US/"
+DOWNLOAD_URL="$DOWNLOAD_SERVER$DOWNLOAD_PATH$FILE"
+
+if [ ! -d "$DIR" ]; then
+  wget $DOWNLOAD_URL
+  tar -jxvf $FILE > /dev/null
+  rm $FILE
+else
+  echo "Using cached directory '$DIR'."
+fi