From ab86163c1c38a9f81fff57a5296384556e7f3534 Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 12:06:04 +0100 Subject: [PATCH 01/16] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b72f88a6e0..c9f81cf1cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ dist: xenial - + services: - postgresql addons: From c3e9244fb867bfe8a635e7792261ebe2168d62b0 Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 12:12:56 +0100 Subject: [PATCH 02/16] Delete .travis.yml --- .travis.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c9f81cf1cd..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -dist: xenial - -services: - - postgresql -addons: - postgresql: "9.4" -before_script: - - psql -U postgres -c "create user decide password 'decide'" - - psql -U postgres -c "create database test_decide owner decide" - - psql -U postgres -c "ALTER USER decide CREATEDB" -language: python -python: - - "3.6" -install: - - pip install -r requirements.txt - - pip install codacy-coverage -script: - - cd decide - - coverage run --branch --source=. ./manage.py test --keepdb --with-xunit - - coverage xml - - python-codacy-coverage -r coverage.xml From b72f43dc43345e0ff313fc6bfac54f9af9e4588c Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 12:13:27 +0100 Subject: [PATCH 03/16] Create .travis.yml --- .travis.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..b72f88a6e0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,21 @@ +dist: xenial + +services: + - postgresql +addons: + postgresql: "9.4" +before_script: + - psql -U postgres -c "create user decide password 'decide'" + - psql -U postgres -c "create database test_decide owner decide" + - psql -U postgres -c "ALTER USER decide CREATEDB" +language: python +python: + - "3.6" +install: + - pip install -r requirements.txt + - pip install codacy-coverage +script: + - cd decide + - coverage run --branch --source=. ./manage.py test --keepdb --with-xunit + - coverage xml + - python-codacy-coverage -r coverage.xml From acfe64fd8f71fce1b559af593f750f6858f8c26f Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 12:24:13 +0100 Subject: [PATCH 04/16] Create local_settings.travis.py --- decide/local_settings.travis.py | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 decide/local_settings.travis.py diff --git a/decide/local_settings.travis.py b/decide/local_settings.travis.py new file mode 100644 index 0000000000..d4162dae92 --- /dev/null +++ b/decide/local_settings.travis.py @@ -0,0 +1,41 @@ +ALLOWED_HOSTS = ["*"] + +# Modules in use, commented modules that you won't use +MODULES = [ + 'authentication', + 'base', + 'booth', + 'census', + 'mixnet', + 'postproc', + 'store', + 'visualizer', + 'voting', +] + +APIS = { + 'authentication': 'http://localhost:8000', + 'base': 'http://localhost:8000', + 'booth': 'http://localhost:8000', + 'census': 'http://localhost:8000', + 'mixnet': 'http://localhost:8000', + 'postproc': 'http://localhost:8000', + 'store': 'http://localhost:8000', + 'visualizer': 'http://localhost:8000', + 'voting': 'http://localhost:8000', +} + +BASEURL = 'http://localhost:8000' + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'postgres', + 'USER': 'postgres', + 'HOST': 'localhost', + 'PORT': '5432', + } +} + +# number of bits for the key, all auths should use the same number of bits +KEYBITS = 256 From 1ca749107d5db5be8c3f08573eb11db251f3ceae Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 12:28:18 +0100 Subject: [PATCH 05/16] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b72f88a6e0..965ee3ecac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ services: addons: postgresql: "9.4" before_script: + - cp decide/local_settings.travis.py decide/local_settings.py - psql -U postgres -c "create user decide password 'decide'" - psql -U postgres -c "create database test_decide owner decide" - psql -U postgres -c "ALTER USER decide CREATEDB" From 2e2a3442794f46dee434dbcbb229e07c49d5dba6 Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 13:05:31 +0100 Subject: [PATCH 06/16] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 965ee3ecac..44064ab1c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,10 @@ python: install: - pip install -r requirements.txt - pip install codacy-coverage + - pip install flake8 script: - cd decide - coverage run --branch --source=. ./manage.py test --keepdb --with-xunit - coverage xml - python-codacy-coverage -r coverage.xml + - flake8 . From da23c367c0a6365655e8f600c4900f306fec25b9 Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 13:15:55 +0100 Subject: [PATCH 07/16] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 83d0a57e27..e44b9448fc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -[![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage) +[![Build Status](https://travis-ci.org/AndresJRamirez/decide.svg?branch=master)](https://travis-ci.org/AndresJRamirez/decide) + +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage) Plataforma voto electrónico educativa ===================================== From 05ab58e74f25264cba74cf55038f13119fc8ea24 Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 13:22:18 +0100 Subject: [PATCH 08/16] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e44b9448fc..94d65f4e7c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ [![Build Status](https://travis-ci.org/AndresJRamirez/decide.svg?branch=master)](https://travis-ci.org/AndresJRamirez/decide) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6f738bc832d84dbda8caf4dc772bd244)](https://www.codacy.com/manual/AndresJRamirez/decide?utm_source=github.com&utm_medium=referral&utm_content=AndresJRamirez/decide&utm_campaign=Badge_Grade) +[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/6f738bc832d84dbda8caf4dc772bd244)](https://www.codacy.com/manual/AndresJRamirez/decide?utm_source=github.com&utm_medium=referral&utm_content=AndresJRamirez/decide&utm_campaign=Badge_Coverage) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) +[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage) Plataforma voto electrónico educativa ===================================== From 665b5e79d06b55567e0e697e6ec432b47c9fea6d Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 13:30:54 +0100 Subject: [PATCH 09/16] Update .travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 44064ab1c0..2d7a00b669 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ dist: xenial +notifications: + email: + - ajramirez@us.es + on_sucess: always + on_failure: never services: - postgresql addons: From 8d01e1fc411a50d31bb6a50591e53ed8a8f5d77c Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 13:34:47 +0100 Subject: [PATCH 10/16] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d7a00b669..4388001557 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ before_script: language: python python: - "3.6" + - "2.7" + - "3.3" install: - pip install -r requirements.txt - pip install codacy-coverage @@ -26,4 +28,4 @@ script: - coverage run --branch --source=. ./manage.py test --keepdb --with-xunit - coverage xml - python-codacy-coverage -r coverage.xml - - flake8 . + From 7dfe12bb077f7c72ede0d3ee8593fc3fcba62281 Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 13:37:53 +0100 Subject: [PATCH 11/16] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4388001557..64bd1ed9fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ dist: xenial - + notifications: email: - ajramirez@us.es From dc577bf728bc5b2922a236d157784195d609fac0 Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 13:38:54 +0100 Subject: [PATCH 12/16] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64bd1ed9fc..1997506908 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,7 @@ before_script: - psql -U postgres -c "ALTER USER decide CREATEDB" language: python python: - - "3.6" - "2.7" - - "3.3" install: - pip install -r requirements.txt - pip install codacy-coverage From f70bad66b1cc5def6d82b8864970d2407babf94d Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 13:41:17 +0100 Subject: [PATCH 13/16] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1997506908..4c24e6cf87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ before_script: language: python python: - "2.7" + - "3.3" install: - pip install -r requirements.txt - pip install codacy-coverage From a7095d8ce66ac37244af5cd37e0f3f86f85fe7bf Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 15:10:12 +0100 Subject: [PATCH 14/16] Update .travis.yml --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c24e6cf87..3065619493 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,4 @@ dist: xenial - -notifications: - email: - - ajramirez@us.es - on_sucess: always - on_failure: never services: - postgresql addons: From d1471fd2de3dcd253ce8c5318b17ac0e18fd6f2b Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 15:16:32 +0100 Subject: [PATCH 15/16] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3065619493..08dce055f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ dist: xenial + services: - postgresql addons: @@ -11,7 +12,7 @@ before_script: language: python python: - "2.7" - - "3.3" + - "3.6" install: - pip install -r requirements.txt - pip install codacy-coverage From 9e821ec9828bca712698e262e6febc5fdf68abe0 Mon Sep 17 00:00:00 2001 From: AndresJRamirez Date: Mon, 28 Oct 2019 15:21:17 +0100 Subject: [PATCH 16/16] Create test --- test | 1 + 1 file changed, 1 insertion(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000000..63ccd5a14c --- /dev/null +++ b/test @@ -0,0 +1 @@ +its a test