File tree Expand file tree Collapse file tree 2 files changed +14
-2
lines changed
simple_history/tests/tests Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change 1
1
from setuptools import setup
2
2
import simple_history
3
3
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
+
4
10
setup (
5
11
name = 'django-simple-history' ,
6
12
version = simple_history .__version__ ,
27
33
'Programming Language :: Python :: 3.3' ,
28
34
"License :: OSI Approved :: BSD License" ,
29
35
],
30
- tests_require = [ "Django>=1.4" , "webtest==2.0.6" , "django-webtest==1.7" ] ,
36
+ tests_require = tests_require ,
31
37
include_package_data = True ,
32
38
test_suite = 'runtests.main' ,
33
39
)
Original file line number Diff line number Diff line change 1
1
from __future__ import unicode_literals
2
2
3
3
from datetime import datetime , timedelta
4
+ try :
5
+ from unittest import skipUnless
6
+ except ImportError :
7
+ from unittest2 import skipUnless
4
8
9
+ import django
5
10
try :
6
11
from django .contrib .auth import get_user_model
7
12
User = get_user_model ()
8
13
except ImportError : # django 1.4 compatibility
9
14
from django .contrib .auth .models import User
10
15
from django .db .models .loading import get_model
11
- from django .db .migrations import state
12
16
from django .test import TestCase
13
17
from django .core .files .base import ContentFile
14
18
@@ -471,5 +475,7 @@ def test_string_related(self):
471
475
field_object = HistoricalState ._meta .get_field_by_name ('library_id' )[0 ]
472
476
self .assertEqual (field_object .related .model , State )
473
477
478
+ @skipUnless (django .get_version () >= "1.7" , "Requires 1.7 migrations" )
474
479
def test_state_serialization_of_customfk (self ):
480
+ from django .db .migrations import state
475
481
state .ModelState .from_model (HistoricalCustomFKError )
You can’t perform that action at this time.
0 commit comments