From 6a4beca19330efa2b0fb44b62c1080ccc7b8145a Mon Sep 17 00:00:00 2001 From: seroy Date: Mon, 22 Jan 2018 01:10:12 +0300 Subject: [PATCH 1/2] fix tests on Django 2.0 --- tests/test_expressions.py | 2 +- tests/test_slug_fields.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_expressions.py b/tests/test_expressions.py index 8abc57a..79ce45f 100644 --- a/tests/test_expressions.py +++ b/tests/test_expressions.py @@ -32,7 +32,7 @@ class LocalizedExpressionsTestCase(TestCase): cls.TestModel2 = get_fake_model( { 'text': LocalizedField(), - 'other': models.ForeignKey(cls.TestModel1, related_name='features') + 'other': models.ForeignKey(cls.TestModel1, related_name='features', on_delete=models.CASCADE) } ) diff --git a/tests/test_slug_fields.py b/tests/test_slug_fields.py index 4d2d172..96b0772 100644 --- a/tests/test_slug_fields.py +++ b/tests/test_slug_fields.py @@ -175,7 +175,7 @@ class LocalizedSlugFieldTestCase(TestCase): model = get_fake_model( { 'title': LocalizedField(), - 'other': models.ForeignKey(model_fk), + 'other': models.ForeignKey(model_fk, on_delete=models.CASCADE), 'slug': LocalizedUniqueSlugField(populate_from=('title', 'other.name')) } ) From cd844fccecb05a8204f78941bc542887f28f4c19 Mon Sep 17 00:00:00 2001 From: Swen Kooij Date: Mon, 29 Jan 2018 13:34:40 +0200 Subject: [PATCH 2/2] Add support for tox to run tests against Django 1.X/2.0 --- .gitignore | 3 +++ .scrutinizer.yml | 2 +- requirements/test.txt | 2 +- tox.ini | 12 ++++++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 tox.ini diff --git a/.gitignore b/.gitignore index 654f3e7..bf2f15f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ dist/ # Ignore PyCharm .idea/ + +# Ignore tox environments +.tox/ diff --git a/.scrutinizer.yml b/.scrutinizer.yml index bb1d0ff..9b56ffa 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -28,7 +28,7 @@ build: - command: flake8 ./localized_fields/ - - command: coverage run manage.py test + command: tox coverage: file: '.coverage' format: 'py-cc' diff --git a/requirements/test.txt b/requirements/test.txt index 60c0ffa..d3b114c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,6 +1,5 @@ -r base.txt -Django==1.11.9 django-autoslug==1.9.3 django-bleach==0.3.0 django-coverage-plugin==1.3.1 @@ -14,3 +13,4 @@ django-coverage-plugin==1.3.1 flake8==3.5.0 pep8==1.7.1 dj-database-url==0.4.2 +tox==2.9.1 diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..a7f9784 --- /dev/null +++ b/tox.ini @@ -0,0 +1,12 @@ +[tox] +envlist = py35-dj{111,20} + +[testenv] +deps = + dj111: Django>=1.11,<1.12 + dj20: Django>=2.0,<2.1 + -rrequirements/test.txt +setenv = + DJANGO_SETTINGS_MODULE=settings +passenv = DATABASE_URL +commands = coverage run manage.py test