chore: Django bump to <=5.0

Author: Tomáš Daniel

.github/workflows/django.yml

@@ -13,18 +13,8 @@ jobs:
       max-parallel: 4
       matrix:
         include:
-          - python-version: 3.7
-            django-version: Django==3.1
-
-          - python-version: 3.8
-            django-version: Django==3.1
-
-          - python-version: 3.7
-            django-version: Django==3.2
-
-          - python-version: 3.8
-            django-version: Django==3.2
-
+          - python-version: 3.11
+            django-version: Django==4.2
 
     services:
       elasticsearch:

example/dj/apps/app/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.db.models import Count
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pyston.utils.decorators import order_by, filter_class, filter_by, allow_tags, sorter_class
 from pyston.filters.filters import IntegerFilterMixin

example/dj/apps/app/tests/fields.py

@@ -3,7 +3,7 @@
 
 from django.conf import settings
 from django.test.utils import override_settings
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 from germanium.decorators import data_consumer
 from germanium.tools.trivials import assert_in, assert_equal, assert_not_equal
@@ -440,7 +440,7 @@ def test_should_raise_bad_request_with_invalid_filename(self, number, data):
         assert_in('contract', errors)
         assert_equal(
             errors['contract'],
-            ugettext('Content type cannot be evaluated from input data please send it')
+            gettext('Content type cannot be evaluated from input data please send it')
         )
 
     @data_consumer('get_users_data')
@@ -454,7 +454,7 @@ def test_should_raise_bad_request_if_file_content_is_not_in_base64(self, number,
         assert_http_bad_request(resp)
         errors = self.deserialize(resp).get('messages', {}).get('errors')
         assert_in('contract', errors)
-        assert_equal(errors['contract']['content'], ugettext('File content must be in base64 format'))
+        assert_equal(errors['contract']['content'], gettext('File content must be in base64 format'))
 
     @data_consumer('get_users_data')
     def test_should_raise_bad_request_if_url_is_not_valid(self, number, data):
@@ -466,7 +466,7 @@ def test_should_raise_bad_request_if_url_is_not_valid(self, number, data):
         assert_http_bad_request(resp)
         errors = self.deserialize(resp).get('messages', {}).get('errors')
         assert_in('contract', errors)
-        assert_equal(errors['contract']['url'], ugettext('Enter a valid URL.'))
+        assert_equal(errors['contract']['url'], gettext('Enter a valid URL.'))
 
     @data_consumer('get_users_data')
     def test_should_raise_bad_request_if_required_items_are_not_provided(self, number, data):
@@ -477,7 +477,7 @@ def test_should_raise_bad_request_if_required_items_are_not_provided(self, numbe
         assert_http_bad_request(resp)
         errors = self.deserialize(resp).get('messages', {}).get('errors')
         assert_in('contract', errors)
-        msg = ugettext('File data item must contains {} or {}').format(
+        msg = gettext('File data item must contains {} or {}').format(
                   ', '.join(REQUIRED_ITEMS), ', '.join(REQUIRED_URL_ITEMS)
               )
         assert_equal(errors['contract'], msg)
@@ -493,7 +493,7 @@ def test_should_raise_bad_request_if_file_is_unreachable(self, number, data):
         assert_http_bad_request(resp)
         errors = self.deserialize(resp).get('messages', {}).get('errors')
         assert_in('contract', errors)
-        assert_equal(errors['contract']['url'], ugettext('File is unreachable on the URL address'))
+        assert_equal(errors['contract']['url'], gettext('File is unreachable on the URL address'))
 
     @override_settings(PYSTON_FILE_SIZE_LIMIT=10)
     @data_consumer('get_users_data')
@@ -509,7 +509,7 @@ def test_should_raise_bad_request_if_response_is_too_large(self, number, data):
         assert_http_bad_request(resp)
         errors = self.deserialize(resp).get('messages', {}).get('errors')
         assert_in('contract', errors)
-        msg = ugettext('Response too large, maximum size is {} bytes').format(pyston_settings.FILE_SIZE_LIMIT)
+        msg = gettext('Response too large, maximum size is {} bytes').format(pyston_settings.FILE_SIZE_LIMIT)
         assert_equal(errors['contract']['url'], msg)
 
     @data_consumer('get_users_data')

example/dj/settings/base.py

@@ -2,7 +2,7 @@
 import os
 
 try:
-    from django.utils.translation import ugettext_lazy as _
+    from django.utils.translation import gettext_lazy as _
 except ImportError:
     def _(val): return val
 

example/dj/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls import url
+from django.urls import re_path as url
 
 from app.dynamo.resource import CommentDynamoResource
 from app.elasticsearch.resource import CommentElasticsearchResource

example/requirements.txt

@@ -1,20 +1,20 @@
 botocore==1.29.165
 coveralls
-Django<=3.2
+Django~=4.2
 elasticsearch==7.13.4
 elasticsearch-dsl==7.4.0
 factory-boy==3.2.0
 flake8
 html5lib==1.1
 pep8==1.6.2
 pillow>=8.0.1
-psycopg2-binary==2.8.6
+psycopg2-binary==2.9.5
 pynamodb==5.3.3
 pytz==2020.5
-reportlab==3.6.6
+reportlab==3.6.13
 responses==0.12.1
-skip-django-germanium==2.3.7.1
-skip-pydjamodb==0.0.10.1
-xhtml2pdf==0.2.5
+skip-django-germanium @ git+https://github.com/skip-pay/germanium@tda/chore/django_bump
+skip-pydjamodb @ git+https://github.com/skip-pay/pydjamodb@tda/chore/django_bump
+xhtml2pdf==0.2.11
 XlsxWriter==0.7.7
 -e ../

pyston/contrib/dynamo/paginator.py

@@ -1,7 +1,7 @@
 import base64
 import json
 
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 from pyston.exception import RestException
 from pyston.paginator import BasePaginator
@@ -33,11 +33,11 @@ def _get_base(self, request):
         elif base.isdigit():
             base_int = int(base)
             if base_int > self.max_base:
-                raise RestException(ugettext('Base must lower or equal to {}').format(self.max_base))
+                raise RestException(gettext('Base must lower or equal to {}').format(self.max_base))
             else:
                 return base_int
         else:
-            raise RestException(ugettext('Base must be natural number or empty'))
+            raise RestException(gettext('Base must be natural number or empty'))
 
     def _get_cursor(self, request):
         cursor = request._rest_context.get('cursor')
@@ -48,7 +48,7 @@ def _get_cursor(self, request):
                 ).decode('ascii')
                 return json.loads(cursor)
             except json.JSONDecodeError:
-                raise RestException(ugettext('Invalid next cursor value'))
+                raise RestException(gettext('Invalid next cursor value'))
         else:
             return None
 

pyston/converters/__init__.py

@@ -9,7 +9,7 @@
 from django.core.serializers.json import DjangoJSONEncoder
 from django.http.response import HttpResponseBase
 from django.template.loader import get_template
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.xmlutils import SimplerXMLGenerator
 from django.utils.module_loading import import_string
 from django.utils.html import format_html
@@ -175,7 +175,7 @@ def _to_xml(self, xml, data):
                 self._to_xml(xml, value)
                 xml.endElement(key)
         else:
-            xml.characters(force_text(data))
+            xml.characters(force_str(data))
 
     def _encode(self, data, **kwargs):
         if data is not None:
@@ -287,7 +287,7 @@ def render_value(self, value, first=True):
         elif is_collection(value):
             return self._render_iterable(value, first)
         else:
-            return force_text(value)
+            return force_str(value)
 
     def _get_value_from_row(self, data, field):
         return self.render_value(self._get_recursive_value_from_row(data, field.key_path) or '')
@@ -306,7 +306,7 @@ def _encode_to_stream(self, output_stream, data, resource=None, requested_fields
                           **kwargs):
         fieldset = FieldsetGenerator(
             resource,
-            force_text(requested_fields) if requested_fields is not None else None,
+            force_str(requested_fields) if requested_fields is not None else None,
             direct_serialization=direct_serialization
         ).generate()
         self.generator_class().generate(

pyston/converters/file_generators.py

@@ -7,7 +7,7 @@
 from decimal import Decimal
 
 from django.conf import settings as django_settings
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.template.loader import get_template
 
 try:
@@ -68,9 +68,9 @@ def _prepare_value(self, value):
         if isinstance(value, float):
             value = ('%.2f' % value).replace('.', ',')
         elif isinstance(value, Decimal):
-            value = force_text(value.quantize(TWOPLACES)).replace('.', ',')
+            value = force_str(value.quantize(TWOPLACES)).replace('.', ',')
         else:
-            value = force_text(value)
+            value = force_str(value)
         return value.replace(' ', ' ')
 
 
@@ -80,7 +80,7 @@ def __init__(self, f, dialect=csv.excel, use_bom=True, **kwargs):
         self.writer = csv.writer(f, dialect=dialect, **kwargs)
         self.stream = f
         if use_bom:
-            self.stream.write(force_text(codecs.BOM_UTF8))  # BOM for Excel
+            self.stream.write(force_str(codecs.BOM_UTF8))  # BOM for Excel
 
     def writerow(self, row):
         self.writer.writerow(row)
@@ -105,7 +105,7 @@ def generate(self, header, data, output_stream):
                     output_stream.write('{}:\n'.format(header[col]))
                 if isinstance(val, str):
                     val = self._prepare_value(val)
-                output_stream.write('\t'.join(('\t' + force_text(val).lstrip()).splitlines(True)) + '\n\n')
+                output_stream.write('\t'.join(('\t' + force_str(val).lstrip()).splitlines(True)) + '\n\n')
             output_stream.write('---\n')
 
 
@@ -127,7 +127,7 @@ def generate(self, header, data, output_stream):
 
             if header:
                 for col, head in enumerate(header):
-                    ws.write(row, col, force_text(head))
+                    ws.write(row, col, force_str(head))
                 row += 1
 
             for data_row in data:
@@ -163,7 +163,7 @@ def fetch_resources(uri, rel):
                 return ''
 
             pisa.pisaDocument(
-                force_text(
+                force_str(
                     get_template(settings.PDF_EXPORT_TEMPLATE).render(
                         {'pagesize': 'A4', 'headers': header, 'data': data}
                     )

pyston/data_processor.py

@@ -6,7 +6,7 @@
 from io import BytesIO
 
 from django.forms.fields import FileField
-from django.utils.translation import ugettext_lazy as _, ugettext
+from django.utils.translation import gettext_lazy as _, gettext
 from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
@@ -82,7 +82,7 @@ class FileDataPreprocessor(DataProcessor):
     def _validate_not_empty(self, data_item, key, item):
         if not data_item.get(item):
             error = self.errors.get(key, RestDictError())
-            error.update(RestDictError({item: RestValidationError(ugettext('This field is required'))}))
+            error.update(RestDictError({item: RestValidationError(gettext('This field is required'))}))
             self.errors[key] = error
 
     def _get_content_type(self, content_type, filename, file_content):
@@ -106,11 +106,11 @@ def _process_file_data(self, data, files, key, data_item, file_content):
         content_type = self._get_content_type(content_type, filename, file_content)
         filename = self._get_filename(content_type, filename)
         if not content_type:
-            self.errors[key] = RestValidationError(ugettext(
+            self.errors[key] = RestValidationError(gettext(
                 'Content type cannot be evaluated from input data please send it'
             ))
         elif not filename:
-            self.errors[key] = RestValidationError(ugettext(
+            self.errors[key] = RestValidationError(gettext(
                 'File name cannot be evaluated from input data please send it'
             ))
         else:
@@ -128,7 +128,7 @@ def _process_file_data_field(self, data, files, key, data_item):
             self._process_file_data(data, files, key, data_item, file_content)
         except (TypeError, binascii.Error):
             self.errors[key] = RestDictError({'content': RestValidationError(
-                ugettext('File content must be in base64 format')
+                gettext('File content must be in base64 format')
             )})
 
     def _process_file_data_url_field(self, data, files, key, data_item):
@@ -144,13 +144,13 @@ def _process_file_data_url_field(self, data, files, key, data_item):
             self._process_file_data(data, files, key, data_item, file_content)
         except RequestDataTooBig:
             self.errors[key] = RestDictError({'url': RestValidationError(
-                ugettext('Response too large, maximum size is {} bytes').format(
+                gettext('Response too large, maximum size is {} bytes').format(
                     pyston_settings.FILE_SIZE_LIMIT
                 ))
             })
         except (RequestException, InvalidResponseStatusCode):
             self.errors[key] = RestDictError({'url': RestValidationError(
-                ugettext('File is unreachable on the URL address')
+                gettext('File is unreachable on the URL address')
             )})
         try:
             url_validator(url)
@@ -177,7 +177,7 @@ def _process_field(self, data, files, key, data_item):
                     self._process_file_data_url_field(data, files, key, data_item)
             else:
                 self.errors[key] = RestValidationError(
-                    ugettext('File data item must contains {} or {}').format(
+                    gettext('File data item must contains {} or {}').format(
                         ', '.join(REQUIRED_ITEMS), ', '.join(REQUIRED_URL_ITEMS)
                     )
                 )

pyston/exception.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class UnsupportedMediaTypeException(Exception):