Skip to content

Commit 07ac1f1

Browse files
committed
Only run migration state test in 1.7 or greater
1 parent 9793a5e commit 07ac1f1

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

setup.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
from setuptools import setup
22
import simple_history
33

4+
tests_require = ["Django>=1.4", "webtest==2.0.6", "django-webtest==1.7"]
5+
try:
6+
from unittest import skipUnless
7+
except ImportError: # Python 2.6 compatibility
8+
tests_require.append("unittest2")
9+
410
setup(
511
name='django-simple-history',
612
version=simple_history.__version__,
@@ -27,7 +33,7 @@
2733
'Programming Language :: Python :: 3.3',
2834
"License :: OSI Approved :: BSD License",
2935
],
30-
tests_require=["Django>=1.4", "webtest==2.0.6", "django-webtest==1.7"],
36+
tests_require=tests_require,
3137
include_package_data=True,
3238
test_suite='runtests.main',
3339
)

simple_history/tests/tests/test_models.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
from __future__ import unicode_literals
22

33
from datetime import datetime, timedelta
4+
try:
5+
from unittest import skipUnless
6+
except ImportError:
7+
from unittest2 import skipUnless
48

9+
import django
510
try:
611
from django.contrib.auth import get_user_model
712
User = get_user_model()
813
except ImportError: # django 1.4 compatibility
914
from django.contrib.auth.models import User
1015
from django.db.models.loading import get_model
11-
from django.db.migrations import state
1216
from django.test import TestCase
1317
from django.core.files.base import ContentFile
1418

@@ -471,5 +475,7 @@ def test_string_related(self):
471475
field_object = HistoricalState._meta.get_field_by_name('library_id')[0]
472476
self.assertEqual(field_object.related.model, State)
473477

478+
@skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
474479
def test_state_serialization_of_customfk(self):
480+
from django.db.migrations import state
475481
state.ModelState.from_model(HistoricalCustomFKError)

0 commit comments

Comments
 (0)