Skip to content

Commit

Permalink
Merge branch 'develop' into deserialized-data-dict
Browse files Browse the repository at this point in the history
  • Loading branch information
robgolding committed Jan 11, 2015
2 parents 534403b + 847794a commit c847950
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
3 changes: 3 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
# 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.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages

version = '0.7.0-dev'
version = '0.7.0'

setup(
name='tasklib',
Expand Down

0 comments on commit c847950

Please sign in to comment.