Packaging updates

.travis.yml

@@ -1,16 +1,26 @@
 language: python
 sudo: false
 
+matrix:
+  include:
+  - python: 3.6
+    env: TOXENV=lint
+  - python: 3.6
+    env: TOXENV=docs
+  - python: 2.7
+    env: TOXENV=py27
+  - python: 3.4
+    env: TOXENV=py34
+  - python: 3.5
+    env: TOXENV=py35
+  - python: 3.6
+    env: TOXENV=py36
+
 install:
 - pip install tox coveralls
 
 script: tox -v
 
-env:
-- TOXENV=lint
-- TOXENV=py27
-- TOXENV=py34
-
 after_success:
 - coveralls
 

README.rst

@@ -31,11 +31,11 @@ The default configuration:
    <https://msdn.microsoft.com/library/jj542450(v=vs.85).aspx>`_ to prevent
    file downloads opening for IE >= 8.
 -  Sets a strict `Content Security
-   Policy <https://developer.mozilla.org/en-US/docs/Web/Security/CSP/Introducing_Content_Security_Policy>`_
+   Policy <https://developer.mozilla.org/en-US/docs/Web/Security/CSP/Introducing_Content_Security_Policy>`__
    of ``default-src: 'self'``. This is intended to almost completely
    prevent Cross Site Scripting (XSS) attacks. This is probably the only
-   setting that you should reasonably change. See the `section
-   below <#content-security-policy>`_ on configuring this.
+   setting that you should reasonably change. See the
+   `Content Security Policy`_ section.
 
 In addition to Talisman, you **should always use a cross-site request
 forgery (CSRF) library**. It's highly recommended to use
@@ -86,7 +86,7 @@ Options
 -  ``strict_transport_security_include_subdomains``, default ``True``,
    whether subdomains should also use HSTS.
 -  ``content_security_policy``, default ``default-src: 'self'``, see the
-   `section below <#content-security-policy>`_.
+   `Content Security Policy`_ section.
 -  ``content_security_policy_report_only``, default ``False``, whether to set
    the CSP header as "report-only" (as `Content-Security-Policy-Report-Only`)
    to ease deployment by disabling the policy enforcement by the browser,

setup.py

@@ -36,7 +36,7 @@
     license='Apache Software License',
 
     classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 4 - Beta',
 
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries :: Python Modules',
@@ -49,6 +49,7 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
 
         'Operating System :: POSIX',
         'Operating System :: MacOS',

tox.ini

@@ -1,23 +1,23 @@
 [tox]
-skipsdist = True
-envlist = py27,py34,lint
+envlist = py27,py34,py35,py36,lint
 
 [testenv]
-basepython = python2.7
 deps =
-  -rrequirements-dev.txt
+  flask
+  mock
+  pytest
+  pytest-cov
 commands =
-  nosetests \
-    --with-coverage \
-    --cover-package flask_talisman \
-    {posargs}
-
-[testenv:py34]
-basepython = python3.4
+  py.test --cov=flask_talisman --cov-report= {posargs}
+  coverage report --show-missing --fail-under=100
 
 [testenv:lint]
+basepython = python3.6
 deps =
+  docutils
+  pygments
   flake8
   flake8-import-order
 commands =
+  python setup.py check --metadata --restructuredtext --strict
   flake8 --import-order-style=google flask_talisman