Merge branch 'upgrade-restframework' into 'develop'

Upgrade restframework

See merge request bramw/baserow!513

backend/requirements/base.txt

@@ -1,6 +1,6 @@
 Django==3.2.6
 django-cors-headers==3.8.0
-djangorestframework==3.12.4
+djangorestframework==3.13.1
 drf-jwt==1.19.1
 psycopg2==2.9.1
 Faker==8.11.0

backend/tests/baserow/contrib/database/api/rows/test_row_views.py

@@ -11,6 +11,7 @@ from rest_framework.status import (
 
 from baserow.contrib.database.fields.handler import FieldHandler
 from baserow.contrib.database.fields.registries import field_type_registry
+from baserow.contrib.database.fields.models import NUMBER_TYPE_DECIMAL
 from baserow.contrib.database.rows.handler import RowHandler
 from baserow.contrib.database.tokens.handler import TokenHandler
 from baserow.test_utils.helpers import setup_interesting_test_table
@@ -642,6 +643,26 @@ def test_create_empty_row_for_interesting_fields(api_client, data_fixture):
     assert response.status_code == HTTP_200_OK
 
 
+@pytest.mark.django_db
+def test_create_row_with_blank_decimal_field(api_client, data_fixture):
+    user, jwt_token = data_fixture.create_user_and_token()
+    table = data_fixture.create_database_table(user=user)
+    decimal_field = data_fixture.create_number_field(
+        table=table, order=1, name="TestDecimal", number_type=NUMBER_TYPE_DECIMAL
+    )
+
+    response = api_client.post(
+        reverse("api:database:rows:list", kwargs={"table_id": table.id}),
+        {f"field_{decimal_field.id}": ""},
+        format="json",
+        HTTP_AUTHORIZATION=f"JWT {jwt_token}",
+    )
+
+    response_json_row_1 = response.json()
+    assert response.status_code == HTTP_200_OK
+    assert response_json_row_1[f"field_{decimal_field.id}"] is None
+
+
 @pytest.mark.django_db
 def test_get_row(api_client, data_fixture):
     user, jwt_token = data_fixture.create_user_and_token()

changelog.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Fixed `'<' not supported between instances of 'NoneType' and 'int'` error. Blank string for a decimal value is now converted to `None` when using the REST API.
+
 ## Released (2022-01-13 1.8.2)
 
 * Fix Table Export showing blank modal.