From 574d8c81228deed130d1b226e5d60d1c914a0ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ses=C3=B3stris=20Vieira?= Date: Wed, 16 Apr 2025 12:24:19 -0300 Subject: [PATCH] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20de=20componentes=20e=20?= =?UTF-8?q?docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 4 ++-- requirements/dev-requirements.txt | 2 +- requirements/requirements.txt | 18 +++++++++--------- sigi/apps/espacos/admin.py | 1 + 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 889ea23..c94a7fa 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim-bullseye +FROM python:3.13-slim-bullseye # Setup env ENV PYTHONDONTWRITEBYTECODE=1 @@ -45,7 +45,7 @@ ENV MOODLE_API_TOKEN='' # Install env ENV RUN_PACKAGES gcc locales build-essential python3-dev graphviz \ libgraphviz-dev pkg-config libmagic-dev libpq-dev postgresql-client \ - libsasl2-dev libldap2-dev libssl-dev vim nginx cron + libsasl2-dev libldap2-dev libssl-dev vim nginx cron git # Install required packages RUN apt-get update && \ diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 8fe43c1..7fdc8a8 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,4 +1,4 @@ -r requirements.txt black==25.1.0 ipdb==0.13.13 -pygraphviz==1.14 +pygraphviz==1.14 \ No newline at end of file diff --git a/requirements/requirements.txt b/requirements/requirements.txt index ea6d2c5..78e9178 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -5,30 +5,30 @@ email_validator==2.2.0 gunicorn==23.0.0 ibge==0.0.5 inflection==0.5.1 -ipython==9.0.1 +ipython==9.1.0 moodlepy==0.24.1 pandas==2.2.3 parsel==1.10.0 -pillow==11.1.0 +pillow==11.2.1 psycopg2-binary==2.9.10 python-docx==1.1.2 python-magic==0.4.27 PyYAML==6.0.2 requests==2.32.3 uritemplate==4.1.1 -weasyprint==64.1 +weasyprint==65.1 XlsxWriter==3.2.2 -Django==5.1.7 +Django==5.2 django-admin-autocomplete-filter==0.7.1 django-auth-ldap==5.1.0 -django-debug-toolbar==5.0.1 +django-debug-toolbar==5.1.0 django-environ==0.12.0 -django-extensions==3.2.3 +django-extensions==4.1 django-filter==25.1 django-import-export==4.3.7 django-localflavor==4.0 django-tinymce==4.1.0 django-weasyprint==2.4.0 -djangorestframework==3.15.2 -djbs-theme_sesostris @ git+https://github.com/interlegis/djbs-theme.git -django-dashboard @ git+https://github.com/interlegis/django-dashboard.git +djangorestframework==3.16.0 +djbs-theme @ git+https://github.com/interlegis/djbs-theme.git +django-dashboard @ git+https://github.com/interlegis/django-dashboard.git \ No newline at end of file diff --git a/sigi/apps/espacos/admin.py b/sigi/apps/espacos/admin.py index 0c03c7a..7866870 100644 --- a/sigi/apps/espacos/admin.py +++ b/sigi/apps/espacos/admin.py @@ -33,6 +33,7 @@ class ReservaResource(resources.ModelResource): "solicitante", "contato", "telefone_contato", + "recursos_solicitados", ) export_order = fields