Merge branch 'develop' into deserialized-data-dict

diff --git a/.travis.yml b/.travis.yml
index 519886b64a894436ca1fc0a54cfa190ce06b311e..6a1936e8bab30f2bacf7bda68a0efbb3f26b7ecf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ python:
   - "3.4"
 install:
   - pip install -e .
+  - pip install coveralls
   - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
   - sudo apt-get update -qq
   - sudo apt-get install -qq build-essential cmake uuid-dev g++-4.8
@@ -29,4 +30,6 @@ install:
 before_script:
   - cd $TRAVIS_BUILD_DIR
 script:
-  - python setup.py test
+  - coverage run --source=tasklib setup.py test
+after_success:
+  - coveralls

diff --git a/README.rst b/README.rst
index b0a3e3453971b7fdb147b26db04097dd28848232..ff25287dc08ad5ab280aa93eade6013f0ef6fc45 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -4,6 +4,9 @@ tasklib
 .. image:: https://travis-ci.org/robgolding63/tasklib.png
     :target: http://travis-ci.org/robgolding63/tasklib
 
+.. image:: https://coveralls.io/repos/robgolding63/tasklib/badge.png?branch=develop
+    :target: https://coveralls.io/r/robgolding63/tasklib?branch=develop
+
 tasklib is a Python library for interacting with taskwarrior_ databases, using
 a queryset API similar to that of Django's ORM.
 

diff --git a/docs/conf.py b/docs/conf.py
index d39bb9b60f970cd613c13d7832b65692c1af80b3..650efc95ec4b88f07569121a37df03f6a35b660c 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = u'2014, Rob Golding'
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.0-dev'
+version = '0.7.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.0-dev'
+release = '0.7.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
index a9b8b1123088346d96b278c5b35d4f95fb5ef54e..92f8e85a7d752a0f86aa27cdecec54330b7fa391 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.7.0-dev'
+version = '0.7.0'
 
 setup(
     name='tasklib',