added requirements.txt to manifest. deprecated jinja2_renderer.

knowsuchagency · Jun 26, 2017 · 8d92bae · 8d92bae
1 parent d023131
commit 8d92bae
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,7 +3,7 @@ include CONTRIBUTING.rst
 include HISTORY.rst
 include LICENSE
 include README.rst
-include package.json
+include requirements.txt
 
 graft ninjadog
 

diff --git a/ninjadog/ext/jinja2.py b/ninjadog/ext/jinja2.py
@@ -53,8 +53,8 @@ def jinja2_renderer(string: str = '',
     Returns: html string
 
     """
-    warnings.warn("\nThis function will be deprecated in the upcoming minor version " \
-                  "use ninjadog.render(... with_jinja=True) instead", PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("\nThis function is deprecated and will be removed in the upcoming minor version.\n" \
+                  "Please use ninjadog.render(... with_jinja=True) instead", DeprecationWarning, stacklevel=2)
     # lock arguments
     pug_renderer = partial(_render,
                            context=context,

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -14,3 +14,4 @@ sphinx-autodoc-typehints==1.2.0
 mypy==0.511
 wheel==0.29.0
 fabric3==1.13.1.post1
+tox-pyenv==1.0.3
diff --git a/tests/test_ninjadog.py b/tests/test_ninjadog.py
@@ -148,7 +148,7 @@ def test_jinja2_renderer_raises_pending_deprecation():
     import warnings
     from ninjadog import jinja2_renderer
     warnings.simplefilter('error')
-    with pytest.raises(PendingDeprecationWarning):
+    with pytest.raises(DeprecationWarning):
         jinja2_renderer('h1 foo')
 
 

diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py35, py36 flake8
+envlist = py36
 
 [travis]
 python =
-    3.5: py35
     3.6: py36
 
 [testenv:flake8]