Update dependencies and lock versions on keyring and cryptography. Fixes #407

This commit is contained in:
Manuel Ebert 2016-02-10 10:24:52 -08:00
parent 452d99f835
commit 285c219bed

View file

@ -80,13 +80,13 @@ setup(
description="A command line journal application that stores your journal in a plain text file", description="A command line journal application that stores your journal in a plain text file",
packages=['jrnl', 'jrnl.plugins'], packages=['jrnl', 'jrnl.plugins'],
install_requires=[ install_requires=[
"parsedatetime>=1.2", "parsedatetime>=1.5",
"pytz>=2013b", "pytz>=2015.7",
"six>=1.7.4", "six>=1.10.0",
"cryptography>=0.8.1", "cryptography==1.2.2",
"tzlocal>=1.1", "tzlocal>=1.2",
"pyyaml>=3.11", "pyyaml>=3.11",
"keyring>=3.3", "keyring==7.3",
"passlib>=1.6.2", "passlib>=1.6.2",
"pyxdg>=0.25", "pyxdg>=0.25",
] + [p for p, cond in conditional_dependencies.items() if cond], ] + [p for p, cond in conditional_dependencies.items() if cond],