From 36c121b8896cd03296bbfbe08f0ea41a7e7c7f67 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Mon, 2 May 2016 13:42:17 -0300 Subject: [PATCH] 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