Merge branch 'develop' for opting out git-flow

.travis.yml

@@ -1,8 +1,9 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
+  - "3.6"
   - "pypy"
 install:
   - "pip install -U setuptools pip"

docs/requirements.in

@@ -0,0 +1,4 @@
+sphinx
+sphinx-kr-theme
+
+jinja2>=2.8.1  # CVE-2016-10745 and CVE-2019-10906

docs/requirements.txt

@@ -1,6 +1,12 @@
-docutils==0.12
-Jinja2==2.7.3
-MarkupSafe==0.23
-Pygments==2.0.2
-Sphinx==1.2.3
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements.in
+#
+docutils==0.12            # via sphinx
+jinja2==2.10.1
+markupsafe==0.23          # via jinja2
+pygments==2.0.2           # via sphinx
 sphinx-kr-theme==0.2.1
+sphinx==1.2.3

setup.cfg

@@ -1,6 +1,7 @@
-[pytest]
-addopts = --pep8 --cov flask_docker.py
-pep8ignore =
-    docs/conf.py ALL
 [bdist_wheel]
 universal = 1
+
+[tool:pytest]
+addopts = --pep8 --cov flask_docker
+pep8ignore =
+    docs/conf.py ALL

tests/test_factory.py

@@ -32,11 +32,11 @@ def test_out_of_context():
     # but if we...
     with raises(RuntimeError) as error:
         docker.app.name
-    assert error.value.args[0] == 'working outside of application context'
+    assert 'outside of application context' in error.value.args[0]
 
     with raises(RuntimeError) as error:
         docker.client
-    assert error.value.args[0] == 'working outside of application context'
+    assert 'outside of application context' in error.value.args[0]
 
 
 def test_url_missing(app):

tox.ini

@@ -1,6 +1,11 @@
 [tox]
-envlist = py27,py33,py34,pypy,docs
+envlist = py27,py34,py35,py36,py37,pypy,docs
+
 [testenv]
+# Fit for the bad design of Python 3.x
+setenv =
+    LC_ALL=C.UTF-8
+    LANG=C.UTF-8
 deps =
     setuptools>=12.0
     pytest
@@ -10,6 +15,7 @@ deps =
     responses
 commands =
     py.test
+
 [testenv:docs]
 changedir = docs
 deps =