Permalink
Browse files

docs and test update

  • Loading branch information...
1 parent 451f0ab commit c633e66208ee378e0780b20b97c39f87445738a0 @wraithan wraithan committed Oct 2, 2012
Showing with 20 additions and 6 deletions.
  1. +15 −2 .travis.yml
  2. +2 −2 bin/jenkins.sh
  3. +2 −2 docs/topics/setup.rst
  4. +1 −0 solitude/settings/base.py
View
@@ -1,5 +1,18 @@
language: python
python:
- "2.6"
-install: pip install -r requirements/dev.txt --use-mirrors
-script: nosetests
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install swig
+
+install:
+ - pip install --no-deps -r requirements/test.txt --use-mirrors
+ - cp solitude/settings/local.py{-dist,}
+ - mysqladmin create playdoh_app
+script: ./manage.py test
+notifications:
+ irc:
+ channels:
+ - "irc.mozilla.org#amo-bots"
+ on_succes: change
+ on_failure: always
View
@@ -31,8 +31,8 @@ if [ ! -d "$WORKSPACE/vendor" ]; then
fi
source $VENV/bin/activate
-pip install -q -r requirements/compiled.txt
-pip install -q -r requirements/dev.txt
+pip install -q --exists-action=w --no-deps -r requirements/compiled.txt
+pip install -q --exists-action=w --no-deps -r requirements/test.txt
cat > solitude/settings/local.py <<SETTINGS
from solitude.settings.base import *
View
@@ -27,12 +27,12 @@ Install
From github::
- git clone --recursive git://github.com/mozilla/solitude.git
+ git clone git://github.com/mozilla/solitude.git
If you used a virtualenv_ activate it and compile some playdoh dependencies::
cd solitude
- pip install -r requirements/compiled.txt
+ pip install -r requirements/dev.txt
Setup settings::
@@ -12,6 +12,7 @@
INSTALLED_APPS = (
'aesfield',
'funfactory',
+ 'django_nose',
'django_statsd',
'solitude',
)

0 comments on commit c633e66

Please sign in to comment.