From ba6f7a43ba40bcbeb5f7e26c94f6988ffd93a8a3 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <maebert@uos.de>
Date: Wed, 17 Apr 2013 10:19:25 +0200
Subject: [PATCH] Makes PyCrypto an automatic install

---
 CHANGELOG.md | 1 +
 README.md    | 3 ++-
 setup.py     | 4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55ab9246..768d63bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Changelog
 
 ### 1.0.2 (April 17, 2013)
 
+* [Improved] Installs pycrypto by default
 * [Improved] Removed clint in favour of colorama
 ### 1.0.1 (March 12, 2013)
 
diff --git a/README.md b/README.md
index 55ef0d70..35d32bf5 100644
--- a/README.md
+++ b/README.md
@@ -222,4 +222,5 @@ Known Issues
 ------------
 
 - The Windows shell prior to Windows 7 has issues with unicode encoding. If you want to use non-ascii characters, change the codepage with `chcp 1252` before using `jrnl` (Thanks to Yves Pouplard for solving this!)
-- _jrnl_ relies on the `Crypto` package to encrypt journals, which has some known problems with installing within virtual environments.
+- _jrnl_ relies on the `PyCrypto` package to encrypt journals, which has some known problems with installing within virtual environments. If you want to install __jrnl__ within a virtual environment, you need to [install PyCyrypto manually](https://www.dlitz.net/software/pycrypto/) first.
+
diff --git a/setup.py b/setup.py
index eb1ac563..cdf8ee38 100644
--- a/setup.py
+++ b/setup.py
@@ -56,12 +56,10 @@ setup(
     version = "1.0.1",
     description = "A command line journal application that stores your journal in a plain text file",
     packages = ['jrnl'],
-    extras_require = {
-        'encryption': ["pycrypto"],
-    },
     install_requires = [
         "parsedatetime >= 1.1.2",
         "colorama >= 0.2.5",
+        "pycrypto >= 2.6"
         ],
     long_description=__doc__,
     entry_points={