Marta Miranda / boletin_api

Go to a project
Toggle navigation Toggle navigation pinning
Marta Miranda
b7018167 2 parents bb3b1e05 7b51bfd3

Solucionar conflictos base.txt

Inline Side-by-side
Showing 2 changed files with 9 additions and 6 deletions
@@ -3,7 +3,7 @@ import os @@ -3,7 +3,7 @@ import os
3 3
4 import environ 4 import environ
5 5
6 -from django.utils.translation import ugettext_lazy as _ 6 +from django.utils.translation import gettext_lazy as _
7 7
8 ROOT_DIR = environ.Path(__file__) - 3 8 ROOT_DIR = environ.Path(__file__) - 3
9 PROJECT_DIR = ROOT_DIR.path('project') 9 PROJECT_DIR = ROOT_DIR.path('project')
1 # Requeriments base. 1 # Requeriments base.
2 2
3 -Django==3.2.8 3 +Django==4.1.9
4 django-cors-headers==3.10.0 4 django-cors-headers==3.10.0
5 django-filter==21.1 5 django-filter==21.1
6 -djangorestframework==3.12.4  
7 -djangorestframework-jsonapi==5.0.0  
8 -django-environ==0.7.0 6 +
  7 +djangorestframework==3.14.0
  8 +djangorestframework-jsonapi==6.0.0
  9 +django-environ==0.10.0
9 django-oauth-toolkit==2.3.0 10 django-oauth-toolkit==2.3.0
10 11
  12 +Pillow==9.5.0
  13 +
11 # Requests and SSL. 14 # Requests and SSL.
12 requests_toolbelt==0.9.1 15 requests_toolbelt==0.9.1
13 requests==2.27.1 16 requests==2.27.1
@@ -15,4 +18,4 @@ pyOpenSSL==22.0.0 @@ -15,4 +18,4 @@ pyOpenSSL==22.0.0
15 18
16 # database 19 # database
17 psycopg2==2.9.1 20 psycopg2==2.9.1
18 -psycopg2-binary==2.9.1  
  21 +psycopg2-binary==2.9.1