summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Ebert <manuel.ebert@upf.edu>2012-05-24 13:43:48 +0200
committerManuel Ebert <manuel.ebert@upf.edu>2012-05-24 13:43:48 +0200
commit321d8d2d50a62e19ee888126499b9bde8dbcedf8 (patch)
treeec22de2184c5e4b81eeb65469fbb0abec907c168
parentb73d081f555c1e28095c0cf650e947f49abe60ce (diff)
Version bump to 0.2.5v0.2.5
-rw-r--r--CHANGELOG.md2
-rw-r--r--jrnl/__init__.py2
-rwxr-xr-xjrnl/jrnl.py2
-rw-r--r--setup.py2
4 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8ae2a64..b3eaaf8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
Changelog
=========
+* Changed directory structure and install scripts (removing the necessity to make an alias from `jrnl` to `jrnl.py`)
+
### 0.2.4
* Fixes parsing of new lines in journal files and entries
diff --git a/jrnl/__init__.py b/jrnl/__init__.py
index 38269459..2c6ba2a0 100644
--- a/jrnl/__init__.py
+++ b/jrnl/__init__.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
# encoding: utf-8
-import Journal
+from Journal import Journal
from jrnl import cli
diff --git a/jrnl/jrnl.py b/jrnl/jrnl.py
index 8a0657eb..52b0136b 100755
--- a/jrnl/jrnl.py
+++ b/jrnl/jrnl.py
@@ -19,7 +19,7 @@ except ImportError: import json
__title__ = 'jrnl'
-__version__ = '0.2.4'
+__version__ = '0.2.5'
__author__ = 'Manuel Ebert, Stephan Gabler'
__license__ = 'MIT'
diff --git a/setup.py b/setup.py
index 31818d06..4a19230c 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ base_dir = os.path.dirname(os.path.abspath(__file__))
setup(
name = "jrnl",
- version = "0.3.0",
+ version = "0.2.5",
description = "A command line journal application that stores your journal in a plain text file",
packages = ['jrnl'],
install_requires = ["parsedatetime", "simplejson"],