Browse Source

Atualiza pacotes, corrige settings e adiciona exportação para Excel

pull/194/merge
Sesóstris Vieira 6 days ago
parent
commit
f9a49e42ec
  1. 2
      requirements/dev-requirements.txt
  2. 22
      requirements/requirements.txt
  3. 4
      sigi/apps/convenios/models.py
  4. 4
      sigi/apps/eventos/admin.py
  5. 4
      sigi/apps/ocorrencias/views.py
  6. 12
      sigi/settings.py

2
requirements/dev-requirements.txt

@ -1,4 +1,4 @@
-r requirements.txt -r requirements.txt
black==26.1.0 black==26.3.1
ipdb==0.13.13 ipdb==0.13.13
pygraphviz==1.14 pygraphviz==1.14

22
requirements/requirements.txt

@ -1,35 +1,37 @@
Django==6.0.2 Django==6.0.4
django-admin-autocomplete-filter==0.7.1 django-admin-autocomplete-filter==0.7.1
django-auth-ldap==5.3.0 django-auth-ldap==5.3.0
django-debug-toolbar==6.2.0 django-debug-toolbar==6.3.0
django-environ==0.13.0 django-environ==0.13.0
django-extensions==4.1 django-extensions==4.1
django-filter==25.2 django-filter==25.2
django-import-export==4.4.0 django-import-export==4.4.0
django-localflavor==5.0 django-localflavor==5.0
django-tinymce==5.0.0 django-tinymce==5.0.0
django-weasyprint==2.4.0 django-weasyprint==2.5.0
djangorestframework==3.16.1 djangorestframework==3.17.1
dnspython==2.8.0 dnspython==2.8.0
docutils==0.22.4 docutils==0.22.4
email-validator==2.3.0 email-validator==2.3.0
gunicorn==25.1.0 gunicorn==25.3.0
ibge==0.0.5 ibge==0.0.5
inflection==0.5.1 inflection==0.5.1
ipython==9.10.0 ipython==9.12.0
ipython_pygments_lexers==1.1.1 ipython_pygments_lexers==1.1.1
moodlepy==0.24.1 moodlepy==0.24.1
pandas==3.0.1 odfpy==1.4.1
pandas==3.0.2
parsel==1.11.0 parsel==1.11.0
pillow==12.1.1 pillow==12.2.0
psycopg2-binary==2.9.11 psycopg2-binary==2.9.11
python-docx==1.2.0 python-docx==1.2.0
python-magic==0.4.27 python-magic==0.4.27
PyYAML==6.0.3 PyYAML==6.0.3
requests==2.32.5 requests==2.33.1
tzdata==2026.1
uritemplate==4.2.0 uritemplate==4.2.0
weasyprint==68.1 weasyprint==68.1
xlsxwriter==3.2.9 xlsxwriter==3.2.9
djbs-theme @ git+https://github.com/interlegis/djbs-theme.git djbs-theme @ git+https://github.com/interlegis/djbs-theme.git
django-dashboard @ git+https://github.com/interlegis/django-dashboard.git django-dashboard @ git+https://github.com/interlegis/django-dashboard.git
dx-job-controller @ git+https://github.com/interlegis/dx-job-controller.git dx-job-controller @ git+https://github.com/interlegis/dx-job-controller.git@v1.0.0

4
sigi/apps/convenios/models.py

@ -15,7 +15,7 @@ from django.utils import timezone
from django.utils.formats import date_format from django.utils.formats import date_format
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from django_weasyprint.utils import django_url_fetcher from django_weasyprint.utils import DjangoURLFetcher
from docx import Document from docx import Document
from tinymce.models import HTMLField from tinymce.models import HTMLField
from weasyprint import HTML from weasyprint import HTML
@ -105,7 +105,7 @@ class Projeto(models.Model):
string = Template(template_string).render(context) string = Template(template_string).render(context)
pdf = HTML( pdf = HTML(
string=string, string=string,
url_fetcher=django_url_fetcher, url_fetcher=DjangoURLFetcher(),
encoding="utf-8", encoding="utf-8",
base_url=path, base_url=path,
) )

4
sigi/apps/eventos/admin.py

@ -25,7 +25,7 @@ from django.urls import path, reverse
from django.utils import timezone from django.utils import timezone
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from django_weasyprint.utils import django_url_fetcher from django_weasyprint.utils import DjangoURLFetcher
from django_weasyprint.views import WeasyTemplateResponse from django_weasyprint.views import WeasyTemplateResponse
from import_export import resources from import_export import resources
from import_export.admin import ExportActionMixin from import_export.admin import ExportActionMixin
@ -1284,7 +1284,7 @@ class EventoAdmin(AsciifyQParameter, ExportActionMixin, admin.ModelAdmin):
) )
pdf = HTML( pdf = HTML(
string=string, string=string,
url_fetcher=django_url_fetcher, url_fetcher=DjangoURLFetcher(),
encoding="utf-8", encoding="utf-8",
base_url=request.build_absolute_uri("/"), base_url=request.build_absolute_uri("/"),
) )

4
sigi/apps/ocorrencias/views.py

@ -16,7 +16,7 @@ from django.utils.html import escape, quote
from django.utils.translation import ngettext, gettext as _ from django.utils.translation import ngettext, gettext as _
from django.views.decorators.http import require_POST from django.views.decorators.http import require_POST
from django.views.generic import TemplateView, ListView, CreateView, UpdateView from django.views.generic import TemplateView, ListView, CreateView, UpdateView
from django_weasyprint.utils import django_url_fetcher from django_weasyprint.utils import DjangoURLFetcher
from weasyprint import HTML from weasyprint import HTML
from sigi.apps.casas.models import Funcionario, Orgao from sigi.apps.casas.models import Funcionario, Orgao
from sigi.apps.eventos.models import Evento from sigi.apps.eventos.models import Evento
@ -1002,7 +1002,7 @@ class SolicitaOficinaCreateView(ContatoInterlegisViewMixin, CreateView):
) )
pdf = HTML( pdf = HTML(
string=html, string=html,
url_fetcher=django_url_fetcher, url_fetcher=DjangoURLFetcher(),
encoding="utf-8", encoding="utf-8",
base_url=self.request.build_absolute_uri("/"), base_url=self.request.build_absolute_uri("/"),
) )

12
sigi/settings.py

@ -35,7 +35,11 @@ INTERNAL_IPS = [
"127.0.0.1", "127.0.0.1",
] ]
ADMINS = env("ADMINS", eval) ADMINS = env(
"ADMINS",
default=(("SIGI Administrator", "sigi@interlegis.leg.br"),),
cast=eval,
)
DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000 DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000
@ -96,10 +100,10 @@ EMAIL_HOST = env("EMAIL_HOST", default="")
EMAIL_HOST_USER = env("EMAIL_HOST_USER", default="") EMAIL_HOST_USER = env("EMAIL_HOST_USER", default="")
EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD", default="") EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD", default="")
EMAIL_SUBJECT_PREFIX = env("EMAIL_SUBJECT_PREFIX", default="[SIGI]") EMAIL_SUBJECT_PREFIX = env("EMAIL_SUBJECT_PREFIX", default="[SIGI]")
EMAIL_USE_LOCALTIME = env("EMAIL_USE_LOCALTIME", bool, default=False) EMAIL_USE_LOCALTIME = env("EMAIL_USE_LOCALTIME", bool, default=True)
EMAIL_USE_TLS = env("EMAIL_USE_TLS", bool, default=False) EMAIL_USE_TLS = env("EMAIL_USE_TLS", bool, default=False)
EMAIL_USE_SSL = env("EMAIL_USE_SSL", bool, default=False) EMAIL_USE_SSL = env("EMAIL_USE_SSL", bool, default=False)
EMAIL_TIMEOUT = env("EMAIL_TIMEOUT", int, default=None) EMAIL_TIMEOUT = env("EMAIL_TIMEOUT", int, default=120)
DEFAULT_FROM_EMAIL = env("DEFAULT_FROM_EMAIL", default="sigi@interlegis.leg.br") DEFAULT_FROM_EMAIL = env("DEFAULT_FROM_EMAIL", default="sigi@interlegis.leg.br")
SERVER_EMAIL = DEFAULT_FROM_EMAIL SERVER_EMAIL = DEFAULT_FROM_EMAIL
@ -107,7 +111,7 @@ SERVER_EMAIL = DEFAULT_FROM_EMAIL
# https://docs.djangoproject.com/en/5.0/ref/settings/#databases # https://docs.djangoproject.com/en/5.0/ref/settings/#databases
DATABASES = { DATABASES = {
"default": env.db(), "default": env.db(default="sqlite:////:memory:"),
} }
ROOT_URLCONF = "sigi.urls" ROOT_URLCONF = "sigi.urls"

Loading…
Cancel
Save