Django3 supported (#88)

* Update routing_read_strategies.py

* Update sharding_functions.py

* Update test_fields.py

* Update test_sharding_functions.py

* Update decorators.py

* Update test_routing_read_strategies.py

* Update test_id_generation_strategies.py

* Update common.txt

* Update CHANGES.md

* Update setup.py

* Update config.yml

* Update setup.py

Author: JBKahn

.circleci/config.yml

@@ -100,6 +100,31 @@ jobs:
       - store_test_results:
           path: /tmp/test-reports/
 
+  django-3-0:
+    executor:
+      name: python/default
+      tag: 3.8.0
+    steps:
+      - checkout
+      - python/load-cache:
+          key: python-cache-latest
+      - python/install-deps
+      - python/save-cache:
+          key: python-cache-latest
+      - run:
+          command: pip install --user -U "Django>=3,<3.1"
+          name: Install Django
+      - run: mkdir /tmp/test-reports
+      - run:
+          command: |
+            python -m pytest \
+              -vv \
+              --junitxml /tmp/test-reports/xunit.xml \
+              --durations 10
+          name: Test
+      - store_test_results:
+          path: /tmp/test-reports/
+
   django-latest:
     executor:
       name: python/default
@@ -135,4 +160,5 @@ workflows:
       - django-2-1
       - django-2-2
       - django-1-11
+      - django-3-0
       - django-latest

CHANGES.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+5.1.0 (December 10th 2019)
+------------------
+
+- Allow django>=3,<4
+
+
 5.0.0 (November 30th 2019)
 ------------------
 

django_sharding_library/decorators.py

@@ -1,7 +1,8 @@
+from six import iteritems
+
 from django.conf import settings
 from django.apps import apps
 from django_sharding_library.constants import Backends
-from django.utils.six import iteritems
 
 from django_sharding_library.exceptions import NonExistentDatabaseException, ShardedModelInitializationException
 from django_sharding_library.fields import ShardedIDFieldMixin, BasePostgresShardGeneratedIDField

django_sharding_library/routing_read_strategies.py

@@ -1,7 +1,6 @@
 from itertools import cycle
 from random import choice, randint
-
-from django.utils.six import next, viewitems
+from six import next, viewitems
 
 
 class BaseRoutingStrategy(object):

django_sharding_library/sharding_functions.py

@@ -1,7 +1,6 @@
 from itertools import cycle
 from random import choice, randint
-
-from django.utils.six import next
+from six import next
 
 
 class BaseBucketingStrategy(object):

requirements/common.txt

@@ -1 +1,2 @@
 django-environ<1.0.0
+six

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '5.0.0'
+version = '5.1.0'
 
 
 def get_requirements(file_path):
@@ -18,7 +18,7 @@ def get_requirements(file_path):
     url='https://github.com/JBKahn/django-sharding',
     packages=find_packages(exclude=['tests']),
     include_package_data=True,
-    install_requires=get_requirements('requirements/common.txt') + ["django>=1.11,<3.0.0"],
+    install_requires=get_requirements('requirements/common.txt') + ["django>=1.11,<4.0.0"],
     tests_require=get_requirements('requirements/development.txt'),
     setup_requires=[
         'pytest-runner',

tests/test_fields.py

@@ -1,12 +1,12 @@
 from mock import patch
+from six.moves import xrange
 import unittest
 
 from django.conf import settings
 from django.db import connections
 from django.db.utils import DataError, IntegrityError
 from django.db.models import CASCADE
 from django.test import TestCase
-from django.utils.six.moves import xrange
 
 import time
 from datetime import datetime

tests/test_id_generation_strategies.py

@@ -1,9 +1,9 @@
 from random import choice
+from six.moves import xrange
 from uuid import UUID
 
 from django.conf import settings
 from django.test import TestCase
-from django.utils.six.moves import xrange
 
 from tests.models import ShardedModelIDs
 from django_sharding_library.id_generation_strategies import TableStrategy, UUIDStrategy

tests/test_routing_read_strategies.py

@@ -1,6 +1,7 @@
+from six.moves import xrange
+
 from django.conf import settings
 from django.test import TestCase
-from django.utils.six.moves import xrange
 
 from django_sharding_library.routing_read_strategies import RoundRobinRoutingStrategy, PrimaryOnlyRoutingStrategy
 

tests/test_sharding_functions.py

@@ -1,6 +1,7 @@
+from six.moves import xrange
+
 from django.conf import settings
 from django.test import TestCase
-from django.utils.six.moves import xrange
 
 from django_sharding_library.sharding_functions import (
     BaseBucketingStrategy,