Merge pull request #157 from ambitioninc/develop

5.0.0

Author: somewes

.travis.yml

@@ -8,18 +8,15 @@ python:
 
 env:
   matrix:
-    - DJANGO=2.0
-    - DJANGO=2.1
     - DJANGO=2.2
+    - DJANGO=3.0
+    - DJANGO=3.1
     - DJANGO=master
 
 addons:
   postgresql: '9.6'
 
 matrix:
-  exclude:
-    - { python: "3.7", env: DJANGO=2.0 }
-
   include:
     - { python: "3.6", env: TOXENV=flake8 }
 

MANIFEST.in

@@ -1,2 +1,3 @@
 include README.md
 include LICENSE
+recursive-include requirements *

entity/models.py

@@ -7,7 +7,6 @@
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
 from django.db.models import Count, Q
-from django.utils.encoding import python_2_unicode_compatible
 from python3_utils import compare_on_attr
 from six.moves import reduce
 
@@ -27,7 +26,6 @@ def get_queryset(self):
         return super(ActiveEntityKindManager, self).get_queryset().filter(is_active=True)
 
 
-@python_2_unicode_compatible
 class EntityKind(BaseActivatableModel):
     """
     A kind for an Entity that is useful for filtering based on different types of entities.
@@ -242,7 +240,6 @@ def get_queryset(self):
 
 
 @compare_on_attr()
-@python_2_unicode_compatible
 class Entity(BaseActivatableModel):
     """
     Describes an entity and its relevant metadata. Also defines if the entity is active. Filtering functions

entity/tests/models.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 
 from entity.config import EntityConfig, register_entity
 from entity.models import Entity
@@ -13,7 +12,6 @@ class Meta:
     objects = ManagerUtilsManager()
 
 
-@python_2_unicode_compatible
 class TeamGroup(BaseEntityModel):
     """
     A grouping of teams.
@@ -24,7 +22,6 @@ def __str__(self):
         return self.name
 
 
-@python_2_unicode_compatible
 class Competitor(BaseEntityModel):
     """
     An enclosing group for competitors
@@ -47,7 +44,6 @@ class Team(BaseEntityModel):
     team_group = models.ForeignKey(TeamGroup, null=True, on_delete=models.CASCADE)
 
 
-@python_2_unicode_compatible
 class Account(BaseEntityModel):
     """
     An account entity model

entity/version.py

@@ -1 +1 @@
-__version__ = '4.2.0'
+__version__ = '5.0.0'

release_notes.md

@@ -1,5 +1,8 @@
 ## Release Notes
 
+- 5.0.0:
+    - Django 3.0, Django 3.1
+    - Drop Django 2.0, 2.1 support
 - 4.2.0:
     - Python 3.7, Django 2.2
 - 4.1.1:

requirements/requirements-testing.txt

@@ -1,5 +1,5 @@
 coverage==4.5.1
 django-nose==1.4.5
-django-dynamic-fixture==2.0.0
+django-dynamic-fixture
 mock==2.0.0
-psycopg2==2.7.7
+psycopg2>=2.7.7

requirements/requirements.txt

@@ -0,0 +1,6 @@
+Django>=2.2
+django-activatable-model>=2.0.0
+django-manager-utils>=2.0.0
+jsonfield>=0.9.20
+python3-utils>=0.3
+wrapt>=1.10.5

setup.py

@@ -18,21 +18,13 @@ def get_version():
         raise RuntimeError('Unable to find version string in {0}.'.format(VERSION_FILE))
 
 
-install_requires = [
-    'Django>=2.0,<3.0',
-    'django-activatable-model>=1.2.1',
-    'django-manager-utils>=1.4.0',
-    'jsonfield>=0.9.20',
-    'python3-utils>=0.3',
-    'wrapt>=1.10.5'
-]
-
-tests_require = [
-    'django-dynamic-fixture',
-    'django-nose>=1.4',
-    'mock>=1.0.1',
-    'psycopg2',
-]
+def get_lines(file_path):
+    return open(file_path, 'r').read().split('\n')
+
+
+install_requires = get_lines('requirements/requirements.txt')
+tests_require = get_lines('requirements/requirements-testing.txt')
+
 
 setup(
     name='django-entity',
@@ -48,6 +40,7 @@ def get_version():
         'Programming Language :: Python',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',

tox.ini

@@ -1,18 +1,18 @@
 [tox]
 envlist =
     flake8
-    py{36}-django20
-    py{36,37}-django21
     py{36,37}-django22
+    py{36,37}-django30
+    py{36,37}-django31
     py{36,37}-djangomaster
 
 [testenv]
 setenv =
     DB = postgres
 deps =
-    django20: Django>=2.0,<2.1
-    django21: Django>=2.1,<2.2
-    django22: Django>=2.2,<2.3
+    django22: Django>=2.2,<3.0
+    django30: Django>=3.0,<3.1
+    django31: Django>=3.1,<3.2
     djangomaster: https://github.com/django/django/archive/master.tar.gz
     -rrequirements/requirements-testing.txt
 commands =
@@ -25,7 +25,7 @@ commands = flake8 entity
 
 [travis:env]
 DJANGO =
-    2.0: django20
-    2.1: django21
     2.2: django22
+    3.0: django30
+    3.1: django31
     master: djangomaster