diff --git a/.travis.yml b/.travis.yml index 45e5979..106a6ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,15 +6,15 @@ python: install: pip install -r requirements.txt --use-mirrors before_script: - - wget https://github.com/downloads/elasticsearch/elasticsearch/elasticsearch-0.19.8.tar.gz - - tar xvzf elasticsearch-0.19.8.tar.gz + - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.3.tar.gz + - tar xvzf elasticsearch-0.90.3.tar.gz - sudo apt-get update - sudo apt-get install openjdk-7-jre-headless - PWD=`pwd` - sed -ie 's/\/opt\/Brownian\//\/home\/vagrant\/builds\/grigorescu\/Brownian\//' Brownian/settings.py - - ES_PATH=$PWD/elasticsearch-0.19.8 ./elasticsearch-0.19.8/bin/elasticsearch + - ES_PATH=$PWD/elasticsearch-0.90.3 ./elasticsearch-0.90.3/bin/elasticsearch - sleep 15 - curl -s -XPOST localhost:9200/_bulk --data-binary @tests/data.json - DJANGO_SETTINGS_MODULE="Brownian.settings" python ./manage.py syncdb --noinput -script: DJANGO_SETTINGS_MODULE="Brownian.settings" nosetests \ No newline at end of file +script: DJANGO_SETTINGS_MODULE="Brownian.settings" nosetests diff --git a/setup.py b/setup.py index 7aa1fdf..ce19516 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ name = "Brownian", version = "0.5-r107", packages = ["Brownian", "Brownian.view", "Brownian.view.templatetags", "Brownian.view.utils"], - install_requires = ["Django==1.4.1", "django-dajax==0.9.1", "django-dajaxice==0.5", "requests==0.13.6", "nose", "pytz"], + install_requires = ["Django==1.4.1", "django-dajax==0.9.1", "django-dajaxice==0.5", "requests==0.13.6", "nose", "pytz==2013b"], package_data = {'Brownian.view': ['static/css/*.css', 'static/img/*.png',