From 285c219bed0425f5405d9c901d3aa1211c4fbe5b Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Wed, 10 Feb 2016 10:24:52 -0800 Subject: [PATCH] Update dependencies and lock versions on keyring and cryptography. Fixes #407 --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 39b45082..e01868ad 100644 --- a/setup.py +++ b/setup.py @@ -80,13 +80,13 @@ setup( description="A command line journal application that stores your journal in a plain text file", packages=['jrnl', 'jrnl.plugins'], install_requires=[ - "parsedatetime>=1.2", - "pytz>=2013b", - "six>=1.7.4", - "cryptography>=0.8.1", - "tzlocal>=1.1", + "parsedatetime>=1.5", + "pytz>=2015.7", + "six>=1.10.0", + "cryptography==1.2.2", + "tzlocal>=1.2", "pyyaml>=3.11", - "keyring>=3.3", + "keyring==7.3", "passlib>=1.6.2", "pyxdg>=0.25", ] + [p for p, cond in conditional_dependencies.items() if cond],