From 572b68ecb5dee100f503ef34f54d874f45a587fe Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 13:47:52 -0300 Subject: [PATCH 01/86] wip --- .travis.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06e7d6fd6..a90aa0ed1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,18 @@ language: python -python: 3.4 -install: "pip install -r requirements/dev-requirements.txt" -script: py.test + +python: + - "3.4.3" + +install: + - pip install . + - sudo ln -s /usr/bin/nodejs /usr/bin/node + - sudo npm install -g bower + - pkg-config postgresql postgresql-contrib pgadmin3 python-psycopg2 nodejs npm + - pip install -r requirements/test-requirements.txt + - python setup.py -q install + +before script: + -./manage.py bower install + -./manage.py migrate +scripts: + - test_and_check_qa.sh \ No newline at end of file From 16279e2a24c0c01f7523cc6cc5632b71966ddfe7 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 16:40:15 -0300 Subject: [PATCH 02/86] wip --- materia/forms.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/materia/forms.py b/materia/forms.py index 6f6587c7e..7c7df1003 100644 --- a/materia/forms.py +++ b/materia/forms.py @@ -1,4 +1,3 @@ -import django_filters from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML, Button, Column, Fieldset, Layout, Submit from django import forms @@ -8,6 +7,8 @@ from django.db.models import Max from django.forms import ModelForm from django.utils.translation import ugettext_lazy as _ +import django_filters + import crispy_layout_mixin import sapl from crispy_layout_mixin import form_actions From d32d81372e77ac72e6f85ed55835622c53594c09 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 17:07:44 -0300 Subject: [PATCH 03/86] wip --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a90aa0ed1..5a2597a5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - "3.4.3" install: - - pip install . - sudo ln -s /usr/bin/nodejs /usr/bin/node - sudo npm install -g bower - pkg-config postgresql postgresql-contrib pgadmin3 python-psycopg2 nodejs npm From a07a7040261ac3d72a098a27336e4787afc66652 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 17:16:43 -0300 Subject: [PATCH 04/86] wip2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5a2597a5a..c87c83596 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +sudo: true python: - "3.4.3" From 97334b19b86ca864209fa0f4eebb136710a4a0db Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 17:21:06 -0300 Subject: [PATCH 05/86] wip3 --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c87c83596..eeae7e9c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,15 @@ python: - "3.4.3" install: - - sudo ln -s /usr/bin/nodejs /usr/bin/node + - node_modules - sudo npm install -g bower - pkg-config postgresql postgresql-contrib pgadmin3 python-psycopg2 nodejs npm - pip install -r requirements/test-requirements.txt - python setup.py -q install before script: - -./manage.py bower install - -./manage.py migrate + - npm install -g bower + - bower install + - manage.py migrate scripts: - test_and_check_qa.sh \ No newline at end of file From f907ee2a24d6fa25a5a4a4d2b4171ac28ca3bdbf Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 17:27:55 -0300 Subject: [PATCH 06/86] wip4 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eeae7e9c9..08ec63473 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ python: - "3.4.3" install: - - node_modules - sudo npm install -g bower - pkg-config postgresql postgresql-contrib pgadmin3 python-psycopg2 nodejs npm - pip install -r requirements/test-requirements.txt From 10519bbee533d6d2a05fff957eadf0040b2c6ae8 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 17:30:57 -0300 Subject: [PATCH 07/86] wip5 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 08ec63473..b099e437e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ python: - "3.4.3" install: - - sudo npm install -g bower - pkg-config postgresql postgresql-contrib pgadmin3 python-psycopg2 nodejs npm - pip install -r requirements/test-requirements.txt - python setup.py -q install From e2bbdaed5f32760693c8d7eb54a32a85c98d602c Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 17:38:23 -0300 Subject: [PATCH 08/86] wip6 --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b099e437e..d7c3010ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,15 @@ sudo: true python: - "3.4.3" +services: + - postgresql + install: - - pkg-config postgresql postgresql-contrib pgadmin3 python-psycopg2 nodejs npm - pip install -r requirements/test-requirements.txt - python setup.py -q install before script: + - psql -c 'create database travis_ci_test;' -U postgres - npm install -g bower - bower install - manage.py migrate From 6ee05f3eeb82209889f4ac49ae9bd0bd7b4b392b Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 17:50:58 -0300 Subject: [PATCH 09/86] wip7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7c3010ed..5f2619cbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ services: install: - pip install -r requirements/test-requirements.txt - - python setup.py -q install + - setup.py -q before script: - psql -c 'create database travis_ci_test;' -U postgres From e42390addf80beafd07ab7276d14bf44cdb66a1f Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 18:00:42 -0300 Subject: [PATCH 10/86] wip8 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5f2619cbc..5e88283e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,9 @@ services: - postgresql install: + - "python setup.py -q install" - pip install -r requirements/test-requirements.txt - - setup.py -q + before script: - psql -c 'create database travis_ci_test;' -U postgres From 3690293c0c7be57207979acc4904d1a150fa142a Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 18:10:16 -0300 Subject: [PATCH 11/86] wip9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e88283e6..604a7f6fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: - postgresql install: - - "python setup.py -q install" + - python setup.py install - pip install -r requirements/test-requirements.txt From 55cb344a7ab5bcb896921a3d124d167d378ad6ba Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 18:12:48 -0300 Subject: [PATCH 12/86] wip10 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 604a7f6fd..5b1ecdf8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,8 @@ services: - postgresql install: - - python setup.py install - pip install -r requirements/test-requirements.txt - + - python setup.py install before script: - psql -c 'create database travis_ci_test;' -U postgres From b01f030a091a89986318ca75f288f0c618bf16bb Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 18:17:39 -0300 Subject: [PATCH 13/86] wip10 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5b1ecdf8d..47d771815 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ services: install: - pip install -r requirements/test-requirements.txt - - python setup.py install before script: - psql -c 'create database travis_ci_test;' -U postgres From 1f193b42589a70690d5756cd90542e2f831e11bf Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 18:24:26 -0300 Subject: [PATCH 14/86] wip10 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 47d771815..4f6652e27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,4 @@ before script: - bower install - manage.py migrate scripts: - - test_and_check_qa.sh \ No newline at end of file + - test_and_check_qa \ No newline at end of file From add113cb4bd683e7793bcffab8dbe88d51d7d6cd Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 18:36:18 -0300 Subject: [PATCH 15/86] wip11 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f6652e27..c894f10a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,5 +15,6 @@ before script: - npm install -g bower - bower install - manage.py migrate -scripts: + +script: - test_and_check_qa \ No newline at end of file From ab69b8530a5b4847698f7d3732b782e6ca0564cf Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 28 Apr 2016 18:57:48 -0300 Subject: [PATCH 16/86] wip12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c894f10a8..40ebab7b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ before script: - manage.py migrate script: - - test_and_check_qa \ No newline at end of file + - test_and_check_qa.sh \ No newline at end of file From 61f009a5ee2dd5b802558ff44a8a0824f09da7aa Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 08:22:15 -0300 Subject: [PATCH 17/86] wip13 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 40ebab7b9..3557d29ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ before script: - manage.py migrate script: - - test_and_check_qa.sh \ No newline at end of file + - ./test_and_check_qa \ No newline at end of file From b2ae5042b569b4eaf1cc85da619b68052df585be Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 08:31:59 -0300 Subject: [PATCH 18/86] wip13 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3557d29ef..6edb4e1c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,4 @@ before script: - bower install - manage.py migrate -script: - - ./test_and_check_qa \ No newline at end of file +script: ./test_and_check_qa \ No newline at end of file From e29ae65704cfde541591e996929f2bbad14e1847 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 08:38:20 -0300 Subject: [PATCH 19/86] wip13 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6edb4e1c5..979dcd7d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,4 @@ before script: - bower install - manage.py migrate -script: ./test_and_check_qa \ No newline at end of file +script: ./test_and_check_qa.sh \ No newline at end of file From bd9d5c409d9def0b8adfdf165e2318cd6f191c48 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 08:54:40 -0300 Subject: [PATCH 20/86] tenta resolver questao do .env --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 979dcd7d1..387e51a29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ install: - pip install -r requirements/test-requirements.txt before script: + - cp .env.travis .env - psql -c 'create database travis_ci_test;' -U postgres - npm install -g bower - bower install From dd20758b39e625dbc3f54043707ce922b5527b93 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 09:02:43 -0300 Subject: [PATCH 21/86] tenta resolver questao do .env2 --- .env.travis | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .env.travis diff --git a/.env.travis b/.env.travis new file mode 100644 index 000000000..f7e186224 --- /dev/null +++ b/.env.travis @@ -0,0 +1,13 @@ +DATABASE_URL = postgresql://sapl:sapl@localhost:5432/sapl +SECRET_KEY=19&i+*nx9u%njkau+af4&hxjmq$sr%eownbla(uj8e(q5^io#v +DEBUG=True +NAME=sapl +USER=sapl +PASSWORD=sapl +HOST=localhost +PORT=5432 +EMAIL_USE_TLS = True +EMAIL_PORT = 587 +EMAIL_HOST = 'smtp.interlegis.leg.br' +EMAIL_HOST_USER = 'sapl-test' +EMAIL_HOST_PASSWORD = '2BhCwbGHcZ' \ No newline at end of file From a36031335fdaf937dde9d926e715177c4e120932 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 09:10:23 -0300 Subject: [PATCH 22/86] tenta resolver questao do .env3 --- .env.travis | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.travis b/.env.travis index f7e186224..2e5659f8f 100644 --- a/.env.travis +++ b/.env.travis @@ -1,6 +1,6 @@ DATABASE_URL = postgresql://sapl:sapl@localhost:5432/sapl -SECRET_KEY=19&i+*nx9u%njkau+af4&hxjmq$sr%eownbla(uj8e(q5^io#v -DEBUG=True +SECRET_KEY=7vv87ur3tv_ic_)@jju%7#=x4a(eg0bxh1!k!jh^4s(yrkyob9 +DEBUG=False NAME=sapl USER=sapl PASSWORD=sapl From 07229be79f4a61268299f89c1ac2c3d55514c833 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 09:45:35 -0300 Subject: [PATCH 23/86] wip20 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 387e51a29..6490f4010 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,12 @@ services: - postgresql install: + - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz pkg-config postgresql postgresql-contrib pgadmin3 python-psycopg2 nodejs npm - pip install -r requirements/test-requirements.txt + - sudo ln -s /usr/bin/nodejs /usr/bin/node + - sudo npm install -g bower before script: - - cp .env.travis .env - psql -c 'create database travis_ci_test;' -U postgres - npm install -g bower - bower install From 613e9b588997a913bd607459b9fab1c26faa950f Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 09:52:50 -0300 Subject: [PATCH 24/86] wip21 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6490f4010..f0c02544d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: - postgresql install: - - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz pkg-config postgresql postgresql-contrib pgadmin3 python-psycopg2 nodejs npm + - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz pkg-config python-psycopg2 nodejs npm - pip install -r requirements/test-requirements.txt - sudo ln -s /usr/bin/nodejs /usr/bin/node - sudo npm install -g bower From 41e022ae20c4fb31c4ddae72d58dc3190253c741 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 09:58:31 -0300 Subject: [PATCH 25/86] wip22 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0c02544d..257642f65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ services: install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz pkg-config python-psycopg2 nodejs npm - pip install -r requirements/test-requirements.txt - - sudo ln -s /usr/bin/nodejs /usr/bin/node - sudo npm install -g bower before script: From a879e77ea4fab49c54aee20a97c68eb934d37fff Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 10:14:13 -0300 Subject: [PATCH 26/86] wip23 --- .env_dev | 13 +++++++++++++ .travis.yml | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .env_dev diff --git a/.env_dev b/.env_dev new file mode 100644 index 000000000..f207cb050 --- /dev/null +++ b/.env_dev @@ -0,0 +1,13 @@ +DATABASE_URL = postgresql://sapl:sapl@localhost:5432/sapl +SECRET_KEY=adoihswaywieiuwae7!*&&!@#&*@!#&*TISSAD +DEBUG=False +NAME=sapl +USER=sapl +PASSWORD=sapl +HOST=localhost +PORT=5432 +EMAIL_USE_TLS = True +EMAIL_PORT = 587 +EMAIL_HOST = 'smtp.interlegis.leg.br' +EMAIL_HOST_USER = 'sapl-test' +EMAIL_HOST_PASSWORD = '2BhCwbGHcZ' \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 257642f65..9fa8e9175 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,15 @@ services: install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz pkg-config python-psycopg2 nodejs npm - - pip install -r requirements/test-requirements.txt + - sudo apt-get install curl -y + - sudo npm cache clean -f + - sudo npm install -g n + - sudo n stable - sudo npm install -g bower + - pip install -r requirements/test-requirements.txt before script: + - cp .env_dev .env - psql -c 'create database travis_ci_test;' -U postgres - npm install -g bower - bower install From 7d048dbe87408e11523870bd3ba6b1b2b1e9fea5 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 10:22:24 -0300 Subject: [PATCH 27/86] wip24 --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9fa8e9175..405fdb8e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,7 @@ services: install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz pkg-config python-psycopg2 nodejs npm - - sudo apt-get install curl -y - - sudo npm cache clean -f - - sudo npm install -g n - - sudo n stable - - sudo npm install -g bower + - npm install -g bower - pip install -r requirements/test-requirements.txt before script: From 6f7ff2df68f9f68bc2300b87b94443a8131e3fc8 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 10:29:41 -0300 Subject: [PATCH 28/86] wip25 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 405fdb8e6..646fe0ee3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ services: 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/nodejs /usr/bin/node - npm install -g bower - pip install -r requirements/test-requirements.txt From b7c06c2ede223e384d8cb5a1097cebf2b63c0d52 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 10:36:45 -0300 Subject: [PATCH 29/86] wip26 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 646fe0ee3..ab2574490 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ services: 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/nodejs /usr/bin/node + - sudo ln -s /usr/bin/node - npm install -g bower - pip install -r requirements/test-requirements.txt From e17d0ce16f1a6d8c8dda6bf5048869f213c39823 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 10:53:20 -0300 Subject: [PATCH 30/86] wip27 --- .env_dev | 2 +- .travis.yml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env_dev b/.env_dev index f207cb050..0c85b3154 100644 --- a/.env_dev +++ b/.env_dev @@ -1,5 +1,5 @@ DATABASE_URL = postgresql://sapl:sapl@localhost:5432/sapl -SECRET_KEY=adoihswaywieiuwae7!*&&!@#&*@!#&*TISSAD +SECRET_KEY=2j_-c$_8rssj3ijw=!tf$zr6vlee=s5z^w056trow(%t=k2o9_ DEBUG=False NAME=sapl USER=sapl diff --git a/.travis.yml b/.travis.yml index ab2574490..2edc9005d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,16 +7,19 @@ python: 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 apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - npm install -g bower + - npm install -g bower - pip install -r requirements/test-requirements.txt before script: - cp .env_dev .env - psql -c 'create database travis_ci_test;' -U postgres - - npm install -g bower - bower install - manage.py migrate From f04526a75e0684457b8d8c7faabcac9f96f095f2 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 10:56:21 -0300 Subject: [PATCH 31/86] wip28 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2edc9005d..ff4a4c8ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: - postgresql addons: - postgresql: "9.3" + postgresql: "9.3.12" install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm From d0ff244b903f6bb40917c5e0566f4add13fa4922 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 11:06:37 -0300 Subject: [PATCH 32/86] wip29 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff4a4c8ed..319437033 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,12 @@ install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - npm install -g bower - - npm install -g bower + - bower install - pip install -r requirements/test-requirements.txt before script: - cp .env_dev .env - psql -c 'create database travis_ci_test;' -U postgres - - bower install - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From 78d3262bca3af4db53679345bfc8574a1251afc4 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 11:18:42 -0300 Subject: [PATCH 33/86] wip30 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 319437033..97309a427 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - npm install -g bower - - bower install + - ./bower install - pip install -r requirements/test-requirements.txt before script: From 73b8f225565ed9565409f1e9606e463e220088c5 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 11:23:38 -0300 Subject: [PATCH 34/86] wip31 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97309a427..0245ace5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,12 @@ install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - npm install -g bower - - ./bower install - pip install -r requirements/test-requirements.txt -before script: +before_script: - cp .env_dev .env - psql -c 'create database travis_ci_test;' -U postgres + - bower install - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From 4d09adb9d02d1d57afaf8fbed5597dea4f474bfe Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 11:29:23 -0300 Subject: [PATCH 35/86] wip32 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0245ace5e..8977b7c32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ install: before_script: - cp .env_dev .env - - psql -c 'create database travis_ci_test;' -U postgres - bower install - manage.py migrate From 3ef90b983006bfad72f0ef4949b0940aa519286e Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 11:36:15 -0300 Subject: [PATCH 36/86] wip33 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8977b7c32..23aad731e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ install: before_script: - cp .env_dev .env - - bower install + - bower install -f - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From 836e2f4d79b01f7af46456739a1ede6fce04d03b Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 11:43:30 -0300 Subject: [PATCH 37/86] wip34 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23aad731e..cb2cab058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ install: before_script: - cp .env_dev .env - - bower install -f - - manage.py migrate + - ./bower install + - ./manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From 2da59c93354a008f5f2c33c134675e0ee5d7bb65 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 11:50:43 -0300 Subject: [PATCH 38/86] wip35 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb2cab058..5c18c5bc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ install: before_script: - cp .env_dev .env - - ./bower install + - ./manage.py bower install - ./manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From 78620d65b03c160c4faae3fa008f5c69c0f3d636 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 11:56:56 -0300 Subject: [PATCH 39/86] wip36 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c18c5bc5..edf053344 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ install: before_script: - cp .env_dev .env - - ./manage.py bower install - - ./manage.py migrate + - manage.py bower install + - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From e25939aa2bbef83648356248c72870c7bf2c30d2 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:03:54 -0300 Subject: [PATCH 40/86] wip37 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index edf053344..5810e2148 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,11 @@ install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - npm install -g bower + - ./manage.py bower install - pip install -r requirements/test-requirements.txt before_script: - cp .env_dev .env - - manage.py bower install - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From 13c00a97327616f7e139ea3101e8c5c677503427 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:08:50 -0300 Subject: [PATCH 41/86] wip38 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5810e2148..424852b0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,12 +13,12 @@ addons: install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - - npm install -g bower - - ./manage.py bower install - pip install -r requirements/test-requirements.txt before_script: - cp .env_dev .env + - npm install -g bower + - bower install - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From e4b8bc7eafa1b62c4cabe4180737c808ffb022a2 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:19:40 -0300 Subject: [PATCH 42/86] wip38 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 424852b0a..85c6db23e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ install: before_script: - cp .env_dev .env - npm install -g bower - - bower install + - ./manage.py bower install - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From c26ecd4e527169212b89a5f721cd7c01a7abec07 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:24:44 -0300 Subject: [PATCH 43/86] wip38 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85c6db23e..891bbdded 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ install: before_script: - cp .env_dev .env - npm install -g bower - - ./manage.py bower install - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From a2d2a17dba43e41aacd7d227152dae6b41863848 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:29:24 -0300 Subject: [PATCH 44/86] wip39 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 891bbdded..75bc81847 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,5 @@ install: before_script: - cp .env_dev .env - npm install -g bower - - manage.py migrate script: ./test_and_check_qa.sh \ No newline at end of file From 13634724b1931897baa71022a8e6ac02de569efd Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:33:33 -0300 Subject: [PATCH 45/86] wip40 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 75bc81847..d875d4ad8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ python: services: - postgresql + addons: postgresql: "9.3.12" From c3c1ab1a41609d5f82f220d83153cfd0e21ad315 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:40:17 -0300 Subject: [PATCH 46/86] wip41 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d875d4ad8..e626d5ec1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ python: services: - postgresql - addons: postgresql: "9.3.12" @@ -19,5 +18,6 @@ install: before_script: - cp .env_dev .env - npm install -g bower + - python manage.py bower install script: ./test_and_check_qa.sh \ No newline at end of file From d8be177d2f388cd64ca69e410b85f54541e81768 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:47:59 -0300 Subject: [PATCH 47/86] wip42 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e626d5ec1..712506928 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ install: before_script: - cp .env_dev .env - npm install -g bower - - python manage.py bower install -script: ./test_and_check_qa.sh \ No newline at end of file +script: + - python manage.py bower install + - ./test_and_check_qa.sh \ No newline at end of file From 0d7ccdc5db592e45c1ceedbafa4c80233a202e50 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 12:53:28 -0300 Subject: [PATCH 48/86] wip43 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 712506928..001d07792 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,5 +20,5 @@ before_script: - npm install -g bower script: - - python manage.py bower install + - ./manage.py bower install - ./test_and_check_qa.sh \ No newline at end of file From 2e562938170f8b34509f0d9baec07a52406d8204 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 13:00:26 -0300 Subject: [PATCH 49/86] wip44 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 001d07792..fb5f3510d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ before_script: - cp .env_dev .env - npm install -g bower -script: +script: + - ./manage.py migrate - ./manage.py bower install - ./test_and_check_qa.sh \ No newline at end of file From ff44221b6da4b8e12061b92a3126fe7378d7970e Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 13:16:49 -0300 Subject: [PATCH 50/86] wip45 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fb5f3510d..085698782 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - pip install -r requirements/test-requirements.txt + - pip install django-extensions before_script: - cp .env_dev .env From f4465deb5fd70f0634bd216af8c1462226c4fcf0 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 13:22:52 -0300 Subject: [PATCH 51/86] wip46 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 085698782..c8fad531b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,7 @@ addons: install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - - pip install -r requirements/test-requirements.txt - - pip install django-extensions + - pip install -r requirements/dev-requirements.txt before_script: - cp .env_dev .env From ed96e0cd78cbdf7cee3f834071ded60e10f17d66 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Fri, 29 Apr 2016 14:12:23 -0300 Subject: [PATCH 52/86] wip47 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c8fad531b..798c096e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,5 @@ before_script: - npm install -g bower script: - - ./manage.py migrate - ./manage.py bower install - ./test_and_check_qa.sh \ No newline at end of file From 150ca71e77508e5af3e58d399ba10f5110018b1c Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 10:18:07 -0300 Subject: [PATCH 53/86] WIP52 --- .travis.yml | 1 + materia/forms.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 798c096e0..aff644876 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - pip install -r requirements/dev-requirements.txt + - pip install --upgrade setuptools before_script: - cp .env_dev .env diff --git a/materia/forms.py b/materia/forms.py index 7c7df1003..6f6587c7e 100644 --- a/materia/forms.py +++ b/materia/forms.py @@ -1,3 +1,4 @@ +import django_filters from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML, Button, Column, Fieldset, Layout, Submit from django import forms @@ -7,8 +8,6 @@ from django.db.models import Max from django.forms import ModelForm from django.utils.translation import ugettext_lazy as _ -import django_filters - import crispy_layout_mixin import sapl from crispy_layout_mixin import form_actions From cf4fae538330daeb36d165e02ee524c525dea3db Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 10:25:09 -0300 Subject: [PATCH 54/86] WIP53 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index aff644876..6b5d83525 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,6 @@ before_script: - npm install -g bower script: + - ./manage.py migrate - ./manage.py bower install - ./test_and_check_qa.sh \ No newline at end of file From fc878b6036cd81ad1985719eaf1a68560c7bbc60 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 10:36:02 -0300 Subject: [PATCH 55/86] WIP54 --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b5d83525..02ee8aff6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,11 @@ install: before_script: - cp .env_dev .env - npm install -g bower + - psql -c 'create database capomastro;' -U postgres + - sed -i -e 's/getpass.getuser()/"postgres"/g' settings.py + - python manage.py syncdb –migrate –noinput script: - - ./manage.py migrate + - python manage.py test - ./manage.py bower install - ./test_and_check_qa.sh \ No newline at end of file From 182b011b97cd36d388d4c1d23216f27cf1c8e7e1 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 10:45:03 -0300 Subject: [PATCH 56/86] WIP55 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 02ee8aff6..b3b56f1bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: before_script: - cp .env_dev .env - npm install -g bower - - psql -c 'create database capomastro;' -U postgres + - psql -c 'create database sapl;' -U postgres - sed -i -e 's/getpass.getuser()/"postgres"/g' settings.py - python manage.py syncdb –migrate –noinput From 076626fcdaa2586744967189a94414155467f32d Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 10:55:22 -0300 Subject: [PATCH 57/86] WIP56 --- .env_dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env_dev b/.env_dev index 0c85b3154..57952fd62 100644 --- a/.env_dev +++ b/.env_dev @@ -3,7 +3,7 @@ SECRET_KEY=2j_-c$_8rssj3ijw=!tf$zr6vlee=s5z^w056trow(%t=k2o9_ DEBUG=False NAME=sapl USER=sapl -PASSWORD=sapl +PASSWORD= HOST=localhost PORT=5432 EMAIL_USE_TLS = True From e53be5c430b81e185c41d7a7b8229eb7038b538d Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 11:03:39 -0300 Subject: [PATCH 58/86] WIP57 --- .env_dev | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env_dev b/.env_dev index 57952fd62..713012828 100644 --- a/.env_dev +++ b/.env_dev @@ -1,9 +1,8 @@ -DATABASE_URL = postgresql://sapl:sapl@localhost:5432/sapl +DATABASE_URL = postgresql://sapl:@localhost:5432/sapl SECRET_KEY=2j_-c$_8rssj3ijw=!tf$zr6vlee=s5z^w056trow(%t=k2o9_ DEBUG=False NAME=sapl USER=sapl -PASSWORD= HOST=localhost PORT=5432 EMAIL_USE_TLS = True From 1e6b00523de3bddb1da5e1d8424d74008fd327be Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 11:12:45 -0300 Subject: [PATCH 59/86] WIP58 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3b56f1bc..105e0447b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_script: - cp .env_dev .env - npm install -g bower - psql -c 'create database sapl;' -U postgres - - sed -i -e 's/getpass.getuser()/"postgres"/g' settings.py + - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py - python manage.py syncdb –migrate –noinput script: From 7618fae3afd3dcec6f0d3b7225f0ece171580bb3 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 11:25:47 -0300 Subject: [PATCH 60/86] WIP60 --- .env_dev | 4 - .travis.yml | 2 +- sapl/settings_travis.py | 183 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 sapl/settings_travis.py diff --git a/.env_dev b/.env_dev index 713012828..d0da226e8 100644 --- a/.env_dev +++ b/.env_dev @@ -1,10 +1,6 @@ DATABASE_URL = postgresql://sapl:@localhost:5432/sapl SECRET_KEY=2j_-c$_8rssj3ijw=!tf$zr6vlee=s5z^w056trow(%t=k2o9_ DEBUG=False -NAME=sapl -USER=sapl -HOST=localhost -PORT=5432 EMAIL_USE_TLS = True EMAIL_PORT = 587 EMAIL_HOST = 'smtp.interlegis.leg.br' diff --git a/.travis.yml b/.travis.yml index 105e0447b..a346aa204 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: - pip install --upgrade setuptools before_script: - - cp .env_dev .env + - cp sapl/settings_travis.py sapl/settings.py - npm install -g bower - psql -c 'create database sapl;' -U postgres - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py diff --git a/sapl/settings_travis.py b/sapl/settings_travis.py new file mode 100644 index 000000000..13d5214c8 --- /dev/null +++ b/sapl/settings_travis.py @@ -0,0 +1,183 @@ + +""" +Django settings for sapl project. +Generated by 'django-admin startproject' using Django 1.8.2. +For more information on this file, see +https://docs.djangoproject.com/en/1.8/topics/settings/ +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.8/ref/settings/ +""" +from unipath import Path + +from .temp_suppress_crispy_form_warnings import \ + SUPRESS_CRISPY_FORM_WARNINGS_LOGGING + +BASE_DIR = Path(__file__).ancestor(2) + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '!9g1-#la+#(oft(v-y1qhy$jk-2$24pdk69#b_jfqyv!*%a_)t' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = ['*'] + + +# SAPL business apps in dependency order +SAPL_APPS = ( + 'base', + 'parlamentares', + 'comissoes', + 'materia', + 'norma', + 'sessao', + 'lexml', + 'painel', + 'protocoloadm', + 'compilacao', +) + +INSTALLED_APPS = ( + 'django_admin_bootstrapped', # must come before django.contrib.admin + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + + # more + 'django_extensions', + 'djangobower', + 'bootstrap3', # basically for django_admin_bootstrapped + 'crispy_forms', + 'sass_processor', + 'rest_framework', + +) + SAPL_APPS + +if DEBUG: + INSTALLED_APPS += ('debug_toolbar',) + +MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.locale.LocaleMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', +) + +ROOT_URLCONF = 'sapl.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': ['templates'], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + "django.core.context_processors.media", + "django.core.context_processors.static", + 'django.contrib.messages.context_processors.messages', + 'sapl.context_processors.parliament_info', + ], + 'debug': DEBUG + }, + }, +] + + +WSGI_APPLICATION = 'sapl.wsgi.application' + +# Database +# https://docs.djangoproject.com/en/1.8/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'sapl', + 'USER': 'sapl', + 'PASSWORD': '', + 'HOST': 'localhost', + 'PORT': '5432', + } +} + +EMAIL_USE_TLS = True +EMAIL_HOST = '' +EMAIL_HOST_USER = '' +EMAIL_HOST_PASSWORD = '' +EMAIL_PORT = 587 + +# Internationalization +# https://docs.djangoproject.com/en/1.8/topics/i18n/ +LANGUAGE_CODE = 'pt-br' +LANGUAGES = ( + ('pt-br', u'Português'), +) + +TIME_ZONE = 'America/Sao_Paulo' +USE_I18N = True +USE_L10N = False +USE_TZ = True +# DATE_FORMAT = 'N j, Y' +DATE_FORMAT = 'd/m/Y' +SHORT_DATE_FORMAT = 'd/m/Y' +DATE_INPUT_FORMATS = ('%d/%m/%Y', '%m-%d-%Y', '%Y-%m-%d') + +LOCALE_PATHS = ( + 'locale', +) + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.8/howto/static-files/ +STATIC_URL = '/static/' +STATIC_ROOT = BASE_DIR.child("collected_static") +STATICFILES_DIRS = (BASE_DIR.child("static"),) +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'djangobower.finders.BowerFinder', + 'sass_processor.finders.CssFinder', +) + +MEDIA_ROOT = BASE_DIR.child("media") +MEDIA_URL = '/media/' + +DAB_FIELD_RENDERER = \ + 'django_admin_bootstrapped.renderers.BootstrapFieldRenderer' +CRISPY_TEMPLATE_PACK = 'bootstrap3' +CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' +CRISPY_FAIL_SILENTLY = not DEBUG + +BOWER_COMPONENTS_ROOT = BASE_DIR.child("bower") +BOWER_INSTALLED_APPS = ( + 'bootstrap-sass', + 'components-font-awesome', + 'tinymce', + 'jquery-ui', + 'jquery-runner', + 'jQuery-Mask-Plugin', + 'jsdiff', + 'https://github.com/hoarrd/drunken-parrot-flat-ui.git', +) + +# Additional search paths for SASS files when using the @import statement +SASS_PROCESSOR_INCLUDE_DIRS = (BOWER_COMPONENTS_ROOT.child( + 'bower_components', 'bootstrap-sass', 'assets', 'stylesheets'), +) + +# FIXME update cripy-forms and remove this +# hack to suppress many annoying warnings from crispy_forms +# see sapl.temp_suppress_crispy_form_warnings +LOGGING = SUPRESS_CRISPY_FORM_WARNINGS_LOGGING \ No newline at end of file From c4b215a413da539573239e278abd6290696edc04 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 11:33:52 -0300 Subject: [PATCH 61/86] WIP61 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a346aa204..2c574b19a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,10 @@ install: - pip install --upgrade setuptools before_script: - - cp sapl/settings_travis.py sapl/settings.py - npm install -g bower - - psql -c 'create database sapl;' -U postgres + - cp sapl/settings_travis.py sapl/settings.py - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py + - psql -c 'create database sapl;' -U postgres - python manage.py syncdb –migrate –noinput script: From e26ea35d7eaf45dec7e96162d619a143e47802de Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 11:45:23 -0300 Subject: [PATCH 62/86] WIP62 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c574b19a..3530712e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: python -sudo: true +sudo: required python: - "3.4.3" @@ -17,6 +17,7 @@ install: - pip install --upgrade setuptools before_script: + - sudo service postgresql restart - npm install -g bower - cp sapl/settings_travis.py sapl/settings.py - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py From eee9c235171714d4705fe36e0e62c21aad9809b3 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 11:56:32 -0300 Subject: [PATCH 63/86] WIP63 --- sapl/settings_travis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/settings_travis.py b/sapl/settings_travis.py index 13d5214c8..11f4d8f6a 100644 --- a/sapl/settings_travis.py +++ b/sapl/settings_travis.py @@ -109,7 +109,7 @@ DATABASES = { 'USER': 'sapl', 'PASSWORD': '', 'HOST': 'localhost', - 'PORT': '5432', + 'PORT': '5466', } } From 29cbcbcbbfffb9ac9260c3e134be30232cf59c74 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 11:59:18 -0300 Subject: [PATCH 64/86] WIP64 --- sapl/settings_travis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/settings_travis.py b/sapl/settings_travis.py index 11f4d8f6a..f04105ad6 100644 --- a/sapl/settings_travis.py +++ b/sapl/settings_travis.py @@ -109,7 +109,7 @@ DATABASES = { 'USER': 'sapl', 'PASSWORD': '', 'HOST': 'localhost', - 'PORT': '5466', + 'PORT': '', } } From 1ad2ef178070d8f5e958e3ddc4b44c4cfa90c526 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 12:13:04 -0300 Subject: [PATCH 65/86] WIP65 --- .env_dev | 4 ++-- .travis.yml | 3 +-- sapl/settings_travis.py | 7 ++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env_dev b/.env_dev index d0da226e8..5c28122fb 100644 --- a/.env_dev +++ b/.env_dev @@ -1,5 +1,5 @@ -DATABASE_URL = postgresql://sapl:@localhost:5432/sapl -SECRET_KEY=2j_-c$_8rssj3ijw=!tf$zr6vlee=s5z^w056trow(%t=k2o9_ +DATABASE_URL = postgresql://sapl:@localhost:/sapl +SECRET_KEY=TravisTest DEBUG=False EMAIL_USE_TLS = True EMAIL_PORT = 587 diff --git a/.travis.yml b/.travis.yml index 3530712e3..7579e4474 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,8 @@ install: - pip install --upgrade setuptools before_script: - - sudo service postgresql restart - npm install -g bower - - cp sapl/settings_travis.py sapl/settings.py + - cp .env_dev .env - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py - psql -c 'create database sapl;' -U postgres - python manage.py syncdb –migrate –noinput diff --git a/sapl/settings_travis.py b/sapl/settings_travis.py index f04105ad6..14952710c 100644 --- a/sapl/settings_travis.py +++ b/sapl/settings_travis.py @@ -7,6 +7,7 @@ https://docs.djangoproject.com/en/1.8/topics/settings/ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.8/ref/settings/ """ +from dj_database_url import parse as db_url from unipath import Path from .temp_suppress_crispy_form_warnings import \ @@ -18,10 +19,10 @@ BASE_DIR = Path(__file__).ancestor(2) # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '!9g1-#la+#(oft(v-y1qhy$jk-2$24pdk69#b_jfqyv!*%a_)t' +SECRET_KEY = 'TravisTest' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False ALLOWED_HOSTS = ['*'] @@ -180,4 +181,4 @@ SASS_PROCESSOR_INCLUDE_DIRS = (BOWER_COMPONENTS_ROOT.child( # FIXME update cripy-forms and remove this # hack to suppress many annoying warnings from crispy_forms # see sapl.temp_suppress_crispy_form_warnings -LOGGING = SUPRESS_CRISPY_FORM_WARNINGS_LOGGING \ No newline at end of file +LOGGING = SUPRESS_CRISPY_FORM_WARNINGS_LOGGING From b8bde14b060195dcde859834b626d0197dd2aad7 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 12:20:11 -0300 Subject: [PATCH 66/86] WIP65 --- .env_dev | 2 +- .travis.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.env_dev b/.env_dev index 5c28122fb..db1a6ff5a 100644 --- a/.env_dev +++ b/.env_dev @@ -1,4 +1,4 @@ -DATABASE_URL = postgresql://sapl:@localhost:/sapl +DATABASE_URL = postgresql://postgres:@localhost:/sapl SECRET_KEY=TravisTest DEBUG=False EMAIL_USE_TLS = True diff --git a/.travis.yml b/.travis.yml index 7579e4474..13c1f264c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ install: before_script: - 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 - python manage.py syncdb –migrate –noinput From 6dc89e7e2b25d1da06f3df89a282150a35faf19c Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 12:26:14 -0300 Subject: [PATCH 67/86] WIP66 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13c1f264c..fedbf7a4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ python: services: - postgresql -addons: - postgresql: "9.3.12" install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm From 00dd6670f96eb04b4ede976b967f1b05a68d4e6a Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 12:32:56 -0300 Subject: [PATCH 68/86] WIP67 --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index fedbf7a4b..4c833478a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,14 @@ python: services: - postgresql +addons: + postgresql: "9.3.12" + +env: + - DB=postgres + +before_install: + - export DJANGO_SETTINGS_MODULE=ledenbestand.settings.local install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm From 6eb87bf3e0b8e86fa05930ed74588eff8fed7d8b Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 13:05:07 -0300 Subject: [PATCH 69/86] WIP68 --- .travis.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c833478a..b9f037b62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,7 @@ services: - postgresql addons: - postgresql: "9.3.12" - -env: - - DB=postgres - -before_install: - - export DJANGO_SETTINGS_MODULE=ledenbestand.settings.local + postgresql: "9.3" install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm @@ -23,8 +17,21 @@ install: - pip install --upgrade setuptools 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 - python manage.py syncdb –migrate –noinput From 5164e7794688f575a62d3764e5a67e2aa1ff5731 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 13:09:51 -0300 Subject: [PATCH 70/86] WIP69 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9f037b62..ad65f9072 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ addons: postgresql: "9.3" install: - - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz postgresql-contrib pkg-config python-psycopg2 nodejs npm + - 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/dev-requirements.txt - pip install --upgrade setuptools From 1858cf761acabd35b22cbd7370c632565bf5a86b Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 13:17:08 -0300 Subject: [PATCH 71/86] WIP70 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad65f9072..4ef54d1f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,8 @@ before_script: - cp .env_dev .env - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py - psql -c 'create database sapl;' -U postgres - - python manage.py syncdb –migrate –noinput script: - - python manage.py test + - ./manage.py migrate - ./manage.py bower install - ./test_and_check_qa.sh \ No newline at end of file From 36c121b8896cd03296bbfbe08f0ea41a7e7c7f67 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 13:42:17 -0300 Subject: [PATCH 72/86] WIP71 --- .travis.yml | 2 + ...remove_parlamentar_unidade_deliberativa.py | 19 ++ sapl/settings_travis.py | 184 ------------------ 3 files changed, 21 insertions(+), 184 deletions(-) create mode 100644 parlamentares/migrations/0017_remove_parlamentar_unidade_deliberativa.py delete mode 100644 sapl/settings_travis.py diff --git a/.travis.yml b/.travis.yml index 4ef54d1f1..7a8d95fbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ install: - pip install -r requirements/dev-requirements.txt - pip install --upgrade setuptools +# 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 ./ diff --git a/parlamentares/migrations/0017_remove_parlamentar_unidade_deliberativa.py b/parlamentares/migrations/0017_remove_parlamentar_unidade_deliberativa.py new file mode 100644 index 000000000..8bfaccba7 --- /dev/null +++ b/parlamentares/migrations/0017_remove_parlamentar_unidade_deliberativa.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-02 16:32 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('parlamentares', '0016_auto_20160404_1409'), + ] + + operations = [ + migrations.RemoveField( + model_name='parlamentar', + name='unidade_deliberativa', + ), + ] diff --git a/sapl/settings_travis.py b/sapl/settings_travis.py deleted file mode 100644 index 14952710c..000000000 --- a/sapl/settings_travis.py +++ /dev/null @@ -1,184 +0,0 @@ - -""" -Django settings for sapl project. -Generated by 'django-admin startproject' using Django 1.8.2. -For more information on this file, see -https://docs.djangoproject.com/en/1.8/topics/settings/ -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.8/ref/settings/ -""" -from dj_database_url import parse as db_url -from unipath import Path - -from .temp_suppress_crispy_form_warnings import \ - SUPRESS_CRISPY_FORM_WARNINGS_LOGGING - -BASE_DIR = Path(__file__).ancestor(2) - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'TravisTest' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False - -ALLOWED_HOSTS = ['*'] - - -# SAPL business apps in dependency order -SAPL_APPS = ( - 'base', - 'parlamentares', - 'comissoes', - 'materia', - 'norma', - 'sessao', - 'lexml', - 'painel', - 'protocoloadm', - 'compilacao', -) - -INSTALLED_APPS = ( - 'django_admin_bootstrapped', # must come before django.contrib.admin - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - - # more - 'django_extensions', - 'djangobower', - 'bootstrap3', # basically for django_admin_bootstrapped - 'crispy_forms', - 'sass_processor', - 'rest_framework', - -) + SAPL_APPS - -if DEBUG: - INSTALLED_APPS += ('debug_toolbar',) - -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.locale.LocaleMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.security.SecurityMiddleware', -) - -ROOT_URLCONF = 'sapl.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': ['templates'], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - "django.core.context_processors.media", - "django.core.context_processors.static", - 'django.contrib.messages.context_processors.messages', - 'sapl.context_processors.parliament_info', - ], - 'debug': DEBUG - }, - }, -] - - -WSGI_APPLICATION = 'sapl.wsgi.application' - -# Database -# https://docs.djangoproject.com/en/1.8/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'sapl', - 'USER': 'sapl', - 'PASSWORD': '', - 'HOST': 'localhost', - 'PORT': '', - } -} - -EMAIL_USE_TLS = True -EMAIL_HOST = '' -EMAIL_HOST_USER = '' -EMAIL_HOST_PASSWORD = '' -EMAIL_PORT = 587 - -# Internationalization -# https://docs.djangoproject.com/en/1.8/topics/i18n/ -LANGUAGE_CODE = 'pt-br' -LANGUAGES = ( - ('pt-br', u'Português'), -) - -TIME_ZONE = 'America/Sao_Paulo' -USE_I18N = True -USE_L10N = False -USE_TZ = True -# DATE_FORMAT = 'N j, Y' -DATE_FORMAT = 'd/m/Y' -SHORT_DATE_FORMAT = 'd/m/Y' -DATE_INPUT_FORMATS = ('%d/%m/%Y', '%m-%d-%Y', '%Y-%m-%d') - -LOCALE_PATHS = ( - 'locale', -) - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.8/howto/static-files/ -STATIC_URL = '/static/' -STATIC_ROOT = BASE_DIR.child("collected_static") -STATICFILES_DIRS = (BASE_DIR.child("static"),) -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'djangobower.finders.BowerFinder', - 'sass_processor.finders.CssFinder', -) - -MEDIA_ROOT = BASE_DIR.child("media") -MEDIA_URL = '/media/' - -DAB_FIELD_RENDERER = \ - 'django_admin_bootstrapped.renderers.BootstrapFieldRenderer' -CRISPY_TEMPLATE_PACK = 'bootstrap3' -CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' -CRISPY_FAIL_SILENTLY = not DEBUG - -BOWER_COMPONENTS_ROOT = BASE_DIR.child("bower") -BOWER_INSTALLED_APPS = ( - 'bootstrap-sass', - 'components-font-awesome', - 'tinymce', - 'jquery-ui', - 'jquery-runner', - 'jQuery-Mask-Plugin', - 'jsdiff', - 'https://github.com/hoarrd/drunken-parrot-flat-ui.git', -) - -# Additional search paths for SASS files when using the @import statement -SASS_PROCESSOR_INCLUDE_DIRS = (BOWER_COMPONENTS_ROOT.child( - 'bower_components', 'bootstrap-sass', 'assets', 'stylesheets'), -) - -# FIXME update cripy-forms and remove this -# hack to suppress many annoying warnings from crispy_forms -# see sapl.temp_suppress_crispy_form_warnings -LOGGING = SUPRESS_CRISPY_FORM_WARNINGS_LOGGING From 4f2ce93909baa28272479f79db5a30d34473987b Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 14:05:49 -0300 Subject: [PATCH 73/86] WIP75 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7a8d95fbf..11f178862 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ before_script: - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py - psql -c 'create database sapl;' -U postgres + script: - ./manage.py migrate - ./manage.py bower install From 82af928d1186d31c2ee0b8878b0e7233f3d7b442 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 10:01:28 -0300 Subject: [PATCH 74/86] wipFINAL --- .travis.yml | 1 - protocoloadm/views.py | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11f178862..7a8d95fbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,6 @@ before_script: - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py - psql -c 'create database sapl;' -U postgres - script: - ./manage.py migrate - ./manage.py bower install diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 851cf76f9..4aabbb9c9 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -1,10 +1,12 @@ import json -from datetime import date, datetime from braces.views import FormValidMessageMixin +from crud.base import Crud, make_pagination +from datetime import date, datetime + from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse -from django.db.models import Q, Max +from django.db.models import Max, Q from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ @@ -12,7 +14,6 @@ from django.views.generic import CreateView, DetailView, FormView, ListView from django.views.generic.base import TemplateView from django_filters.views import FilterView -from crud.base import Crud, make_pagination from materia.models import Proposicao, TipoMateriaLegislativa from sapl.utils import create_barcode, get_client_ip From 721790d5b5c0692330114fd24829f4e78abe8828 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 10:10:01 -0300 Subject: [PATCH 75/86] WIPFINAL2 --- .travis.yml | 2 ++ protocoloadm/views.py | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a8d95fbf..77b6e6b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ install: - pip install -r requirements/dev-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: diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 4aabbb9c9..851cf76f9 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -1,12 +1,10 @@ import json - -from braces.views import FormValidMessageMixin -from crud.base import Crud, make_pagination from datetime import date, datetime +from braces.views import FormValidMessageMixin from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse -from django.db.models import Max, Q +from django.db.models import Q, Max from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ @@ -14,6 +12,7 @@ from django.views.generic import CreateView, DetailView, FormView, ListView from django.views.generic.base import TemplateView from django_filters.views import FilterView +from crud.base import Crud, make_pagination from materia.models import Proposicao, TipoMateriaLegislativa from sapl.utils import create_barcode, get_client_ip From 4b2bbbbb409a61c1ad15bafa338bd9b744bcaaaa Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 10:25:21 -0300 Subject: [PATCH 76/86] WIPFINAL3 --- protocoloadm/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 851cf76f9..4aabbb9c9 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -1,10 +1,12 @@ import json -from datetime import date, datetime from braces.views import FormValidMessageMixin +from crud.base import Crud, make_pagination +from datetime import date, datetime + from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse -from django.db.models import Q, Max +from django.db.models import Max, Q from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ @@ -12,7 +14,6 @@ from django.views.generic import CreateView, DetailView, FormView, ListView from django.views.generic.base import TemplateView from django_filters.views import FilterView -from crud.base import Crud, make_pagination from materia.models import Proposicao, TipoMateriaLegislativa from sapl.utils import create_barcode, get_client_ip From aee6033c2da1ea0a3f0334521a0b35393b4f7029 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 12:54:38 -0300 Subject: [PATCH 77/86] WIPFINALfinal --- protocoloadm/views.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 4aabbb9c9..851cf76f9 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -1,12 +1,10 @@ import json - -from braces.views import FormValidMessageMixin -from crud.base import Crud, make_pagination from datetime import date, datetime +from braces.views import FormValidMessageMixin from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse -from django.db.models import Max, Q +from django.db.models import Q, Max from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ @@ -14,6 +12,7 @@ from django.views.generic import CreateView, DetailView, FormView, ListView from django.views.generic.base import TemplateView from django_filters.views import FilterView +from crud.base import Crud, make_pagination from materia.models import Proposicao, TipoMateriaLegislativa from sapl.utils import create_barcode, get_client_ip From 948e468dcb74c22f3e79579aeed46cf55f22330d Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 13:08:09 -0300 Subject: [PATCH 78/86] WIPfinalFinal --- .travis.yml | 3 ++- requirements/dev-requirements.txt | 1 - requirements/test-requirements.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77b6e6b60..42cb5d988 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,4 +41,5 @@ before_script: script: - ./manage.py migrate - ./manage.py bower install - - ./test_and_check_qa.sh \ No newline at end of file + - pip freeze + - ./test_and_check_qa.sh diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index b4a0bed4d..8b915ee98 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -5,7 +5,6 @@ django-debug-toolbar==1.4 django-extensions==1.6.1 django-floppyforms==1.6.1 easy-thumbnails==2.3 -flake8==2.5.4 ipdb==0.9.0 pygraphviz==1.3rc2 pytest-ipdb==0.1-prerelease2 diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 5929d4dec..7768498e1 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -1,6 +1,7 @@ -r requirements.txt coverage django-webtest +flake8==2.5.4 isort model_mommy pep8 From 86bedae645e7da2698d73634fe1decefa9b9aa00 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 13:17:51 -0300 Subject: [PATCH 79/86] WIP THE END --- protocoloadm/views.py | 2 +- requirements/test-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 851cf76f9..bc4b122d2 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -4,7 +4,7 @@ from datetime import date, datetime from braces.views import FormValidMessageMixin from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse -from django.db.models import Q, Max +from django.db.models import Max, Q from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 7768498e1..a6156db6c 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -2,7 +2,7 @@ coverage django-webtest flake8==2.5.4 -isort +isort==4.2.5 model_mommy pep8 pytest From c983f7422a9f3977f595343a80fa71983a19f1e9 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 13:28:43 -0300 Subject: [PATCH 80/86] THE END --- .travis.yml | 2 +- requirements/test-requirements.txt | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42cb5d988..4bd0ed9ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: 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/dev-requirements.txt + - pip install -r requirements/test-requirements.txt - pip install --upgrade setuptools # Line 24 to 35 is a hack found in this link below diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index a6156db6c..0b0a7653a 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -1,11 +1,11 @@ -r requirements.txt -coverage +coverage==4.0.3 django-webtest flake8==2.5.4 isort==4.2.5 -model_mommy -pep8 -pytest -pytest-cov -pytest-django -webtest +model_mommy==1.2.6 +pep8==1.7.0 +pytest==2.7.2 +pytest-cov==2.2.1 +pytest-django==2.9.1 +webtest==2.0.21 From 3fb9d857053da4c953031f6571bcdded942bf522 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 13:35:11 -0300 Subject: [PATCH 81/86] THE END - FINAL --- requirements/requirements.txt | 2 +- requirements/test-requirements.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 10d6300cd..16772d731 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,4 +1,4 @@ -dj-database-url +dj-database-url==0.4.1 django-admin-bootstrapped==2.5.7 django-bootstrap3==7.0.1 django-bower==5.1.0 diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 0b0a7653a..69712c267 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -1,5 +1,7 @@ -r requirements.txt coverage==4.0.3 +django-bootstrap3==7.0.1 +django-bower==5.1.0 django-webtest flake8==2.5.4 isort==4.2.5 From 1cbb94cd61e17209d31f090223507ca858842946 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 13:39:08 -0300 Subject: [PATCH 82/86] Final --- requirements/requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 16772d731..8d186782a 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,7 +1,5 @@ dj-database-url==0.4.1 django-admin-bootstrapped==2.5.7 -django-bootstrap3==7.0.1 -django-bower==5.1.0 django-braces==1.8.1 django-compressor==2.0 django-crispy-forms==1.6.0 From 2cf745f6154fffdf683612e759b045ddee0aff91 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 13:47:42 -0300 Subject: [PATCH 83/86] FINAL TEST --- requirements/dev-requirements.txt | 1 - requirements/requirements.txt | 3 +++ requirements/test-requirements.txt | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 8b915ee98..ac9f569a9 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -2,7 +2,6 @@ autopep8==1.2.2 beautifulsoup4==4.4.1 django-debug-toolbar==1.4 -django-extensions==1.6.1 django-floppyforms==1.6.1 easy-thumbnails==2.3 ipdb==0.9.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8d186782a..7b9b0cbcc 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,9 +1,12 @@ dj-database-url==0.4.1 django-admin-bootstrapped==2.5.7 +django-bootstrap3==7.0.1 +django-bower==5.1.0 django-braces==1.8.1 django-compressor==2.0 django-crispy-forms==1.6.0 python-decouple==3.0 +django-extensions==1.6.1 django-extra-views==0.7.1 django-filter==0.13.0 django-model-utils==2.4 diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 69712c267..0b0a7653a 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -1,7 +1,5 @@ -r requirements.txt coverage==4.0.3 -django-bootstrap3==7.0.1 -django-bower==5.1.0 django-webtest flake8==2.5.4 isort==4.2.5 From 1370f3159327f4e74a5923e3f24d3b1abe461d0c Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 13:53:57 -0300 Subject: [PATCH 84/86] FINAL TEST2 --- requirements/dev-requirements.txt | 1 - requirements/requirements.txt | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index ac9f569a9..de19bcc88 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -3,7 +3,6 @@ autopep8==1.2.2 beautifulsoup4==4.4.1 django-debug-toolbar==1.4 django-floppyforms==1.6.1 -easy-thumbnails==2.3 ipdb==0.9.0 pygraphviz==1.3rc2 pytest-ipdb==0.1-prerelease2 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7b9b0cbcc..4492bab4b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -5,7 +5,6 @@ django-bower==5.1.0 django-braces==1.8.1 django-compressor==2.0 django-crispy-forms==1.6.0 -python-decouple==3.0 django-extensions==1.6.1 django-extra-views==0.7.1 django-filter==0.13.0 @@ -13,9 +12,11 @@ django-model-utils==2.4 django-sass-processor==0.3.4 django==1.9.5 djangorestframework +easy-thumbnails==2.3 git+git://github.com/interlegis/trml2pdf.git libsass==0.11.0 psycopg2==2.6.1 +python-decouple==3.0 pytz==2016.3 pyyaml==3.11 rtyaml==0.0.2 From c5e7555a4fd53aeea7f97e090a939b723951fa11 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 14:00:16 -0300 Subject: [PATCH 85/86] FINAL TEST3 --- requirements/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4492bab4b..2af641724 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,6 +8,7 @@ django-crispy-forms==1.6.0 django-extensions==1.6.1 django-extra-views==0.7.1 django-filter==0.13.0 +django-floppyforms==1.6.1 django-model-utils==2.4 django-sass-processor==0.3.4 django==1.9.5 From 247a516d2d8808a70ab1c133c6d1d88de1598dae Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 14:00:43 -0300 Subject: [PATCH 86/86] FINAL TEST4 --- requirements/dev-requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index de19bcc88..af272dc74 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -2,7 +2,6 @@ autopep8==1.2.2 beautifulsoup4==4.4.1 django-debug-toolbar==1.4 -django-floppyforms==1.6.1 ipdb==0.9.0 pygraphviz==1.3rc2 pytest-ipdb==0.1-prerelease2