Merge pull request #119 from ambitioninc/chore/django4

Django4 compatibility

Author: somewes

.github/workflows/tests.yml

@@ -18,12 +18,10 @@ jobs:
         # AttributeError: module 'collections' has no attribute 'Callable'
         # https://github.com/nose-devs/nose/issues/1099
         django:
-        - 'Django~=2.2.0'
-        - 'Django~=3.0.0'
-        - 'Django~=3.1.0'
         - 'Django~=3.2.0'
         - 'Django~=4.0.0'
         - 'Django~=4.1.0'
+        - 'Django~=4.2.0'
         experimental: [false]
         # include:
         # - python: '3.9'
@@ -38,6 +36,8 @@ jobs:
           django: 'Django~=4.0.0'
         - python: '3.7'
           django: 'Django~=4.1.0'
+        - python: '3.7'
+          django: 'Django~=4.2.0'
     services:
       postgres:
         image: postgres:latest
@@ -69,7 +69,7 @@ jobs:
       env:
         DB_SETTINGS: >-
           {
-            "ENGINE":"django.db.backends.postgresql_psycopg2",
+            "ENGINE":"django.db.backends.postgresql",
             "NAME":"querybuilder",
             "USER":"postgres",
             "PASSWORD":"postgres",
@@ -78,7 +78,7 @@ jobs:
           }
         DB_SETTINGS2: >-
           {
-            "ENGINE":"django.db.backends.postgresql_psycopg2",
+            "ENGINE":"django.db.backends.postgresql",
             "NAME":"querybuilder2",
             "USER":"postgres",
             "PASSWORD":"postgres",

docs/release_notes.rst

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+v3.1.0
+------
+* django 4.2 support
+
 v3.0.4
 ------
 * Adjusted querybuilder select functionality to process json values as needed in the result set

manage.py

@@ -1,6 +1,13 @@
 #!/usr/bin/env python
 import sys
 
+# Show warnings about django deprecations - uncomment for version upgrade testing
+import warnings
+from django.utils.deprecation import RemovedInNextVersionWarning
+warnings.filterwarnings('always', category=DeprecationWarning)
+warnings.filterwarnings('always', category=PendingDeprecationWarning)
+warnings.filterwarnings('always', category=RemovedInNextVersionWarning)
+
 from settings import configure_settings
 
 

querybuilder/__init__.py

@@ -1,4 +1,2 @@
 # flake8: noqa
 from .version import __version__
-
-default_app_config = 'querybuilder.apps.QueryBuilderConfig'

querybuilder/tables.py

@@ -1,7 +1,6 @@
-import abc
+from abc import ABCMeta
 
 from django.db.models.base import ModelBase
-from six import string_types, with_metaclass
 
 import querybuilder
 from querybuilder.fields import FieldFactory
@@ -31,7 +30,7 @@ def __new__(cls, table, *args, **kwargs):
             kwargs.update(alias=list(table.keys())[0])
             table = list(table.values())[0]
             table_type = type(table)
-        if isinstance(table, string_types):
+        if isinstance(table, str):
             return SimpleTable(table, **kwargs)
         elif issubclass(table_type, ModelBase):
             return ModelTable(table, **kwargs)
@@ -44,7 +43,7 @@ def __new__(cls, table, *args, **kwargs):
         return None
 
 
-class Table(with_metaclass(abc.ABCMeta, object)):
+class Table(object, metaclass=ABCMeta):
     """
     Abstract table class that all table types extend.
 
@@ -259,7 +258,7 @@ def add_fields(self, fields):
             or ``Field`` instance
         :type fields: str or tuple or list of str or list of Field or :class:`Field <querybuilder.fields.Field>`
         """
-        if isinstance(fields, string_types):
+        if isinstance(fields, str):
             fields = [fields]
         elif type(fields) is tuple:
             fields = list(fields)

querybuilder/tests/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'querybuilder.tests.apps.QuerybuilderTestConfig'

querybuilder/tests/migrations/0001_initial.py

@@ -1,18 +1,9 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.1 on 2016-02-12 19:03
-from __future__ import unicode_literals
 
 from querybuilder.tests.utils import get_postgres_version
 
 # These migrations should only be run during tests and not in your installed app.
-try:
-    if get_postgres_version() < (9, 4):
-        raise ImportError('Invalid Postgres version')
-    import django.contrib.postgres.fields.jsonb
-    json_field = django.contrib.postgres.fields.jsonb.JSONField()
-except ImportError:
-    import jsonfield.fields
-    json_field = jsonfield.fields.JSONField()
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -38,7 +29,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('other_value', models.FloatField(default=0)),
-                ('data', json_field),
+                ('data', models.JSONField()),
             ],
         ),
         migrations.CreateModel(
@@ -63,7 +54,7 @@ class Migration(migrations.Migration):
                 ('field5', models.CharField(default=None, max_length=16, null=True)),
                 ('field6', models.CharField(max_length=16)),
                 ('field7', models.CharField(max_length=16)),
-                ('field8', json_field),
+                ('field8', models.JSONField()),
                 ('custom_field_name', models.CharField(max_length=16, null=True, default='foo', db_column='actual_db_column_name')),
             ],
         ),

querybuilder/tests/models.py

@@ -54,7 +54,7 @@ class Uniques(models.Model):
     field5 = models.CharField(max_length=16, null=True, default=None)
     field6 = models.CharField(max_length=16)
     field7 = models.CharField(max_length=16)
-    field8 = JSONField(default={})
+    field8 = JSONField(default=dict)
     custom_field_name = models.CharField(
         max_length=16, null=True, default='foo', db_column='actual_db_column_name'
     )

querybuilder/urls.py

@@ -1,6 +1 @@
-from django.conf.urls import patterns  # pragma: no cover
-
-
-urlpatterns = patterns(
-    '',
-)  # pragma: no cover
+urlpatterns = []  # pragma: no cover

querybuilder/version.py

@@ -1 +1 @@
-__version__ = '3.0.4'
+__version__ = '3.1.0'

requirements/requirements-testing.txt

@@ -4,7 +4,5 @@ six
 psycopg2
 django-nose>=1.4
 django-dynamic-fixture
-jsonfield==0.9.20
-mock
 coverage
 flake8

requirements/requirements.txt

@@ -1,4 +1,3 @@
-Django>=2.2
+Django>=3.2
 pytz>=2015.6
 fleming>=0.6.0
-six

settings.py

@@ -51,7 +51,6 @@ def configure_settings():
         settings.configure(
             TEST_RUNNER='django_nose.NoseTestSuiteRunner',
             NOSE_ARGS=['--nocapture', '--nologcapture', '--verbosity=1'],
-            MIDDLEWARE_CLASSES=(),
             DATABASES={
                 'default': db_config,
                 'mock-second-database': db_config2,
@@ -65,4 +64,5 @@ def configure_settings():
             ROOT_URLCONF='querybuilder.urls',
             TIME_ZONE='UTC',
             USE_TZ=False,
+            DEFAULT_AUTO_FIELD='django.db.models.AutoField',
         )