Merge pull request romgar#128 from hsmett/hsmett/tox

romgar · web-flow · commit 0dbec2ea486b · 2018-04-05T11:57:01.000+01:00
Python-Django matrix &amp; Django 2.0 support
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,44 @@
 language: python
 
-python:
-  - 2.7
-  - 3.5
-
-env:
-  - TOXENV=django18
-  - TOXENV=django19
-  - TOXENV=django110
-  - TOXENV=coverage
-  - TOXENV=postgresql
-  - TOXENV=flake8
+matrix:
+  include:
+    # Python version is just for the look on travis.
+    - python: 2.7
+      env: TOXENV=py27-django18
+    - python: 2.7
+      env: TOXENV=py27-django19
+    - python: 2.7
+      env: TOXENV=py27-django110
+    - python: 2.7
+      env: TOXENV=py27-django111
+    - python: 3.4
+      env: TOXENV=py34-django18
+    - python: 3.4
+      env: TOXENV=py34-django19
+    - python: 3.4
+      env: TOXENV=py34-django110
+    - python: 3.4
+      env: TOXENV=py34-django111
+    - python: 3.5
+      env: TOXENV=py35-django18
+    - python: 3.5
+      env: TOXENV=py35-django19
+    - python: 3.5
+      env: TOXENV=py35-django110
+    - python: 3.5
+      env: TOXENV=py35-django111
+    - python: 3.6
+      env: TOXENV=py36-django111
+    - python: 3.6
+      env: TOXENV=py36-django20
+    - python: 2.7
+      env: TOXENV=py27-flake8
+    - python: 3.6
+      env: TOXENV=py36-flake8
+    - python: 3.6
+      env: TOXENV=py36-django111-coverage
+    - python: 3.6
+      env: TOXENV=py36-django111-postgresql
 
 services:
   - postgresql
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -6,6 +6,11 @@ ChangeLog
 master (unreleased)
 -------------------
 
+*New:*
+    - Test against the whole Python-Django matrix with Tox & Travis
+
+*Bugfix:*
+    - Fix tests for Django 2.0
 
 .. _v1.3.1:
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 Django>=1.8
-pytz>=2015.7
+pytz>=2015.7
diff --git a/tests-requirements.txt b/tests-requirements.txt
@@ -0,0 +1,4 @@
+pytest==3.0.6
+pytest-django==3.1.2
+jsonfield==1.0.3
+pytz
diff --git a/tests/models.py b/tests/models.py
@@ -18,16 +18,16 @@ class TestModelWithDecimalField(DirtyFieldsMixin, models.Model):
 
 
 class TestModelWithForeignKey(DirtyFieldsMixin, models.Model):
-    fkey = models.ForeignKey(TestModel)
+    fkey = models.ForeignKey(TestModel, on_delete=models.CASCADE)
 
 
 class TestMixedFieldsModel(DirtyFieldsMixin, models.Model):
-    fkey = models.ForeignKey(TestModel)
+    fkey = models.ForeignKey(TestModel, on_delete=models.CASCADE)
     characters = models.CharField(blank=True, max_length=80)
 
 
 class TestModelWithOneToOneField(DirtyFieldsMixin, models.Model):
-    o2o = models.OneToOneField(TestModel)
+    o2o = models.OneToOneField(TestModel, on_delete=models.CASCADE)
 
 
 class TestModelWithNonEditableFields(DirtyFieldsMixin, models.Model):
@@ -38,7 +38,7 @@ class TestModelWithNonEditableFields(DirtyFieldsMixin, models.Model):
 
 
 class TestModelWithSelfForeignKey(DirtyFieldsMixin, models.Model):
-    fkey = models.ForeignKey("self", blank=True, null=True)
+    fkey = models.ForeignKey("self", blank=True, null=True, on_delete=models.CASCADE)
 
 
 class OrdinaryTestModel(models.Model):
@@ -47,7 +47,7 @@ class OrdinaryTestModel(models.Model):
 
 
 class OrdinaryTestModelWithForeignKey(models.Model):
-    fkey = models.ForeignKey(OrdinaryTestModel)
+    fkey = models.ForeignKey(OrdinaryTestModel, on_delete=models.CASCADE)
 
 
 class SubclassModel(TestModel):
@@ -108,8 +108,9 @@ class TestModelWithoutM2MCheck(DirtyFieldsMixin, models.Model):
 
 
 class TestDoubleForeignKeyModel(DirtyFieldsMixin, models.Model):
-    fkey1 = models.ForeignKey(TestModel)
-    fkey2 = models.ForeignKey(TestModel, null=True, related_name='fkey2')
+    fkey1 = models.ForeignKey(TestModel, on_delete=models.CASCADE)
+    fkey2 = models.ForeignKey(TestModel, null=True, related_name='fkey2',
+                              on_delete=models.CASCADE)
 
 
 if is_postgresql_env_with_json_field():
@@ -128,7 +129,8 @@ class TestModelWithSpecifiedFields(DirtyFieldsMixin, models.Model):
 class TestModelWithSpecifiedFieldsAndForeignKey(DirtyFieldsMixin, models.Model):
     boolean1 = models.BooleanField(default=True)
     boolean2 = models.BooleanField(default=True)
-    fk_field = models.OneToOneField(TestModel, null=True)
+    fk_field = models.OneToOneField(TestModel, null=True,
+                                    on_delete=models.CASCADE)
     FIELDS_TO_CHECK = ['fk_field_id']
 
 
diff --git a/tox.ini b/tox.ini
@@ -1,66 +1,64 @@
 [tox]
+skipsdist = True
 envlist =
-    django18
-    django19
-    django110
-    django111
-    coverage
-    postgresql
-    flake8
-
-[flake8]
-ignore = E501
+    py{27,34,35}-django{18,19,110,111}
+    py36-django{111,20}
+    py{27,36}-flake8
+    py36-django111-coverage
+    py36-django111-postgresql
 
 [testenv]
+usedevelop = True
+pip_pre = False
 setenv =
     PYTHONPATH = {toxinidir}
+deps =
+    -rtests-requirements.txt
+    django18: Django>=1.8,<1.8.99
+    django19: Django>=1.9,<1.9.99
+    django110: Django>=1.10,<1.10.99
+    django111: Django>=1.11,<1.11.99
+    django20: Django>=2.0,<2.0.99
 commands =
+    python --version
+    pip freeze -l
     py.test --ds=tests.django_settings -v
-deps =
-    pytest==3.0.6
-    pytest-django==3.1.2
-    jsonfield==1.0.3
-    pytz
-
-[testenv:django18]
-deps =
-    django>=1.8,<1.8.99
-    {[testenv]deps}
-
-[testenv:django19]
-deps =
-    django>=1.9,<1.9.99
-    {[testenv]deps}
 
-[testenv:django110]
-deps =
-    django>=1.10,<1.10.99
-    {[testenv]deps}
+[flake8]
+ignore = E501
 
-[testenv:django111]
-deps =
-    django>=1.11,<1.11.99
-    {[testenv]deps}
+[testenv:py27-flake8]
+basepython = python2.7
+deps = flake8
+commands =
+    python --version
+    flake8 src tests
 
-[testenv:postgresql]
-setenv =
-    PYTHONPATH = {toxinidir}
+[testenv:py36-flake8]
+basepython = python3.6
+deps = flake8
 commands =
-    py.test --ds=tests.postgresql_django_settings -v
+    python --version
+    flake8 src tests
+
+[testenv:py36-django111-postgresql]
+basepython = python3.6
 deps =
-    django>=1.11,<1.11.99
+    -rtests-requirements.txt
     psycopg2
-    {[testenv]deps}
 passenv=POSTGRES_NAME POSTGRES_USER POSTGRES_PASSWORD
+commands =
+    python --version
+    pip freeze -l
+    py.test --ds=tests.postgresql_django_settings -v
 
-[testenv:coverage]
-commands = coverage run --source dirtyfields -m py.test --ds=tests.django_settings
+[testenv:py36-django111-coverage]
+basepython = python3.6
 deps =
+    -rtests-requirements.txt
     coverage
-    {[testenv:django110]deps}
-
-[testenv:flake8]
-deps = flake8
 commands =
     python --version
-    flake8 src tests
+    pip freeze -l
+    coverage run --branch --source dirtyfields -m py.test --ds=tests.django_settings
+    coverage report -m

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Django>=1.8`
`2`		`-pytz>=2015.7`
	`2`	`+pytz>=2015.7`