Merge pull request #83 from nicoddemus/release-0.11.0

Release 0.11.0

Author: vitalk

README.rst

@@ -1,7 +1,7 @@
 pytest-flask
 ============
 
-|PyPI version| |PyPI downloads| |Documentation status|
+|PyPI version| |conda-forge version| |Python versions| |Documentation status|
 
 An extension of `pytest <http://pytest.org/>`__ test runner which
 provides a set of useful tools to simplify testing and development
@@ -14,7 +14,9 @@ the `PyPI <https://pypi.python.org/pypi/pytest-flask>`__ overview page or
 How to start?
 -------------
 
-Define your application fixture in ``conftest.py``::
+Define your application fixture in ``conftest.py``:
+
+.. code-block:: python
 
     from myapp import create_app
 
@@ -38,8 +40,12 @@ suggestion.
    :target: https://pypi.python.org/pypi/pytest-flask
    :alt: PyPi version
 
-.. |PyPI downloads| image:: https://img.shields.io/pypi/dm/pytest-flask.svg
-   :target: https://pypi.python.org/pypi/pytest-flask
+.. |conda-forge version| image:: https://img.shields.io/conda/vn/conda-forge/pytest-flask.svg
+   :target: https://anaconda.org/conda-forge/pytest-flask
+   :alt: conda-forge version
+
+.. |Python versions| image:: https://img.shields.io/pypi/pyversions/pytest-flask.svg
+   :target: https://pypi.org/project/pytest-flask
    :alt: PyPi downloads
 
 .. |Documentation status| image:: https://readthedocs.org/projects/pytest-flask/badge/?version=latest

docs/changelog.rst

@@ -3,8 +3,8 @@
 Changelog
 =========
 
-Upcoming release
------------------
+0.11.0 (compared to 0.10.0)
+---------------------------
 
 - Implement deployment using Travis, following in line with many other pytest plugins.