Merge pull request AltSchool#345 from AltSchool/pr/339

Update to work with Django 4.0.* & 4.1.* (cc AltSchool#339)

Author: aleontiev

.circleci/config.yml

@@ -12,9 +12,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8]
-        dj-version: ["2.2.*", "3.0.*", "3.1.*", "3.2.*"]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
+        dj-version: ["2.2.*", "3.0.*", "3.1.*", "3.2.*", "4.0.*", "4.1.*"]
         drf-version: ["3.11.*", "3.12.*", "3.13.*"]
+        exclude:
+        - python-version: 3.7
+          dj-version: '4.0.*'
+        - python-version: 3.7
+          dj-version: '4.1.*'
+        - dj-version: '4.0.*'
+          drf-version: '3.11.*'
+        - dj-version: '4.1.*'
+          drf-version: '3.11.*'
+        - dj-version: '4.0.*'
+          drf-version: '3.12.*'
+        - dj-version: '4.1.*'
+          drf-version: '3.12.*'
 
     steps:
     - uses: actions/checkout@v2
@@ -39,15 +52,15 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up Python37
+    - name: Set up Python39
       uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.9
 
     - name: Install Dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install flake8==2.4.0
+        pip install flake8==5.0.4
 
     - name: Lint Code
       run: |

.circleci/python-versions.txt

@@ -36,7 +36,7 @@
                 verticalAlign: 'middle',
                 borderWidth: 0
             },
-            series: [{"name": "DREST 2.0.0", "data": [[3, 0.0037530000000000003], [14, 0.004215], [39, 0.0047805], [84, 0.005736], [155, 0.006875], [258, 0.0083385], [399, 0.010683000000000002], [584, 0.0135645], [819, 0.016668000000000002], [1110, 0.020622], [1463, 0.025916500000000002], [1884, 0.031551499999999996], [2379, 0.0381205], [2954, 0.0471535], [3615, 0.0551515], [4368, 0.0671345]]}, {"name": "DRF 3.12.4", "data": [[3, 0.0016465], [14, 0.0033355], [39, 0.005826], [84, 0.0093875], [155, 0.014127], [258, 0.0199585], [399, 0.027033], [584, 0.035491499999999995], [819, 0.044836], [1110, 0.056142], [1463, 0.0692645], [1884, 0.085964], [2379, 0.10098850000000001], [2954, 0.122303], [3615, 0.1445205], [4368, 0.16253800000000002]]}]
+            series: [{"name": "DREST 2.1.5", "data": [[3, 0.0040409999999999995], [14, 0.0045705], [39, 0.0050475], [84, 0.005978], [155, 0.007379500000000001], [258, 0.009155], [399, 0.011596], [584, 0.014615], [819, 0.0196445], [1110, 0.023429], [1463, 0.030967], [1884, 0.0363245], [2379, 0.042646], [2954, 0.052871], [3615, 0.061801499999999995], [4368, 0.075429]]}, {"name": "DRF 3.13.1", "data": [[3, 0.0016865], [14, 0.0031869999999999997], [39, 0.0054065], [84, 0.008954], [155, 0.012576], [258, 0.017916500000000002], [399, 0.023919], [584, 0.0305975], [819, 0.040176], [1110, 0.049114], [1463, 0.0607875], [1884, 0.073817], [2379, 0.08280850000000001], [2954, 0.100053], [3615, 0.116385], [4368, 0.1316425]]}]
         });
     });
 </script>
@@ -75,7 +75,7 @@
                 verticalAlign: 'middle',
                 borderWidth: 0
             },
-            series: [{"name": "DREST 2.0.0", "data": [[256, 0.004253], [512, 0.007494499999999999], [768, 0.010120500000000001], [1024, 0.0127455], [1280, 0.0157595], [1536, 0.018013], [1792, 0.0212245], [2048, 0.0240905], [2304, 0.02581], [2560, 0.0287565], [2816, 0.0314165], [3072, 0.0506805], [3328, 0.0382505], [3584, 0.042971], [3840, 0.0428355], [4096, 0.0469565]]}, {"name": "DRF 3.12.4", "data": [[256, 0.08546100000000001], [512, 0.171128], [768, 0.2598395], [1024, 0.33919750000000004], [1280, 0.426328], [1536, 0.5128635], [1792, 0.5989595], [2048, 0.684221], [2304, 0.762429], [2560, 0.8562815], [2816, 0.9428665], [3072, 1.0435575], [3328, 1.1402725], [3584, 1.208104], [3840, 1.29737], [4096, 1.403646]]}]
+            series: [{"name": "DREST 2.1.5", "data": [[256, 0.0049345], [512, 0.0079795], [768, 0.011013499999999999], [1024, 0.014020999999999999], [1280, 0.017308999999999998], [1536, 0.021166], [1792, 0.024343999999999998], [2048, 0.02784], [2304, 0.0314175], [2560, 0.033699], [2816, 0.038019], [3072, 0.041934], [3328, 0.043043], [3584, 0.0794575], [3840, 0.0490405], [4096, 0.053863999999999995]]}, {"name": "DRF 3.13.1", "data": [[256, 0.08685699999999999], [512, 0.178358], [768, 0.24748900000000001], [1024, 0.3386085], [1280, 0.4147925], [1536, 0.514057], [1792, 0.5993599999999999], [2048, 0.6840200000000001], [2304, 0.773505], [2560, 0.842225], [2816, 0.920455], [3072, 1.0180465], [3328, 1.080375], [3584, 1.171262], [3840, 1.276456], [4096, 1.3620234999999998]]}]
         });
     });
 </script>
@@ -114,7 +114,7 @@
                 verticalAlign: 'middle',
                 borderWidth: 0
             },
-            series: [{"name": "DREST 2.0.0", "data": [[20, 0.003006], [72, 0.004069], [156, 0.005076], [272, 0.006527], [420, 0.0086305], [600, 0.010717], [812, 0.013677], [1056, 0.016252], [1332, 0.020575], [1640, 0.024105500000000002], [1980, 0.0269815], [2352, 0.032959], [2756, 0.036424], [3192, 0.043724], [3660, 0.047021], [4160, 0.0538335]]}, {"name": "DRF 3.12.4", "data": [[20, 0.0027085], [72, 0.004940999999999999], [156, 0.0076405], [272, 0.0109555], [420, 0.0148125], [600, 0.018860000000000002], [812, 0.0231945], [1056, 0.0287305], [1332, 0.0355045], [1640, 0.041485], [1980, 0.047808], [2352, 0.056248], [2756, 0.062773], [3192, 0.071774], [3660, 0.07946], [4160, 0.0885375]]}]
+            series: [{"name": "DREST 2.1.5", "data": [[20, 0.003293], [72, 0.0041295], [156, 0.0052875], [272, 0.006942500000000001], [420, 0.0093875], [600, 0.0121055], [812, 0.0145185], [1056, 0.01793], [1332, 0.022449499999999997], [1640, 0.025948], [1980, 0.031333], [2352, 0.0370555], [2756, 0.04199], [3192, 0.0666925], [3660, 0.0555085], [4160, 0.060936500000000005]]}, {"name": "DRF 3.13.1", "data": [[20, 0.0023765], [72, 0.0044495], [156, 0.006364], [272, 0.008661499999999999], [420, 0.0117725], [600, 0.0146015], [812, 0.017887], [1056, 0.0214405], [1332, 0.026827], [1640, 0.029961], [1980, 0.036192], [2352, 0.040636], [2756, 0.045358499999999996], [3192, 0.050945000000000004], [3660, 0.056278499999999995], [4160, 0.0628445]]}]
         });
     });
 </script>

.github/workflows/test.yml

@@ -8,6 +8,7 @@
 STATIC_ROOT = INSTALL_DIR + 'www/static'
 
 DEBUG = True
+USE_TZ = False
 
 DATABASES = {}
 if os.environ.get('DATABASE_URL'):

benchmarks.html

@@ -269,3 +269,4 @@ def get_random_string(size):
             )
             test = generate_benchmark(name, title, drest, drf, size, sample)
             setattr(BenchmarkTest, test_name, test)
+            del test_name, test

benchmarks/settings.py

@@ -1,7 +1,11 @@
 """This module contains custom DRF metadata classes."""
 from collections import OrderedDict
 
-from django.utils.encoding import force_text
+try:
+    from django.utils.encoding import force_str
+except ImportError:
+    from django.utils.encoding import force_text as force_str
+
 from rest_framework.fields import empty
 from rest_framework.metadata import SimpleMetadata
 from rest_framework.serializers import ListSerializer, ModelSerializer
@@ -50,7 +54,7 @@ def get_field_info(self, field):
             field_info['choices'] = [
                 {
                     'value': choice_value,
-                    'display_name': force_text(choice_name, strings_only=True)
+                    'display_name': force_str(choice_name, strings_only=True)
                 }
                 for choice_value, choice_name in field.choices.items()
             ]

benchmarks/test_bench.py

@@ -1,5 +1,5 @@
-Django>=2.2,<4
-djangorestframework>=3.11.0,<3.14.0
+Django>=2.2,<4.2
+djangorestframework>=3.11.2,<3.15
 inflection>=0.4.0
 requests
 hashids>=1.3.1

dynamic_rest/metadata.py

@@ -1,14 +1,14 @@
-Sphinx==1.3.4
-Django>=2.2.12<=3.2.7
-djangorestframework>=3.11.0,<3.14.0
 dj-database-url==0.3.0
 django-debug-toolbar==1.7
-flake8==3.9.2
-pytest-cov==2.5.1
-pytest-django==2.8.0
-pytest-sugar==0.5.1
-pytest==3.7.1
-psycopg2-binary==2.8.6
-tox-pyenv==1.0.2
-tox==2.3.1
-djay==0.0.8
+Django>=2.2,<4.2
+djangorestframework>=3.11.2,<3.15
+djay>=0.0.9
+flake8>=3.0
+psycopg2-binary==2.9.3
+pytest-cov==3.0.0
+pytest-django==4.5.2
+pytest-sugar==0.9.5
+pytest==7.1.2
+Sphinx==1.7.5
+tox-pyenv==1.1.0
+tox==3.25.1

install_requires.txt

@@ -1,15 +1,15 @@
 dj-database-url==0.5.0
-djay>=0.0.8
-flake8==3.9.2
+djay>=0.0.9
+flake8>=3.0
 hashids==1.3.1
 mock==2.0.0
-psycopg2-binary==2.8.6
-pytest-cov==2.5.1
-pytest-django==3.4.1
-pytest-sugar==0.9.1
-pytest==3.7.1
+psycopg2-binary==2.9.3
+pytest-cov==3.0.0
+pytest-django==4.5.2
+pytest-sugar==0.9.5
+pytest>=7.0.0
 six==1.16.0
 Sphinx==1.7.5
 tox-pyenv==1.1.0
-tox==3.14.6
-twine==3.3.0
+tox==3.25.1
+twine==3.8.0