fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pycrypto back to extras.

Browse source 
Fixes 68
This commit is contained in:
Manuel Ebert 2013-04-22 09:58:45 +02:00
parent 2790f250e6
commit 56a9c0bbcc
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -10,7 +10,6 @@ Changelog
### 1.0.3 (April 17, 2013) ### 1.0.3 (April 17, 2013)
* [Improved] Installs pycrypto by default
* [Improved] Removed clint in favour of colorama * [Improved] Removed clint in favour of colorama
* [Fixed] Fixed a bug where showing tags failed when no tags are defined. * [Fixed] Fixed a bug where showing tags failed when no tags are defined.
* [Fixed] Improvements to config parsing (Thanks [alapolloni](https://github.com/alapolloni)) * [Fixed] Improvements to config parsing (Thanks [alapolloni](https://github.com/alapolloni))

6
README.md
View file

@ -33,7 +33,11 @@ Install _jrnl_ using pip:
pip install jrnl pip install jrnl
Alternatively, install manually by cloning the repository: Or, if you want the option to encrypt your journal,
pip install jrnl[encrypted]
To install `pycrypto` as well (Note: this requires a `gcc` compiler. You can also [install PyCyrypto manually](https://www.dlitz.net/software/pycrypto/) first)). Alternatively, install _jrnl_ manually by cloning the repository:
git clone git://github.com/maebert/jrnl.git git clone git://github.com/maebert/jrnl.git
cd jrnl cd jrnl

2
jrnl/__init__.py
View file

@ -7,7 +7,7 @@ jrnl is a simple journal application for your command line.
""" """
__title__ = 'jrnl' __title__ = 'jrnl'
__version__ = '1.0.3' __version__ = '1.0.4'
__author__ = 'Manuel Ebert' __author__ = 'Manuel Ebert'
__license__ = 'MIT License' __license__ = 'MIT License'
__copyright__ = 'Copyright 2013 Manuel Ebert' __copyright__ = 'Copyright 2013 Manuel Ebert'

6
setup.py
View file

@ -70,9 +70,11 @@ setup(
packages = ['jrnl'], packages = ['jrnl'],
install_requires = [ install_requires = [
"parsedatetime>=1.1.2", "parsedatetime>=1.1.2",
"colorama>=0.2.5", "colorama>=0.2.5"
"pycrypto>=2.6"
] + [p for p, cond in conditional_dependencies.items() if cond], ] + [p for p, cond in conditional_dependencies.items() if cond],
extras_require = {
"encrypted": "pycrypto>=2.6"
},
long_description=__doc__, long_description=__doc__,
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [