Skip to content

Commit 1de41b2

Browse files
author
Ross Mechanic
committed
Removed Django1.8 support
1 parent 63e4bd8 commit 1de41b2

File tree

9 files changed

+16
-39
lines changed

9 files changed

+16
-39
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ python:
99
- 3.6
1010

1111
env:
12-
- DJANGO="Django>=1.8,<1.9"
1312
- DJANGO="Django>=1.9,<1.10"
1413
- DJANGO="Django>=1.10,<1.11"
1514
- DJANGO="Django>=1.11,<1.12"

CHANGES.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changes
22
=======
33

4+
Latest
5+
------
6+
- Dropped support for Django<=1.8
7+
48
1.9.1 (2018-03-30)
59
------------------
610
- Use get_queryset rather than model.objects in history_view. (gh-303)

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ django-simple-history
2020

2121
django-simple-history stores Django model state on every create/update/delete.
2222

23-
This app requires Django 1.8 or greater and Python 2.7, or 3.4 or greater.
23+
This app requires Django 1.9 or greater and Python 2.7, or 3.4 or greater.
2424

2525
Getting Help
2626
------------

runtests.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import django
88
from django.conf import settings
9+
from django.test.runner import DiscoverRunner
910

1011
sys.path.insert(0, abspath(dirname(__file__)))
1112

@@ -59,17 +60,9 @@ def main():
5960

6061
if not settings.configured:
6162
settings.configure(**DEFAULT_SETTINGS)
62-
if hasattr(django, 'setup'):
63-
django.setup()
64-
try:
65-
from django.test.runner import DiscoverRunner
66-
except ImportError:
67-
from django.test.simple import DjangoTestSuiteRunner
68-
failures = DjangoTestSuiteRunner(failfast=False).run_tests(['tests'])
69-
failures |= DjangoTestSuiteRunner(failfast=False).run_tests(['registry_tests'])
70-
else:
71-
failures = DiscoverRunner(failfast=False).run_tests(['simple_history.tests'])
72-
failures |= DiscoverRunner(failfast=False).run_tests(['simple_history.registry_tests'])
63+
django.setup()
64+
failures = DiscoverRunner(failfast=False).run_tests(['simple_history.tests'])
65+
failures |= DiscoverRunner(failfast=False).run_tests(['simple_history.registry_tests'])
7366
sys.exit(failures)
7467

7568

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import simple_history
33

44
tests_require = [
5-
'Django>=1.8', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
5+
'Django>=1.9', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
66

77
setup(
88
name='django-simple-history',
@@ -25,7 +25,6 @@
2525
"Environment :: Web Environment",
2626
"Intended Audience :: Developers",
2727
"Framework :: Django",
28-
"Framework :: Django :: 1.8",
2928
"Framework :: Django :: 1.9",
3029
"Framework :: Django :: 1.10",
3130
"Framework :: Django :: 1.11",

simple_history/management/commands/populate_history.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
from optparse import make_option
2-
3-
from django.core.management.base import BaseCommand, CommandError
41
from django.apps import apps
2+
from django.core.management.base import BaseCommand, CommandError
53

6-
get_model = apps.get_model
7-
8-
from ... import models
94
from . import _populate_utils as utils
5+
from ... import models
6+
7+
get_model = apps.get_model
108

119

1210
class Command(BaseCommand):
@@ -23,12 +21,6 @@ class Command(BaseCommand):
2321
EXISTING_HISTORY_FOUND = "Existing history found, skipping model"
2422
INVALID_MODEL_ARG = "An invalid model was specified"
2523

26-
if hasattr(BaseCommand, 'option_list'): # Django < 1.8
27-
option_list = BaseCommand.option_list + (
28-
make_option('--auto', action='store_true', dest='auto', default=False),
29-
make_option('--batchsize', action='store', dest='batchsize', default=200, type=int),
30-
)
31-
3224
def add_arguments(self, parser):
3325
super(Command, self).add_arguments(parser)
3426
parser.add_argument('models', nargs='*', type=str)

simple_history/manager.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ def get_queryset(self):
3333
key_name = self.instance._meta.pk.name
3434
return self.get_super_queryset().filter(**{key_name: self.instance.pk})
3535

36-
get_query_set = get_queryset
37-
3836
def most_recent(self):
3937
"""
4038
Returns the most recent copy of the instance available in the history.

simple_history/tests/tests/test_models.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -519,18 +519,12 @@ def test_invalid_bases(self):
519519

520520
def test_import_related(self):
521521
field_object = HistoricalChoice._meta.get_field('poll')
522-
try:
523-
related_model = field_object.rel.related_model
524-
except AttributeError: # Django<1.8
525-
related_model = field_object.related.model
522+
related_model = field_object.rel.related_model
526523
self.assertEqual(related_model, HistoricalChoice)
527524

528525
def test_string_related(self):
529526
field_object = HistoricalState._meta.get_field('library')
530-
try:
531-
related_model = field_object.rel.related_model
532-
except AttributeError: # Django<1.8
533-
related_model = field_object.related.model
527+
related_model = field_object.rel.related_model
534528
self.assertEqual(related_model, HistoricalState)
535529

536530
def test_state_serialization_of_customfk(self):

tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[tox]
22
envlist =
3-
py{27,34,35}-django18,
43
py{27,34,35}-django19,
54
py{27,34,35,36}-django110,
65
py{27,34,35,36}-django111,
@@ -29,7 +28,6 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
2928
[testenv]
3029
deps =
3130
coverage
32-
django18: Django>=1.8,<1.9
3331
django19: Django>=1.9,<1.10
3432
django110: Django>=1.10,<1.11
3533
django111: Django>=1.11,<1.12

0 commit comments

Comments
 (0)