From 56a9c0bbccf3b8f484b9369679e244cc00563b72 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <maebert@uos.de>
Date: Mon, 22 Apr 2013 09:58:45 +0200
Subject: [PATCH] pycrypto back to extras.

Fixes 68
---
 CHANGELOG.md     | 1 -
 README.md        | 6 +++++-
 jrnl/__init__.py | 2 +-
 setup.py         | 6 ++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24dfbd6c..91fd3af6 100644
--- a/CHANGELOG.md
+++ b/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))
diff --git a/README.md b/README.md
index 3be408a8..e0bbfca3 100644
--- a/README.md
+++ b/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
diff --git a/jrnl/__init__.py b/jrnl/__init__.py
index ca93c1c9..bc168105 100644
--- a/jrnl/__init__.py
+++ b/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'
diff --git a/setup.py b/setup.py
index e9208c11..2b0bbd11 100644
--- a/setup.py
+++ b/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': [