diff --git a/notifications/__init__.py b/notifications/__init__.py index e8d3f11..6a254b8 100644 --- a/notifications/__init__.py +++ b/notifications/__init__.py @@ -11,16 +11,3 @@ __version__ = '1.4.0' default_app_config = 'notifications.apps.Config' # pylint: disable=invalid-name - - -# patch jsonfield expectations until they actually update -def _patch_jsonfield_six(): - import django - if django.VERSION >= (3,): - from django import utils - import six - utils.six = six - - -_patch_jsonfield_six() -del _patch_jsonfield_six diff --git a/setup.py b/setup.py index acc7c4c..9f4e29b 100755 --- a/setup.py +++ b/setup.py @@ -28,15 +28,14 @@ setup( install_requires=[ 'django>=2.2', 'django-model-utils>=3.1.0', - 'jsonfield>=1.0.3', - 'six', # for jsonfield on django 3.0 until it drops py2 compat + 'jsonfield>=2.1.0', 'pytz', 'swapper' ], test_requires=[ 'django>=2.2', 'django-model-utils>=3.1.0', - 'jsonfield>=1.0.3', + 'jsonfield>=2.1.0', 'pytz' ], packages=[