Bump to 0.2v0.2

2 files changed, 18 insertions, 13 deletions

diff --git a/jrnl.py b/jrnl.py
index 163fa05d..603ed1d0 100755
--- a/jrnl.py
+++ b/jrnl.py
@@ -13,7 +13,7 @@ try: import simplejson as json
 except ImportError: import json
 import sys
 import readline, glob
-from ` import AES
+from Crypto.Cipher import AES
 from Crypto.Random import random, atfork
 import hashlib
 import getpass
diff --git a/setup.py b/setup.py
index 9b3df11f..4227c6e6 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import os.path
 import sys
 
-install_requires = ["parsedatetime", "pycrypto"]
+install_requires = ["parsedatetime", "pycrypto", "hashlib"]
 if sys.version_info < (2, 6):
     install_requires.append("simplejson")
 
@@ -10,29 +10,34 @@ base_dir = os.path.dirname(os.path.abspath(__file__))
 
 setup(
     name = "jrnl",
-    version = "0.1.1",
+    version = "0.2.0",
     description = "A command line journal application that stores your journal in a plain text file",
 
     packages = find_packages(),
     scripts = ['jrnl.py'],
     install_requires = install_requires,
 
-    package_data = {
-        # If any package contains *.txt or *.rst files, include them:
-        '': ['*.txt', '*.rst'],
-        # And include any *.msg files found in the 'hello' package, too:
-        'hello': ['*.msg'],
-    },
-
-    long_description="\n\n".join([
+    long_description="\n".join([
         open(os.path.join(base_dir, "README.md"), "r").read(),
         open(os.path.join(base_dir, "CHANGELOG.md"), "r").read()
     ]),
-
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: End Users/Desktop',
+        'License :: Freely Distributable',
+        'License :: OSI Approved :: MIT License',
+        'Natural Language :: English',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Office/Business :: News/Diary',
+        'Topic :: Text Processing'
+    ],
     # metadata for upload to PyPI
     author = "Manuel Ebert",
     author_email = "manuel.ebert@upf.edu",
-    license = "MIT",
+    license = "MIT License",
     keywords = "journal todo todo.txt jrnl".split(),
     url = "http://maebert.github.com/jrnl",   # project home page, if any
 )
\ No newline at end of file