Merge pull request #47 from PamelaM/master

Update tox.ini to support 2.1dev djangotip and 2.0b1

Author: PamelaM

README.rst

@@ -14,7 +14,7 @@ A `coverage.py`_ plugin to measure the coverage of Django templates.
 
 Supported Python versions are 2.7, 3.4, 3.5 and 3.6.
 
-Supported Django versions are 1.8 through 1.11.
+Supported Django versions are 1.8 through 2.0b1.
 
 Supported coverage.py versions are 4.0 and higher.
 
@@ -49,18 +49,20 @@ template files are included in the report.
 Caveats
 ~~~~~~~
 
-Files included by the ``{% ssi %}`` tag are not included in the coverage
-measurements.
-
 Coverage.py can't tell whether a ``{% blocktrans %}`` tag used the singular or
 plural text, so both are marked as used if the tag is used.
 
 
 Changes
 ~~~~~~~
 
+v1.5.2 --- 2017-10-18
+----------------------
+
+Validates support for Django version 2.0b1. Improves discovery of template files.
+
 v1.5.1a --- 2017-04-05
----------------------
+----------------------
 
 Validates support for Django version 1.11. Testing for new package maintainer Pamela McA'Nulty
 

setup.py

@@ -22,7 +22,7 @@
 
 setup(
     name='django_coverage_plugin',
-    version='1.5.1a',
+    version='1.5.2',
     description='Django template coverage.py plugin',
     author='Ned Batchelder',
     author_email='[email protected]',

tests/test_extends.py

@@ -168,8 +168,10 @@ def test_ssi_unparsed(self):
         text = self.run_django_coverage(name="outer.html", context={'a': 17})
         self.assertEqual(text, "First\nInside {{ a }}\nJob\n\nLast\n")
         self.assert_analysis([1, 2, 3], name="outer.html")
-        # nested.html is not among the measured files:
-        self.assertEqual(self.measured_files(), ["templates/outer.html"])
+        self.assertEqual(
+            set(self.measured_files()),
+            set(["templates/outer.html", "templates/nested.html"])
+        )
 
     def test_ssi_parsed(self):
         nested = self.make_template(name="nested.html", text="""\
@@ -186,5 +188,7 @@ def test_ssi_parsed(self):
         text = self.run_django_coverage(name="outer.html", context={'a': 17})
         self.assertEqual(text, "First\nInside 17\nJob\n\nLast\n")
         self.assert_analysis([1, 2, 3], name="outer.html")
-        # nested.html is not among the measured files:
-        self.assertEqual(self.measured_files(), ["templates/outer.html"])
+        self.assertEqual(
+            set(self.measured_files()),
+            set(["templates/outer.html", "templates/nested.html"])
+        )

tox.ini

@@ -16,9 +16,9 @@
 # Don't test 'tip' on python27!
 envlist =
     py27-django{18,19,110,111,111tip},
-    py34-django{18,19,110,111,111tip,tip},
-    py35-django{18,19,110,111,111tip,tip},
-    py36-django{18,19,110,111,111tip,tip},
+    py34-django{18,19,110,111,111tip,20},
+    py35-django{18,19,110,111,111tip,20,tip},
+    py36-django{18,19,110,111,111tip,20,tip},
     check,doc
 
 [testenv]
@@ -29,6 +29,7 @@ deps =
     django110: Django >=1.10, <1.11
     django111: Django >=1.11, <2.0
     django111tip: https://github.com/django/django/archive/stable/1.11.x.tar.gz
+    django20: Django>=2.0b1,<2.1
     djangotip: https://github.com/django/django/archive/master.tar.gz
 
 commands =