From 99b5d7821d44ed2c3fd4d6e0bbdaa700d6a86912 Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Sun, 26 Jan 2014 12:37:41 +0100 Subject: [PATCH] Upgrade to parsedatetime 1.2 --- CHANGELOG.md | 1 + jrnl/Journal.py | 2 +- jrnl/__init__.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e43f5c7a..ae6079b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changelog ### 1.7 (December 22, 2013) +* __1.7.8__ Upgrade to parsedatetime 1.2 * __1.7.7__ Cleaned up imports, better unicode support * __1.7.6__ Python 3 port for slugify * __1.7.5__ Colorama is only needed on windows. Smaller fixes diff --git a/jrnl/Journal.py b/jrnl/Journal.py index aa34139f..32fb8b20 100644 --- a/jrnl/Journal.py +++ b/jrnl/Journal.py @@ -7,7 +7,7 @@ from . import util import codecs import os try: import parsedatetime.parsedatetime_consts as pdt -except ImportError: import parsedatetime.parsedatetime as pdt +except ImportError: import parsedatetime as pdt import re from datetime import datetime import dateutil diff --git a/jrnl/__init__.py b/jrnl/__init__.py index 12d92e04..f4143c27 100644 --- a/jrnl/__init__.py +++ b/jrnl/__init__.py @@ -8,7 +8,7 @@ jrnl is a simple journal application for your command line. from __future__ import absolute_import __title__ = 'jrnl' -__version__ = '1.7.7' +__version__ = '1.7.8' __author__ = 'Manuel Ebert' __license__ = 'MIT License' __copyright__ = 'Copyright 2013 - 2014 Manuel Ebert' diff --git a/requirements.txt b/requirements.txt index 211675e6..1981d62c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -parsedatetime >= 1.1.2 +parsedatetime >= 1.2 pytz >= 2013b pycrypto >= 2.6 argparse==1.2.1 diff --git a/setup.py b/setup.py index def31310..27209fdb 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ setup( description = "A command line journal application that stores your journal in a plain text file", packages = ['jrnl'], install_requires = [ - "parsedatetime>=1.1.2", + "parsedatetime>=1.2", "pytz>=2013b", "tzlocal==1.0", "keyring>=3.3",