From c7e03a39dd2f867cbdf972f05604621e32af45b5 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <mazza@interlegis.leg.br>
Date: Fri, 29 Jul 2016 16:18:08 -0300
Subject: [PATCH] =?UTF-8?q?Simplifica=20configura=C3=A7=C3=A3o=20do=20trav?=
 =?UTF-8?q?is?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml                   | 36 +++++++----------------------------
 requirements/requirements.txt |  4 ++--
 .env_dev => sapl/.env_test    |  0
 3 files changed, 9 insertions(+), 31 deletions(-)
 rename .env_dev => sapl/.env_test (100%)

diff --git a/.travis.yml b/.travis.yml
index 9d469a9b4..d3ba4e10e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,45 +1,23 @@
 language: python
-sudo: required
 
 python:
-  - "3.4.3"
+  - 3.4.3
+
 
 services:
   - postgresql
 
-addons:
-  postgresql: "9.3"
-
 install:
-  - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz pkg-config python-psycopg2 nodejs npm
-  - sudo ln -s /usr/bin/node
   - pip install -r requirements/test-requirements.txt
-  - pip install --upgrade setuptools
-
-# Line 24 to 35 is a hack found in this link below
-# It was used to fix an error in database building
-# https://dockyard.com/blog/ruby/2013/03/29/running-postgresql-9-2-on-travis-ci
 
 before_script:
-  - sudo /etc/init.d/postgresql stop
-  - sudo cp /etc/postgresql/9.2/main/pg_hba.conf ./
-  - sudo apt-get remove postgresql postgresql-9.2 -qq --purge
-  - source /etc/lsb-release
-  - echo "deb http://apt.postgresql.org/pub/repos/apt/ $DISTRIB_CODENAME-pgdg main" > pgdg.list
-  - sudo mv pgdg.list /etc/apt/sources.list.d/
-  - wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -
-  - sudo apt-get update
-  - sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install postgresql-9.3 postgresql-contrib-9.3 -qq
-  - sudo /etc/init.d/postgresql stop
-  - sudo cp ./pg_hba.conf /etc/postgresql/9.3/main
-  - sudo /etc/init.d/postgresql start
   - npm install -g bower
-  - cp .env_dev .env
-  - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py
-  - psql -c 'create database sapl;' -U postgres
+  - cp sapl/.env_test sapl/.env
+  - psql -c "CREATE USER sapl WITH PASSWORD 'sapl'" -U postgres;
+  - psql -c "CREATE DATABASE sapl OWNER sapl;" -U postgres
 
 script:
   - ./manage.py migrate
   - ./manage.py bower install
-  - pip freeze
-  - ./test_and_check_qa.sh
\ No newline at end of file
+  - py.test
+  # - ./test_and_check_qa.sh
\ No newline at end of file
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 44ef147c0..9c8faaa2d 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,4 +1,5 @@
 dj-database-url==0.4.1
+django==1.9.7
 django-admin-bootstrapped==2.5.7
 django-bootstrap3==7.0.1
 django-bower==5.1.0
@@ -10,8 +11,7 @@ django-extra-views==0.8.0
 django-filter==0.13.0
 django-floppyforms==1.6.2
 django-model-utils==2.5
-django-sass-processor==0.4.0
-django==1.9.7
+django-sass-processor==0.4.6
 djangorestframework
 easy-thumbnails==2.3
 git+git://github.com/interlegis/trml2pdf.git
diff --git a/.env_dev b/sapl/.env_test
similarity index 100%
rename from .env_dev
rename to sapl/.env_test