Merge branch 'release-0.1.3'

HISTORY.rst

@@ -0,0 +1,39 @@
+Release History
+---------------
+
+0.1.3 (2015-05-13)
+++++++++++++++++++
+
+**Features and Improvements**
+
+- Fixture loading. You can now load your fixtures by setting :code:`context.fixtures`.
+- behave-django now supports all versions of Django
+
+**Bugfixes**
+
+- The behave command should not correctly return non-zero exit codes when a test fails.
+
+0.1.2 (2015-05-13)
+++++++++++++++++++
+
+**Features and Improvements**
+
+- You can now have a :code:`.behaverc` in your project's root directory. You can specify where your feature directories are in this file, among other things. See the `behave docs on configuration files <https://pythonhosted.org/behave/behave.html#configuration-files>`__.
+- Removed BEHAVE\_FEATURES setting in favor of using behave's configuration file
+
+0.1.1 (2015-05-13)
+++++++++++++++++++
+
+**Features and Improvements**
+
+- Behave management command now accepts behave command line arguments
+- BEHAVE\_FEATURES settings added for multiple feature directories
+
+**Bugfixes**
+
+- Removed test apps and projects from the release package
+
+0.1.0 (2015-05-13)
+++++++++++++++++++
+
+-  Initial release

README.rst

@@ -14,6 +14,7 @@ Features
 -  Use unittest + Django assert library
 -  Use behave's command line arguments
 -  Use behave's configuration file
+-  Fixture loading
 
 Getting started
 ---------------
@@ -23,33 +24,19 @@ Getting started
 Support
 -------
 
-behave-django is tested on Django 1.7.7 and 1.8 on Python 2.7, 3.3 and 3.4. However, it may work with other setups.
+behave-django is tested on:
 
-Contributing
-------------
-
-`Read the quick contributing guide <CONTRIBUTING.md>`__
-
-Changelog
----------
+Django 1.4.20, 1.5.12, 1.6.11, 1.7.7, 1.8
 
-0.1.2
-^^^^^
+Python 2.6, 2.7, 3.3, 3.4
 
--  FEATURE: You can now have a :code:`.behaverc` in your project's root directory. You can specify where your feature directories are in this file, among other things. See the `behave docs on configuration files <https://pythonhosted.org/behave/behave.html#configuration-files>`__.
--  FEATURE: Removed BEHAVE\_FEATURES setting in favor of using behave's configuration file
+It should work on everything, basically.
 
-0.1.1
-^^^^^
-
--  FEATURE: Behave management command now accepts behave command line arguments
--  FEATURE: BEHAVE\_FEATURES settings added for multiple feature directories
--  BUGFIX: Removed test apps and projects from the release package
+Contributing
+------------
 
-0.1.0
-^^^^^
+`Read the quick contributing guide <CONTRIBUTING.md>`__
 
--  Initial release
 
 .. |Build Status| image:: https://travis-ci.org/mixxorz/behave-django.svg?branch=master
    :target: https://travis-ci.org/mixxorz/behave-django

behave_django/__init__.py

@@ -1 +1 @@
-# Release 0.1.2
+# Release 0.1.3

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='behave-django',
-    version='0.1.2',
+    version='0.1.3',
     packages=find_packages(exclude=['test*']),
     include_package_data=True,
     license='MIT License',