From bd2bc3a4f7d71f6f7b387f13694defcebaca93ea Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sat, 5 Jan 2019 04:39:39 -0200 Subject: [PATCH 01/20] bump django para 1.11 --- requirements/requirements.txt | 17 +++++++++-------- setup.py | 11 ++++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 3c4d2e135..69cb803f5 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,18 +1,19 @@ +django>=1.11,<2.0 +django-haystack==2.8.1 +django-bootstrap3==11.0.0 +django-filter==2.0.0 +djangorestframework==3.9.0 + dj-database-url==0.4.1 -django-haystack==2.6.0 -django>=1.10,<1.11 -django-bootstrap3==7.0.1 django-bower==5.2.0 django-braces==1.9.0 django-compressor==2.0 django-crispy-forms==1.6.1 django-extensions==1.9.8 django-extra-views==0.11.0 -django-filter==1.0.0 django-floppyforms==1.6.2 django-model-utils==3.1.1 django-sass-processor==0.5.8 -djangorestframework==3.4.0 easy-thumbnails==2.5 django-image-cropping==1.2 libsass==0.11.1 @@ -32,6 +33,6 @@ whoosh==2.7.4 django-speedinfo==1.3.5 django-reversion-compare==0.8.4 -git+git://github.com/interlegis/trml2pdf.git -git+git://github.com/jasperlittle/django-rest-framework-docs -git+git://github.com/rubgombar1/django-admin-bootstrapped.git \ No newline at end of file +#git+git://github.com/interlegis/trml2pdf.git +#git+git://github.com/jasperlittle/django-rest-framework-docs +#git+git://github.com/rubgombar1/django-admin-bootstrapped.git \ No newline at end of file diff --git a/setup.py b/setup.py index 61de04956..a64217d42 100644 --- a/setup.py +++ b/setup.py @@ -9,21 +9,22 @@ with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme: os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) install_requires = [ + 'django>=1.11,<2.0', + 'django-haystack==2.8.1', + 'django-bootstrap3==11.0.0', + 'django-filter==2.0.0', + 'djangorestframework==3.9.0', + 'dj-database-url==0.4.1', - 'django-haystack==2.6.0', - 'django>=1.10,<1.11', - 'django-bootstrap3==7.0.1', 'django-bower==5.2.0', 'django-braces==1.9.0', 'django-compressor==2.0', 'django-crispy-forms==1.6.1', 'django-extensions==1.9.8', 'django-extra-views==0.11.0', - 'django-filter==0.15.3', 'django-floppyforms==1.6.2', 'django-model-utils==3.1.1', 'django-sass-processor==0.5.8', - 'djangorestframework==3.4.0', 'drfdocs', 'easy-thumbnails==2.5', 'django-image-cropping==1.1.0', From 55963883265c9165aa62a8bf62e030395eb7d80b Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sat, 5 Jan 2019 04:40:44 -0200 Subject: [PATCH 02/20] =?UTF-8?q?altera=C3=A7=C3=B5es=20m=C3=ADnimas=20par?= =?UTF-8?q?a=20executar=20manage=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/api/forms.py | 2 +- sapl/api/views.py | 5 +++-- sapl/settings.py | 7 ++++--- sapl/utils.py | 21 ++++++++++----------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/sapl/api/forms.py b/sapl/api/forms.py index fecfbf598..0c8a1889f 100644 --- a/sapl/api/forms.py +++ b/sapl/api/forms.py @@ -6,8 +6,8 @@ from django.forms.widgets import MultiWidget, TextInput from django.utils import timezone from django.utils.translation import ugettext_lazy as _ from django_filters.filters import CharFilter, ModelChoiceFilter, DateFilter +from django_filters.rest_framework.filterset import FilterSet from rest_framework import serializers -from rest_framework.filters import FilterSet from sapl.base.models import Autor, TipoAutor from sapl.parlamentares.models import Legislatura diff --git a/sapl/api/views.py b/sapl/api/views.py index b8cafc1dd..336bb23d7 100644 --- a/sapl/api/views.py +++ b/sapl/api/views.py @@ -1,9 +1,10 @@ import logging + from django.contrib.contenttypes.models import ContentType from django.db.models import Q from django.http import Http404 from django.utils.translation import ugettext_lazy as _ -from rest_framework.filters import DjangoFilterBackend +from django_filters.rest_framework.backends import DjangoFilterBackend from rest_framework.generics import ListAPIView from rest_framework.mixins import ListModelMixin, RetrieveModelMixin from rest_framework.permissions import (AllowAny, IsAuthenticated, @@ -175,7 +176,7 @@ class AutoresProvaveisListView(ListAPIView): serializer_class = ChoiceSerializer def get_queryset(self): - + params = {'content_type__isnull': False} username = self.request.user.username tipo = '' diff --git a/sapl/settings.py b/sapl/settings.py index 80bf18273..63f18e325 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -90,6 +90,7 @@ INSTALLED_APPS = ( 'haystack', 'sass_processor', 'rest_framework', + 'django_filters', 'reversion', 'reversion_compare', 'whoosh', @@ -110,7 +111,7 @@ SOLR_URL = config('SOLR_URL', cast=str, default='http://localhost:8983') SOLR_COLLECTION = config('SOLR_COLLECTION', cast=str, default='sapl') if USE_SOLR: - HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' #enable auto-index + HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' # enable auto-index SEARCH_BACKEND = 'haystack.backends.solr_backend.SolrEngine' SEARCH_URL = ('URL', '{}/solr/{}'.format(SOLR_URL, SOLR_COLLECTION)) @@ -118,7 +119,7 @@ if USE_SOLR: HAYSTACK_CONNECTIONS = { 'default': { 'ENGINE': SEARCH_BACKEND, - SEARCH_URL[0]: SEARCH_URL[1], + SEARCH_URL[0]: SEARCH_URL[1], 'BATCH_SIZE': 1000, 'TIMEOUT': 60, }, @@ -166,7 +167,7 @@ REST_FRAMEWORK = { "DEFAULT_PAGINATION_CLASS": "sapl.api.pagination.StandardPagination", "DEFAULT_FILTER_BACKENDS": ( "rest_framework.filters.SearchFilter", - "rest_framework.filters.DjangoFilterBackend", + 'django_filters.rest_framework.DjangoFilterBackend', ), } diff --git a/sapl/utils.py b/sapl/utils.py index def839eb1..c884a8c48 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -21,7 +21,6 @@ from django.db.models import Q from django.utils import six, timezone from django.utils.translation import ugettext_lazy as _ import django_filters -from django_filters.filterset import STRICTNESS from easy_thumbnails import source_generators from floppyforms import ClearableFileInput import magic @@ -685,12 +684,12 @@ def qs_override_django_filter(self): valid = self.is_bound and self.form.is_valid() if self.is_bound and not valid: - if self.strict == STRICTNESS.RAISE_VALIDATION_ERROR: + """if self.strict == STRICTNESS.RAISE_VALIDATION_ERROR: raise forms.ValidationError(self.form.errors) - elif bool(self.strict) == STRICTNESS.RETURN_NO_RESULTS: - self._qs = self.queryset.none() - return self._qs - # else STRICTNESS.IGNORE... ignoring + elif bool(self.strict) == STRICTNESS.RETURN_NO_RESULTS:""" + self._qs = self.queryset.none() + return self._qs + # else STRICTNESS.IGNORE... ignoring # start with all the results and filter from there qs = self.queryset.all() @@ -703,12 +702,12 @@ def qs_override_django_filter(self): try: value = self.form.fields[name].clean(raw_value) except forms.ValidationError: - if self.strict == STRICTNESS.RAISE_VALIDATION_ERROR: + """if self.strict == STRICTNESS.RAISE_VALIDATION_ERROR: raise - elif bool(self.strict) == STRICTNESS.RETURN_NO_RESULTS: - self._qs = self.queryset.none() - return self._qs - # else STRICTNESS.IGNORE... ignoring + elif bool(self.strict) == STRICTNESS.RETURN_NO_RESULTS:""" + self._qs = self.queryset.none() + return self._qs + # else STRICTNESS.IGNORE... ignoring if value is not None: # valid & clean data qs = qs._next_is_sticky() From b4666807ab6c9f16101a2dd5cc832d580ef06c01 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sat, 5 Jan 2019 04:52:22 -0200 Subject: [PATCH 03/20] =?UTF-8?q?adequa=C3=A7=C3=A3o=20de=20c=C3=B3digo=20?= =?UTF-8?q?na=20chamada=20do=20render=20de=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/base/email_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/base/email_utils.py b/sapl/base/email_utils.py index 024045edd..b41c68402 100644 --- a/sapl/base/email_utils.py +++ b/sapl/base/email_utils.py @@ -18,7 +18,7 @@ def load_email_templates(templates, context={}): emails = [] for t in templates: tpl = loader.get_template(t) - email = tpl.render(Context(context)) + email = tpl.render(context) if t.endswith(".html"): email = email.replace('\n', '').replace('\r', '') emails.append(email) From 243f984a13a60ef441daff8fef9dc8603be773a1 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sun, 6 Jan 2019 16:21:20 -0200 Subject: [PATCH 04/20] remove django-compressor --- requirements/requirements.txt | 11 ++++++----- sapl/base/templatetags/common_tags.py | 15 ++++++++++----- sapl/crud/base.py | 15 +++++++++------ setup.py | 9 +++++---- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 69cb803f5..944b300d7 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,13 +1,12 @@ django>=1.11,<2.0 -django-haystack==2.8.1 django-bootstrap3==11.0.0 +django-haystack==2.8.1 django-filter==2.0.0 djangorestframework==3.9.0 - -dj-database-url==0.4.1 +dj-database-url==0.5.0 django-bower==5.2.0 django-braces==1.9.0 -django-compressor==2.0 + django-crispy-forms==1.6.1 django-extensions==1.9.8 django-extra-views==0.11.0 @@ -35,4 +34,6 @@ django-reversion-compare==0.8.4 #git+git://github.com/interlegis/trml2pdf.git #git+git://github.com/jasperlittle/django-rest-framework-docs -#git+git://github.com/rubgombar1/django-admin-bootstrapped.git \ No newline at end of file +#git+git://github.com/rubgombar1/django-admin-bootstrapped.git + +#django-compressor==2.2 \ No newline at end of file diff --git a/sapl/base/templatetags/common_tags.py b/sapl/base/templatetags/common_tags.py index 89f781558..884a6968f 100644 --- a/sapl/base/templatetags/common_tags.py +++ b/sapl/base/templatetags/common_tags.py @@ -1,8 +1,4 @@ -import logging - -from compressor.utils import get_class from django import template -from django.conf import settings from django.template.defaultfilters import stringfilter from sapl.base.models import AppConfig @@ -15,6 +11,15 @@ from sapl.utils import filiacao_data, SEPARADOR_HASH_PROPOSICAO register = template.Library() +def get_class(class_string): + if not hasattr(class_string, '__bases__'): + class_string = str(class_string) + dot = class_string.rindex('.') + mod_name, class_name = class_string[:dot], class_string[dot + 1:] + if class_name: + return getattr(__import__(mod_name, {}, {}, [str('')]), class_name) + + @register.simple_tag def define(arg): return arg @@ -228,7 +233,7 @@ def file_extension(value): def cronometro_to_seconds(value): if not AppConfig.attr('cronometro_' + value): return 0 - + return AppConfig.attr('cronometro_' + value).seconds diff --git a/sapl/crud/base.py b/sapl/crud/base.py index e720b36cd..faa0e1287 100644 --- a/sapl/crud/base.py +++ b/sapl/crud/base.py @@ -1,6 +1,6 @@ import logging + from braces.views import FormMessagesMixin -from compressor.utils.decorators import cached_property from crispy_forms.bootstrap import FieldWithButtons, StrictButton from crispy_forms.helper import FormHelper from crispy_forms.layout import Field, Layout @@ -16,6 +16,7 @@ from django.http.response import Http404 from django.shortcuts import redirect from django.utils.decorators import classonlymethod from django.utils.encoding import force_text +from django.utils.functional import cached_property from django.utils.translation import string_concat from django.utils.translation import ugettext_lazy as _ from django.views.generic import (CreateView, DeleteView, DetailView, ListView, @@ -29,6 +30,7 @@ from sapl.rules.map_rules import (RP_ADD, RP_CHANGE, RP_DELETE, RP_DETAIL, from sapl.settings import BASE_DIR from sapl.utils import normalize + ACTION_LIST, ACTION_CREATE, ACTION_DETAIL, ACTION_UPDATE, ACTION_DELETE = \ 'list', 'create', 'detail', 'update', 'delete' @@ -558,7 +560,8 @@ class CrudListView(PermissionRequiredContainerCrudMixin, ListView): fm = model._meta.get_field(fo) except Exception as e: username = self.request.user.username - self.logger.error("user=" + username + ". " + str(e)) + self.logger.error( + "user=" + username + ". " + str(e)) pass if fm and hasattr(fm, 'related_model')\ @@ -824,7 +827,7 @@ class CrudUpdateView(PermissionRequiredContainerCrudMixin, logger = logging.getLogger(__name__) def form_valid(self, form): - + self.object = form.instance try: self.object.modifier = self.request.user @@ -882,12 +885,12 @@ class CrudDeleteView(PermissionRequiredContainerCrudMixin, error_msg2 += '{} - {}, '.format( i._meta.verbose_name, i ) - error_msg2 = error_msg2[:len(error_msg2)-2] + '.' + error_msg2 = error_msg2[:len(error_msg2) - 2] + '.' error_msg += '' - + username = request.user.username self.logger.error("user=" + username + ". Registro não pode ser removido, pois " - "é referenciado por outros registros: " + error_msg2) + "é referenciado por outros registros: " + error_msg2) messages.add_message(request, messages.ERROR, error_msg) diff --git a/setup.py b/setup.py index a64217d42..e44ded347 100644 --- a/setup.py +++ b/setup.py @@ -10,15 +10,14 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) install_requires = [ 'django>=1.11,<2.0', - 'django-haystack==2.8.1', 'django-bootstrap3==11.0.0', + 'django-haystack==2.8.1', 'django-filter==2.0.0', 'djangorestframework==3.9.0', - - 'dj-database-url==0.4.1', + 'dj-database-url==0.5.0', 'django-bower==5.2.0', 'django-braces==1.9.0', - 'django-compressor==2.0', + 'django-crispy-forms==1.6.1', 'django-extensions==1.9.8', 'django-extra-views==0.11.0', @@ -47,6 +46,8 @@ install_requires = [ # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' + + #'django-compressor==2.2', ] setup( name='interlegis-sapl', From 22b87f36ebc8659a6ecaf8831ab0f425206b0993 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sun, 6 Jan 2019 16:49:40 -0200 Subject: [PATCH 05/20] =?UTF-8?q?bump=20django-crispy-forms=20e=20ajustes?= =?UTF-8?q?=20de=20c=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/requirements.txt | 2 +- sapl/utils.py | 16 ++++++++++++---- setup.py | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 944b300d7..7b6dc25c1 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -6,8 +6,8 @@ djangorestframework==3.9.0 dj-database-url==0.5.0 django-bower==5.2.0 django-braces==1.9.0 +django-crispy-forms==1.7.2 -django-crispy-forms==1.6.1 django-extensions==1.9.8 django-extra-views==0.11.0 django-floppyforms==1.6.2 diff --git a/sapl/utils.py b/sapl/utils.py index c884a8c48..706d5cb65 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -208,19 +208,27 @@ class RangeWidgetOverride(forms.MultiWidget): def __init__(self, attrs=None): widgets = (forms.DateInput(format='%d/%m/%Y', - attrs={'class': 'dateinput', + attrs={'class': 'dateinput form-control', 'placeholder': 'Inicial'}), forms.DateInput(format='%d/%m/%Y', - attrs={'class': 'dateinput', + attrs={'class': 'dateinput form-control', 'placeholder': 'Final'})) super(RangeWidgetOverride, self).__init__(widgets, attrs) def decompress(self, value): if value: return [value.start, value.stop] - return [None, None] + return [] + + def render(self, name, value, attrs=None, renderer=None): + rendered_widgets = [] + for i, x in enumerate(self.widgets): + rendered_widgets.append( + x.render( + '%s_%d' % (name, i), value[i] if value else '' + ) + ) - def format_output(self, rendered_widgets): html = '
%s
%s
'\ % tuple(rendered_widgets) return '
%s
' % html diff --git a/setup.py b/setup.py index e44ded347..018ff1002 100644 --- a/setup.py +++ b/setup.py @@ -17,8 +17,8 @@ install_requires = [ 'dj-database-url==0.5.0', 'django-bower==5.2.0', 'django-braces==1.9.0', + 'django-crispy-forms==1.7.2', - 'django-crispy-forms==1.6.1', 'django-extensions==1.9.8', 'django-extra-views==0.11.0', 'django-floppyforms==1.6.2', @@ -46,7 +46,7 @@ install_requires = [ # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' - + #'django-compressor==2.2', ] setup( From ca684e006734a94e10af7da367cba0c0db5747f8 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sun, 6 Jan 2019 17:08:34 -0200 Subject: [PATCH 06/20] descomenta libs do requirements --- requirements/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7b6dc25c1..4b869decc 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -32,8 +32,8 @@ whoosh==2.7.4 django-speedinfo==1.3.5 django-reversion-compare==0.8.4 -#git+git://github.com/interlegis/trml2pdf.git -#git+git://github.com/jasperlittle/django-rest-framework-docs -#git+git://github.com/rubgombar1/django-admin-bootstrapped.git +git+git://github.com/interlegis/trml2pdf.git +git+git://github.com/jasperlittle/django-rest-framework-docs +git+git://github.com/rubgombar1/django-admin-bootstrapped.git #django-compressor==2.2 \ No newline at end of file From 82fb5613c39f991a985f0291af0d6d95c86754d3 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 00:43:54 -0200 Subject: [PATCH 07/20] bump django-floppyforms --- requirements/requirements.txt | 2 +- sapl/sessao/forms.py | 8 +++----- sapl/settings.py | 19 ++++++++++++------- sapl/static/styles/app.scss | 3 +++ .../parlamentares/parlamentares_list.html | 6 ++++-- setup.py | 4 ++-- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4b869decc..524549446 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -7,10 +7,10 @@ dj-database-url==0.5.0 django-bower==5.2.0 django-braces==1.9.0 django-crispy-forms==1.7.2 +django-floppyforms==1.7.0 django-extensions==1.9.8 django-extra-views==0.11.0 -django-floppyforms==1.6.2 django-model-utils==3.1.1 django-sass-processor==0.5.8 easy-thumbnails==2.5 diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 35d49e277..68f6d3222 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -3,7 +3,6 @@ from datetime import datetime from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML, Button, Fieldset, Layout from django import forms -from django.contrib import messages from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.db import transaction @@ -12,22 +11,21 @@ from django.forms import ModelForm from django.forms.widgets import CheckboxSelectMultiple from django.utils.translation import ugettext_lazy as _ import django_filters -from floppyforms import widgets from sapl.base.models import Autor, TipoAutor from sapl.crispy_layout_mixin import form_actions, to_row, SaplFormLayout from sapl.materia.forms import MateriaLegislativaFilterSet from sapl.materia.models import (MateriaLegislativa, StatusTramitacao, TipoMateriaLegislativa) -from sapl.parlamentares.models import Parlamentar, Legislatura, Mandato +from sapl.parlamentares.models import Parlamentar, Mandato from sapl.utils import (RANGE_DIAS_MES, RANGE_MESES, MateriaPesquisaOrderingFilter, autor_label, autor_modal, timezone, choice_anos_com_sessaoplenaria) from .models import (Bancada, Bloco, ExpedienteMateria, JustificativaAusencia, Orador, OradorExpediente, OrdemDia, PresencaOrdemDia, SessaoPlenaria, - SessaoPlenariaPresenca, TipoJustificativa, TipoResultadoVotacao, - OcorrenciaSessao, RegistroVotacao, RetiradaPauta, TipoRetiradaPauta) + SessaoPlenariaPresenca, TipoResultadoVotacao, + OcorrenciaSessao, RetiradaPauta, TipoRetiradaPauta) MES_CHOICES = RANGE_MESES diff --git a/sapl/settings.py b/sapl/settings.py index 63f18e325..fbc19f53f 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -79,20 +79,25 @@ INSTALLED_APPS = ( 'django.contrib.messages', 'django.contrib.staticfiles', - # more - 'django_extensions', 'djangobower', - 'bootstrap3', # basically for django_admin_bootstrapped + 'bootstrap3', 'crispy_forms', - 'easy_thumbnails', - 'image_cropping', 'floppyforms', - 'haystack', - 'sass_processor', + 'rest_framework', 'django_filters', + + + + 'django_extensions', + 'easy_thumbnails', + 'image_cropping', + 'sass_processor', + 'reversion', 'reversion_compare', + + 'haystack', 'whoosh', 'speedinfo', diff --git a/sapl/static/styles/app.scss b/sapl/static/styles/app.scss index a0540b8e1..f05189142 100644 --- a/sapl/static/styles/app.scss +++ b/sapl/static/styles/app.scss @@ -451,6 +451,9 @@ nav { overflow-x: auto; } } +.lista-parlamentares .table td { + vertical-align: middle; +} @media (min-width: 1092px) and (max-width: 1199px) { .container { diff --git a/sapl/templates/parlamentares/parlamentares_list.html b/sapl/templates/parlamentares/parlamentares_list.html index bc3955b06..43627a9ad 100644 --- a/sapl/templates/parlamentares/parlamentares_list.html +++ b/sapl/templates/parlamentares/parlamentares_list.html @@ -21,7 +21,7 @@ {% if not rows %}

{{ NO_ENTRIES_MSG }}

{% else %} -
+
{% blocktrans with verbose_name_plural=view.verbose_name_plural %}Total de {{ verbose_name_plural }}: {{count}}{% endblocktrans %}
@@ -43,7 +43,9 @@ {% for value, href, obj in value_list %} {% if forloop.first %} {% endif %}
- + {% if obj.fotografia %} + + {% endif %} diff --git a/setup.py b/setup.py index 018ff1002..12a1823a7 100644 --- a/setup.py +++ b/setup.py @@ -18,10 +18,10 @@ install_requires = [ 'django-bower==5.2.0', 'django-braces==1.9.0', 'django-crispy-forms==1.7.2', + 'django-floppyforms==1.7.0', - 'django-extensions==1.9.8', 'django-extra-views==0.11.0', - 'django-floppyforms==1.6.2', + 'django-extensions==1.9.8', 'django-model-utils==3.1.1', 'django-sass-processor==0.5.8', 'drfdocs', From 3564909a1b6baf6735e471af5ca3fdb006738b18 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 01:03:06 -0200 Subject: [PATCH 08/20] bump django-extra-views --- requirements/requirements.txt | 2 +- sapl/settings.py | 25 +++++++++++++++------- sapl/temp_suppress_crispy_form_warnings.py | 22 ------------------- setup.py | 2 +- 4 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 sapl/temp_suppress_crispy_form_warnings.py diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 524549446..3b260f0d6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,9 +8,9 @@ django-bower==5.2.0 django-braces==1.9.0 django-crispy-forms==1.7.2 django-floppyforms==1.7.0 +django-extra-views==0.12.0 django-extensions==1.9.8 -django-extra-views==0.11.0 django-model-utils==3.1.1 django-sass-processor==0.5.8 easy-thumbnails==2.5 diff --git a/sapl/settings.py b/sapl/settings.py index fbc19f53f..78f8f7781 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -22,9 +22,6 @@ from dj_database_url import parse as db_url from easy_thumbnails.conf import Settings as thumbnail_settings from unipath import Path -from .temp_suppress_crispy_form_warnings import \ - SUPRESS_CRISPY_FORM_WARNINGS_LOGGING - host = socket.gethostbyname_ex(socket.gethostname())[0] @@ -288,6 +285,7 @@ DAB_FIELD_RENDERER = \ CRISPY_TEMPLATE_PACK = 'bootstrap3' CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' CRISPY_FAIL_SILENTLY = not DEBUG +FLOPPY_FORMS_USE_GIS = False BOWER_COMPONENTS_ROOT = PROJECT_DIR.child("bower") BOWER_INSTALLED_APPS = ( @@ -345,6 +343,22 @@ LOGGING = { } } +PASSWORD_HASHERS = [ + 'django.contrib.auth.hashers.PBKDF2PasswordHasher', # default + 'sapl.hashers.ZopeSHA1PasswordHasher', +] + + +def remove_warnings(): + import warnings + warnings.filterwarnings( + 'ignore', module='floppyforms', + message='Unable to import floppyforms.gis' + ) + + +remove_warnings() + def uncaught_exceptions(type, value, error_traceback): import traceback @@ -356,8 +370,3 @@ def uncaught_exceptions(type, value, error_traceback): # captura exceções que não foram tratadas sys.excepthook = uncaught_exceptions - -PASSWORD_HASHERS = [ - 'django.contrib.auth.hashers.PBKDF2PasswordHasher', # default - 'sapl.hashers.ZopeSHA1PasswordHasher', -] diff --git a/sapl/temp_suppress_crispy_form_warnings.py b/sapl/temp_suppress_crispy_form_warnings.py deleted file mode 100644 index 39105d39e..000000000 --- a/sapl/temp_suppress_crispy_form_warnings.py +++ /dev/null @@ -1,22 +0,0 @@ -import copy -import logging - -from django.utils.log import DEFAULT_LOGGING - -# hack to suppress many annoying warnings from crispy_forms -# Do remove this file and corresponding import in settings -# when crispy_forms is corrected !!! -SUPRESS_CRISPY_FORM_WARNINGS_LOGGING = copy.deepcopy(DEFAULT_LOGGING) -SUPRESS_CRISPY_FORM_WARNINGS_LOGGING['filters']['suppress_deprecated'] = { - '()': 'sapl.temp_suppress_crispy_form_warnings.SuppressDeprecated' -} -SUPRESS_CRISPY_FORM_WARNINGS_LOGGING['handlers']['console']['filters'].append( - 'suppress_deprecated') - - -class SuppressDeprecated(logging.Filter): - - def filter(self, record): - msg = record.getMessage() - return not ('crispy_forms' in msg and - 'RemovedInDjango19Warning' in msg) diff --git a/setup.py b/setup.py index 12a1823a7..4a44886a9 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ install_requires = [ 'django-braces==1.9.0', 'django-crispy-forms==1.7.2', 'django-floppyforms==1.7.0', + 'django-extra-views==0.12.0', - 'django-extra-views==0.11.0', 'django-extensions==1.9.8', 'django-model-utils==3.1.1', 'django-sass-processor==0.5.8', From 08d249f123304f8bcb817c89bd1cdf3bb36e7b0a Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 09:57:28 -0200 Subject: [PATCH 09/20] bump django-models-utils e django-sass-processor --- requirements/requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 3b260f0d6..5ad014630 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -9,10 +9,10 @@ django-braces==1.9.0 django-crispy-forms==1.7.2 django-floppyforms==1.7.0 django-extra-views==0.12.0 +django-model-utils==3.1.2 +django-sass-processor==0.7.2 django-extensions==1.9.8 -django-model-utils==3.1.1 -django-sass-processor==0.5.8 easy-thumbnails==2.5 django-image-cropping==1.2 libsass==0.11.1 diff --git a/setup.py b/setup.py index 4a44886a9..b17a241c0 100644 --- a/setup.py +++ b/setup.py @@ -20,10 +20,10 @@ install_requires = [ 'django-crispy-forms==1.7.2', 'django-floppyforms==1.7.0', 'django-extra-views==0.12.0', + 'django-model-utils==3.1.2', + 'django-sass-processor==0.7.2', 'django-extensions==1.9.8', - 'django-model-utils==3.1.1', - 'django-sass-processor==0.5.8', 'drfdocs', 'easy-thumbnails==2.5', 'django-image-cropping==1.1.0', From 9bc8225bbc0a14b2bf526d96df15fdb81d115ce7 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:18:30 -0200 Subject: [PATCH 10/20] bump django-reversion e django-reversion-compare --- requirements/requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5ad014630..229fc2b44 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -11,6 +11,8 @@ django-floppyforms==1.7.0 django-extra-views==0.12.0 django-model-utils==3.1.2 django-sass-processor==0.7.2 +django-reversion==3.0.2 +django-reversion-compare==0.8.6 django-extensions==1.9.8 easy-thumbnails==2.5 @@ -26,11 +28,9 @@ unipath==1.1 pysolr==3.6.0 python-magic==0.4.12 gunicorn==19.6.0 -django-reversion==2.0.8 WeasyPrint==0.42 whoosh==2.7.4 django-speedinfo==1.3.5 -django-reversion-compare==0.8.4 git+git://github.com/interlegis/trml2pdf.git git+git://github.com/jasperlittle/django-rest-framework-docs diff --git a/setup.py b/setup.py index b17a241c0..c08b7cafb 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,8 @@ install_requires = [ 'django-extra-views==0.12.0', 'django-model-utils==3.1.2', 'django-sass-processor==0.7.2', + 'django-reversion==3.0.2', + 'django-reversion-compare==0.8.6' 'django-extensions==1.9.8', 'drfdocs', @@ -38,11 +40,9 @@ install_requires = [ 'pysolr==3.6.0', 'python-magic==0.4.12', 'gunicorn==19.6.0', - 'django-reversion==2.0.8', 'WeasyPrint==0.42', 'whoosh==2.7.4', 'django-speedinfo==1.3.5', - 'django-reversion-compare==0.8.4' # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' From 93c462703ff30be1e3f970caf905c0ed93daf2bf Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:25:46 -0200 Subject: [PATCH 11/20] bump django-speedinfo --- requirements/requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 229fc2b44..0ebfd9195 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -13,6 +13,7 @@ django-model-utils==3.1.2 django-sass-processor==0.7.2 django-reversion==3.0.2 django-reversion-compare==0.8.6 +django-speedinfo==1.4.0 django-extensions==1.9.8 easy-thumbnails==2.5 @@ -30,7 +31,6 @@ python-magic==0.4.12 gunicorn==19.6.0 WeasyPrint==0.42 whoosh==2.7.4 -django-speedinfo==1.3.5 git+git://github.com/interlegis/trml2pdf.git git+git://github.com/jasperlittle/django-rest-framework-docs diff --git a/setup.py b/setup.py index c08b7cafb..e7839c35e 100644 --- a/setup.py +++ b/setup.py @@ -24,6 +24,7 @@ install_requires = [ 'django-sass-processor==0.7.2', 'django-reversion==3.0.2', 'django-reversion-compare==0.8.6' + 'django-speedinfo==1.4.0', 'django-extensions==1.9.8', 'drfdocs', @@ -42,7 +43,6 @@ install_requires = [ 'gunicorn==19.6.0', 'WeasyPrint==0.42', 'whoosh==2.7.4', - 'django-speedinfo==1.3.5', # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' From 1c6192a54e9ff358908fa3ed0d5be56bf4001cde Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:31:54 -0200 Subject: [PATCH 12/20] bump django-extensions --- requirements/requirements.txt | 4 ++-- sapl/settings.py | 6 ++---- setup.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 0ebfd9195..2b83fa694 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -14,10 +14,10 @@ django-sass-processor==0.7.2 django-reversion==3.0.2 django-reversion-compare==0.8.6 django-speedinfo==1.4.0 +django-extensions==2.1.4 -django-extensions==1.9.8 -easy-thumbnails==2.5 django-image-cropping==1.2 +easy-thumbnails==2.5 libsass==0.11.1 psycopg2-binary==2.7.4 python-decouple==3.0 diff --git a/sapl/settings.py b/sapl/settings.py index 78f8f7781..782cbb0f4 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -75,21 +75,19 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django_extensions', 'djangobower', 'bootstrap3', 'crispy_forms', 'floppyforms', + 'sass_processor', 'rest_framework', 'django_filters', - - - 'django_extensions', 'easy_thumbnails', 'image_cropping', - 'sass_processor', 'reversion', 'reversion_compare', diff --git a/setup.py b/setup.py index e7839c35e..2ebde35b9 100644 --- a/setup.py +++ b/setup.py @@ -25,8 +25,8 @@ install_requires = [ 'django-reversion==3.0.2', 'django-reversion-compare==0.8.6' 'django-speedinfo==1.4.0', + 'django-extensions==2.1.4', - 'django-extensions==1.9.8', 'drfdocs', 'easy-thumbnails==2.5', 'django-image-cropping==1.1.0', From 33200eae61f253baf2ac826a2bf9ffa3e6efc934 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:33:54 -0200 Subject: [PATCH 13/20] bump django-image-cropping --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 2ebde35b9..3917d49bd 100644 --- a/setup.py +++ b/setup.py @@ -26,10 +26,9 @@ install_requires = [ 'django-reversion-compare==0.8.6' 'django-speedinfo==1.4.0', 'django-extensions==2.1.4', - - 'drfdocs', + 'django-image-cropping==1.2.0', 'easy-thumbnails==2.5', - 'django-image-cropping==1.1.0', + 'libsass==0.11.1', 'psycopg2==2.7.4', 'python-decouple==3.0', @@ -43,6 +42,8 @@ install_requires = [ 'gunicorn==19.6.0', 'WeasyPrint==0.42', 'whoosh==2.7.4', + + 'drfdocs', # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' From bfdbf82ef5fc121c3cf683d70f13ec316b3a1ac8 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:38:06 -0200 Subject: [PATCH 14/20] bump libsass --- requirements/requirements.txt | 10 +++++----- setup.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 2b83fa694..5e5425ebe 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -15,10 +15,10 @@ django-reversion==3.0.2 django-reversion-compare==0.8.6 django-speedinfo==1.4.0 django-extensions==2.1.4 - django-image-cropping==1.2 easy-thumbnails==2.5 -libsass==0.11.1 +libsass==0.17.0 + psycopg2-binary==2.7.4 python-decouple==3.0 pytz==2016.4 @@ -32,8 +32,8 @@ gunicorn==19.6.0 WeasyPrint==0.42 whoosh==2.7.4 -git+git://github.com/interlegis/trml2pdf.git -git+git://github.com/jasperlittle/django-rest-framework-docs -git+git://github.com/rubgombar1/django-admin-bootstrapped.git +#git+git://github.com/interlegis/trml2pdf.git +#git+git://github.com/jasperlittle/django-rest-framework-docs +#git+git://github.com/rubgombar1/django-admin-bootstrapped.git #django-compressor==2.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 3917d49bd..d8fbacbe5 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ install_requires = [ 'django-image-cropping==1.2.0', 'easy-thumbnails==2.5', - 'libsass==0.11.1', + 'libsass==0.17.0', 'psycopg2==2.7.4', 'python-decouple==3.0', 'pytz==2016.4', @@ -42,7 +42,7 @@ install_requires = [ 'gunicorn==19.6.0', 'WeasyPrint==0.42', 'whoosh==2.7.4', - + 'drfdocs', # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' From a0d47f84c052cf602b32ae3d595a982d3a4ad6a6 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:43:31 -0200 Subject: [PATCH 15/20] bump python-decouple --- requirements/requirements.txt | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5e5425ebe..584b51380 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -18,9 +18,9 @@ django-extensions==2.1.4 django-image-cropping==1.2 easy-thumbnails==2.5 libsass==0.17.0 +python-decouple==3.1 psycopg2-binary==2.7.4 -python-decouple==3.0 pytz==2016.4 pyyaml==4.2b1 rtyaml==0.0.3 diff --git a/setup.py b/setup.py index d8fbacbe5..80379f086 100644 --- a/setup.py +++ b/setup.py @@ -28,10 +28,10 @@ install_requires = [ 'django-extensions==2.1.4', 'django-image-cropping==1.2.0', 'easy-thumbnails==2.5', - 'libsass==0.17.0', + 'python-decouple==3.1', + 'psycopg2==2.7.4', - 'python-decouple==3.0', 'pytz==2016.4', 'pyyaml==4.2b1', 'rtyaml==0.0.3', From 5ef0e0421b6a8d62d78f06b105e50a9a8eab039b Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:46:34 -0200 Subject: [PATCH 16/20] bump psycopg2-binary --- requirements/requirements.txt | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 584b51380..44e37516e 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -19,8 +19,8 @@ django-image-cropping==1.2 easy-thumbnails==2.5 libsass==0.17.0 python-decouple==3.1 +psycopg2-binary==2.7.6.1 -psycopg2-binary==2.7.4 pytz==2016.4 pyyaml==4.2b1 rtyaml==0.0.3 diff --git a/setup.py b/setup.py index 80379f086..b48c420ee 100644 --- a/setup.py +++ b/setup.py @@ -30,10 +30,10 @@ install_requires = [ 'easy-thumbnails==2.5', 'libsass==0.17.0', 'python-decouple==3.1', + 'psycopg2-binary==2.7.6.1', + 'pyyaml==4.2b1', - 'psycopg2==2.7.4', 'pytz==2016.4', - 'pyyaml==4.2b1', 'rtyaml==0.0.3', 'textract==1.5.0', 'unipath==1.1', From 0e1ed356c47e9031cc3cb00f3ab67c5373c26c1f Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:53:26 -0200 Subject: [PATCH 17/20] bump pytz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pytz é uma biblioteca que necessita ser atualizada com mais frequencia... ela traz informações e registra as mudanças de horários de verão, fato comum no Brasil. --- requirements/requirements.txt | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 44e37516e..8f0e1c523 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -20,9 +20,9 @@ easy-thumbnails==2.5 libsass==0.17.0 python-decouple==3.1 psycopg2-binary==2.7.6.1 - -pytz==2016.4 pyyaml==4.2b1 +pytz==2018.9 + rtyaml==0.0.3 textract==1.5.0 unipath==1.1 diff --git a/setup.py b/setup.py index b48c420ee..6b720f173 100644 --- a/setup.py +++ b/setup.py @@ -32,8 +32,8 @@ install_requires = [ 'python-decouple==3.1', 'psycopg2-binary==2.7.6.1', 'pyyaml==4.2b1', + 'pytz==2018.9', - 'pytz==2016.4', 'rtyaml==0.0.3', 'textract==1.5.0', 'unipath==1.1', From 09fc9942c8a428836230e96f29002ec4cf4f3395 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 17:09:31 -0200 Subject: [PATCH 18/20] bump rtyaml --- requirements/requirements.txt | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8f0e1c523..7c40f527d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -22,8 +22,8 @@ python-decouple==3.1 psycopg2-binary==2.7.6.1 pyyaml==4.2b1 pytz==2018.9 +rtyaml==0.0.5 -rtyaml==0.0.3 textract==1.5.0 unipath==1.1 pysolr==3.6.0 @@ -32,8 +32,8 @@ gunicorn==19.6.0 WeasyPrint==0.42 whoosh==2.7.4 -#git+git://github.com/interlegis/trml2pdf.git -#git+git://github.com/jasperlittle/django-rest-framework-docs -#git+git://github.com/rubgombar1/django-admin-bootstrapped.git +git+git://github.com/interlegis/trml2pdf.git +git+git://github.com/jasperlittle/django-rest-framework-docs +git+git://github.com/rubgombar1/django-admin-bootstrapped.git #django-compressor==2.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 6b720f173..e89b7e402 100644 --- a/setup.py +++ b/setup.py @@ -33,8 +33,8 @@ install_requires = [ 'psycopg2-binary==2.7.6.1', 'pyyaml==4.2b1', 'pytz==2018.9', + 'rtyaml==0.0.5', - 'rtyaml==0.0.3', 'textract==1.5.0', 'unipath==1.1', 'pysolr==3.6.0', From a4297969901c78aef7480c870b1df85a5a1813c0 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 17:25:08 -0200 Subject: [PATCH 19/20] bump WeasyPrint --- requirements/requirements.txt | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7c40f527d..0ef545cc5 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -23,13 +23,13 @@ psycopg2-binary==2.7.6.1 pyyaml==4.2b1 pytz==2018.9 rtyaml==0.0.5 +python-magic==0.4.15 +unipath==1.1 +WeasyPrint==44 textract==1.5.0 -unipath==1.1 pysolr==3.6.0 -python-magic==0.4.12 gunicorn==19.6.0 -WeasyPrint==0.42 whoosh==2.7.4 git+git://github.com/interlegis/trml2pdf.git diff --git a/setup.py b/setup.py index e89b7e402..370a8f3ca 100644 --- a/setup.py +++ b/setup.py @@ -34,13 +34,13 @@ install_requires = [ 'pyyaml==4.2b1', 'pytz==2018.9', 'rtyaml==0.0.5', + 'WeasyPrint==44', 'textract==1.5.0', 'unipath==1.1', 'pysolr==3.6.0', 'python-magic==0.4.12', 'gunicorn==19.6.0', - 'WeasyPrint==0.42', 'whoosh==2.7.4', 'drfdocs', From 284c4662b4adb8b30d0b192072dc238ef8f64712 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 17:26:39 -0200 Subject: [PATCH 20/20] bump gunicorn --- requirements/requirements.txt | 2 +- setup.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 0ef545cc5..bcc15f37b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -26,10 +26,10 @@ rtyaml==0.0.5 python-magic==0.4.15 unipath==1.1 WeasyPrint==44 +gunicorn==19.9.0 textract==1.5.0 pysolr==3.6.0 -gunicorn==19.6.0 whoosh==2.7.4 git+git://github.com/interlegis/trml2pdf.git diff --git a/setup.py b/setup.py index 370a8f3ca..7b750d91a 100644 --- a/setup.py +++ b/setup.py @@ -34,16 +34,15 @@ install_requires = [ 'pyyaml==4.2b1', 'pytz==2018.9', 'rtyaml==0.0.5', + 'python-magic==0.4.15', + 'unipath==1.1', 'WeasyPrint==44', + 'gunicorn==19.9.0', 'textract==1.5.0', - 'unipath==1.1', 'pysolr==3.6.0', - 'python-magic==0.4.12', - 'gunicorn==19.6.0', 'whoosh==2.7.4', - 'drfdocs', # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git''