[Getan-commits] [PATCH 1 of 2] Prepares release v2.0

[Wald Commits]

# HG changeset patch
# User Bernhard Reiter <bernhard at intevation.de>
# Date 1493811509 -7200
# Node ID 69ef6f89e9309f4b54d4c7b72168579247debb4d
# Parent  a499441249af134177b1d1d2d4f8bd9d84861451
Prepares release v2.0.

 * Updates CHANGES, README, version and some copyright lines.

diff -r a499441249af -r 69ef6f89e930 CHANGES
--- a/CHANGES	Wed May 03 13:35:58 2017 +0200
+++ b/CHANGES	Wed May 03 13:38:29 2017 +0200
@@ -1,21 +1,24 @@
 UNRELEASED
 
-1.2 X.Y.2017
+2.0 03.05.2017
 
- * Already written entries can now be adjusted for start_time and length.
+ * Adds jinja2 template rendering.
 
- * Added contrib/getan-report.py, a script to write a daily report.
+   getan-eval.py can be used as a main entry point for user templates. User
+   templates are loaded from ~/.getan/templates and can be used via the
+   --template option. E.g. 'getan-eval.py --template=mytemplate' will try
+   to load ~/.getan/templates/mytemplate.
 
- * Added a template rendering module bases on jinja2.
+ * Adds: Existing entries can be adjusted for start_time and length via ui.
 
- * Cleanup: All scripts are now in the directory 'scripts'.
+ * Adds 'getan-report.py', a script to write a daily report.
 
- * getan-eval.py can be used as a main entry point for user templates. User
-   templates are loaded from ~/.getan/templates and can be used via the
-   --template option. E.g. getan-eval.py --template=mytemplate will try to load
-   ~/.getan/templates/mytemplate.
+ * Replaces zeiterfassung.py with 'getan-eval.py -t zeiterfassung'.
 
- * zeiterfassung.py is replaced by 'getan-eval.py -t zeiterfassung'
+ * Cleanup: All scripts moved into 'scripts/'.
+
+ * Improves: Recognition of workpackages from the descriptions. They are now
+   closer to the behaviour of zeitvertexung: any non-whitespace is allowed.
 
 
 1.1 03.03.2014
diff -r a499441249af -r 69ef6f89e930 README
--- a/README	Wed May 03 13:35:58 2017 +0200
+++ b/README	Wed May 03 13:38:29 2017 +0200
@@ -24,8 +24,9 @@
 
 Or if you prefer using a virtualenv::
 
-    $ virtuelenv getan-env
+    $ virtualenv getan-env
     $ source getan-env/bin/activate
+    (getan-env)$ pip install -U pip  # to get the latest pip
     (getan-env)$ pip install urwid
 
 Using urwid sources
diff -r a499441249af -r 69ef6f89e930 getan/__init__.py
--- a/getan/__init__.py	Wed May 03 13:35:58 2017 +0200
+++ b/getan/__init__.py	Wed May 03 13:38:29 2017 +0200
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 #
 # (c) 2013, 2014 by Björn Ricks <bjoern.ricks at intevation.de>
+# (c) 2017 by Intevation GmbH
 #
 # This is Free Software licensed under the terms of GPLv3 or later.
 # For details see LICENSE coming with the source of 'getan'.
 
-__version_info__ = ("1", "2dev1")
+__version_info__ = ("2", "0")
 __version__ = '.'.join(__version_info__)
diff -r a499441249af -r 69ef6f89e930 setup.py
--- a/setup.py	Wed May 03 13:35:58 2017 +0200
+++ b/setup.py	Wed May 03 13:38:29 2017 +0200
@@ -2,6 +2,11 @@
 # -*- coding: utf-8 -*-
 #
 # (c) 2011, 2014 by Björn Ricks <bjoern.ricks at intevation.de>
+# (c) 2017 by Intevation GmbH
+#
+# Author(s):
+#  * Björn Ricks <bjoern.ricks at intevation.de>
+#  * Bernhard Reiter <bernhard.reiter at intevation.de>
 #
 # A python worklog-alike to log what you have 'getan' (done).
 #