fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-06-28 13:36:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'maebert/2.0-rc1' into 2.0-rc1

Browse source 
Conflicts:
	setup.py
This commit is contained in:
flight16 2015-04-13 08:46:43 +09:00
commit 53e3bd334c
23 changed files with 320 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

18
setup.py
View file

@ -75,11 +75,11 @@ conditional_dependencies = {
setup(
name = "jrnl",
version = get_version(),
description = "A command line journal application that stores your journal in a plain text file",
packages = ['jrnl'],
install_requires = [
name="jrnl",
version=get_version(),
description="A command line journal application that stores your journal in a plain text file",
packages=['jrnl'],
install_requires=[
"pyxdg>=0.19",
"parsedatetime>=1.2",
"pytz>=2013b",
@ -115,9 +115,9 @@ setup(
'Topic :: Text Processing'
],
# metadata for upload to PyPI
author = "Manuel Ebert",
author_email = "manuel@1450.me",
author="Manuel Ebert",
author_email="manuel@1450.me",
license="LICENSE",
keywords = "journal todo todo.txt jrnl".split(),
url = "http://www.jrnl.sh",
keywords="journal todo todo.txt jrnl".split(),
url="http://www.jrnl.sh",
)