Merge branch 'develop'

Author: robgolding

README.rst

@@ -1,11 +1,11 @@
 tasklib
 =======
 
-.. image:: https://travis-ci.org/robgolding63/tasklib.png?branch=develop
-    :target: http://travis-ci.org/robgolding63/tasklib
+.. image:: https://travis-ci.org/robgolding/tasklib.png?branch=develop
+    :target: http://travis-ci.org/robgolding/tasklib
 
-.. image:: https://coveralls.io/repos/robgolding63/tasklib/badge.png?branch=develop
-    :target: https://coveralls.io/r/robgolding63/tasklib?branch=develop
+.. image:: https://coveralls.io/repos/robgolding/tasklib/badge.png?branch=develop
+    :target: https://coveralls.io/r/robgolding/tasklib?branch=develop
 
 tasklib is a Python library for interacting with taskwarrior_ databases, using
 a queryset API similar to that of Django's ORM.

docs/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.0'
+version = '2.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.0'
+release = '2.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -2,7 +2,7 @@
 
 install_requirements = ['pytz', 'tzlocal']
 
-version = '2.2.1'
+version = '2.3.0'
 
 try:
     import importlib
@@ -17,8 +17,8 @@
     author='Rob Golding',
     author_email='[email protected]',
     license='BSD',
-    url='https://github.com/robgolding63/tasklib',
-    download_url='https://github.com/robgolding63/tasklib/downloads',
+    url='https://github.com/robgolding/tasklib',
+    download_url='https://github.com/robgolding/tasklib/downloads',
     packages=find_packages(),
     include_package_data=True,
     test_suite='tasklib.tests',

tasklib/__init__.py

@@ -2,4 +2,4 @@
 from .task import Task
 from .serializing import local_zone
 
-__version__ = '2.2.1'
+__version__ = '2.3.0'

tasklib/tests.py

@@ -1229,13 +1229,22 @@ def test_simple_eoy_conversion(self):
         t = Task(self.tw, description='test task', due='eoy')
         now = local_zone.localize(datetime.datetime.now())
         eoy = local_zone.localize(datetime.datetime(
-            year=now.year,
-            month=12,
-            day=31,
-            hour=23,
-            minute=59,
-            second=59,
+            year=now.year+1,
+            month=1,
+            day=1,
+            hour=0,
+            minute=0,
+            second=0,
             ))
+        if self.tw.version < '2.5.2':
+            eoy = local_zone.localize(datetime.datetime(
+                year=now.year,
+                month=12,
+                day=31,
+                hour=23,
+                minute=59,
+                second=59,
+                ))
         self.assertEqual(eoy, t['due'])
 
     def test_complex_eoy_conversion(self):
@@ -1251,14 +1260,25 @@ def test_complex_eoy_conversion(self):
         now = local_zone.localize(datetime.datetime.now())
         due_date = local_zone.localize(
             datetime.datetime(
-                year=now.year,
-                month=12,
-                day=31,
-                hour=23,
-                minute=59,
-                second=59,
+                year=now.year+1,
+                month=1,
+                day=1,
+                hour=0,
+                minute=0,
+                second=0,
             )
         ) - datetime.timedelta(0, 4 * 30 * 86400)
+        if self.tw.version < '2.5.2':
+            due_date = local_zone.localize(
+                datetime.datetime(
+                    year=now.year,
+                    month=12,
+                    day=31,
+                    hour=23,
+                    minute=59,
+                    second=59,
+                )
+            ) - datetime.timedelta(0, 4 * 30 * 86400)
         self.assertEqual(due_date, t['due'])
 
     def test_filtering_with_string_datetime(self):