From 918a46a2fa9ec1de745ec9209204be1f6bab9cdc Mon Sep 17 00:00:00 2001
From: Manuel Ebert <maebert@uos.de>
Date: Fri, 14 Dec 2012 15:18:30 -0800
Subject: [PATCH] Fixes requirements and setup

---
 .travis.yml      | 2 +-
 requirements.txt | 2 ++
 setup.py         | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 requirements.txt

diff --git a/.travis.yml b/.travis.yml
index 4b53631b..bca86835 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,6 @@ language: python
 python:
   - "2.7"
   - "3.2"
-install: "pip install cling parsedatetime simplejson --use-mirrors"
+install: "pip install -r requirements.txt --use-mirrors"
 # command to run tests
 script: nosetests
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..04cd8ad4
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+clint >= 0.3.1
+parsedatetime >= 0.8.7
diff --git a/setup.py b/setup.py
index d8f49b14..21077ba2 100644
--- a/setup.py
+++ b/setup.py
@@ -56,10 +56,10 @@ setup(
     version = "0.3.0",
     description = "A command line journal application that stores your journal in a plain text file",
     packages = ['jrnl'],
-    install_requires = ["parsedatetime", "simplejson"],
+    install_requires = ["parsedatetime"],
     extras_require = {
         'encryption': ["pycrypto"],
-        'highlight':  ["cling"]
+        'highlight':  ["clint"]
     },
     long_description=__doc__,
     entry_points={