pycrypto back to extras.

Fixes 68

CHANGELOG.md

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

README.md

@@ -33,7 +33,11 @@ Install _jrnl_ using pip:
 
     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
     cd jrnl

jrnl/__init__.py

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

setup.py

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